1

samples/Sample.SqlServer/Sample.SqlServer.csproj

@@ -6,11 +6,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.9" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.18" />
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\src\ShardingCore\ShardingCore.csproj" />
+      <ProjectReference Include="..\..\src3x\ShardingCore.3x\ShardingCore.3x.csproj" />
     </ItemGroup>
 
 </Project>

samples/Sample.SqlServer/Startup.cs

@@ -21,10 +21,10 @@ namespace Sample.SqlServer
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddControllers();
-            services.AddDbContext<DefaultTableDbContext>(o => o.UseSqlServer("Data Source=localhost;Initial Catalog=ShardingCoreDB;Integrated Security=True"));
+            //services.AddDbContext<DefaultTableDbContext>(o => o.UseSqlServer("Data Source=localhost;Initial Catalog=ShardingCoreDBxx3;Integrated Security=True"));
 
 
-            services.AddShardingDbContext<DefaultShardingDbContext, DefaultTableDbContext>(o => o.UseSqlServer("Data Source=localhost;Initial Catalog=ShardingCoreDBxx;Integrated Security=True;MultipleActiveResultSets=True;")
+            services.AddShardingDbContext<DefaultShardingDbContext, DefaultTableDbContext>(o => o.UseSqlServer("Data Source=localhost;Initial Catalog=ShardingCoreDBxx3;Integrated Security=True;MultipleActiveResultSets=True;")
                 ,op =>
                 {
                     op.EnsureCreatedWithOutShardingTable = true;

src/ShardingCore/EFCores/ShardingDbSetSource.cs

@@ -12,8 +12,11 @@ namespace ShardingCore.EFCores
     * @Date: Saturday, 14 August 2021 10:17:43
     * @Email: 326308290@qq.com
     */
+#if !EFCORE2
     public class ShardingDbSetSource:IDbSetSource
     {
+#if EFCORE5
+
         private static readonly MethodInfo _genericCreateSet
             = typeof(ShardingDbSetSource).GetTypeInfo().GetDeclaredMethod(nameof(CreateSetFactory));
 
@@ -48,5 +51,83 @@ namespace ShardingCore.EFCores
         private static Func<DbContext, string, object> CreateSetFactory<TEntity>()
             where TEntity : class
             => (c, name) => new ShardingInternalDbSet<TEntity>(c, name);
+#endif
+#if EFCORE3
+        
+        private static readonly MethodInfo _genericCreateSet
+            = typeof(ShardingDbSetSource).GetTypeInfo().GetDeclaredMethod(nameof(CreateSetFactory));
+
+        private readonly ConcurrentDictionary<Type, Func<DbContext, object>> _cache
+            = new ConcurrentDictionary<Type, Func<DbContext, object>>();
+
+        /// <summary>
+        ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
+        ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
+        ///     any release. You should only use it directly in your code with extreme caution and knowing that
+        ///     doing so can result in application failures when updating to a new Entity Framework Core release.
+        /// </summary>
+        public virtual object Create(DbContext context, Type type)
+            => CreateCore(context, type, _genericCreateSet);
+
+        private object CreateCore(DbContext context, Type type, MethodInfo createMethod)
+            => _cache.GetOrAdd(
+                type,
+                t => (Func<DbContext, object>)createMethod
+                    .MakeGenericMethod(t)
+                    .Invoke(null, null))(context);
+
+        private static Func<DbContext, object> CreateSetFactory<TEntity>()
+            where TEntity : class
+            => c => new ShardingInternalDbSet<TEntity>(c);
+#endif
     }
+#endif
+
+#if EFCORE2
+
+    /// <summary>
+    ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
+    ///     directly from your code. This API may change or be removed in future releases.
+    /// </summary>
+    public class ShardingDbSetSource : IDbSetSource, IDbQuerySource
+    {
+        private static readonly MethodInfo _genericCreateSet
+            = typeof(ShardingDbSetSource).GetTypeInfo().GetDeclaredMethod(nameof(CreateSetFactory));
+
+        private static readonly MethodInfo _genericCreateQuery
+            = typeof(ShardingDbSetSource).GetTypeInfo().GetDeclaredMethod(nameof(CreateQueryFactory));
+
+        private readonly ConcurrentDictionary<Type, Func<DbContext, object>> _cache
+            = new ConcurrentDictionary<Type, Func<DbContext, object>>();
+
+        /// <summary>
+        ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
+        ///     directly from your code. This API may change or be removed in future releases.
+        /// </summary>
+        public virtual object Create(DbContext context, Type type)
+            => CreateCore(context, type, _genericCreateSet);
+
+        /// <summary>
+        ///     This API supports the Entity Framework Core infrastructure and is not intended to be used
+        ///     directly from your code. This API may change or be removed in future releases.
+        /// </summary>
+        public virtual object CreateQuery(DbContext context, Type type)
+            => CreateCore(context, type, _genericCreateQuery);
+
+        private object CreateCore(DbContext context, Type type, MethodInfo createMethod)
+            => _cache.GetOrAdd(
+                type,
+                t => (Func<DbContext, object>)createMethod
+                    .MakeGenericMethod(t)
+                    .Invoke(null, null))(context);
+
+        private static Func<DbContext, object> CreateSetFactory<TEntity>()
+            where TEntity : class
+            => c => new ShardingInternalDbSet<TEntity>(c);
+
+        private static Func<DbContext, DbQuery<TQuery>> CreateQueryFactory<TQuery>()
+            where TQuery : class
+            => c => new ShardingInternalDbQuery<TQuery>(c);
+    }
+#endif
 }

src/ShardingCore/EFCores/ShardingInternalDbQuery.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Internal;
+
+namespace ShardingCore.EFCores
+{
+    /*
+    * @Author: xjm
+    * @Description:
+    * @Date: 2021/8/20 17:05:36
+    * @Ver: 1.0
+    * @Email: 326308290@qq.com
+    */
+#if EFCORE2
+    
+    public class ShardingInternalDbQuery<TQuery> : InternalDbQuery<TQuery> where TQuery : class
+    {
+        public ShardingInternalDbQuery(DbContext context) : base(context)
+        {
+        }
+    }
+#endif
+}

src/ShardingCore/EFCores/ShardingInternalDbSet.cs

@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Internal;
 using ShardingCore.Core;
@@ -17,15 +18,25 @@ namespace ShardingCore.EFCores
     * @Ver: 1.0
     * @Email: 326308290@qq.com
     */
+    
     public class ShardingInternalDbSet<TEntity> : InternalDbSet<TEntity>
         where TEntity : class
     {
         private readonly DbContext _context;
+#if EFCORE5
 
         public ShardingInternalDbSet(DbContext context, string entityTypeName) : base(context, entityTypeName)
         {
             _context = context;
         }
+#endif
+#if !EFCORE5
+
+        public ShardingInternalDbSet(DbContext context) : base(context)
+        {
+            _context = context;
+        }
+#endif
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
         ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
@@ -44,6 +55,7 @@ namespace ShardingCore.EFCores
         ///     any release. You should only use it directly in your code with extreme caution and knowing that
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
+#if !EFCORE2
         public override async ValueTask<EntityEntry<TEntity>> AddAsync(
             TEntity entity,
             CancellationToken cancellationToken = default)
@@ -52,6 +64,15 @@ namespace ShardingCore.EFCores
             return await genericDbContext.AddAsync(entity, cancellationToken);
 
         }
+#endif
+#if EFCORE2
+        public override async Task<EntityEntry<TEntity>> AddAsync(TEntity entity, CancellationToken cancellationToken = new CancellationToken())
+        {
+            var genericDbContext = ((IShardingDbContext)_context).CreateGenericDbContext(entity);
+            return await genericDbContext.AddAsync(entity, cancellationToken);
+        }
+
+#endif
 
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
@@ -346,4 +367,5 @@ namespace ShardingCore.EFCores
         }
 
     }
