Merge branch 'main' of github.com:dotnetcore/sharding-core

Author: xuejmnet

samples/Sample.MySql/Controllers/WeatherForecastController.cs

@@ -65,7 +65,6 @@ public IQueryable<SysTest> GetAll()
             // //一定要先在路由里面添加尾巴
             // virtualTableRoute.Append("20220921");
             // shardingTableCreator.CreateTable<SysUserMod>("ds0","20220921");
-
             return _defaultTableDbContext.Set<SysTest>();
         }
         [HttpGet]

samples/Sample.MySql/Startup.cs

@@ -179,7 +179,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             {
                 app.UseDeveloperExceptionPage();
             }
-            app.ApplicationServices.UseAutoShardingCreate();
             // app.ApplicationServices.UseAutoTryCompensateTable();
 
             // app.ApplicationServices.UseAutoShardingCreate();

samples/Sample.ShardingConsole/Program.cs

@@ -5,7 +5,6 @@
 using ShardingCore;
 using ShardingCore.Extensions;
 
-ShardingProvider.ShardingRuntimeContext.UseAutoShardingCreate();
 ShardingProvider.ShardingRuntimeContext.UseAutoTryCompensateTable();
 
 var dbContextOptionsBuilder = new DbContextOptionsBuilder<MyDbContext>();

src/ShardingCore/Bootstrappers/IShardingBootstrapper.cs

@@ -10,7 +10,7 @@ namespace ShardingCore.Bootstrappers
     /// 主要的分片初始化器,需要手动调用,如果你的分片路由存在定时执行的job譬如
     /// 系统默认的时间分片的情况下那么需要调用<code>IShardingRuntimeContext初始化的时候会调用</code>
     /// </summary>
-    public interface IShardingBootstrapper
+    internal interface IShardingBootstrapper
     {
         void AutoShardingCreate();
     }

src/ShardingCore/Bootstrappers/ShardingBootstrapper.cs

@@ -25,21 +25,18 @@ namespace ShardingCore.Bootstrappers
     * @Date: Monday, 21 December 2020 09:10:07
     * @Email: 326308290@qq.com
     */
-    public class ShardingBootstrapper : IShardingBootstrapper
+    internal class ShardingBootstrapper : IShardingBootstrapper
     {
         private readonly IShardingProvider _shardingProvider;
-        private readonly IDbContextCreator _dbContextCreator;
         private readonly DoOnlyOnce _onlyOnce=new DoOnlyOnce();
-        public ShardingBootstrapper(IShardingProvider shardingProvider,IDbContextCreator dbContextCreator)
+        public ShardingBootstrapper(IShardingProvider shardingProvider)
         {
             _shardingProvider = shardingProvider;
-            _dbContextCreator = dbContextCreator;
         }
         public void AutoShardingCreate()
         {
             if (!_onlyOnce.IsUnDo())
                 return;
-            CheckRequirement();
             StartAutoShardingJob();
         }
 
@@ -51,29 +48,6 @@ private void StartAutoShardingJob()
                 await jobRunnerService.StartAsync();
             }, TaskCreationOptions.LongRunning);
         }
-        private void CheckRequirement()
-        {
-            try
-            {
-                using (var scope = _shardingProvider.CreateScope())
-                {
-                    using (var dbContext = _dbContextCreator.GetShellDbContext(scope.ServiceProvider))
-                    {
-                        if (dbContext == null)
-                        {
-                            throw new ShardingCoreInvalidOperationException(
-                                $"cant get shell db context,plz override {nameof(IDbContextCreator)}.{nameof(IDbContextCreator.GetShellDbContext)}");
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                throw new ShardingCoreInvalidOperationException(
-                    $"cant get shell db context,plz override {nameof(IDbContextCreator)}.{nameof(IDbContextCreator.GetShellDbContext)}",
-                    ex);
-            }
-        }
 
     }
 }

src/ShardingCore/Core/DbContextCreator/ActivatorDbContextCreator.cs

@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using ShardingCore.Core.ServiceProviders;
+using ShardingCore.Exceptions;
 using ShardingCore.Helpers;
 using ShardingCore.Sharding.Abstractions;
 
@@ -46,7 +47,16 @@ public virtual DbContext CreateDbContext(DbContext shellDbContext, ShardingDbCon
 
         public virtual DbContext GetShellDbContext(IShardingProvider shardingProvider)
         {
-            return shardingProvider.GetService<TShardingDbContext>();
+            try
+            {
+                return shardingProvider.GetService<TShardingDbContext>();
+            }
+            catch (Exception ex)
+            {
+                throw new ShardingCoreInvalidOperationException(
+                    $"cant get shell db context,plz override {nameof(IDbContextCreator)}.{nameof(IDbContextCreator.GetShellDbContext)}",
+                    ex);
+            }
         }
     }
 }

src/ShardingCore/Core/RuntimeContexts/IShardingRuntimeContext.cs

