支持IShardingRuntimeContext<TDbContext>接口注入,支持多dbcontext分片的处理,修复多次AddShardingDbContext后导致的只有最后一个生效的bug,发布6.8.0.2

Author: xuejmnet

samples/Sample.BulkConsole/Program.cs

@@ -89,7 +89,16 @@ static void Main(string[] args)
 
                 var b = DateTime.Now.Date.AddDays(-3);
                 var queryable = myShardingDbContext.Set<Order>().Select(o=>new {Id=o.Id,OrderNo=o.OrderNo, CreateTime =o.CreateTime });//.Where(o => o.CreateTime >= b);
-
+                var dateTime = DateTime.Now;
+                var dbContexts = myShardingDbContext.BulkShardingTableExpression<MyShardingDbContext,Order>(o=>o.CreateTime<=dateTime);
+                using (var dbContextTransaction = myShardingDbContext.Database.BeginTransaction())
+                {
+                    foreach (var dbContext in dbContexts)
+                    {
+                        dbContext.Set<Order>().Where(o=>o.CreateTime<=dateTime).BatchUpdate(a => new Order { OrderNo = "12345" });
+                    }
+                    dbContextTransaction.Commit();
+                }
                 var startNew1 = Stopwatch.StartNew();
 
 

src/ShardingCore/Core/RuntimeContexts/IShardingRuntimeContext`1.cs

@@ -0,0 +1,8 @@
+using ShardingCore.Sharding.Abstractions;
+
+namespace ShardingCore.Core.RuntimeContexts;
+
+public interface IShardingRuntimeContext<TDbContext>:IShardingRuntimeContext where TDbContext:IShardingDbContext
+{
+    
+}

src/ShardingCore/Core/RuntimeContexts/ShardingRuntimeContext.cs

@@ -31,7 +31,7 @@
 
 namespace ShardingCore.Core.RuntimeContexts
 {
-    public sealed class ShardingRuntimeContext : IShardingRuntimeContext
+    public sealed class ShardingRuntimeContext<TDbContext> : IShardingRuntimeContext<TDbContext> where TDbContext:IShardingDbContext
     {
         private bool isInited = false;
         private object INIT_LOCK = new object();
@@ -42,12 +42,9 @@ public sealed class ShardingRuntimeContext : IShardingRuntimeContext
         private IServiceCollection _serviceMap = new ServiceCollection();
 
         private IServiceProvider _serviceProvider;
-        public Type DbContextType { get; }
-        // private ILoggerFactory _applicationLoggerFactory;
-        public ShardingRuntimeContext(Type dbContextType)
-        {
-            DbContextType = dbContextType;
-        }
+
+        public Type DbContextType => typeof(TDbContext);
+     
 
         public void AddServiceConfig(Action<IServiceCollection> configure)
         {

src/ShardingCore/Core/ShardingConfigurations/ConfigBuilders/ShardingCoreConfigBuilder.cs

@@ -79,11 +79,12 @@ public ShardingCoreConfigBuilder<TShardingDbContext> ReplaceService<TService, TI
         [Obsolete("plz use AddShardingCore")]
         public void EnsureConfig()
         {
-             _services.AddSingleton<IShardingRuntimeContext>(sp => _shardingRuntimeBuilder.Build(sp));
+             AddShardingCore();
         }
         public void AddShardingCore()
         {
-             _services.AddSingleton<IShardingRuntimeContext>(sp => _shardingRuntimeBuilder.Build(sp));
+            _services.AddSingleton<IShardingRuntimeContext<TShardingDbContext>>(sp => _shardingRuntimeBuilder.Build(sp));
+            _services.AddSingleton<IShardingRuntimeContext>(sp => sp.GetService<IShardingRuntimeContext<TShardingDbContext>>());
         }
 
     }

src/ShardingCore/ShardingCoreExtension.cs

@@ -106,14 +106,14 @@ public static ShardingCoreConfigBuilder<TShardingDbContext> AddShardingConfigure
         public static void UseDefaultSharding<TShardingDbContext>(this DbContextOptionsBuilder dbContextOptionsBuilder,
             IServiceProvider serviceProvider) where TShardingDbContext : DbContext, IShardingDbContext
         {
-            var shardingRuntimeContext = serviceProvider.GetRequiredService<IShardingRuntimeContext>();
+            var shardingRuntimeContext = serviceProvider.GetRequiredService<IShardingRuntimeContext<TShardingDbContext>>();
             dbContextOptionsBuilder.UseDefaultSharding<TShardingDbContext>(shardingRuntimeContext);
         }
 
         public static void UseDefaultSharding<TShardingDbContext>(IServiceProvider serviceProvider,
             DbContextOptionsBuilder dbContextOptionsBuilder) where TShardingDbContext : DbContext, IShardingDbContext
         {
-            var shardingRuntimeContext = serviceProvider.GetRequiredService<IShardingRuntimeContext>();
+            var shardingRuntimeContext = serviceProvider.GetRequiredService<IShardingRuntimeContext<TShardingDbContext>>();
             dbContextOptionsBuilder.UseDefaultSharding<TShardingDbContext>(shardingRuntimeContext);
         }
 

src/ShardingCore/ShardingRuntimeBuilder.cs

@@ -71,18 +71,18 @@ public ShardingRuntimeBuilder<TShardingDbContext> ReplaceService<TService, TImpl
             return this;
         }
 
-        public IShardingRuntimeContext Build()
+        public IShardingRuntimeContext<TShardingDbContext> Build()
         {
             return Build(null);
         }
-        public IShardingRuntimeContext Build(IServiceProvider appServiceProvider)
+        public IShardingRuntimeContext<TShardingDbContext> Build(IServiceProvider appServiceProvider)
         {
             return Build(appServiceProvider, appServiceProvider?.GetService<ILoggerFactory>());
         }
 
-        public IShardingRuntimeContext Build(IServiceProvider appServiceProvider, ILoggerFactory loggerFactory)
+        public IShardingRuntimeContext<TShardingDbContext> Build(IServiceProvider appServiceProvider, ILoggerFactory loggerFactory)
         {
-            var shardingRuntimeContext = new ShardingRuntimeContext(typeof(TShardingDbContext));
+            var shardingRuntimeContext = new ShardingRuntimeContext<TShardingDbContext>();
             shardingRuntimeContext.AddServiceConfig(services =>
             {
                 // services.AddSingleton<IDbContextTypeCollector>(sp => new DbContextTypeCollector<TShardingDbContext>());

test/ShardingCore.Test/ShardingTest.cs

@@ -174,12 +174,12 @@ public async Task GenericTest()
 
             await _virtualDbContext.AddRangeAsync(logDays);
             var bulkShardingExpression = _virtualDbContext.BulkShardingExpression<ShardingDefaultDbContext, Order>(o => new[] { "A", "B" }.Contains(o.Area));
+         
             Assert.Equal(2, bulkShardingExpression.Count);
             Assert.True(bulkShardingExpression.ContainsKey("A"));
             Assert.True(bulkShardingExpression.ContainsKey("B"));
 
             var bulkShardingTableExpression = _virtualDbContext.BulkShardingTableExpression<ShardingDefaultDbContext, SysUserMod>(o => o.Id == Guid.NewGuid().ToString());
-
             Assert.Equal(1, bulkShardingTableExpression.Count());
 
             var noShardingExpression = _virtualDbContext.BulkShardingExpression<ShardingDefaultDbContext, LogNoSharding>(o => o.Id == "123");