7.x.1.10 修复匿名对象返回nullable的value的bug

xuejmnet · xuejmnet · commit 6d2253680bc5 · 2023-06-06T09:14:50.000+08:00
diff --git a/samples/Sample.AutoCreateIfPresent/AreaDeviceRoute.cs b/samples/Sample.AutoCreateIfPresent/AreaDeviceRoute.cs
@@ -61,6 +61,7 @@ private void InitTails()
 
         public override string ShardingKeyToTail(object shardingKey)
         {
+            InitOnce();
             return $"{shardingKey}";
         }
 
@@ -70,6 +71,12 @@ public override string ShardingKeyToTail(object shardingKey)
         /// </summary>
         /// <returns></returns>
         public override List<string> GetTails()
+        {
+            InitOnce();
+            return _tails.Keys.ToList();
+        }
+
+        private void InitOnce()
         {
             if (!_inited)
             {
@@ -82,8 +89,7 @@ public override List<string> GetTails()
                     }
                 }
             }
-
-            return _tails.Keys.ToList();
+            
         }
 
         public override void Configure(EntityMetadataTableBuilder<AreaDevice> builder)
diff --git a/samples/Sample.MySql/Controllers/WeatherForecastController.cs b/samples/Sample.MySql/Controllers/WeatherForecastController.cs
@@ -85,7 +85,9 @@ public IQueryable<SysTest> GetAll()
             var shardingTableCreator = _shardingRuntimeContext.GetShardingTableCreator();
             var tableRouteManager = _shardingRuntimeContext.GetTableRouteManager();
             //系统的时间分片都会实现 ITailAppendable 如果不是系统的自定义的转成你自己的对象即可
-            var virtualTableRoute = (ITailAppendable)tableRouteManager.GetRoute(typeof(SysUserMod));
+            var tableRoute = tableRouteManager.GetRoute(typeof(SysUserMod));
+            var tails = tableRoute.GetTails();
+            var virtualTableRoute = (ITailAppendable)tableRoute;
             //一定要先在路由里面添加尾巴
             virtualTableRoute.Append("20220921");
             shardingTableCreator.CreateTable<SysUserMod>("ds0","20220921");
@@ -330,6 +332,13 @@ public async Task<IActionResult> Get9()
         [HttpGet]
         public async Task<IActionResult> Get10()
         {
+            var shardingDbContextExecutor = _defaultTableDbContext.GetShardingExecutor();
+            var dataSourceDbContexts = shardingDbContextExecutor.GetCurrentDbContexts();
+            var sourceDbContexts = dataSourceDbContexts.Values;
+            var dataSourceDbContext = sourceDbContexts.FirstOrDefault();
+            var dbConnection = dataSourceDbContext.GetCurrentContexts().FirstOrDefault().Value.Database.GetDbConnection();
+
+
             var sysUserMod1 = await _defaultTableDbContext.Set<SysTest>().Where(o=>o.UserId=="11231").AllAsync(o=>o.Id=="1123"&&string.Compare(o.UserId,"123")>0);
             var sysUserMod2 = await _defaultTableDbContext.Set<SysTest>().AllAsync(o=>o.Id=="1123");
             var dateTime = new DateTime(2020,1,1);
@@ -354,5 +363,25 @@ await _defaultTableDbContext.Set<SysTest>().Where(o => o.Id == "11")
 
             return Ok();
         }
+        [HttpGet]
+        public async Task<IActionResult> Get12()
+        {
+            var sysTests = from ut in _defaultTableDbContext.Set<SysTest>()
+                where _defaultTableDbContext.Set<SysUserLogByMonth>().Any(x => x.Id == ut.Id)
+                    select ut;
+            var tests = sysTests.ToList();
+            return Ok();
+        }
+        [HttpGet]
+        public async Task<IActionResult> Get13()
+        {
+            var list =await _defaultTableDbContext.Set<SysUserLogByMonth>()
+                .GroupBy(o=>o.Time)
+                .Select(o=>new
+                {
+                    o.Key
+                }).ToListAsync();
+            return Ok();
+        }
     }
 }