+    
 }

src/ShardingCore/Sharding/AbstractShardingDbContext.cs

@@ -134,6 +134,8 @@ namespace ShardingCore.Sharding
             return CreateGenericDbContext(entity).Add(entity);
         }
 
+#if !EFCORE2
+        
         public override ValueTask<EntityEntry<TEntity>> AddAsync<TEntity>(TEntity entity, CancellationToken cancellationToken = new CancellationToken())
         {
             return CreateGenericDbContext(entity).AddAsync(entity, cancellationToken);
@@ -143,6 +145,19 @@ namespace ShardingCore.Sharding
         {
             return CreateGenericDbContext(entity).AddAsync(entity, cancellationToken);
         }
+#endif
+#if EFCORE2
+
+        public override Task<EntityEntry<TEntity>> AddAsync<TEntity>(TEntity entity, CancellationToken cancellationToken = new CancellationToken())
+        {
+            return CreateGenericDbContext(entity).AddAsync(entity, cancellationToken);
+        }
+
+        public override Task<EntityEntry> AddAsync(object entity, CancellationToken cancellationToken = new CancellationToken())
+        {
+            return CreateGenericDbContext(entity).AddAsync(entity, cancellationToken);
+        }
+#endif
 
         public override void AddRange(params object[] entities)
         {
@@ -443,6 +458,8 @@ namespace ShardingCore.Sharding
             }
             return i;
         }
