针对时间分表的StarJob替换成AutoCreateTableByTime并且默认强制重写,发布x.3.1.49

xuejmnet · xuejmnet · commit 993bfecb5d52 · 2021-11-24T08:12:03.000+08:00
diff --git a/nuget-publish.bat b/nuget-publish.bat
@@ -1,9 +1,9 @@
 :start
 ::定义版本
-set EFCORE2=2.3.1.48
-set EFCORE3=3.3.1.48
-set EFCORE5=5.3.1.48
-set EFCORE6=6.3.1.48
+set EFCORE2=2.3.1.49
+set EFCORE3=3.3.1.49
+set EFCORE5=5.3.1.49
+set EFCORE6=6.3.1.49
 
 ::删除所有bin与obj下的文件
 @echo off
diff --git a/samples/Sample.BulkConsole/OrderVirtualRoute.cs b/samples/Sample.BulkConsole/OrderVirtualRoute.cs
@@ -28,5 +28,10 @@ public override IPaginationConfiguration<Order> CreatePaginationConfiguration()
         {
             return new OrderPaginationConfiguration();
         }
+
+        public override bool AutoCreateTableByTime()
+        {
+            return true;
+        }
     }
 }
diff --git a/samples/Sample.Migrations/EFCores/ShardingWithDateTime.cs b/samples/Sample.Migrations/EFCores/ShardingWithDateTime.cs
@@ -36,5 +36,10 @@ public override void Configure(EntityMetadataTableBuilder<ShardingWithDateTime>
         {
             builder.ShardingProperty(o => o.CreateTime);
         }
+
+        public override bool AutoCreateTableByTime()
+        {
+            return true;
+        }
     }
 }
diff --git a/samples/Sample.MySql/Shardings/SysUserLogByMonthRoute.cs b/samples/Sample.MySql/Shardings/SysUserLogByMonthRoute.cs
@@ -13,5 +13,10 @@ public override DateTime GetBeginTime()
         {
             return new DateTime(2021, 1, 01);
         }
+
+        public override bool AutoCreateTableByTime()
+        {
+            return true;
+        }
     }
 }
diff --git a/samples/Sample.SqlServer/Shardings/TestYearShardingVirtualTableRoute.cs b/samples/Sample.SqlServer/Shardings/TestYearShardingVirtualTableRoute.cs
@@ -14,15 +14,16 @@ public override DateTime GetBeginTime()
         {
             return new DateTime(2020, 1, 1);
         }
+        
 
-        public override bool StartJob()
+        public override void Configure(EntityMetadataTableBuilder<TestYearSharding> builder)
         {
-            return true;
+            builder.ShardingProperty(o => o.CreateTIme);
         }
 
-        public override void Configure(EntityMetadataTableBuilder<TestYearSharding> builder)
+        public override bool AutoCreateTableByTime()
         {
-            builder.ShardingProperty(o => o.CreateTIme);
+            return true;
         }
     }
 }
diff --git a/samples/Sample.SqlServerShardingAll/VirtualTableRoutes/OrderVirtualTableRoute.cs b/samples/Sample.SqlServerShardingAll/VirtualTableRoutes/OrderVirtualTableRoute.cs
@@ -16,5 +16,10 @@ public override void Configure(EntityMetadataTableBuilder<Order> builder)
         {
             builder.ShardingProperty(o => o.CreationTime);
         }
+
+        public override bool AutoCreateTableByTime()
+        {
+            return true;
+        }
     }
 }
diff --git a/samples/Sample.SqlServerShardingTable/VirtualRoutes/OrderVirtualTableRoute.cs b/samples/Sample.SqlServerShardingTable/VirtualRoutes/OrderVirtualTableRoute.cs
@@ -16,5 +16,10 @@ public override void Configure(EntityMetadataTableBuilder<Order> builder)
         {
             builder.ShardingProperty(o => o.CreationTime);
         }
+
+        public override bool AutoCreateTableByTime()
+        {
+            return true;
+        }
     }
 }
