修复重构后的bug 后需要实现group by

Author: xuejmnet

src/ShardingCore/Sharding/MergeEngines/Enumerables/AppendOrderSequenceShardingEnumerable.cs

@@ -8,6 +8,7 @@
 using ShardingCore.Sharding.MergeEngines.Common.Abstractions;
 using ShardingCore.Sharding.MergeEngines.Enumerables.Base;
 using ShardingCore.Sharding.MergeEngines.Executors.Abstractions;
+using ShardingCore.Sharding.MergeEngines.Executors.Enumerables;
 using ShardingCore.Sharding.MergeEngines.ShardingMergeEngines.Abstractions.StreamMerge;
 using ShardingCore.Sharding.PaginationConfigurations;
 using ShardingCore.Sharding.StreamMergeEngines;
@@ -95,7 +96,7 @@ protected override IEnumerable<ISqlRouteUnit> GetDefaultSqlRouteUnits()
 
         protected override IExecutor<IStreamMergeAsyncEnumerator<TEntity>> CreateExecutor(bool async)
         {
-            throw new System.NotImplementedException();
+            return new AppendOrderSequenceEnumerableExecutor<TEntity>(GetStreamMergeContext(), async);
         }
     }
 }

src/ShardingCore/Sharding/MergeEngines/Executors/Abstractions/AbstractExecutor.cs

@@ -92,13 +92,6 @@ private async Task<List<TResult>> ExecuteAsync0(bool async,
                 //严格限制连接数就在内存中进行聚合并且直接回收掉当前dbcontext
                 if (dataSourceSqlExecutorUnit.ConnectionMode == ConnectionModeEnum.CONNECTION_STRICTLY)
                 {
-                    var resultCount = result.Count;
-                    if (resultCount > 1)
-                    {
-                        throw new ShardingCoreInvalidOperationException(
-                            $"in memory merge result length error:{resultCount}");
-                    }
-
                     GetShardingMerger()
                         .InMemoryMerge(result, routeQueryResults.Select(o => o.MergeResult).ToList());
                     // MergeParallelExecuteResult(result, , async);

src/ShardingCore/Sharding/MergeEngines/Executors/CircuitBreakers/AbstractCircuitBreaker.cs

@@ -55,9 +55,9 @@ public void Terminated0()
             _afterTerminated?.Invoke();
         }
 
-        public void Register(Action afterTrip)
+        public void Register(Action afterTerminated)
         {
-            _afterTerminated = afterTrip;
+            _afterTerminated = afterTerminated;
         }
     }
 }

src/ShardingCore/Sharding/MergeEngines/Executors/CircuitBreakers/AllCircuitBreaker.cs

@@ -13,13 +13,13 @@ public AllCircuitBreaker(StreamMergeContext streamMergeContext) : base(streamMer
         protected override bool OrderConditionTerminated<TResult>(IEnumerable<TResult> results)
         {
             //只要有一个是false就拉闸
-            return results.Any(o => o is RouteQueryResult<bool> routeQueryResult && routeQueryResult.QueryResult==false);
+            return results.Any(o => o is false);
         }
 
         protected override bool RandomConditionTerminated<TResult>(IEnumerable<TResult> results)
         {
             //只要有一个是false就拉闸
-            return results.Any(o => o is RouteQueryResult<bool> routeQueryResult && routeQueryResult.QueryResult == false);
+            return results.Any(o => o is false);
         }
     }
 }

src/ShardingCore/Sharding/MergeEngines/Executors/CircuitBreakers/AnyCircuitBreaker.cs

@@ -11,12 +11,12 @@ public AnyCircuitBreaker(StreamMergeContext streamMergeContext) : base(streamMer
         }
         protected override bool OrderConditionTerminated<TResult>(IEnumerable<TResult> results)
         {
-            return results.Any(o => o is RouteQueryResult<bool> routeQueryResult && routeQueryResult.QueryResult);
+            return results.Any(o => o is true);
         }
 
         protected override bool RandomConditionTerminated<TResult>(IEnumerable<TResult> results)
         {
-            return results.Any(o => o is RouteQueryResult<bool> routeQueryResult && routeQueryResult.QueryResult);
+            return results.Any(o => o is true);
         }
     }
 }

src/ShardingCore/Sharding/MergeEngines/Executors/CircuitBreakers/ContainsCircuitBreaker.cs

@@ -12,12 +12,12 @@ public ContainsCircuitBreaker(StreamMergeContext streamMergeContext) : base(stre
 
         protected override bool OrderConditionTerminated<TResult>(IEnumerable<TResult> results)
         {
-            return results.Any(o => o is RouteQueryResult<bool> routeQueryResult && routeQueryResult.QueryResult);
+            return results.Any(o => o is true);
         }
 
         protected override bool RandomConditionTerminated<TResult>(IEnumerable<TResult> results)
         {
-            return results.Any(o => o is RouteQueryResult<bool> routeQueryResult && routeQueryResult.QueryResult);
+            return results.Any(o => o is true);
         }
     }
 }

src/ShardingCore/Sharding/MergeEngines/Executors/CircuitBreakers/SingleOrSingleOrDefaultCircuitBreaker.cs

@@ -30,7 +30,12 @@ public AnyMethodExecutor(StreamMergeContext streamMergeContext) : base(streamMer
 
         public override ICircuitBreaker CreateCircuitBreaker()
         {
-            return new AnyElementCircuitBreaker(GetStreamMergeContext());
+            var anyCircuitBreaker = new AnyCircuitBreaker(GetStreamMergeContext());
+            anyCircuitBreaker.Register(() =>
+            {
+                Cancel();
+            });
+            return anyCircuitBreaker;
         }
 
         public override IShardingMerger<bool> GetShardingMerger()

src/ShardingCore/Sharding/MergeEngines/Executors/Methods/AnyMethodExecutor.cs

@@ -33,7 +33,12 @@ public AverageMethodWrapExecutor(StreamMergeContext streamMergeContext) : base(s
 
         public override ICircuitBreaker CreateCircuitBreaker()
         {
-            return new NoTripCircuitBreaker(GetStreamMergeContext());
+            var circuitBreaker = new NoTripCircuitBreaker(GetStreamMergeContext());
+            circuitBreaker.Register(() =>
+            {
+                Cancel();
+            });
+            return circuitBreaker;
         }
 
         public override IShardingMerger<RouteQueryResult<AverageResult<TSelect>>> GetShardingMerger()

src/ShardingCore/Sharding/MergeEngines/Executors/Methods/AverageMethodWrapExecutor.cs

@@ -32,7 +32,13 @@ public MaxMethodExecutor(StreamMergeContext streamMergeContext) : base(streamMer
 
         public override ICircuitBreaker CreateCircuitBreaker()
         {
-            return new AnyElementCircuitBreaker(GetStreamMergeContext());
+
+            var circuitBreaker = new AnyElementCircuitBreaker(GetStreamMergeContext());
+            circuitBreaker.Register(() =>
+            {
+                Cancel();
+            });
+            return circuitBreaker;
         }
 
         public override IShardingMerger<RouteQueryResult<TResult>> GetShardingMerger()