添加自定义排序实现

xuejmnet · xuejmnet · commit e7ca85d25e57 · 2021-10-31T16:11:39.000+08:00
diff --git a/src/ShardingCore/DIExtensions/ShardingCoreConfigEndBuilder.cs b/src/ShardingCore/DIExtensions/ShardingCoreConfigEndBuilder.cs
@@ -30,6 +30,11 @@ public ShardingCoreConfigEndBuilder(
             _shardingCoreConfigBuilder = shardingCoreConfigBuilder;
         }
 
+        public ShardingCoreConfigEndBuilder<TShardingDbContext>  ReplaceShardingComparer(Func<IServiceProvider, IShardingComparer<TShardingDbContext>> newShardingComparerFactory)
+        {
+            _shardingCoreConfigBuilder.ShardingConfigOption.ReplaceShardingComparer(newShardingComparerFactory);
+            return this;
+        }
         public IServiceCollection End()
         {
             var services = _shardingCoreConfigBuilder.Services;
@@ -50,6 +55,14 @@ public IServiceCollection End()
                 .AddSingleton<IShardingDbContextCreatorConfig,
                     DefaultShardingDbContextCreatorConfig<TShardingDbContext>>(sp =>
                     new DefaultShardingDbContextCreatorConfig<TShardingDbContext>());
+            if (_shardingCoreConfigBuilder.ShardingConfigOption.ReplaceShardingComparerFactory != null)
+            {
+                services.AddSingleton<IShardingComparer<TShardingDbContext>>(_shardingCoreConfigBuilder.ShardingConfigOption.ReplaceShardingComparerFactory);
+            }
+            else
+            {
+                services.AddSingleton<IShardingComparer<TShardingDbContext>, CSharpLanguageShardingComparer<TShardingDbContext>>();
+            }
 
             if (!_shardingCoreConfigBuilder.ShardingConfigOption.UseReadWrite)
             {
@@ -94,6 +107,7 @@ public IServiceCollection End()
 
                 services.TryAddSingleton<IShardingReadWriteManager, ShardingReadWriteManager>();
                 services.AddSingleton<IShardingReadWriteAccessor, ShardingReadWriteAccessor<TShardingDbContext>>();
+                
                 //foreach (var dataSourceKv in dataSources)
                 //{
                 //    if (dataSourceKv.Key == _shardingCoreConfigBuilder.DefaultDataSourceName)
diff --git a/src/ShardingCore/DIExtensions/ShardingDataBaseOrTableBuilder.cs b/src/ShardingCore/DIExtensions/ShardingDataBaseOrTableBuilder.cs
@@ -40,5 +40,10 @@ public ShardingReadWriteSeparationBuilder<TShardingDbContext> AddShardingTableRo
             }
             return new ShardingReadWriteSeparationBuilder<TShardingDbContext>(_shardingCoreConfigBuilder);
         }
+        public ShardingDataBaseOrTableBuilder<TShardingDbContext>  ReplaceShardingComparer(Func<IServiceProvider, IShardingComparer<TShardingDbContext>> newShardingComparerFactory)
+        {
+            _shardingCoreConfigBuilder.ShardingConfigOption.ReplaceShardingComparer(newShardingComparerFactory);
+            return this;
+        }
     }
 }
diff --git a/src/ShardingCore/DIExtensions/ShardingDataSourceRouteBuilder.cs b/src/ShardingCore/DIExtensions/ShardingDataSourceRouteBuilder.cs
@@ -36,5 +36,10 @@ public ShardingTableBuilder<TShardingDbContext> AddShardingDataSourceRoute(Actio
 
             return new ShardingTableBuilder<TShardingDbContext>(_shardingCoreConfigBuilder);
         }
+        public ShardingDataSourceRouteBuilder<TShardingDbContext>  ReplaceShardingComparer(Func<IServiceProvider, IShardingComparer<TShardingDbContext>> newShardingComparerFactory)
+        {
+            _shardingCoreConfigBuilder.ShardingConfigOption.ReplaceShardingComparer(newShardingComparerFactory);
+            return this;
+        }
     }
 }
