From 36d8709efeb1f44ecdfecb18783626f8661d352a Mon Sep 17 00:00:00 2001
From: xuejiaming <326308290@qq.com>
Date: Wed, 17 Aug 2022 11:42:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81tableengine?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RoutingRuleEngine/TableRouteRuleEngine.cs | 52 ++++++++-----------
 1 file changed, 21 insertions(+), 31 deletions(-)

diff --git a/src/ShardingCore/Core/VirtualRoutes/TableRoutes/RoutingRuleEngine/TableRouteRuleEngine.cs b/src/ShardingCore/Core/VirtualRoutes/TableRoutes/RoutingRuleEngine/TableRouteRuleEngine.cs
index 400b4817..657becb3 100644
--- a/src/ShardingCore/Core/VirtualRoutes/TableRoutes/RoutingRuleEngine/TableRouteRuleEngine.cs
+++ b/src/ShardingCore/Core/VirtualRoutes/TableRoutes/RoutingRuleEngine/TableRouteRuleEngine.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using ShardingCore.Core.EntityMetadatas;
 using ShardingCore.Core.VirtualRoutes.Abstractions;
+using ShardingCore.Core.VirtualRoutes.DataSourceRoutes.RouteRuleEngine;
 using ShardingCore.Extensions;
 using ShardingCore.Sharding.MergeEngines.Common;
 using ShardingCore.Sharding.MergeEngines.Common.Abstractions;
@@ -28,6 +29,22 @@ namespace ShardingCore.Core.VirtualRoutes.TableRoutes.RoutingRuleEngine
             _entityMetadataManager = entityMetadataManager;
         }
 
+        private List<TableRouteUnit> GetEntityRouteUnit(DataSourceRouteResult dataSourceRouteResult,Type shardingEntity,IQueryable queryable)
+        {
+            if (!_entityMetadataManager.IsShardingTable(shardingEntity))
+            {
+                var dataSourceNames = dataSourceRouteResult.IntersectDataSources;
+                var tableRouteUnits = new List<TableRouteUnit>(dataSourceNames.Count);
+                foreach (var dataSourceName in dataSourceNames)
+                {
+                    var shardingRouteUnit = new TableRouteUnit(dataSourceName, string.Empty, shardingEntity);
+                    tableRouteUnits.Add(shardingRouteUnit);
+                }
+                return tableRouteUnits;
+            }
+            var virtualTableRoute = _tableRouteManager.GetRoute(shardingEntity);
+            return virtualTableRoute.RouteWithPredicate(dataSourceRouteResult, queryable, true);
+        }
         public ShardingRouteResult Route(TableRouteRuleContext tableRouteRuleContext)
         {
             Dictionary<string /*dataSourceName*/, Dictionary<Type /*entityType*/, ISet<TableRouteUnit>>> routeMaps =
@@ -38,41 +55,13 @@ namespace ShardingCore.Core.VirtualRoutes.TableRoutes.RoutingRuleEngine
             foreach (var shardingEntityKv in queryEntities)
             {
                 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,
-                    (shardingEntityKv.Value ?? tableRouteRuleContext.Queryable), true);
+                var shardingRouteUnits = GetEntityRouteUnit(tableRouteRuleContext.DataSourceRouteResult,shardingEntity, shardingEntityKv.Value ?? tableRouteRuleContext.Queryable);
+                
                 foreach (var shardingRouteUnit in shardingRouteUnits)
                 {
                     var dataSourceName = shardingRouteUnit.DataSourceName;
 
+
                     if (!routeMaps.ContainsKey(dataSourceName))
                     {
                         routeMaps.Add(dataSourceName,
@@ -148,5 +137,6 @@ namespace ShardingCore.Core.VirtualRoutes.TableRoutes.RoutingRuleEngine
             // return sqlRouteUnits;
             // return routeMaps.Select(o => o.Value).Cartesian().Where(o=>o).Select(o => new TableRouteResult(o,_shardingDatabaseProvider.GetShardingDbContextType()));
         }
+        
     }
 }
\ No newline at end of file