修复bug支持order by的时候存在简单的convert强转移除构造函数强日志依赖

2022-06-24 14:48:14 +08:00 · 2022-06-24 14:48:14 +08:00 · 04ec7a4671
parent aaed91b0b8
commit 04ec7a4671
9 changed files with 67 additions and 35 deletions
--- a/samples/Sample.MySql/Startup.cs
+++ b/samples/Sample.MySql/Startup.cs
@ -104,7 +104,7 @@ namespace Sample.MySql
            //     {
            //         conn.Open();
            //     }
-            //     // DynamicShardingHelper.DynamicAppendDataSource<DefaultShardingDbContext>($"c0",$"ds{i}",$"server=127.0.0.1;port=3306;database=dbdbd{i};userid=root;password=root;");
+            // DynamicShardingHelper.DynamicAppendDataSource<DefaultShardingDbContext>($"c0",$"ds{i}",$"server=127.0.0.1;port=3306;database=dbdbd{i};userid=root;password=root;");
            //     
            // }
            app.DbSeed();
--- a/samples/Sample.MySql/appsettings.Development.json
+++ b/samples/Sample.MySql/appsettings.Development.json
@ -1,7 +1,7 @@
 {
  "Logging": {
    "LogLevel": {
-      "Default": "Information",
+      "Default": "Debug",
      "Microsoft": "Warning",
      "Microsoft.Hosting.Lifetime": "Information"
    }
--- a/samples/Sample.MySql/appsettings.json
+++ b/samples/Sample.MySql/appsettings.json
@ -1,7 +1,7 @@
 {
  "Logging": {
    "LogLevel": {
-      "Default": "Information",
+      "Default": "Debug",
      "Microsoft": "Information",
      "Microsoft.Hosting.Lifetime": "Information"
    }
--- a/src/ShardingCore/Bootstrappers/EntityMetadataInitializer.cs
+++ b/src/ShardingCore/Bootstrappers/EntityMetadataInitializer.cs
@ -19,6 +19,7 @@ using ShardingCore.Extensions;
 using ShardingCore.Helpers;
 using ShardingCore.Jobs;
 using ShardingCore.Jobs.Abstaractions;
+using ShardingCore.Logger;
 using ShardingCore.Sharding.Abstractions;

 /*
@ -36,6 +37,7 @@ namespace ShardingCore.Bootstrappers
    /// <typeparam name="TEntity"></typeparam>
    public class EntityMetadataInitializer<TShardingDbContext,TEntity>: IEntityMetadataInitializer where TShardingDbContext:DbContext,IShardingDbContext where TEntity:class
    {
+        private static readonly ILogger<EntityMetadataInitializer<TShardingDbContext, TEntity>> _logger=InternalLoggerFactory.CreateLogger<EntityMetadataInitializer<TShardingDbContext,TEntity>>();
        private const string QueryFilter = "QueryFilter";
        private readonly IEntityType _entityType;
        private readonly string _virtualTableName;
@ -45,15 +47,13 @@ namespace ShardingCore.Bootstrappers
        private readonly IVirtualDataSourceRouteManager<TShardingDbContext> _virtualDataSourceRouteManager;
        private readonly IVirtualTableManager<TShardingDbContext> _virtualTableManager;
        private readonly IEntityMetadataManager<TShardingDbContext> _entityMetadataManager;
-        private readonly ILogger<EntityMetadataInitializer<TShardingDbContext, TEntity>> _logger;

        public EntityMetadataInitializer(EntityMetadataEnsureParams entityMetadataEnsureParams,
            IShardingEntityConfigOptions<TShardingDbContext> shardingEntityConfigOptions,
            IVirtualDataSourceManager<TShardingDbContext> virtualDataSourceManager,
            IVirtualDataSourceRouteManager<TShardingDbContext> virtualDataSourceRouteManager,
            IVirtualTableManager<TShardingDbContext> virtualTableManager,
-            IEntityMetadataManager<TShardingDbContext> entityMetadataManager,
-            ILogger<EntityMetadataInitializer<TShardingDbContext, TEntity>> logger
+            IEntityMetadataManager<TShardingDbContext> entityMetadataManager
            )
        {
            _entityType = entityMetadataEnsureParams.EntityType;
@ -64,7 +64,6 @@ namespace ShardingCore.Bootstrappers
            _virtualDataSourceRouteManager = virtualDataSourceRouteManager;
            _virtualTableManager = virtualTableManager;
            _entityMetadataManager = entityMetadataManager;
-            _logger = logger;
        }
        /// <summary>
        /// 初始化
--- a/src/ShardingCore/DynamicDataSources/DefaultDataSourceInitializer.cs
+++ b/src/ShardingCore/DynamicDataSources/DefaultDataSourceInitializer.cs
@ -16,27 +16,29 @@ using ShardingCore.TableCreator;
 using System;
 using System.Collections.Generic;
 using System.Threading;
+using ShardingCore.Logger;

 namespace ShardingCore.DynamicDataSources
 {
    public class DataSourceInitializer<TShardingDbContext> : IDataSourceInitializer<TShardingDbContext>
        where TShardingDbContext : DbContext, IShardingDbContext
    {
+        private static readonly ILogger<DataSourceInitializer<TShardingDbContext>> _logger =
+            InternalLoggerFactory.CreateLogger<DataSourceInitializer<TShardingDbContext>>();
+
        private readonly IShardingEntityConfigOptions<TShardingDbContext> _entityConfigOptions;
        private readonly IVirtualDataSourceManager<TShardingDbContext> _virtualDataSourceManager;
        private readonly IRouteTailFactory _routeTailFactory;
        private readonly IVirtualTableManager<TShardingDbContext> _virtualTableManager;
        private readonly IEntityMetadataManager<TShardingDbContext> _entityMetadataManager;
        private readonly IShardingTableCreator<TShardingDbContext> _tableCreator;
-        private readonly ILogger<DataSourceInitializer<TShardingDbContext>> _logger;

        public DataSourceInitializer(
            IShardingEntityConfigOptions<TShardingDbContext> entityConfigOptions,
            IVirtualDataSourceManager<TShardingDbContext> virtualDataSourceManager,
            IRouteTailFactory routeTailFactory, IVirtualTableManager<TShardingDbContext> virtualTableManager,
            IEntityMetadataManager<TShardingDbContext> entityMetadataManager,
-            IShardingTableCreator<TShardingDbContext> shardingTableCreator,
-            ILogger<DataSourceInitializer<TShardingDbContext>> logger)
+            IShardingTableCreator<TShardingDbContext> shardingTableCreator)
        {
            _entityConfigOptions = entityConfigOptions;
            _virtualDataSourceManager = virtualDataSourceManager;
@ -44,7 +46,6 @@ namespace ShardingCore.DynamicDataSources
            _virtualTableManager = virtualTableManager;
            _entityMetadataManager = entityMetadataManager;
            _tableCreator = shardingTableCreator;
-            _logger = logger;
        }

        public void InitConfigure(IVirtualDataSource<TShardingDbContext> virtualDataSource, string dataSourceName,
--- a/src/ShardingCore/Sharding/ShardingDbContextExecutors/DataSourceDbContext.cs
+++ b/src/ShardingCore/Sharding/ShardingDbContextExecutors/DataSourceDbContext.cs
@ -17,6 +17,7 @@ using ShardingCore.Core.DbContextCreator;
 using ShardingCore.Exceptions;
 using ShardingCore.Extensions;
 using ShardingCore.Infrastructures;
+using ShardingCore.Logger;
 using ShardingCore.Sharding.Abstractions;

 namespace ShardingCore.Sharding.ShardingDbContextExecutors
@ -28,25 +29,34 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
    * @Ver: 1.0
    * @Email: 326308290@qq.com
    */
-    public class DataSourceDbContext<TShardingDbContext> : IDataSourceDbContext where TShardingDbContext : DbContext, IShardingDbContext
+    public class DataSourceDbContext<TShardingDbContext> : IDataSourceDbContext
+        where TShardingDbContext : DbContext, IShardingDbContext
    {
+        private static readonly ILogger<DataSourceDbContext<TShardingDbContext>> _logger =
+            InternalLoggerFactory.CreateLogger<DataSourceDbContext<TShardingDbContext>>();
+
        private static readonly IComparer<string> _comparer = new NoShardingFirstComparer();
+
        /// <summary>
        /// 当前是否是默认的dbcontext 也就是不分片的dbcontext
        /// </summary>
        public bool IsDefault { get; }
+
        /// <summary>
        /// 当前同库有多少dbcontext了
        /// </summary>
        public int DbContextCount => _dataSourceDbContexts.Count;
+
        /// <summary>
        /// dbcontext 创建接口
        /// </summary>
        private readonly IDbContextCreator<TShardingDbContext> _dbContextCreator;
+
        /// <summary>
        /// 实际的链接字符串管理者 用来提供查询和插入dbcontext的创建链接的获取
        /// </summary>
        private readonly ActualConnectionStringManager<TShardingDbContext> _actualConnectionStringManager;
+
        /// <summary>
        /// 当前的数据源是什么默认单数据源可以支持多数据源配置
        /// </summary>
@ -56,6 +66,7 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
        /// 数据源名称
        /// </summary>
        public string DataSourceName { get; }
+
        /// <summary>
        /// 数据源排序默认提交将未分片的数据库最先提交
        /// </summary>
@ -66,21 +77,23 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
        /// 是否开启了事务
        /// </summary>
        private bool _isBeginTransaction => _shardingShellDbContext.Database.CurrentTransaction != null;
+
        /// <summary>
        /// shell dbcontext最外面的壳
        /// </summary>
        private readonly DbContext _shardingShellDbContext;
+
        /// <summary>
        /// 数据库事务
        /// </summary>
-        private IDbContextTransaction _shardingContextTransaction => _shardingShellDbContext?.Database?.CurrentTransaction;
+        private IDbContextTransaction _shardingContextTransaction =>
+            _shardingShellDbContext?.Database?.CurrentTransaction;

-
-        private readonly ILogger<DataSourceDbContext<TShardingDbContext>> _logger;
        /// <summary>
        /// 同库下公用一个db context options
        /// </summary>
        private DbContextOptions<TShardingDbContext> _dbContextOptions;
+
        /// <summary>
        /// 是否触发了并发如果是的话就报错
        /// </summary>
@ -108,12 +121,13 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
            DataSourceName = dataSourceName;
            IsDefault = isDefault;
            _shardingShellDbContext = shardingShellDbContext;
-            _virtualDataSource = (IVirtualDataSource<TShardingDbContext>)((IShardingDbContext)shardingShellDbContext).GetVirtualDataSource();
+            _virtualDataSource =
+                (IVirtualDataSource<TShardingDbContext>)((IShardingDbContext)shardingShellDbContext)
+                .GetVirtualDataSource();
            _dbContextCreator = dbContextCreator;
            _actualConnectionStringManager = actualConnectionStringManager;
-            _logger = ShardingContainer.GetService<ILogger<DataSourceDbContext<TShardingDbContext>>>();
-
        }
+
        /// <summary>
        /// 创建共享的数据源配置用来做事务 不支持并发后期发现直接报错
        /// </summary>
@ -124,12 +138,14 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
            {
                return _dbContextOptions;
            }
+
            //是否触发并发了
            var acquired = oneByOne.Start();
            if (!acquired)
            {
                throw new ShardingCoreException("cant parallel create CreateShareDbContextOptionsBuilder");
            }
+
            try
            {
                //先创建dbcontext option builder
@ -168,7 +184,6 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
            {
                oneByOne.Stop();
            }
-
        }

        public static DbContextOptionsBuilder<TShardingDbContext> CreateDbContextOptionBuilder()
@ -193,10 +208,12 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
            var cacheKey = routeTail.GetRouteTailIdentity();
            if (!_dataSourceDbContexts.TryGetValue(cacheKey, out var dbContext))
            {
-                dbContext = _dbContextCreator.CreateDbContext(_shardingShellDbContext,CreateShareDbContextOptionsBuilder(), routeTail);
+                dbContext = _dbContextCreator.CreateDbContext(_shardingShellDbContext,
+                    CreateShareDbContextOptionsBuilder(), routeTail);
                _dataSourceDbContexts.Add(cacheKey, dbContext);
                ShardingDbTransaction();
            }
+
            return dbContext;
        }

@ -208,6 +225,7 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
                JoinCurrentTransaction();
            }
        }
+
        /// <summary>
        /// 加入到当前事务
        /// </summary>
@ -246,6 +264,7 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
                }
            }
        }
