修复仅分库的对象查询bug

Author: xuejmnet

nuget-publish.bat

@@ -1,9 +1,9 @@
 :start
 ::定义版本
-set EFCORE2=2.6.0.29
-set EFCORE3=3.6.0.29
-set EFCORE5=5.6.0.29
-set EFCORE6=6.6.0.29
+set EFCORE2=2.6.0.30
+set EFCORE3=3.6.0.30
+set EFCORE5=5.6.0.30
+set EFCORE6=6.6.0.30
 
 ::删除所有bin与obj下的文件
 @echo off

samples/Sample.SqlServerShardingDataSource/Startup.cs

@@ -80,7 +80,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             {
                 endpoints.MapControllers();
             });
-            //app.InitSeed();
+            app.InitSeed();
         }
     }
 }

samples/Sample.SqlServerShardingDataSource/VirtualRoutes/OrderVirtualDataSourceRoute.cs

@@ -6,16 +6,18 @@
 using ShardingCore.Core.EntityMetadatas;
 using ShardingCore.Core.VirtualRoutes;
 using ShardingCore.Core.VirtualRoutes.DataSourceRoutes.Abstractions;
+using ShardingCore.Helpers;
 
 namespace Sample.SqlServerShardingDataSource.VirtualRoutes
 {
     public class OrderVirtualDataSourceRoute : AbstractShardingOperatorVirtualDataSourceRoute<Order, string>
     {
-        private readonly List<string> _dataSources = Enumerable.Range(0,100).Select(o=>(o % 100).ToString().PadLeft(2,'0')).ToList();
+        private readonly List<string> _dataSources = Enumerable.Range(0,4).Select(o=>(o % 100).ToString().PadLeft(2,'0')).ToList();
         //我们设置区域就是数据库
         public override string ShardingKeyToDataSourceName(object shardingKey)
         {
-            return shardingKey?.ToString() ?? string.Empty;
+            var shardingKeyToDataSourceName = Math.Abs(ShardingCoreHelper.GetStringHashCode(shardingKey?.ToString() ?? string.Empty) % 4).ToString().PadLeft(2, '0');
+            return shardingKeyToDataSourceName;
         }
 
         public override List<string> GetAllDataSourceNames()
@@ -47,7 +49,7 @@ public override Func<string, bool> GetRouteToFilter(string shardingKey, Sharding
 
         public override void Configure(EntityMetadataDataSourceBuilder<Order> builder)
         {
-            builder.ShardingProperty(o => o.Area);
+            builder.ShardingProperty(o => o.Id);
         }
     }
 }

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

@@ -39,7 +39,32 @@ public ShardingRouteResult Route(TableRouteRuleContext tableRouteRuleContext)
             {
                 var shardingEntity = shardingEntityKv.Key;
                 if (!_entityMetadataManager.IsShardingTable(shardingEntity))
+                {
+                    var dataSourceNames = tableRouteRuleContext.DataSourceRouteResult.IntersectDataSources;
+                    foreach (var dataSourceName in dataSourceNames)
+                    {
+                        var shardingRouteUnit = new TableRouteUnit(dataSourceName, string.Empty, shardingEntity);
+                        if (!routeMaps.ContainsKey(dataSourceName))
+                        {
+                            routeMaps.Add(dataSourceName,
+                                new Dictionary<Type, ISet<TableRouteUnit>>()
+                                    { { shardingEntity, new HashSet<TableRouteUnit>() { shardingRouteUnit } } });
+                        }
+                        else
+                        {
+                            var routeMap = routeMaps[dataSourceName];
+                            if (!routeMap.ContainsKey(shardingEntity))
+                            {
+                                routeMap.Add(shardingEntity, new HashSet<TableRouteUnit>() { shardingRouteUnit });
+                            }
+                            else
+                            {
+                                routeMap[shardingEntity].Add(shardingRouteUnit);
+                            }
+                        }
+                    }
                     continue;
+                }
                 var virtualTableRoute = _tableRouteManager.GetRoute(shardingEntity);
                 var shardingRouteUnits = virtualTableRoute.RouteWithPredicate(
                     tableRouteRuleContext.DataSourceRouteResult,
@@ -107,10 +132,6 @@ public ShardingRouteResult Route(TableRouteRuleContext tableRouteRuleContext)
                         }
                     }
                 }
-                else
-                {
-                    routeMaps.Add(dataSourceName,new Dictionary<Type, ISet<TableRouteUnit>>());   
-                }
             }
 
            return new ShardingRouteResult(sqlRouteUnits, sqlRouteUnits.Count == 0, dataSourceCount > 1, isCrossTable,