移除命名空间和不必要的参数

Author: xuejmnet

Directory.Build.props

@@ -4,8 +4,9 @@
     <!--默认统一输出XML注释文档，不需要输出的项目可以单独关闭-->
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Authors>xuejmnet</Authors>
-    <RepositoryUrl>https://github.com/xuejmnet/sharding-core</RepositoryUrl>
+    <RepositoryUrl>https://github.com/dotnetcore/sharding-core</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
+    <PackageProjectUrl>https://github.com/dotnetcore/sharding-core</PackageProjectUrl>
     <Company>xuejm</Company>
     <LangVersion>10.0</LangVersion>
     <Description>high performance lightweight solution for efcore sharding table and sharding database support read-write-separation </Description>

src/ShardingCore/Bootstrappers/EntityMetadataInitializer.cs

@@ -14,7 +14,7 @@
 using ShardingCore.Helpers;
 using ShardingCore.Jobs;
 using ShardingCore.Jobs.Abstaractions;
-using ShardingCore.Logger;
+
 using ShardingCore.Sharding.Abstractions;
 
 /*

src/ShardingCore/Bootstrappers/ShardingBootstrapper.cs

@@ -13,7 +13,7 @@
 using ShardingCore.Extensions;
 using ShardingCore.Jobs;
 using ShardingCore.Jobs.Abstaractions;
-using ShardingCore.Logger;
+
 using ShardingCore.Sharding.MergeEngines.ParallelControl;
 using ShardingCore.Sharding.ParallelTables;
 

src/ShardingCore/Bootstrappers/ShardingInitializer.cs

@@ -9,7 +9,7 @@
 using ShardingCore.Extensions;
 using ShardingCore.Jobs;
 using ShardingCore.Jobs.Abstaractions;
-using ShardingCore.Logger;
+
 using ShardingCore.Sharding.MergeEngines.ParallelControl;
 using ShardingCore.Sharding.ParallelTables;
 
@@ -25,9 +25,9 @@ internal class ShardingInitializer:IShardingInitializer
         private readonly IParallelTableManager _parallelTableManager;
         private readonly DoOnlyOnce _doOnlyOnce = new DoOnlyOnce();
 
-        public ShardingInitializer(IShardingProvider shardingProvider)
+        public ShardingInitializer(IShardingProvider shardingProvider,ILogger<ShardingBootstrapper> logger)
         {
-            _logger = ShardingLoggerFactory.DefaultFactory.CreateLogger<ShardingBootstrapper>();
+            _logger = logger;
             _shardingProvider = shardingProvider;
             _routeConfigOptions = shardingProvider.GetRequiredService<IShardingRouteConfigOptions>();
             _entityMetadataManager = shardingProvider.GetRequiredService<IEntityMetadataManager>();

src/ShardingCore/Core/EntityMetadatas/DefaultEntityMetadataManager.cs

@@ -5,6 +5,7 @@
 using System.Text;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
+using ShardingCore.Exceptions;
 using ShardingCore.Extensions;
 using ShardingCore.Sharding.Abstractions;
 
@@ -16,6 +17,7 @@ namespace ShardingCore.Core.EntityMetadatas
     public class DefaultEntityMetadataManager : IEntityMetadataManager
     {
         private readonly ConcurrentDictionary<Type, EntityMetadata> _caches = new();
+        private readonly ConcurrentDictionary<string/*logic table name*/, EntityMetadata> _logicTableCaches = new();
 
         public bool AddEntityMetadata(EntityMetadata entityMetadata)
         {
@@ -70,7 +72,11 @@ public EntityMetadata TryGet(Type entityType)
 
         public EntityMetadata TryGetByLogicTableName(string logicTableName)
         {
-            return _caches.Values.FirstOrDefault(o => o.LogicTableName == logicTableName);
+            if (_logicTableCaches.TryGetValue(logicTableName, out var metadata))
+            {
+                return metadata;
+            }
+            return null;
         }
 
         /// <summary>
@@ -99,6 +105,16 @@ public bool TryInitModel(IEntityType efEntityType)
             if (_caches.TryGetValue(efEntityType.ClrType, out var metadata))
             {
                 metadata.SetEntityModel(efEntityType);
+                if (string.IsNullOrWhiteSpace(metadata.LogicTableName))
+                {
+                    throw new ShardingCoreInvalidOperationException(
+                        $"init model error, cant get logic table name:[{metadata.LogicTableName}] from  entity:[{efEntityType.ClrType}]");
+                }
+                if (!_logicTableCaches.TryAdd(metadata.LogicTableName, metadata))
+                {
+                    throw new ShardingCoreInvalidOperationException(
+                        $"cant add logic table name caches for metadata:[{metadata.LogicTableName}-{efEntityType.ClrType}]");
+                }
                 return true;
             }
 

src/ShardingCore/Core/RuntimeContexts/IShardingRuntimeContext.cs

@@ -54,7 +54,6 @@ public interface IShardingRuntimeContext
         void CheckRequirement();
 
         void GetOrCreateShardingRuntimeModel(DbContext dbContext);
-
          void Initialize();
          void AutoShardingCreate();
         object GetService(Type serviceType);

src/ShardingCore/Core/RuntimeContexts/ShardingRuntimeContext.cs

@@ -19,7 +19,7 @@
 using ShardingCore.Core.VirtualRoutes.TableRoutes.RouteTails.Abstractions;
 using ShardingCore.DynamicDataSources;
 using ShardingCore.Exceptions;
-using ShardingCore.Logger;
+
 using ShardingCore.Sharding.Abstractions;
 using ShardingCore.Sharding.ParallelTables;
 using ShardingCore.Sharding.ReadWriteConfigurations.Abstractions;
@@ -254,12 +254,6 @@ public void GetOrCreateShardingRuntimeModel(DbContext dbContext)
                 }
             }
         }