diff --git a/src/ShardingCore/DIExtensions/ShardingReadWriteSeparationBuilder.cs b/src/ShardingCore/DIExtensions/ShardingReadWriteSeparationBuilder.cs
@@ -34,5 +34,10 @@ public ShardingCoreConfigEndBuilder<TShardingDbContext> AddReadWriteSeparation(
             _shardingCoreConfigBuilder.ShardingConfigOption.UseReadWriteConfiguration(readWriteSeparationConfigure,readStrategyEnum, defaultEnable,defaultPriority);
             return new ShardingCoreConfigEndBuilder<TShardingDbContext>(_shardingCoreConfigBuilder);
         }
+        public ShardingReadWriteSeparationBuilder<TShardingDbContext>  ReplaceShardingComparer(Func<IServiceProvider, IShardingComparer<TShardingDbContext>> newShardingComparerFactory)
+        {
+            _shardingCoreConfigBuilder.ShardingConfigOption.ReplaceShardingComparer(newShardingComparerFactory);
+            return this;
+        }
     }
 }
diff --git a/src/ShardingCore/DIExtensions/ShardingTableBuilder.cs b/src/ShardingCore/DIExtensions/ShardingTableBuilder.cs
@@ -35,5 +35,10 @@ public ShardingReadWriteSeparationBuilder<TShardingDbContext> AddShardingTableRo
             }
             return new ShardingReadWriteSeparationBuilder<TShardingDbContext>(_shardingCoreConfigBuilder);
         }
+        public ShardingTableBuilder<TShardingDbContext>  ReplaceShardingComparer(Func<IServiceProvider, IShardingComparer<TShardingDbContext>> newShardingComparerFactory)
+        {
+            _shardingCoreConfigBuilder.ShardingConfigOption.ReplaceShardingComparer(newShardingComparerFactory);
+            return this;
+        }
     }
 }
