[#72]修复自动建表bug,并且添加单元测试发布x.3.1.55

Author: xuejmnet

nuget-publish.bat

@@ -1,9 +1,9 @@
 :start
 ::定义版本
-set EFCORE2=2.3.1.54
-set EFCORE3=3.3.1.54
-set EFCORE5=5.3.1.54
-set EFCORE6=6.3.1.54
+set EFCORE2=2.3.1.55
+set EFCORE3=3.3.1.55
+set EFCORE5=5.3.1.55
+set EFCORE6=6.3.1.55
 
 ::删除所有bin与obj下的文件
 @echo off

src/ShardingCore/Bootstrapers/ShardingDbContextBootstrapper.cs

@@ -164,6 +164,7 @@ private void CreateDataTable(string dataSourceName, IVirtualTable virtualTable)
                 {
                     try
                     {
+
                         //添加物理表
                         virtualTable.AddPhysicTable(new DefaultPhysicTable(virtualTable, tail));
                         _tableCreator.CreateTable(dataSourceName, entityMetadata.EntityType, tail);

src/ShardingCore/Sharding/ShardingDbContextExecutors/NoShardingFirstComparer.cs

@@ -3,14 +3,14 @@
 using ShardingCore.Core.VirtualRoutes.TableRoutes.RouteTails;
 using ShardingCore.Extensions;
 
-namespace ShardingCore.Sharding.ShardingDbContextExecutors
-{
 /*
 * @Author: xjm
 * @Description:
 * @Date: Sunday, 28 November 2021 21:47:38
 * @Email: [email protected]
 */
+namespace ShardingCore.Sharding.ShardingDbContextExecutors
+{
     public class NoShardingFirstComparer:IComparer<string>
     {
         private readonly string _defaultTail;

src/ShardingCore/VirtualRoutes/Days/AbstractSimpleShardingDayKeyDateTimeVirtualTableRoute.cs

@@ -3,6 +3,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
+using ShardingCore.Core.PhysicTables;
+using ShardingCore.Core.VirtualTables;
 
 namespace ShardingCore.VirtualRoutes.Days
 {
@@ -20,7 +22,8 @@ public abstract class AbstractSimpleShardingDayKeyDateTimeVirtualTableRoute<TEnt
         /// <returns></returns>
         public abstract DateTime GetBeginTime();
         /// <summary>
-        /// return all tails in database
+        /// 这个方法会在程序启动的时候被调用,后续整个生命周期将不会被调用,仅用来告诉框架启动的时候有多少张TEntity对象的后缀表,
+        /// 然后会在启动的时候添加到 <see cref="IVirtualTable{TEntity}.AddPhysicTable(IPhysicTable physicTable)"/>
         /// </summary>
         /// <returns></returns>
         public override List<string> GetAllTails()

test/ShardingCore.Test/ShardingTest.cs

@@ -164,7 +164,7 @@ public async Task GenericTest()
                 {
                     dics.Add(tail, null);
                 }
-                Assert.Equal(",a,b", string.Join(",", dics.Keys));
+                Assert.Equal($"{emptyTailIdentity},{aTailIdentity},{bTailIdentity}", string.Join(",", dics.Keys));
             }
         }
 

test/ShardingCore.Test/Shardings/LogDayLongVirtualRoute.cs

@@ -4,6 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using ShardingCore.Core.EntityMetadatas;
+using ShardingCore.Helpers;
 using ShardingCore.Test.Domain.Entities;
 using ShardingCore.VirtualRoutes.Days;
 
@@ -27,5 +28,25 @@ public override DateTime GetBeginTime()
         {
             return new DateTime(2021, 1, 1);
         }
+
+        public override List<string> GetAllTails()
+        {
+            var beginTime = GetBeginTime().Date;
+
+            var tails = new List<string>();
+            //提前创建表
+            var nowTimeStamp = new DateTime(2021,11,20).Date;
+            if (beginTime > nowTimeStamp)
+                throw new ArgumentException("begin time error");
+            var currentTimeStamp = beginTime;
+            while (currentTimeStamp <= nowTimeStamp)
+            {
+                var currentTimeStampLong = ShardingCoreHelper.ConvertDateTimeToLong(currentTimeStamp);
+                var tail = TimeFormatToTail(currentTimeStampLong);
+                tails.Add(tail);
+                currentTimeStamp = currentTimeStamp.AddDays(1);
+            }
+            return tails;
+        }
     }
 }

test/ShardingCore.Test/Shardings/LogDayVirtualTableRoute.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using ShardingCore.Core.EntityMetadatas;
 using ShardingCore.Sharding.PaginationConfigurations;
 using ShardingCore.Test.Domain.Entities;
@@ -32,5 +33,24 @@ public override bool AutoCreateTableByTime()
         {
             return true;
         }
+
+        public override List<string> GetAllTails()
+        {
+            var beginTime = GetBeginTime().Date;
+
+            var tails = new List<string>();
+            //提前创建表
+            var nowTimeStamp = new DateTime(2021,11,20).Date;
+            if (beginTime > nowTimeStamp)
+                throw new ArgumentException("begin time error");
+            var currentTimeStamp = beginTime;
+            while (currentTimeStamp <= nowTimeStamp)
+            {
+                var tail = ShardingKeyToTail(currentTimeStamp);
+                tails.Add(tail);
+                currentTimeStamp = currentTimeStamp.AddDays(1);
+            }
+            return tails;
+        }
     }
 }

test/ShardingCore.Test/Startup.cs

@@ -37,11 +37,8 @@ public void ConfigureServices(IServiceCollection services, HostBuilderContext ho
                     o.UseSqlServer(conn).UseLoggerFactory(efLogger))
                 .Begin(o =>
                 {
-#if DEBUG
                     o.CreateShardingTableOnStart = true;
                     o.EnsureCreatedWithOutShardingTable = true;
-
-#endif
                     o.AutoTrackEntity = true;
                 })
                 .AddShardingTransaction((connection, builder) =>

test/ShardingCore.Test2x/ShardingTest.cs

@@ -10,13 +10,15 @@
 using ShardingCore.Core.VirtualDatabase.VirtualDataSources;
 using ShardingCore.Core.VirtualDatabase.VirtualDataSources.PhysicDataSources;
 using ShardingCore.Core.VirtualDatabase.VirtualTables;
+using ShardingCore.Core.VirtualRoutes.TableRoutes.RouteTails;
 using ShardingCore.Exceptions;
 using ShardingCore.Extensions;
 using ShardingCore.Extensions.ShardingPageExtensions;
 using ShardingCore.Helpers;
 using ShardingCore.Sharding;
 using ShardingCore.Sharding.ReadWriteConfigurations.Abstractions;
 using ShardingCore.Sharding.ShardingComparision.Abstractions;
+using ShardingCore.Sharding.ShardingDbContextExecutors;
 using ShardingCore.TableCreator;
 using ShardingCore.Test2x.Domain.Entities;
 using Xunit;
@@ -150,6 +152,21 @@ public async Task GenericTest()
             var virtualTable = _virtualTableManager.GetVirtualTable<SysUserMod>();
             Assert.NotNull(virtualTable);
 
+            var emptyTailIdentity = new SingleQueryRouteTail(string.Empty).GetRouteTailIdentity();
+            var aTailIdentity = new SingleQueryRouteTail("a").GetRouteTailIdentity();
+            var bTailIdentity = new SingleQueryRouteTail("b").GetRouteTailIdentity();
+            var dics = new SortedDictionary<string, string>(new NoShardingFirstComparer());
+            var dicTails = new List<string>() { emptyTailIdentity, aTailIdentity, bTailIdentity };
+            for (int i = 0; i < 10; i++)
+            {
+                dics.Clear();
+                var reOrderList = dicTails.OrderBy(o => Guid.NewGuid()).ToList();
+                foreach (var tail in reOrderList)
+                {
+                    dics.Add(tail, null);
+                }
+                Assert.Equal($"{emptyTailIdentity},{aTailIdentity},{bTailIdentity}", string.Join(",", dics.Keys));
+            }
         }
 
         public class SequenceClass

test/ShardingCore.Test2x/Shardings/LogDayLongVirtualRoute.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using ShardingCore.Core.EntityMetadatas;
+using ShardingCore.Helpers;
 using ShardingCore.Test2x.Domain.Entities;
 using ShardingCore.VirtualRoutes.Days;
 
@@ -23,5 +25,24 @@ public override DateTime GetBeginTime()
         {
             return new DateTime(2021, 1, 1);
         }
+        public override List<string> GetAllTails()
+        {
+            var beginTime = GetBeginTime().Date;
+
+            var tails = new List<string>();
+            //提前创建表
+            var nowTimeStamp = new DateTime(2021, 11, 20).Date;
+            if (beginTime > nowTimeStamp)
+                throw new ArgumentException("begin time error");
+            var currentTimeStamp = beginTime;
+            while (currentTimeStamp <= nowTimeStamp)
+            {
+                var currentTimeStampLong = ShardingCoreHelper.ConvertDateTimeToLong(currentTimeStamp);
+                var tail = TimeFormatToTail(currentTimeStampLong);
+                tails.Add(tail);
+                currentTimeStamp = currentTimeStamp.AddDays(1);
+            }
+            return tails;
+        }
     }
 }