+
        /// <summary>
        /// 通知事务自动管理是否要清理还是开启还是加入事务
        /// </summary>
@ -261,6 +280,7 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
                JoinCurrentTransaction();
            }
        }
+
        /// <summary>
        /// 清理事务
        /// </summary>
@ -288,15 +308,16 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors

            return i;
        }
+
        /// <summary>
        /// 异步提交
        /// </summary>
        /// <param name="acceptAllChangesOnSuccess"></param>
        /// <param name="cancellationToken"></param>
        /// <returns></returns>
-        public async Task<int> SaveChangesAsync(bool acceptAllChangesOnSuccess, CancellationToken cancellationToken = new CancellationToken())
+        public async Task<int> SaveChangesAsync(bool acceptAllChangesOnSuccess,
+            CancellationToken cancellationToken = new CancellationToken())
        {
-
            int i = 0;
            foreach (var dataSourceDbContext in _dataSourceDbContexts)
            {
@ -305,6 +326,7 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors

            return i;
        }
+
        /// <summary>
        /// 获取当前的后缀数据库字典数据
        /// </summary>
@ -313,6 +335,7 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
        {
            return _dataSourceDbContexts;
        }
+
        /// <summary>
        /// 回滚数据
        /// </summary>
@ -329,6 +352,7 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
                _logger.LogError(e, "rollback error.");
            }
        }
