优化读写分离支持权重添加,优化sum和average的装箱拆箱

samples/Sample.SqlServer/Startup.cs

@@ -51,7 +51,7 @@ namespace Sample.SqlServer
                     o.AddShardingTableRoute<TestYearShardingVirtualTableRoute>();
                 }).AddReadWriteSeparation(sp =>
                 {
-                    return new Dictionary<string, ISet<string>>()
+                    return new Dictionary<string, IEnumerable<string>>()
                     {
                         {"ds0",new HashSet<string>(){"Data Source=localhost;Initial Catalog=ShardingCoreDB1;Integrated Security=True;"}}
                     };

src/ShardingCore/DIExtensions/ShardingReadWriteSeparationBuilder.cs

@@ -26,7 +26,7 @@ namespace ShardingCore.DIExtensions
         }
 
         public ShardingCoreConfigEndBuilder<TShardingDbContext> AddReadWriteSeparation(
-            Func<IServiceProvider, IDictionary<string, ISet<string>>> readWriteSeparationConfigure,
+            Func<IServiceProvider, IDictionary<string, IEnumerable<string>>> readWriteSeparationConfigure,
             ReadStrategyEnum readStrategyEnum,
             bool defaultEnable = false,
             int defaultPriority = 10,

src/ShardingCore/Sharding/Enumerators/AggregateExtensions/AggregateExtension.cs

@@ -99,14 +99,8 @@ namespace ShardingCore.Sharding.Enumerators.AggregateExtensions
 
             return source.Count(property);
         }
-        /// <summary>
-        /// 根据属性求和
-        /// </summary>
-        /// <param name="source"></param>
-        /// <param name="property"></param>
-        /// <returns></returns>
-        /// <exception cref="ArgumentNullException"></exception>
-        public static object SumByProperty(this IQueryable source, PropertyInfo property)
+
+        private static MethodCallExpression CreateSumByProperty(this IQueryable source, PropertyInfo property)
         {
             if (source == null) throw new ArgumentNullException(nameof(source));
             if (property == null) throw new ArgumentNullException(nameof(property));
@@ -121,15 +115,31 @@ namespace ShardingCore.Sharding.Enumerators.AggregateExtensions
                      && m.ReturnType == property.PropertyType
                      && m.IsGenericMethod);
 
-            var genericSumMethod = sumMethod.MakeGenericMethod(new[] {source.ElementType});
+            var genericSumMethod = sumMethod.MakeGenericMethod(new[] { source.ElementType });
 
             var callExpression = Expression.Call(
                 null,
                 genericSumMethod,
-                new[] {source.Expression, Expression.Quote(selector)});
-
+                new[] { source.Expression, Expression.Quote(selector) });
+            return callExpression;
+        }
+        /// <summary>
+        /// 根据属性求和
+        /// </summary>
+        /// <param name="source"></param>
+        /// <param name="property"></param>
+        /// <returns></returns>
+        /// <exception cref="ArgumentNullException"></exception>
+        public static object SumByProperty(this IQueryable source, PropertyInfo property)
+        {
+            var callExpression = CreateSumByProperty(source, property);
             return source.Provider.Execute(callExpression);
         }
+        public static TSelect SumByProperty<TSelect>(this IQueryable source, PropertyInfo property)
+        {
+            var callExpression = CreateSumByProperty(source, property);
+            return source.Provider.Execute<TSelect>(callExpression);
+        }
         /// <summary>
         /// 根据属性求和
         /// </summary>
@@ -145,6 +155,22 @@ namespace ShardingCore.Sharding.Enumerators.AggregateExtensions
             PropertyInfo property = source.ElementType.GetProperty(propertyName);
             return source.SumByProperty(property);
         }
+        /// <summary>
+        /// 对
+        /// </summary>
+        /// <typeparam name="TSelect"></typeparam>
+        /// <param name="source"></param>
+        /// <param name="propertyName"></param>
+        /// <returns></returns>
+        /// <exception cref="ArgumentNullException"></exception>
+        public static TSelect SumByPropertyName<TSelect>(this IQueryable source, string propertyName)
+        {
+            if (source == null) throw new ArgumentNullException(nameof(source));
+            if (propertyName == null) throw new ArgumentNullException(nameof(propertyName));
+
+            PropertyInfo property = source.ElementType.GetProperty(propertyName);
+            return source.SumByProperty<TSelect>(property);
+        }
         //public static object Average(this IQueryable source, string member)
         //{
         //    if (source == null) throw new ArgumentNullException(nameof(source));