+#if !EFCORE2
+        
 
         public override async Task<int> SaveChangesAsync(CancellationToken cancellationToken = new CancellationToken())
         {
@@ -481,6 +498,49 @@ namespace ShardingCore.Sharding
             }
             return i;
         }
+#endif
+#if EFCORE2
+
+
+        public override async Task<int> SaveChangesAsync(CancellationToken cancellationToken = new CancellationToken())
+        {
+
+            var isBeginTransaction = IsBeginTransaction;
+            //如果是内部开的事务就内部自己消化
+            if (!isBeginTransaction)
+            {
+                await Database.BeginTransactionAsync(cancellationToken);
+            }
+            int i = 0;
+
+            try
+            {
+
+                foreach (var dbContextCache in _dbContextCaches)
+                {
+                    dbContextCache.Value.Database.UseTransaction(Database.CurrentTransaction.GetDbTransaction());
+                    i += await dbContextCache.Value.SaveChangesAsync(cancellationToken);
+                }
+                if (!isBeginTransaction)
+                    Database.CurrentTransaction.Commit();
+            }
+            finally
+            {
+                if (!isBeginTransaction) { }
+                if (Database.CurrentTransaction != null)
+                {
+                    Database.CurrentTransaction.Dispose();
+                    foreach (var dbContextCache in _dbContextCaches)
+                    {
+                        dbContextCache.Value.Database.UseTransaction(null);
+                    }
+                }
+
+            }
+            return i;
+        }
+#endif
+#if !EFCORE2
 
         public override async Task<int> SaveChangesAsync(bool acceptAllChangesOnSuccess, CancellationToken cancellationToken = new CancellationToken())
         {
@@ -520,6 +580,48 @@ namespace ShardingCore.Sharding
             }
             return i;
         }
+#endif
+#if EFCORE2
+
+        public override async Task<int> SaveChangesAsync(bool acceptAllChangesOnSuccess, CancellationToken cancellationToken = new CancellationToken())
+        {
+
+            var isBeginTransaction = IsBeginTransaction;
+            //如果是内部开的事务就内部自己消化
+            if (!isBeginTransaction)
+            {
+                await Database.BeginTransactionAsync(cancellationToken);
+            }
+            int i = 0;
+
+            try
+            {
+
+                foreach (var dbContextCache in _dbContextCaches)
+                {
+                    dbContextCache.Value.Database.UseTransaction(Database.CurrentTransaction.GetDbTransaction());
+                    i += await dbContextCache.Value.SaveChangesAsync(acceptAllChangesOnSuccess, cancellationToken);
+                }
+                if (!isBeginTransaction)
+                    Database.CurrentTransaction.Commit(cancellationToken);
+            }
+            finally
+            {
+                if (!isBeginTransaction)
+                    if (Database.CurrentTransaction != null)
+                    {
+                        Database.CurrentTransaction.Dispose();
+
+                        foreach (var dbContextCache in _dbContextCaches)
+                        {
+                            dbContextCache.Value.Database.UseTransaction(null);
+                        }
+                    }
+
+            }
+            return i;
+        }
+#endif
 
         public override void Dispose()
         {
@@ -537,6 +639,7 @@ namespace ShardingCore.Sharding
             base.Dispose();
         }
 