+
        /// <summary>
        /// 提交数据
        /// </summary>
@ -349,7 +373,6 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
            }
        }
 #if !EFCORE2
-
        public async Task RollbackAsync(CancellationToken cancellationToken = new CancellationToken())
        {
            cancellationToken.ThrowIfCancellationRequested();
@ -366,7 +389,8 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
            }
        }

-        public async Task CommitAsync(int dataSourceCount, CancellationToken cancellationToken = new CancellationToken())
+        public async Task CommitAsync(int dataSourceCount, CancellationToken cancellationToken =
+ new CancellationToken())
        {
            cancellationToken.ThrowIfCancellationRequested();
            if (IsDefault)
@ -393,7 +417,6 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
            }
        }
 #if !EFCORE2
-
        public async ValueTask DisposeAsync()
        {
            foreach (var dataSourceDbContext in _dataSourceDbContexts)
@ -403,4 +426,4 @@ namespace ShardingCore.Sharding.ShardingDbContextExecutors
        }
 #endif
    }
-}
+}
--- a/src/ShardingCore/Sharding/ShardingExecutors/DefaultShardingCompilerExecutor.cs
+++ b/src/ShardingCore/Sharding/ShardingExecutors/DefaultShardingCompilerExecutor.cs
@ -5,6 +5,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using ShardingCore.Extensions;
+using ShardingCore.Logger;
 using ShardingCore.Sharding.Parsers.Abstractions;
 using ShardingCore.Sharding.ShardingExecutors.Abstractions;
 using ShardingCore.Sharding.Visitors.ShardingExtractParameters;