diff --git a/samples/Sample.MySql/Domain/Entities/SysUserLogByMonth.cs b/samples/Sample.MySql/Domain/Entities/SysUserLogByMonth.cs
@@ -9,6 +9,6 @@ namespace Sample.MySql.Domain.Entities
     public class SysUserLogByMonth 
     {
         public string Id { get; set; }
-        public DateTime Time { get; set; }
+        public DateTime? Time { get; set; }
     }
 }
diff --git a/samples/Sample.MySql/Domain/Maps/SysTestMap.cs b/samples/Sample.MySql/Domain/Maps/SysTestMap.cs
@@ -1,5 +1,6 @@
 ﻿using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Sample.MySql.Domain.Entities;
 
 namespace Sample.MySql.Domain.Maps
@@ -12,7 +13,7 @@ public void Configure(EntityTypeBuilder<SysTest> builder)
             builder.Property(o => o.Id).IsRequired().HasMaxLength(128);
             builder.Property(o => o.UserId).IsRequired().HasMaxLength(128);
             builder.Property(o => o.UserId).IsConcurrencyToken();
-            builder.ToTable(nameof(SysTest));
+            builder.ToTable(nameof(SysTest),"dbdbd0");
         }
     }
 }
diff --git a/samples/Sample.MySql/Startup.cs b/samples/Sample.MySql/Startup.cs
@@ -74,6 +74,8 @@ public void ConfigureServices(IServiceCollection services)
             services.AddShardingDbContext<DefaultShardingDbContext>()
                 .UseRouteConfig((sp, o) =>
                 {
+                    
+                    // AppDomain.CurrentDomain.GetAssemblies().
                     o.AddShardingTableRoute<DynamicTableRoute>();
                     o.AddShardingTableRoute<SysUserLogByMonthRoute>();
                     o.AddShardingTableRoute<SysUserModVirtualTableRoute>();
@@ -93,6 +95,7 @@ public void ConfigureServices(IServiceCollection services)
                     // {
                     //     b.UseMemoryCache(memoryCache);
                     // });
+                    o.CheckShardingKeyValueGenerated = false;
                     o.IgnoreCreateTableError = false;
                     o.UseEntityFrameworkCoreProxies = true;
                     o.CacheModelLockConcurrencyLevel = 1024;
@@ -107,6 +110,8 @@ public void ConfigureServices(IServiceCollection services)
 
                     o.UseShardingQuery((conStr, builder) =>
                     {
+                        var logger = sp.ApplicationServiceProvider.GetService<ILogger<Startup>>();
+                        logger.LogInformation(conStr);
                         builder.UseMySql(conStr, new MySqlServerVersion(new Version()))
                             .UseLoggerFactory(loggerFactory1)
                             .EnableSensitiveDataLogging();
@@ -180,7 +185,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             {
                 app.UseDeveloperExceptionPage();
             }
-            // app.ApplicationServices.UseAutoTryCompensateTable();
+            app.ApplicationServices.UseAutoTryCompensateTable();
 
             // var shardingRuntimeContext = app.ApplicationServices.GetRequiredService<IShardingRuntimeContext>();
             // var entityMetadataManager = shardingRuntimeContext.GetEntityMetadataManager();
diff --git a/src/ShardingCore/Sharding/Enumerators/AggregateExtensions/AggregateExtension.cs b/src/ShardingCore/Sharding/Enumerators/AggregateExtensions/AggregateExtension.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Linq.Expressions;
@@ -20,16 +21,45 @@ namespace ShardingCore.Sharding.Enumerators.AggregateExtensions
     /// </summary>
     internal static class AggregateExtension
     {
+        
+        public static object ChangeType(this object value, Type targetType)
+        {
+            //targetType类型是否为泛型，因为nullable是泛型类,
+            if (targetType.IsGenericType &&
+                //判断targetType是否为nullable泛型类
+                targetType.IsNullableType())
+            {
+                if (value == null)
+                {
+                    return null;
+                }
+
+                NullableConverter nullableConverter = new NullableConverter(targetType);
+                targetType = nullableConverter.UnderlyingType;
+            }
+            return Convert.ChangeType(value, targetType);
+        }
         public static TSource CopyTSource<TSource>(TSource source)
         {
             var anonType = source.GetType();
             var allProperties = anonType.GetProperties();
             var allPropertyTypes= allProperties.Select(o=>o.PropertyType).ToArray();
             if (anonType.IsAnonymousType())
             {
-                var constantExpressions = allProperties.Select(o => Expression.Constant(o.GetValue(source))).ToArray();
+                var constantExpressions = allProperties.Select(o =>
+                {
+                    var value = o.GetValue(source);
+                    if (value != null &&o.PropertyType.IsNullableType())
+                    {
+                        // var changeTypeValue = ChangeType(value,o.PropertyType);
+                        return Expression.Constant(value,o.PropertyType);
+                    }
+
+                    return Expression.Constant(value);
+                }).ToArray();
+                var constructorInfo = anonType.GetConstructor(allPropertyTypes);
                 var exp = Expression.New(
-                    anonType.GetConstructor(allPropertyTypes),
+                    constructorInfo,
                     constantExpressions);
                 var lambda = LambdaExpression.Lambda(exp);
                 TSource myObj = (TSource)lambda.Compile().DynamicInvoke();

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ private void InitTails()`
`61`	`61`
`62`	`62`	`public override string ShardingKeyToTail(object shardingKey)`
`63`	`63`	`{`
	`64`	`+ InitOnce();`
`64`	`65`	`return $"{shardingKey}";`
`65`	`66`	`}`
`66`	`67`
`@@ -70,6 +71,12 @@ public override string ShardingKeyToTail(object shardingKey)`
`70`	`71`	`/// </summary>`
`71`	`72`	`/// <returns></returns>`
`72`	`73`	`public override List<string> GetTails()`
	`74`	`+ {`
	`75`	`+ InitOnce();`
	`76`	`+ return _tails.Keys.ToList();`
	`77`	`+ }`
	`78`	`+`
	`79`	`+ private void InitOnce()`
`73`	`80`	`{`
`74`	`81`	`if (!_inited)`
`75`	`82`	`{`
`@@ -82,8 +89,7 @@ public override List<string> GetTails()`
`82`	`89`	`}`
`83`	`90`	`}`
`84`	`91`	`}`
`85`		`-`
`86`		`- return _tails.Keys.ToList();`
	`92`	`+`
`87`	`93`	`}`
`88`	`94`
`89`	`95`	`public override void Configure(EntityMetadataTableBuilder<AreaDevice> builder)`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@ namespace Sample.MySql.Domain.Entities`
`9`	`9`	`public class SysUserLogByMonth`
`10`	`10`	`{`
`11`	`11`	`public string Id { get; set; }`
`12`		`- public DateTime Time { get; set; }`
	`12`	`+ public DateTime? Time { get; set; }`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using Microsoft.EntityFrameworkCore;`
`2`	`2`	`using Microsoft.EntityFrameworkCore.Metadata.Builders;`
	`3`	`+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;`
`3`	`4`	`using Sample.MySql.Domain.Entities;`
`4`	`5`
`5`	`6`	`namespace Sample.MySql.Domain.Maps`
`@@ -12,7 +13,7 @@ public void Configure(EntityTypeBuilder<SysTest> builder)`
`12`	`13`	`builder.Property(o => o.Id).IsRequired().HasMaxLength(128);`
`13`	`14`	`builder.Property(o => o.UserId).IsRequired().HasMaxLength(128);`
`14`	`15`	`builder.Property(o => o.UserId).IsConcurrencyToken();`
`15`		`- builder.ToTable(nameof(SysTest));`
	`16`	`+ builder.ToTable(nameof(SysTest),"dbdbd0");`
`16`	`17`	`}`
`17`	`18`	`}`
`18`	`19`	`}`