@@ -56,11 +56,8 @@ public interface IShardingRuntimeContext
         IShardingPageManager GetShardingPageManager();
         IDataSourceInitializer GetDataSourceInitializer();
 
-        void CheckRequirement();
-        
         void GetOrCreateShardingRuntimeModel(DbContext dbContext);
          void Initialize();
-         void AutoShardingCreate();
         object GetService(Type serviceType);
         TService GetService<TService>();
         object GetRequiredService(Type serviceType);

src/ShardingCore/Core/RuntimeContexts/ShardingRuntimeContext.cs

@@ -23,6 +23,7 @@
 using ShardingCore.Exceptions;
 
 using ShardingCore.Sharding.Abstractions;
+using ShardingCore.Sharding.MergeEngines.ParallelControl;
 using ShardingCore.Sharding.ParallelTables;
 using ShardingCore.Sharding.ReadWriteConfigurations.Abstractions;
 using ShardingCore.Sharding.ShardingComparision.Abstractions;
@@ -67,10 +68,11 @@ public void Initialize()
                 _serviceProvider = _serviceMap.BuildServiceProvider();
                 _serviceProvider.GetRequiredService<IShardingInitializer>().Initialize();
                 InitFieldValue();
+                AutoShardingCreate();
             }
         }
 
-        public void AutoShardingCreate()
+        private void AutoShardingCreate()
         {
             GetRequiredService<IShardingBootstrapper>().AutoShardingCreate();
         }
@@ -217,40 +219,6 @@ public IDataSourceInitializer GetDataSourceInitializer()
             return _dataSourceInitializer??=GetRequiredService<IDataSourceInitializer>();
         }
 
-        public void CheckRequirement()
-        {
-            if (isCheckRequirement)
-                return;
-
-            lock (CHECK_REQUIREMENT)
-            {
-                if (isCheckRequirement)
-                    return;
-                isCheckRequirement = true;
-                
-                try
-                {
-                    var shardingProvider = GetShardingProvider();
-                    using (var scope = shardingProvider.CreateScope())
-                    {
-                        using (var dbContext = _dbContextCreator.GetShellDbContext(scope.ServiceProvider))
-                        {
-                            if (dbContext == null)
-                            {
-                                throw new ShardingCoreInvalidOperationException(
-                                    $"cant get shell db context,plz override {nameof(IDbContextCreator)}.{nameof(IDbContextCreator.GetShellDbContext)}");
-                            }
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    throw new ShardingCoreInvalidOperationException(
-                        $"cant get shell db context,plz override {nameof(IDbContextCreator)}.{nameof(IDbContextCreator.GetShellDbContext)}",
-                        ex);
-                }
-            }
-        }
 
         public void GetOrCreateShardingRuntimeModel(DbContext dbContext)
         {

src/ShardingCore/EFCores/RelationTransactions/ShardingRelationalTransaction.cs

@@ -92,13 +92,19 @@ public override void Rollback()
             await _shardingDbContext.CommitAsync(cancellationToken);
             _shardingDbContext.NotifyShardingTransaction();
         }
-// #if !NETCOREAPP3_0
-//         public override void CreateSavepoint(string name)
-//         {
-//             AAA
-//             base.CreateSavepoint(name);
-//         }
-// #endif
+#if !NETCOREAPP3_0&&!NETSTANDARD2_0
+        // public override void CreateSavepoint(string name)
+        // {
+        //     base.CreateSavepoint(name);
+        //     _shardingDbContext.CreateSavepoint(name);
+        // }
+        //
+        // public override async Task CreateSavepointAsync(string name, CancellationToken cancellationToken = new CancellationToken())
+        // {
+        //     await base.CreateSavepointAsync(name, cancellationToken);
+        //     await _shardingDbContext.CreateSavepointAsync(name,cancellationToken);
+        // }
+#endif
 #endif
     }
 }

src/ShardingCore/Extensions/ShardingRuntimeExtension.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -10,19 +11,13 @@ namespace ShardingCore.Extensions
 
     public static class ShardingRuntimeExtension
     {
-        public static void UseAutoShardingCreate(this IShardingRuntimeContext shardingRuntimeContext)
-        {
-            shardingRuntimeContext.CheckRequirement();
-            shardingRuntimeContext.AutoShardingCreate();
-        }
         /// <summary>
         /// 自动尝试补偿表
         /// </summary>
         /// <param name="shardingRuntimeContext"></param>
         /// <param name="parallelCount"></param>
         public static void UseAutoTryCompensateTable(this IShardingRuntimeContext shardingRuntimeContext, int? parallelCount = null)
         {
-            shardingRuntimeContext.CheckRequirement();
             var virtualDataSource = shardingRuntimeContext.GetVirtualDataSource();
             var dataSourceInitializer = shardingRuntimeContext.GetDataSourceInitializer();
             var shardingConfigOptions = shardingRuntimeContext.GetShardingConfigOptions();