优化聚合升级到7.x.1.8

nuget-publish.bat

@@ -1,10 +1,10 @@
 :start
 ::定义版本
-set EFCORE7=7.7.1.7
+set EFCORE7=7.7.1.8
-set EFCORE6=7.6.1.7
+set EFCORE6=7.6.1.8
-set EFCORE5=7.5.1.7
+set EFCORE5=7.5.1.8
-set EFCORE3=7.3.1.7
+set EFCORE3=7.3.1.8
-set EFCORE2=7.2.1.7
+set EFCORE2=7.2.1.8
 
 ::删除所有bin与obj下的文件
 @echo off

samples/Sample.MySql/Controllers/WeatherForecastController.cs

@@ -9,6 +9,7 @@ using ShardingCore.Core.RuntimeContexts;
 using ShardingCore.Core.VirtualDatabase.VirtualDataSources.PhysicDataSources;
 using ShardingCore.Core.VirtualRoutes.TableRoutes;
 using ShardingCore.Core.VirtualRoutes.TableRoutes.Abstractions;
+using ShardingCore.Extensions;
 using ShardingCore.Extensions.ShardingPageExtensions;
 using ShardingCore.Extensions.ShardingQueryableExtensions;
 using ShardingCore.Helpers;
@@ -79,7 +80,8 @@ namespace Sample.MySql.Controllers
             var dataSourceInitializer = _shardingRuntimeContext.GetDataSourceInitializer();
             dataSourceInitializer.InitConfigure("ds9",true,true);
 
-            
+            // _defaultTableDbContext.ReadWriteSeparationReadOnly();//读库
+            // _defaultTableDbContext.ReadWriteSeparationWriteOnly();//写库
             var shardingTableCreator = _shardingRuntimeContext.GetShardingTableCreator();
             var tableRouteManager = _shardingRuntimeContext.GetTableRouteManager();
             //系统的时间分片都会实现 ITailAppendable 如果不是系统的自定义的转成你自己的对象即可

samples/Sample.MySql/DbContexts/DefaultShardingDbContext.cs

@@ -40,7 +40,7 @@ namespace Sample.MySql.DbContexts
             modelBuilder.ApplyConfiguration(new SysTestMap());
             modelBuilder.ApplyConfiguration(new SysUserLogByMonthMap());
 
-            // modelBuilder.Entity<SysUserLogByMonth>().HasData(new SysUserLogByMonth() { Id = "1", Time = DateTime.Now });
+             modelBuilder.Entity<SysUserLogByMonth>().HasData(new SysUserLogByMonth() { Id = "1", Time = DateTime.Now });
             // modelBuilder.Entity<SysTest>().HasData(new SysTest() { Id = "1", UserId = "123" });
             // modelBuilder.Entity<TestMod>().ToTable(nameof(TestMod));
             // modelBuilder.Entity<SysTest>().ToTable("xxx");

samples/Sample.MySql/Domain/Entities/SysTest.cs

@@ -8,5 +8,6 @@
     {
         public string Id { get; set; }
         public string UserId { get; set; }
+
     }
 }

samples/Sample.MySql/Domain/Maps/SysUserModMap.cs

@@ -15,7 +15,7 @@ namespace Sample.MySql.Domain.Maps
         public void Configure(EntityTypeBuilder<SysUserMod> builder)
         {
             builder.HasKey(o => o.Id);
-            builder.Property(o => o.Id).IsRequired().HasMaxLength(128);
+            builder.Property(o => o.Id).ValueGeneratedNever().IsRequired().HasMaxLength(128);
             builder.Property(o => o.Name).HasMaxLength(128);
             builder.ToTable(nameof(SysUserMod));
         }

samples/Sample.MySql/NoReadWriteMiddleware.cs

@@ -0,0 +1,37 @@
+using Sample.MySql.DbContexts;
+using ShardingCore.Core.RuntimeContexts;
+using ShardingCore.Extensions;
+
+namespace Sample.MySql
+{
+
+    public class NoReadWriteMiddleware
+    {
+        private readonly RequestDelegate _next;
+
+        public NoReadWriteMiddleware(RequestDelegate next)
+        {
+            _next = next;
+        }
+
+        public async Task Invoke(HttpContext context)
+        {
+            if (context.Request.Path.ToString().StartsWith("/admin"))
+            {
+                var shardingRuntimeContext = context.RequestServices.GetService<IShardingRuntimeContext<DefaultShardingDbContext>>();
+                var shardingReadWriteManager = shardingRuntimeContext.GetShardingReadWriteManager();
+                using (var scope = shardingReadWriteManager.CreateScope())
+                {
+                    shardingReadWriteManager.GetCurrent().SetReadWriteSeparation(9999,false);
+                    await _next(context);
+                }
+            }
+            else
+            {
+                await _next(context);
+            }
+            
+        }
+    
+    }
+}

samples/Sample.MySql/Startup.cs

@@ -93,6 +93,7 @@ namespace Sample.MySql
                     // {
                     //     b.UseMemoryCache(memoryCache);
                     // });
+                    o.IgnoreCreateTableError = false;
                     o.UseEntityFrameworkCoreProxies = true;
                     o.CacheModelLockConcurrencyLevel = 1024;
                     o.CacheEntrySize = 1;
@@ -213,7 +214,6 @@ namespace Sample.MySql
             // app.ApplicationServices.UseAutoTryCompensateTable(12);
 
             app.UseRouting();
-
             app.UseAuthorization();
 
             app.UseEndpoints(endpoints => { endpoints.MapControllers(); });

src/ShardingCore/Core/VirtualRoutes/ShardingRouteResult.cs

@@ -15,9 +15,7 @@ namespace ShardingCore.Core.VirtualRoutes
 
         public ShardingRouteResult(List<ISqlRouteUnit> routeUnits,bool isEmpty,bool isCrossDataSource,bool isCrossTable,bool existCrossTableTails)
         {
-            var routeUnitGroup = routeUnits.GroupBy(o=>o.DataSourceName);
             RouteUnits = routeUnits;
-            var count = routeUnitGroup.Count();
             IsEmpty =isEmpty;
             IsCrossDataSource = isCrossDataSource;
             IsCrossTable = isCrossTable;

src/ShardingCore/Core/VirtualRoutes/TableRoutes/RoutingRuleEngine/TableRouteRuleEngine.cs

@@ -114,6 +114,7 @@ namespace ShardingCore.Core.VirtualRoutes.TableRoutes.RoutingRuleEngine
                     var routeResults = routeMap.Select(o => o.Value).Cartesian()
                         .Select(o => new TableRouteResult(o.ToList())).Where(o => !o.IsEmpty).ToArray();
 
+                    //平行表
                     var tableRouteResults = GetTableRouteResults(tableRouteRuleContext, routeResults);
                     if (tableRouteResults.IsNotEmpty())
                     {

src/ShardingCore/Sharding/MergeEngines/ShardingExecutors/ShardingExecutor.cs

@@ -33,6 +33,11 @@ namespace ShardingCore.Sharding.MergeEngines.ShardingExecutors
                 .ToList();
             if (results.IsEmpty())
                 throw new ShardingCoreException("sharding execute result empty");
+            //不需要merge
+            if (results.Count == 1)
+            {
+                return results[0];
+            }
             var streamMerge = executor.GetShardingMerger().StreamMerge(results);
             return streamMerge;
         }