diff --git a/samples/Samples.AutoByDate.SqlServer/Shardings/SysUserLogByDayVirtualTableRoute.cs b/samples/Samples.AutoByDate.SqlServer/Shardings/SysUserLogByDayVirtualTableRoute.cs
@@ -19,5 +19,10 @@ public override DateTime GetBeginTime()
             //如果返回动态值会导致程序重新启动这个值就会变动导致无法获取之前的表
             return DateTime.Now.AddDays(-2);
         }
+
+        public override bool AutoCreateTableByTime()
+        {
+            return true;
+        }
     }
 }
diff --git a/samples/Samples.AutoByDate.SqlServer/Shardings/TestLogWeekVirtualRoute.cs b/samples/Samples.AutoByDate.SqlServer/Shardings/TestLogWeekVirtualRoute.cs
@@ -14,5 +14,10 @@ public override DateTime GetBeginTime()
         {
             return new DateTime(2021, 8, 1);
         }
+
+        public override bool AutoCreateTableByTime()
+        {
+            return true;
+        }
     }
 }
diff --git a/src/ShardingCore/Bootstrapers/EntityMetadataInitializer.cs b/src/ShardingCore/Bootstrapers/EntityMetadataInitializer.cs
@@ -110,7 +110,7 @@ public void Initialize()
                 //检测校验分表分库对象元数据
                 entityMetadata.CheckShardingTableMetadata();
                 //添加任务
-                if (virtualTableRoute is IJob routeJob && routeJob.StartJob())
+                if (virtualTableRoute is IJob routeJob && routeJob.AutoCreateTableByTime())
                 {
                     var jobManager = ShardingContainer.GetService<IJobManager>();
                     var jobEntry = JobEntryFactory.Create(routeJob);
diff --git a/src/ShardingCore/Core/VirtualRoutes/TableRoutes/Abstractions/AbstractVirtualTableRoute.cs b/src/ShardingCore/Core/VirtualRoutes/TableRoutes/Abstractions/AbstractVirtualTableRoute.cs
@@ -72,6 +72,10 @@ public virtual IPaginationConfiguration<T> CreatePaginationConfiguration()
         /// <returns></returns>
         public abstract List<string> GetAllTails();
 
+        /// <summary>
+        /// 配置分表信息
+        /// </summary>
+        /// <param name="builder"></param>
         public virtual void Configure(EntityMetadataTableBuilder<T> builder)
         {
             
diff --git a/src/ShardingCore/Jobs/Abstaractions/IJob.cs b/src/ShardingCore/Jobs/Abstaractions/IJob.cs
@@ -8,6 +8,6 @@ internal interface IJob
         string JobName { get; }
         string[] GetCronExpressions();
         Task ExecuteAsync();
-        bool StartJob();
+        bool AutoCreateTableByTime();
     }
 }
diff --git a/src/ShardingCore/VirtualRoutes/Abstractions/AbstractShardingAutoCreateOperatorVirtualTableRoute.cs b/src/ShardingCore/VirtualRoutes/Abstractions/AbstractShardingAutoCreateOperatorVirtualTableRoute.cs
@@ -32,14 +32,15 @@ protected AbstractShardingAutoCreateOperatorVirtualTableRoute()
         public virtual string JobName =>
             $"{EntityMetadata?.ShardingDbContextType?.Name}:{EntityMetadata?.EntityType?.Name}";
 
-        public virtual bool StartJob()
-        {
-            return false;
-        }
+        /// <summary>
+        /// 是否需要自动创建按时间分表的路由
+        /// </summary>
+        /// <returns></returns>
+        public abstract bool AutoCreateTableByTime();
         /// <summary>
         /// 显示错误日志
         /// </summary>
-        public virtual bool ShowErrorLog => false;
+        public virtual bool DoLogError => false;
 
         public abstract string[] GetCronExpressions();
 