diff --git a/src/ShardingCore/Extensions/ComparableExtension.cs b/src/ShardingCore/Extensions/ComparableExtension.cs
@@ -0,0 +1,34 @@
+﻿using System;
+
+namespace ShardingCore.Extensions
+{
+/*
+* @Author: xjm
+* @Description:
+* @Date: Sunday, 31 October 2021 15:41:12
+* @Email: 326308290@qq.com
+*/
+    public static class ComparableExtension
+    {
+        public static int SafeCompareToWith(this IComparable value, IComparable other, bool asc)
+        {
+            if (asc)
+                return SafeCompareTo(value, other);
+            return SafeCompareTo(other, value);
+        }
+        public static int SafeCompareTo(IComparable value, IComparable other)
+        {
+            if (null == value && null == other) {
+                return 0;
+            }
+            if (null == value)
+            {
+                return -1;
+            }
+            if (null == other) {
+                return 1;
+            }
+            return value.CompareTo(other);
+        }
+    }
+}
diff --git a/src/ShardingCore/Sharding/Abstractions/IShardingComparer.cs b/src/ShardingCore/Sharding/Abstractions/IShardingComparer.cs
@@ -0,0 +1,22 @@
+﻿using System;
+using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore;
+
+namespace ShardingCore.Sharding.Abstractions
+{
+/*
+* @Author: xjm
+* @Description:
+* @Date: Sunday, 31 October 2021 15:07:52
+* @Email: 326308290@qq.com
+*/
+    public interface IShardingComparer
+    {
+        int Compare(IComparable a, IComparable b,bool asc);
+    }
+
+    public interface IShardingComparer<TShardingDbContext> : IShardingComparer where TShardingDbContext:DbContext,IShardingDbContext
+    {
+        
+    }
+}
diff --git a/src/ShardingCore/Sharding/CSharpLanguageShardingComparer.cs b/src/ShardingCore/Sharding/CSharpLanguageShardingComparer.cs
@@ -0,0 +1,21 @@
+﻿using System;
+using Microsoft.EntityFrameworkCore;
+using ShardingCore.Extensions;
+using ShardingCore.Sharding.Abstractions;
+
+namespace ShardingCore.Sharding
+{
+/*
+* @Author: xjm
+* @Description:
+* @Date: Sunday, 31 October 2021 15:39:46
+* @Email: 326308290@qq.com
+*/
+    public class CSharpLanguageShardingComparer<TShardingDbContext>:IShardingComparer<TShardingDbContext> where TShardingDbContext:DbContext,IShardingDbContext
+    {
+        public int Compare(IComparable a, IComparable b, bool asc)
+        {
+            return a.SafeCompareToWith(b, asc);
+        }
+    }
+}
diff --git a/src/ShardingCore/Sharding/Enumerators/StreamMergeAsync/OrderStreamMergeAsyncEnumerator.cs b/src/ShardingCore/Sharding/Enumerators/StreamMergeAsync/OrderStreamMergeAsyncEnumerator.cs
@@ -115,7 +115,7 @@ public int CompareTo(IOrderStreamMergeAsyncEnumerator<T> other)
             int i = 0;
             foreach (var order in _mergeContext.Orders)
             {
-                int result = CompareHelper.CompareToWith(_orderValues[i], other.GetCompares()[i], order.IsAsc);
+                int result = _mergeContext.GetShardingComparer().Compare(_orderValues[i], other.GetCompares()[i], order.IsAsc);
                 if (0 != result)
                 {
                     return result;
diff --git a/src/ShardingCore/Sharding/StreamMergeContext.cs b/src/ShardingCore/Sharding/StreamMergeContext.cs
@@ -47,26 +47,28 @@ public class StreamMergeContext<T>:IDisposable
         public IEnumerable<TableRouteResult> TableRouteResults { get; }
         public DataSourceRouteResult DataSourceRouteResult { get; }
         /// <summary>
-        /// ���β�ѯ�漰�Ķ���
+        /// 本次查询涉及的对象
         /// </summary>
         public ISet<Type> QueryEntities { get; }
         /// <summary>
-        /// ���β�ѯ�Ƿ����notracking
+        /// 本次查询是否包含notracking
         /// </summary>
         public bool? IsNoTracking { get; }
         /// <summary>
-        /// ���β�ѯ���
+        /// 本次查询跨库
         /// </summary>
         public bool IsCrossDataSource { get; }
         /// <summary>
-        /// ���β�ѯ���
+        /// 本次查询跨表
         /// </summary>
         public bool IsCrossTable { get; }
 
         private readonly ITrackerManager _trackerManager;
         private readonly IShardingConfigOption _shardingConfigOption;
 
-        private readonly ConcurrentDictionary<DbContext, object> _parallelDbContexts; 
+        private readonly ConcurrentDictionary<DbContext, object> _parallelDbContexts;
+
+        private readonly IShardingComparer _shardingComparer;
 
         public StreamMergeContext(IQueryable<T> source, IShardingDbContext shardingDbContext,
             DataSourceRouteResult dataSourceRouteResult,
@@ -93,6 +95,8 @@ public StreamMergeContext(IQueryable<T> source, IShardingDbContext shardingDbCon
             _trackerManager =
                 (ITrackerManager)ShardingContainer.GetService(
                     typeof(ITrackerManager<>).GetGenericType0(shardingDbContext.GetType()));
+            _shardingComparer = (IShardingComparer)ShardingContainer.GetService(typeof(IShardingComparer<>).GetGenericType0(_shardingDbContext.GetType()));
+
             _shardingConfigOption = ShardingContainer.GetServices<IShardingConfigOption>()
                 .FirstOrDefault(o => o.ShardingDbContextType == shardingDbContext.GetType());
             _parallelDbContexts = new ConcurrentDictionary<DbContext, object>();
@@ -123,15 +127,15 @@ public void ReSetSkip(int? skip)
             Skip = skip;
         }
         /// <summary>
-        /// ������Ӧ��dbcontext
+        /// 创建对应的dbcontext
         /// </summary>
         /// <param name="dataSourceName">data source name</param>
         /// <param name="tableRouteResult"></param>
         /// <returns></returns>
         public DbContext CreateDbContext(string dataSourceName, TableRouteResult tableRouteResult)
         {
             var routeTail = _routeTailFactory.Create(tableRouteResult);
-            //��������˶�д������߱��β�ѯ�ǿ�����߿��ı�ʾ���β�ѯ��dbcontext�ǲ��洢��������ֱ��dispose
+            //如果开启了读写分离或者本次查询是跨表或者跨库的表示本次查询的dbcontext是不存储的用完后就直接dispose
             var parallelQuery = IsParallelQuery();
             var dbContext = _shardingDbContext.GetDbContext(dataSourceName, parallelQuery, routeTail);
             if (parallelQuery)
@@ -190,15 +194,15 @@ public TimeSpan GetParallelQueryTimeOut()
             return _shardingConfigOption.ParallelQueryTimeOut;
         }
         /// <summary>
-        /// �Ƿ��ǿ���Դ��ѯ
+        /// 是否是跨资源查询
         /// </summary>
         /// <returns></returns>
         private bool IsCrossQuery()
         {
             return IsCrossDataSource || IsCrossTable;
         }
         /// <summary>
-        /// �Ƿ����ö�д����
+        /// 是否启用读写分离
         /// </summary>
         /// <returns></returns>
         private bool IsUseReadWriteSeparation()
@@ -207,7 +211,7 @@ private bool IsUseReadWriteSeparation()
         }
 
         /// <summary>
-        /// �Ƿ�ʹ�ò��в�ѯ
+        /// 是否使用并行查询
         /// </summary>
         /// <returns></returns>
         private bool IsParallelQuery()
@@ -216,12 +220,12 @@ private bool IsParallelQuery()
         }
 
         /// <summary>
-        /// �Ƿ�ʹ��sharding track
+        /// 是否使用sharding track
         /// </summary>
         /// <returns></returns>
         public bool IsUseShardingTrack(Type entityType)
         {
-            //û�п�dbcontext��ѯ���Ҳ��Ƕ�д����ſ�����ô�Ƿ�׷��֮����ɲ�ѯ��dbcontext���д���
+            //没有跨dbcontext查询并且不是读写分离才可以那么是否追踪之类的由查询的dbcontext自行处理
             if (!IsParallelQuery())
                 return false;
             return QueryTrack() && _trackerManager.EntityUseTrack(entityType);
@@ -242,6 +246,10 @@ private bool QueryTrack()
             }
         }
 