@ -17,15 +18,14 @@ namespace ShardingCore.Sharding.ShardingExecutors
    /// </summary>
    public class DefaultShardingCompilerExecutor: IShardingCompilerExecutor
    {
-        private readonly ILogger<DefaultShardingCompilerExecutor> _logger;
+        private static readonly ILogger<DefaultShardingCompilerExecutor> _logger=InternalLoggerFactory.CreateLogger<DefaultShardingCompilerExecutor>();
        private readonly IShardingTrackQueryExecutor _shardingTrackQueryExecutor;
        private readonly IQueryCompilerContextFactory _queryCompilerContextFactory;
        private readonly IPrepareParser _prepareParser;

-        public DefaultShardingCompilerExecutor(ILogger<DefaultShardingCompilerExecutor> logger,
+        public DefaultShardingCompilerExecutor(
            IShardingTrackQueryExecutor shardingTrackQueryExecutor, IQueryCompilerContextFactory queryCompilerContextFactory,IPrepareParser prepareParser)
        {
-            _logger = logger;
            _shardingTrackQueryExecutor = shardingTrackQueryExecutor;
            _queryCompilerContextFactory = queryCompilerContextFactory;
            _prepareParser = prepareParser;
--- a/src/ShardingCore/Sharding/ShardingExecutors/DefaultShardingQueryExecutor.cs
+++ b/src/ShardingCore/Sharding/ShardingExecutors/DefaultShardingQueryExecutor.cs
@ -14,6 +14,7 @@ using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using ShardingCore.Core;
 using ShardingCore.Extensions.InternalExtensions;
+using ShardingCore.Logger;
 #if EFCORE2
 using Microsoft.EntityFrameworkCore.Internal;
 #endif
@ -29,12 +30,8 @@ namespace ShardingCore.Sharding.ShardingQueryExecutors
    */
    public class DefaultShardingQueryExecutor : IShardingQueryExecutor
    {
-        private readonly ILogger<DefaultShardingQueryExecutor> _logger;
+        private static readonly ILogger<DefaultShardingQueryExecutor> _logger=InternalLoggerFactory.CreateLogger<DefaultShardingQueryExecutor>();

-        public DefaultShardingQueryExecutor(ILogger<DefaultShardingQueryExecutor> logger)
-        {
-            _logger = logger;
-        }

        public TResult Execute<TResult>(IMergeQueryCompilerContext mergeQueryCompilerContext)
        {
--- a/src/ShardingCore/Sharding/Visitors/QueryableExtraDiscoverVisitor.cs
+++ b/src/ShardingCore/Sharding/Visitors/QueryableExtraDiscoverVisitor.cs
@ -62,7 +62,19 @@ namespace ShardingCore.Core.Internal.Visitors
            {
                if (typeof(IOrderedQueryable).IsAssignableFrom(node.Type))
                {
-                    var expression = (((node.Arguments[1] as UnaryExpression).Operand as LambdaExpression).Body as MemberExpression);
+                    MemberExpression expression =null;
+                    var orderbody = ((node.Arguments[1] as UnaryExpression).Operand as LambdaExpression).Body;
+                    if(orderbody is MemberExpression orderMemberExpression)
+                    {
+                        expression = orderMemberExpression;
+                    } 
+                    else if (orderbody.NodeType == ExpressionType.Convert&&orderbody is UnaryExpression orderUnaryExpression)
+                    {
+                        if(orderUnaryExpression.Operand is MemberExpression orderMemberConvertExpression)
+                        {
+                            expression = orderMemberConvertExpression;
+                        }
+                    }
                    if (expression == null)
                        throw new NotSupportedException("sharding order not support ");
                    List<string> properties = new List<string>();