@@ -84,7 +85,7 @@ public Task ExecuteAsync()
                 {
                     //ignore
                     _logger.LogInformation($"warning table tail:[{tail}],entity:[{typeof(TEntity).Name}]");
-                    if (ShowErrorLog)
+                    if (DoLogError)
                         _logger.LogError(e, $"{dataSource} {typeof(TEntity).Name}'s create table error ");
                 }
             }
diff --git a/test/ShardingCore.Test2x/Shardings/LogDayVirtualTableRoute.cs b/test/ShardingCore.Test2x/Shardings/LogDayVirtualTableRoute.cs
@@ -16,11 +16,6 @@ public override DateTime GetBeginTime()
             return new DateTime(2021, 1, 1);
         }
 
-        public override bool StartJob()
-        {
-            return true;
-        }
-
         public override void Configure(EntityMetadataTableBuilder<LogDay> builder)
         {
             builder.ShardingProperty(o => o.LogTime);
@@ -31,5 +26,10 @@ public override IPaginationConfiguration<LogDay> CreatePaginationConfiguration()
         {
             return new LogDayPaginationConfiguration();
         }
+
+        public override bool AutoCreateTableByTime()
+        {
+            return true;
+        }
     }
 }
diff --git a/test/ShardingCore.Test2x/Shardings/OrderCreateTimeVirtualTableRoute.cs b/test/ShardingCore.Test2x/Shardings/OrderCreateTimeVirtualTableRoute.cs
@@ -13,14 +13,14 @@ public override DateTime GetBeginTime()
             return new DateTime(2021, 1, 1);
         }
 
-        public override bool StartJob()
+        public override IPaginationConfiguration<Order> CreatePaginationConfiguration()
         {
-            return true;
+            return new OrderCreateTimePaginationConfiguration();
         }
 
-        public override IPaginationConfiguration<Order> CreatePaginationConfiguration()
+        public override bool AutoCreateTableByTime()
         {
-            return new OrderCreateTimePaginationConfiguration();
+            return true;
         }
     }
 
diff --git a/test/ShardingCore.Test3x/Shardings/LogDayVirtualTableRoute.cs b/test/ShardingCore.Test3x/Shardings/LogDayVirtualTableRoute.cs
@@ -16,11 +16,6 @@ public override DateTime GetBeginTime()
             return new DateTime(2021, 1, 1);
         }
 
-        public override bool StartJob()
-        {
-            return true;
-        }
-
         public override void Configure(EntityMetadataTableBuilder<LogDay> builder)
         {
             builder.ShardingProperty(o => o.LogTime);
@@ -31,5 +26,10 @@ public override IPaginationConfiguration<LogDay> CreatePaginationConfiguration()
         {
             return new LogDayPaginationConfiguration();
         }
+
+        public override bool AutoCreateTableByTime()
+        {
+            return true;
+        }
     }
 }
diff --git a/test/ShardingCore.Test3x/Shardings/OrderCreateTimeVirtualTableRoute.cs b/test/ShardingCore.Test3x/Shardings/OrderCreateTimeVirtualTableRoute.cs
@@ -12,15 +12,16 @@ public override DateTime GetBeginTime()
         {
             return new DateTime(2021, 1, 1);
         }
+        
 
-        public override bool StartJob()
+        public override IPaginationConfiguration<Order> CreatePaginationConfiguration()
         {
-            return true;
+            return new OrderCreateTimePaginationConfiguration();
         }
 
-        public override IPaginationConfiguration<Order> CreatePaginationConfiguration()
+        public override bool AutoCreateTableByTime()
         {
-            return new OrderCreateTimePaginationConfiguration();
+            return true;
         }
     }
 
diff --git a/test/ShardingCore.Test5x/Shardings/LogDayVirtualTableRoute.cs b/test/ShardingCore.Test5x/Shardings/LogDayVirtualTableRoute.cs
@@ -16,11 +16,7 @@ public override DateTime GetBeginTime()
         {
             return new DateTime(2021, 1, 1);
         }