@@ -312,6 +338,35 @@ namespace ShardingCore.Sharding.Enumerators.AggregateExtensions
             var invoke = Expression.Lambda(binaryExpression).Compile().DynamicInvoke();
             return invoke;
         }
+        public static TResult AverageConstant<TSum,TCount,TResult>(TSum sum, TCount count)
+        {
+            var resultType = typeof(TResult);
+            Expression constantSum = Expression.Constant(sum);
+            //如果计算类型和返回类型不一致先转成一致
+            if (sum.GetType() != resultType)
+                constantSum = Expression.Convert(constantSum, resultType);
+            Expression constantCount = Expression.Constant(count);
+            //如果计算类型和返回类型不一致先转成一致
+            if (count.GetType() != resultType)
+                constantCount = Expression.Convert(constantCount, resultType);
+            var binaryExpression = Expression.Divide(constantSum, constantCount);
+            var invoke = Expression.Lambda<Func<TResult>>(binaryExpression).Compile()();
+            return invoke;
+        }
+        //private static readonly Type _divideFirstDecimalType=typeof(decimal);
+        //private static readonly Type _divideSecondDoubleType=typeof(double);
+        //private static readonly Type _divideThirdFloatType=typeof(float);
+        //private static Type GetConvertPriorityType(Type sum, Type count, Type result)
+        //{
+        //    if (_divideFirstDecimalType == sum || _divideFirstDecimalType == count || _divideFirstDecimalType == result)
+        //        return _divideFirstDecimalType;
+        //    if (_divideSecondDoubleType == sum || _divideSecondDoubleType == count || _divideSecondDoubleType == result)
+        //        return _divideSecondDoubleType;
+        //    if (_divideThirdFloatType == sum || _divideThirdFloatType == count || _divideThirdFloatType == result)
+        //        return _divideThirdFloatType;
+        //    return result;
+        //}
+
         /// <summary>
         /// 获取平均数和 [{avg1,sum1},{avg2,sum2}....]=>sum(sum1...n)/sum(sum1...n/avg1...n)
         /// </summary>

src/ShardingCore/Sharding/MergeEngines/AggregateMergeEngines/AverageAsyncInMemoryMergeEngine.cs

@@ -85,9 +85,9 @@ namespace ShardingCore.Sharding.StreamMergeEngines.AggregateMergeEngines
                     Sum = o.QueryResult.Sum,
                     Count = o.QueryResult.Count
                 }).AsQueryable();
-                var sum = queryable.SumByPropertyName(nameof(AverageResult<object>.Sum));
-                var count = queryable.SumByPropertyName(nameof(AverageResult<object>.Count));
-                return (TEnsureResult)AggregateExtension.AverageConstant(sum, count,typeof(TEnsureResult));
+                var sum = queryable.SumByPropertyName<TSelect>(nameof(AverageResult<object>.Sum));
+                var count = queryable.Sum(o => o.Count);
+                return AggregateExtension.AverageConstant<TSelect, long, TEnsureResult>(sum, count);
             }
             
         }

src/ShardingCore/Sharding/MergeEngines/AggregateMergeEngines/SumAsyncInMemoryMergeEngine.cs

@@ -57,7 +57,7 @@ namespace ShardingCore.Sharding.StreamMergeEngines.AggregateMergeEngines
         {
             if (source.IsEmpty())
                 return default;
-            var sum = source.AsQueryable().SumByPropertyName(nameof(RouteQueryResult<TInnerSelect>.QueryResult));
+            var sum = source.AsQueryable().SumByPropertyName<TInnerSelect>(nameof(RouteQueryResult<TInnerSelect>.QueryResult));
             return ConvertSum(sum);
         }
         private TEnsureResult ConvertSum<TNumber>(TNumber number)

src/ShardingCore/ShardingConfigOption.cs

@@ -71,7 +71,7 @@ namespace ShardingCore
         //}
 
         public bool UseReadWrite => ReadConnStringConfigure != null;
