1

src/ShardingCore/Sharding/PaginationConfigurations/PaginationConfig.cs

@@ -4,6 +4,7 @@ using System.Linq.Expressions;
 using System.Reflection;
 using System.Text;
 using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Internal;
 
 namespace ShardingCore.Sharding.PaginationConfigurations
 {

src/ShardingCore/Sharding/ShardingQueryExecutors/EnumeratorShardingQueryExecutor.cs

@@ -5,8 +5,10 @@ using System.Linq.Expressions;
 using System.Text;
 using System.Threading;
 using ShardingCore.Core.ShardingPage.Abstractions;
+using ShardingCore.Core.VirtualTables;
 using ShardingCore.Extensions;
 using ShardingCore.Sharding.Abstractions;
+using ShardingCore.Sharding.PaginationConfigurations;
 using ShardingCore.Sharding.StreamMergeEngines.EnumeratorStreamMergeEngines;
 using ShardingCore.Sharding.StreamMergeEngines.EnumeratorStreamMergeEngines.Abstractions;
 
@@ -23,11 +25,13 @@ namespace ShardingCore.Sharding.ShardingQueryExecutors
     {
         private readonly StreamMergeContext<TEntity> _streamMergeContext;
         private readonly IShardingPageManager _shardingPageManager;
+        private readonly IVirtualTableManager _virtualTableManager;
 
         public EnumeratorShardingQueryExecutor(StreamMergeContext<TEntity> streamMergeContext)
         {
             _streamMergeContext = streamMergeContext;
             _shardingPageManager = ShardingContainer.GetService<IShardingPageManager>();
+            _virtualTableManager = ShardingContainer.GetService<IVirtualTableManager>();
         }
         public IEnumeratorStreamMergeEngine<TEntity> ExecuteAsync(CancellationToken cancellationToken = new CancellationToken())
         {
@@ -36,14 +40,35 @@ namespace ShardingCore.Sharding.ShardingQueryExecutors
             {
                 return new SingleQueryEnumeratorAsyncStreamMergeEngine<TEntity>(_streamMergeContext);
             }
-            //未开启系统分表
-            if (_shardingPageManager.Current == null)
+            //未开启系统分表或者本次查询涉及多张分表
+            if (!_streamMergeContext.IsPaginationQuery()||!_streamMergeContext.IsSingleShardingTableQuery()||_shardingPageManager.Current == null)
             {
                 return new DefaultShardingEnumeratorAsyncStreamMergeEngine<TEntity>(_streamMergeContext);
             }
-            
+            var shardingEntityType = _streamMergeContext.RouteResults.First().ReplaceTables.Single(o=>o.IsShardingTable()).EntityType;
+            var virtualTable = _virtualTableManager.GetVirtualTable(_streamMergeContext.GetShardingDbContext().ShardingDbContextType,shardingEntityType);
+            if (!virtualTable.EnablePagination)
+                return new DefaultShardingEnumeratorAsyncStreamMergeEngine<TEntity>(_streamMergeContext);
+            if (_streamMergeContext.Orders.IsEmpty())
+            {
+                var append = virtualTable.PaginationMetadata.PaginationConfigs.FirstOrDefault(o=>o.AppendIfOrderNone);
+                if (append != null)
+                {
+                    123
+                    return new SequenceEnumeratorAsyncStreamMergeEngine<TEntity>(_streamMergeContext);
+                }
+            }
+
+            var propertyOrder = _streamMergeContext.Orders.First();
+            //PaginationMatchEnum.Owner
+            111
+            var paginationConfig = virtualTable.PaginationMetadata.PaginationConfigs.FirstOrDefault(o=>o.PropertyName==propertyOrder.PropertyExpression);
+            if (paginationConfig==null)
+                return new DefaultShardingEnumeratorAsyncStreamMergeEngine<TEntity>(_streamMergeContext);
+            //调用顺序排序
+            paginationConfig
             
         }
-        
+
     }
 }

src/ShardingCore/Sharding/StreamMergeContext.cs

@@ -94,6 +94,12 @@ namespace ShardingCore.Sharding
             return Skip.HasValue || Take.HasValue;
         }
 
+        public bool IsPaginationQuery()
+        {
+            return Skip.GetValueOrDefault() > 0 || Take.GetValueOrDefault() > 0;
+        }
+        
+
         public bool HasGroupQuery()
         {
             return this.GroupByContext.GroupExpression != null;

src/ShardingCore/Sharding/StreamMergeEngines/EnumeratorStreamMergeEngines/DefaultShardingEnumeratorAsyncStreamMergeEngine.cs

@@ -60,7 +60,7 @@ namespace ShardingCore.Sharding.StreamMergeEngines.EnumeratorStreamMergeEngines
 
         public override IStreamMergeAsyncEnumerator<TEntity> GetStreamMergeAsyncEnumerator(IStreamMergeAsyncEnumerator<TEntity>[] streamsAsyncEnumerators)
         {
-            if (StreamMergeContext.HasSkipTake())
+            if (StreamMergeContext.IsPaginationQuery())
                 return new PaginationStreamMergeAsyncEnumerator<TEntity>(StreamMergeContext, streamsAsyncEnumerators);
             if (StreamMergeContext.HasGroupQuery())
                 return new MultiAggregateOrderStreamMergeAsyncEnumerator<TEntity>(StreamMergeContext, streamsAsyncEnumerators);