-
-        public override bool StartJob()
-        {
-            return true;
-        }
+        
 
         public override void Configure(EntityMetadataTableBuilder<LogDay> builder)
         {
@@ -32,5 +28,10 @@ public override IPaginationConfiguration<LogDay> CreatePaginationConfiguration()
         {
             return new LogDayPaginationConfiguration();
         }
+
+        public override bool AutoCreateTableByTime()
+        {
+            return true;
+        }
     }
 }
diff --git a/test/ShardingCore.Test5x/Shardings/OrderCreateTimeVirtualTableRoute.cs b/test/ShardingCore.Test5x/Shardings/OrderCreateTimeVirtualTableRoute.cs
@@ -13,15 +13,16 @@ public override DateTime GetBeginTime()
             return new DateTime(2021, 1, 1);
         }
 
-        public override bool StartJob()
-        {
-            return true;
-        }
 
         public override IPaginationConfiguration<Order> CreatePaginationConfiguration()
         {
             return new OrderCreateTimePaginationConfiguration();
         }
+
+        public override bool AutoCreateTableByTime()
+        {
+            return true;
+        }
     }
 
    public class OrderCreateTimePaginationConfiguration : IPaginationConfiguration<Order>
diff --git a/test/ShardingCore.Test6x/Shardings/LogDayVirtualTableRoute.cs b/test/ShardingCore.Test6x/Shardings/LogDayVirtualTableRoute.cs
@@ -19,11 +19,7 @@ public override DateTime GetBeginTime()
         {
             return new DateTime(2021, 1, 1);
         }
-
-        public override bool StartJob()
-        {
-            return true;
-        }
+        
 
         public override void Configure(EntityMetadataTableBuilder<LogDay> builder)
         {
@@ -35,5 +31,10 @@ public override IPaginationConfiguration<LogDay> CreatePaginationConfiguration()
         {
             return new LogDayPaginationConfiguration();
         }
+
+        public override bool AutoCreateTableByTime()
+        {
+            return true;
+        }
     }
 }
diff --git a/test/ShardingCore.Test6x/Shardings/OrderCreateTimeVirtualTableRoute.cs b/test/ShardingCore.Test6x/Shardings/OrderCreateTimeVirtualTableRoute.cs
@@ -16,15 +16,16 @@ public override DateTime GetBeginTime()
             return new DateTime(2021, 1, 1);
         }
 
-        public override bool StartJob()
-        {
-            return true;
-        }
 
         public override IPaginationConfiguration<Order> CreatePaginationConfiguration()
         {
             return new OrderCreateTimePaginationConfiguration();
         }
+
+        public override bool AutoCreateTableByTime()
+        {
+            return true;
+        }
     }
 
    public class OrderCreateTimePaginationConfiguration : IPaginationConfiguration<Order>