+        public IShardingComparer GetShardingComparer()
+        {
+            return _shardingComparer;
+        }
         public void Dispose()
         {
             foreach (var dbContext in _parallelDbContexts.Keys)
diff --git a/src/ShardingCore/ShardingConfigOption.cs b/src/ShardingCore/ShardingConfigOption.cs
@@ -43,6 +43,16 @@ public void AddShardingDataSource(Func<IServiceProvider, IDictionary<string, str
         {
             DataSourcesConfigure = dataSourcesConfigure ?? throw new ArgumentNullException(nameof(dataSourcesConfigure));
         }
+        public Func<IServiceProvider, IShardingComparer<TShardingDbContext>> ReplaceShardingComparerFactory { get; private set; }
+        /// <summary>
+        /// 替换默认的比较器
+        /// </summary>
+        /// <param name="newShardingComparerFactory"></param>
+        /// <exception cref="ArgumentNullException"></exception>
+        public void ReplaceShardingComparer(Func<IServiceProvider, IShardingComparer<TShardingDbContext>> newShardingComparerFactory)
+        {
+            ReplaceShardingComparerFactory=newShardingComparerFactory ?? throw new ArgumentNullException(nameof(newShardingComparerFactory));
+        }
 
 
         ///// <summary>

Original file line number	Diff line number	Diff line change
`@@ -40,5 +40,10 @@ public ShardingReadWriteSeparationBuilder<TShardingDbContext> AddShardingTableRo`
`40`	`40`	`}`
`41`	`41`	`return new ShardingReadWriteSeparationBuilder<TShardingDbContext>(_shardingCoreConfigBuilder);`
`42`	`42`	`}`
	`43`	`+ public ShardingDataBaseOrTableBuilder<TShardingDbContext> ReplaceShardingComparer(Func<IServiceProvider, IShardingComparer<TShardingDbContext>> newShardingComparerFactory)`
	`44`	`+ {`
	`45`	`+ _shardingCoreConfigBuilder.ShardingConfigOption.ReplaceShardingComparer(newShardingComparerFactory);`
	`46`	`+ return this;`
	`47`	`+ }`
`43`	`48`	`}`
`44`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,5 +36,10 @@ public ShardingTableBuilder<TShardingDbContext> AddShardingDataSourceRoute(Actio`
`36`	`36`
`37`	`37`	`return new ShardingTableBuilder<TShardingDbContext>(_shardingCoreConfigBuilder);`
`38`	`38`	`}`
	`39`	`+ public ShardingDataSourceRouteBuilder<TShardingDbContext> ReplaceShardingComparer(Func<IServiceProvider, IShardingComparer<TShardingDbContext>> newShardingComparerFactory)`
	`40`	`+ {`
	`41`	`+ _shardingCoreConfigBuilder.ShardingConfigOption.ReplaceShardingComparer(newShardingComparerFactory);`
	`42`	`+ return this;`
	`43`	`+ }`
`39`	`44`	`}`
`40`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,5 +34,10 @@ public ShardingCoreConfigEndBuilder<TShardingDbContext> AddReadWriteSeparation(`
`34`	`34`	`_shardingCoreConfigBuilder.ShardingConfigOption.UseReadWriteConfiguration(readWriteSeparationConfigure,readStrategyEnum, defaultEnable,defaultPriority);`
`35`	`35`	`return new ShardingCoreConfigEndBuilder<TShardingDbContext>(_shardingCoreConfigBuilder);`
`36`	`36`	`}`
	`37`	`+ public ShardingReadWriteSeparationBuilder<TShardingDbContext> ReplaceShardingComparer(Func<IServiceProvider, IShardingComparer<TShardingDbContext>> newShardingComparerFactory)`
	`38`	`+ {`
	`39`	`+ _shardingCoreConfigBuilder.ShardingConfigOption.ReplaceShardingComparer(newShardingComparerFactory);`
	`40`	`+ return this;`
	`41`	`+ }`
`37`	`42`	`}`
`38`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,5 +35,10 @@ public ShardingReadWriteSeparationBuilder<TShardingDbContext> AddShardingTableRo`
`35`	`35`	`}`
`36`	`36`	`return new ShardingReadWriteSeparationBuilder<TShardingDbContext>(_shardingCoreConfigBuilder);`
`37`	`37`	`}`
	`38`	`+ public ShardingTableBuilder<TShardingDbContext> ReplaceShardingComparer(Func<IServiceProvider, IShardingComparer<TShardingDbContext>> newShardingComparerFactory)`
	`39`	`+ {`
	`40`	`+ _shardingCoreConfigBuilder.ShardingConfigOption.ReplaceShardingComparer(newShardingComparerFactory);`
	`41`	`+ return this;`
	`42`	`+ }`
`38`	`43`	`}`
`39`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public int CompareTo(IOrderStreamMergeAsyncEnumerator<T> other)`
`115`	`115`	`int i = 0;`
`116`	`116`	`foreach (var order in _mergeContext.Orders)`
`117`	`117`	`{`
`118`		`- int result = CompareHelper.CompareToWith(_orderValues[i], other.GetCompares()[i], order.IsAsc);`
	`118`	`+ int result = _mergeContext.GetShardingComparer().Compare(_orderValues[i], other.GetCompares()[i], order.IsAsc);`
`119`	`119`	`if (0 != result)`
`120`	`120`	`{`
`121`	`121`	`return result;`