-        public Func<IServiceProvider, IDictionary<string, ISet<string>>> ReadConnStringConfigure { get; private set; }
+        public Func<IServiceProvider, IDictionary<string, IEnumerable<string>>> ReadConnStringConfigure { get; private set; }
         public ReadStrategyEnum ReadStrategyEnum { get; private set; }
         public bool ReadWriteDefaultEnable { get; private set; }
         public int ReadWriteDefaultPriority { get; private set; }
@@ -85,7 +85,7 @@ namespace ShardingCore
         /// <param name="defaultEnable">考虑到很多时候读写分离的延迟需要马上用到写入的数据所以默认关闭需要的话自己开启或者通过IShardingReadWriteManager,false表示默认不走读写分离除非你自己开启,true表示默认走读写分离除非你禁用,</param>
         /// <param name="defaultPriority">IShardingReadWriteManager.CreateScope()会判断dbcontext的priority然后判断是否启用readwrite</param>
         /// <param name="readConnStringGetStrategy">读写分离可能会造成每次查询不一样甚至分表后的分页会有错位问题，因为他不是一个原子操作,所以如果整个请求为一次读写切换大多数更加合适</param>
-        public void UseReadWriteConfiguration(Func<IServiceProvider, IDictionary<string, ISet<string>>> readConnStringConfigure, ReadStrategyEnum readStrategyEnum, bool defaultEnable = false, int defaultPriority = 10, ReadConnStringGetStrategyEnum readConnStringGetStrategy = ReadConnStringGetStrategyEnum.LatestFirstTime)
+        public void UseReadWriteConfiguration(Func<IServiceProvider, IDictionary<string, IEnumerable<string>>> readConnStringConfigure, ReadStrategyEnum readStrategyEnum, bool defaultEnable = false, int defaultPriority = 10, ReadConnStringGetStrategyEnum readConnStringGetStrategy = ReadConnStringGetStrategyEnum.LatestFirstTime)
         {
             ReadConnStringConfigure = readConnStringConfigure ?? throw new ArgumentNullException(nameof(readConnStringConfigure));
             ReadStrategyEnum = readStrategyEnum;

test/ShardingCore.Test/ShardingTest.cs

@@ -899,6 +899,7 @@ namespace ShardingCore.Test
         [Fact]
         public async Task OrderReadWrite()
         {
+
             //切换到只读数据库，只读数据库又只配置了A数据源读取B数据源
             _virtualDbContext.ReadWriteSeparationReadOnly();
             var list = await _virtualDbContext.Set<Order>().Where(o => o.Money == 1).ToListAsync();

test/ShardingCore.Test/Startup.cs

@@ -73,7 +73,7 @@ namespace ShardingCore.Test
                     op.AddShardingTableRoute<LogDayLongVirtualRoute>();
                 }).AddReadWriteSeparation(sp =>
                 {
-                    return new Dictionary<string, ISet<string>>()
+                    return new Dictionary<string, IEnumerable<string>>()
                     {
                         {
                             "A", new HashSet<string>()

test/ShardingCore.Test2x/Startup.cs

@@ -69,7 +69,7 @@ namespace ShardingCore.Test2x
                     op.AddShardingTableRoute<LogDayLongVirtualRoute>();
                 }).AddReadWriteSeparation(sp =>
                 {
-                    return new Dictionary<string, ISet<string>>()
+                    return new Dictionary<string, IEnumerable<string>>()
                     {
                         {
                             "A", new HashSet<string>()

test/ShardingCore.Test3x/Startup.cs

@@ -69,7 +69,7 @@ namespace ShardingCore.Test3x
                     op.AddShardingTableRoute<LogDayLongVirtualRoute>();
                 }).AddReadWriteSeparation(sp =>
                 {
-                    return new Dictionary<string, ISet<string>>()
+                    return new Dictionary<string, IEnumerable<string>>()
                     {
                         {
                             "A", new HashSet<string>()

test/ShardingCore.Test5x/Startup.cs

@@ -69,7 +69,7 @@ namespace ShardingCore.Test5x
                     op.AddShardingTableRoute<LogDayLongVirtualRoute>();
                 }).AddReadWriteSeparation(sp =>
                 {
-                    return new Dictionary<string, ISet<string>>()
+                    return new Dictionary<string, IEnumerable<string>>()
                     {
                         {
                             "A", new HashSet<string>()