diff --git a/test/ShardingCore.Test6x/Shardings/PaginationConfigs/LogDayPaginationConfiguration.cs b/test/ShardingCore.Test6x/Shardings/PaginationConfigs/LogDayPaginationConfiguration.cs
@@ -12,7 +12,9 @@ public class LogDayPaginationConfiguration: IPaginationConfiguration<LogDay>
     {
         public void Configure(PaginationBuilder<LogDay> builder)
         {
-            builder.PaginationSequence(o => o.LogTime).UseQueryMatch(PaginationMatchEnum.Named|PaginationMatchEnum.Owner|PaginationMatchEnum.PrimaryMatch);
+            builder.PaginationSequence(o => o.LogTime)
+                .UseQueryMatch(PaginationMatchEnum.Named | PaginationMatchEnum.Owner |
+                               PaginationMatchEnum.PrimaryMatch);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,10 @@ public override IPaginationConfiguration<Order> CreatePaginationConfiguration()`
`28`	`28`	`{`
`29`	`29`	`return new OrderPaginationConfiguration();`
`30`	`30`	`}`
	`31`	`+`
	`32`	`+ public override bool AutoCreateTableByTime()`
	`33`	`+ {`
	`34`	`+ return true;`
	`35`	`+ }`
`31`	`36`	`}`
`32`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,5 +36,10 @@ public override void Configure(EntityMetadataTableBuilder<ShardingWithDateTime>`
`36`	`36`	`{`
`37`	`37`	`builder.ShardingProperty(o => o.CreateTime);`
`38`	`38`	`}`
	`39`	`+`
	`40`	`+ public override bool AutoCreateTableByTime()`
	`41`	`+ {`
	`42`	`+ return true;`
	`43`	`+ }`
`39`	`44`	`}`
`40`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,10 @@ public override DateTime GetBeginTime()`
`13`	`13`	`{`
`14`	`14`	`return new DateTime(2021, 1, 01);`
`15`	`15`	`}`
	`16`	`+`
	`17`	`+ public override bool AutoCreateTableByTime()`
	`18`	`+ {`
	`19`	`+ return true;`
	`20`	`+ }`
`16`	`21`	`}`
`17`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,15 +14,16 @@ public override DateTime GetBeginTime()`
`14`	`14`	`{`
`15`	`15`	`return new DateTime(2020, 1, 1);`
`16`	`16`	`}`
	`17`	`+`
`17`	`18`
`18`		`- public override bool StartJob()`
	`19`	`+ public override void Configure(EntityMetadataTableBuilder<TestYearSharding> builder)`
`19`	`20`	`{`
`20`		`- return true;`
	`21`	`+ builder.ShardingProperty(o => o.CreateTIme);`
`21`	`22`	`}`
`22`	`23`
`23`		`- public override void Configure(EntityMetadataTableBuilder<TestYearSharding> builder)`
	`24`	`+ public override bool AutoCreateTableByTime()`
`24`	`25`	`{`
`25`		`- builder.ShardingProperty(o => o.CreateTIme);`
	`26`	`+ return true;`
`26`	`27`	`}`
`27`	`28`	`}`
`28`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,10 @@ public override void Configure(EntityMetadataTableBuilder<Order> builder)`
`16`	`16`	`{`
`17`	`17`	`builder.ShardingProperty(o => o.CreationTime);`
`18`	`18`	`}`
	`19`	`+`
	`20`	`+ public override bool AutoCreateTableByTime()`
	`21`	`+ {`
	`22`	`+ return true;`
	`23`	`+ }`
`19`	`24`	`}`
`20`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,10 @@ public override DateTime GetBeginTime()`
`19`	`19`	`//如果返回动态值会导致程序重新启动这个值就会变动导致无法获取之前的表`
`20`	`20`	`return DateTime.Now.AddDays(-2);`
`21`	`21`	`}`
	`22`	`+`
	`23`	`+ public override bool AutoCreateTableByTime()`
	`24`	`+ {`
	`25`	`+ return true;`
	`26`	`+ }`
`22`	`27`	`}`
`23`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,10 @@ public override DateTime GetBeginTime()`
`14`	`14`	`{`
`15`	`15`	`return new DateTime(2021, 8, 1);`
`16`	`16`	`}`
	`17`	`+`
	`18`	`+ public override bool AutoCreateTableByTime()`
	`19`	`+ {`
	`20`	`+ return true;`
	`21`	`+ }`
`17`	`22`	`}`
`18`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public void Initialize()`
`110`	`110`	`//检测校验分表分库对象元数据`
`111`	`111`	`entityMetadata.CheckShardingTableMetadata();`
`112`	`112`	`//添加任务`
`113`		`- if (virtualTableRoute is IJob routeJob && routeJob.StartJob())`
	`113`	`+ if (virtualTableRoute is IJob routeJob && routeJob.AutoCreateTableByTime())`
`114`	`114`	`{`
`115`	`115`	`var jobManager = ShardingContainer.GetService<IJobManager>();`
`116`	`116`	`var jobEntry = JobEntryFactory.Create(routeJob);`