+#if !EFCORE2
         public override async ValueTask DisposeAsync()
         {
             foreach (var dbContextCache in _dbContextCaches)
@@ -553,6 +656,7 @@ namespace ShardingCore.Sharding
 
             await base.DisposeAsync();
         }
+#endif
 
     }
 }

src/ShardingCore/Sharding/StreamMergeEngines/AsyncEnumerableStreamMergeEngine.cs

@@ -11,6 +11,10 @@ using ShardingCore.Sharding.Enumerators;
 using ShardingCore.Sharding.Enumerators.StreamMergeAsync;
 using ShardingCore.Sharding.Enumerators.StreamMergeSync;
 
+#if EFCORE2
+using Microsoft.EntityFrameworkCore.Extensions.Internal;
+#endif
+
 namespace ShardingCore.Sharding.StreamMergeEngines
 {
     /*
@@ -29,59 +33,8 @@ namespace ShardingCore.Sharding.StreamMergeEngines
             _mergeContext = mergeContext;
         }
 
-        //public static IStreamMergeEngine<T> Create<T>(StreamMergeContext<T> mergeContext)
-        //{
-        //    return new AsyncEnumerableStreamMergeEngine<T>(mergeContext);
-        //}
-        //public async Task<IStreamMergeAsyncEnumerator<T>> GetAsyncEnumerator()
-        //{
-        //    var tableResult = _mergeContext.GetRouteResults();
-        //    var enumeratorTasks = tableResult.Select(routeResult =>
-        //     {
-        //         if (routeResult.ReplaceTables.Count > 1)
-        //             throw new ShardingCoreException("route found more than 1 table name s");
-        //         var tail = string.Empty;
-        //         if (routeResult.ReplaceTables.Count == 1)
-        //             tail = routeResult.ReplaceTables.First().Tail;
-
-        //         return Task.Run(async () =>
-        //         {
-        //             try
-        //             {
-        //                 //using (var scope = _mergeContext.CreateScope())
-        //                 //{
-        //                 //var shardingContext = ShardingContext.Create(routeResult);
-        //                 //scope.ShardingAccessor.ShardingContext = shardingContext;
-
-        //                 var shardingDbContext = _mergeContext.CreateDbContext(tail);
-        //                 var newQueryable = (IQueryable<T>) _mergeContext.GetReWriteQueryable()
-        //                         .ReplaceDbContextQueryable(shardingDbContext);
-
-        //                     var asyncEnumerator = await GetAsyncEnumerator(newQueryable);
-        //                     return new StreamMergeAsyncEnumerator<T>(asyncEnumerator);
-        //                 //}
-        //             }
-        //             catch (Exception e)
-        //             {
-        //                 Console.WriteLine(e);
-        //                 throw;
-        //             }
-        //         });
-        //     }).ToArray();
-
-        //    var streamEnumerators = await Task.WhenAll(enumeratorTasks);
-        //    if (_mergeContext.HasSkipTake())
-        //        return new PaginationStreamMergeAsyncEnumerator<T>(_mergeContext, streamEnumerators);
-        //    if (_mergeContext.HasGroupQuery())
-        //        return new MultiAggregateOrderStreamMergeAsyncEnumerator<T>(_mergeContext, streamEnumerators);
-        //    return new MultiOrderStreamMergeAsyncEnumerator<T>(_mergeContext, streamEnumerators);
-        //}
-        //public IStreamMergeEnumerator<T> GetEnumerator()
-        //{
-        //    throw new NotImplementedException();
-        //}
-
 
+#if !EFCORE2
 
         private async Task<IAsyncEnumerator<T>> GetAsyncEnumerator(IQueryable<T> newQueryable)
         {
@@ -89,8 +42,33 @@ namespace ShardingCore.Sharding.StreamMergeEngines
             await enumator.MoveNextAsync();
             return enumator;
         }
+#endif
+#if EFCORE2
+
+        private async Task<IAsyncEnumerator<T>> GetAsyncEnumerator(IQueryable<T> newQueryable)
+        {
+            var enumator = newQueryable.AsAsyncEnumerable().GetEnumerator();
+            await enumator.MoveNext();
+            return enumator;
+        }
+#endif
+#if !EFCORE2
 
         public IAsyncEnumerator<T> GetAsyncEnumerator(CancellationToken cancellationToken = new CancellationToken())
+        {
+            return GetShardingEnumerator();
+        }
+#endif
+
+#if EFCORE2
+        
+        IAsyncEnumerator<T> IAsyncEnumerable<T>.GetEnumerator()
+        {
+            return GetShardingEnumerator();
+        }
+#endif
+
+        private IAsyncEnumerator<T> GetShardingEnumerator()
         {
             var tableResult = _mergeContext.GetRouteResults();
             var enumeratorTasks = tableResult.Select(routeResult =>
@@ -105,18 +83,12 @@ namespace ShardingCore.Sharding.StreamMergeEngines
                 {
                     try
                     {
-                        //using (var scope = _mergeContext.CreateScope())
-                        //{
-                        //var shardingContext = ShardingContext.Create(routeResult);
-                        //scope.ShardingAccessor.ShardingContext = shardingContext;
-
                         var shardingDbContext = _mergeContext.CreateDbContext(tail);
                         var newQueryable = (IQueryable<T>)_mergeContext.GetReWriteQueryable()
                             .ReplaceDbContextQueryable(shardingDbContext);
 
                         var asyncEnumerator = await GetAsyncEnumerator(newQueryable);
                         return new StreamMergeAsyncEnumerator<T>(asyncEnumerator);
-                        //}
                     }
                     catch (Exception e)
                     {
@@ -134,6 +106,7 @@ namespace ShardingCore.Sharding.StreamMergeEngines
             return new MultiOrderStreamMergeAsyncEnumerator<T>(_mergeContext, streamEnumerators);
         }
 
+
         private IEnumerator<T> GetEnumerator(IQueryable<T> newQueryable)
         {
             var enumator = newQueryable.AsEnumerable().GetEnumerator();
@@ -155,10 +128,6 @@ namespace ShardingCore.Sharding.StreamMergeEngines
                {
                    try
                    {
-                        //using (var scope = _mergeContext.CreateScope())
-                        //{
-                        //var shardingContext = ShardingContext.Create(routeResult);
-                        //scope.ShardingAccessor.ShardingContext = shardingContext;
 
                        var shardingDbContext = _mergeContext.CreateDbContext(tail);
                        var newQueryable = (IQueryable<T>)_mergeContext.GetReWriteQueryable()
@@ -166,7 +135,6 @@ namespace ShardingCore.Sharding.StreamMergeEngines
 
                        var enumerator = GetEnumerator(newQueryable);
                        return new StreamMergeEnumerator<T>(enumerator);
-                        //}
                    }
                    catch (Exception e)
                    {
@@ -188,5 +156,6 @@ namespace ShardingCore.Sharding.StreamMergeEngines
         {
             return GetEnumerator();
         }
+
     }
 }

src/ShardingCore/ShardingCore.csproj

@@ -16,6 +16,5 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.7" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.7" />
-        <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="5.0.0" />
     </ItemGroup>
 </Project>

src2x/ShardingCore.2x/ShardingCore.2x.csproj

@@ -25,7 +25,6 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.6" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.2.6" />
-        <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
     </ItemGroup>
 
 </Project>

src3x/ShardingCore.3x/ShardingCore.3x.csproj

@@ -28,9 +28,8 @@
       <Compile Remove="..\..\src\ShardingCore\ShardingTableConfig.cs" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.10" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.18" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.10" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.18" />
-        <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="3.1.6" />
     </ItemGroup>
 
 </Project>