-        //
-        // public void UseLogfactory(ILoggerFactory loggerFactory)
-        // {
-        //     // ShardingLoggerFactory.DefaultFactory = loggerFactory;
-        //     _applicationLoggerFactory = loggerFactory;
-        // }
 
 
         private void CheckIfBuild()

src/ShardingCore/Core/ServiceProviders/IShardingProvider.cs

@@ -8,7 +8,6 @@ namespace ShardingCore.Core.ServiceProviders
     /// </summary>
     public interface IShardingProvider
     {
-        void UseApplicationServiceProvider(IServiceProvider applicationServiceProvider);
      /// <summary>
      /// 优先通过ShardingCore的IServiceProvider获取
      /// 没有再通过ApplicationServiceProvider获取

src/ShardingCore/Core/ServiceProviders/ShardingProvider.cs

@@ -15,11 +15,6 @@ public ShardingProvider(IServiceProvider internalServiceProvider,IServiceProvide
             _applicationServiceProvider = applicationServiceProvider;
         }
 
-        public void UseApplicationServiceProvider(IServiceProvider applicationServiceProvider)
-        {
-            _applicationServiceProvider = applicationServiceProvider;
-        }
-
         public object GetService(Type serviceType,bool tryApplicationServiceProvider=true)
         {
             var service = _internalServiceProvider?.GetService(serviceType);

src/ShardingCore/Core/VirtualDatabase/VirtualDataSources/SimpleVirtualDataSourceConfigurationParams.cs

@@ -87,22 +87,12 @@ public override DbContextOptionsBuilder UseDbContextOptionsBuilder(DbConnection
 
         public override void UseShellDbContextOptionBuilder(DbContextOptionsBuilder dbContextOptionsBuilder)
         {
-            if (_options.ShellDbContextConfigure == null)
-            {
-                return;
-            }
-
-            _options.ShellDbContextConfigure.Invoke(dbContextOptionsBuilder);
+            _options.ShellDbContextConfigure?.Invoke(dbContextOptionsBuilder);
         }
 
         public override void UseExecutorDbContextOptionBuilder(DbContextOptionsBuilder dbContextOptionsBuilder)
         {
-            if (_options.ExecutorDbContextConfigure == null )
-            {
-                return;
-            }
-
-            _options.ExecutorDbContextConfigure.Invoke(dbContextOptionsBuilder);
+            _options.ExecutorDbContextConfigure?.Invoke(dbContextOptionsBuilder);
         }
     }
 }

src/ShardingCore/DynamicDataSources/DefaultDataSourceInitializer.cs

@@ -16,7 +16,7 @@
 using ShardingCore.Core.VirtualRoutes.TableRoutes;
 using ShardingCore.Exceptions;
 using ShardingCore.Extensions;
-using ShardingCore.Logger;
+
 using ShardingCore.Sharding.Abstractions;
 using ShardingCore.TableExists.Abstractions;
 

src/ShardingCore/EFCores/ShardingModelCustomizer.cs

@@ -12,7 +12,7 @@
 using ShardingCore.Core.RuntimeContexts;
 using ShardingCore.Core.VirtualRoutes.TableRoutes.RouteTails.Abstractions;
 using ShardingCore.Extensions.InternalExtensions;
-using ShardingCore.Logger;
+
 using ShardingCore.Sharding.Abstractions;
 using ShardingCore.Utils;