Refactor TableMapperRule (#30306)

apache · Feb 26, 2024 · 3d3aad4 · 3d3aad4
1 parent 87e63ab
commit 3d3aad4
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 31 deletions.
diff --git a/...core/src/main/java/org/apache/shardingsphere/broadcast/rule/BroadcastTableMapperRule.java b/...core/src/main/java/org/apache/shardingsphere/broadcast/rule/BroadcastTableMapperRule.java
@@ -39,14 +39,9 @@ public TableNamesMapper getLogicTableMapper() {
         return logicalTableMapper;
     }
 
-    @Override
-    public TableNamesMapper getActualTableMapper() {
-        return new TableNamesMapper();
-    }
-
     @Override
     public TableNamesMapper getDistributedTableMapper() {
-        return getLogicTableMapper();
+        return logicalTableMapper;
     }
 
     @Override

diff --git a/...ypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptTableMapperRule.java b/...ypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptTableMapperRule.java
@@ -40,18 +40,13 @@ public TableNamesMapper getLogicTableMapper() {
         return logicalTableMapper;
     }
 
-    @Override
-    public TableNamesMapper getActualTableMapper() {
-        return new TableNamesMapper();
-    }
-
     @Override
     public TableNamesMapper getDistributedTableMapper() {
         return new TableNamesMapper();
     }
 
     @Override
     public TableNamesMapper getEnhancedTableMapper() {
-        return getLogicTableMapper();
+        return logicalTableMapper;
     }
 }
diff --git a/...ures/mask/core/src/main/java/org/apache/shardingsphere/mask/rule/MaskTableMapperRule.java b/...ures/mask/core/src/main/java/org/apache/shardingsphere/mask/rule/MaskTableMapperRule.java
@@ -40,11 +40,6 @@ public TableNamesMapper getLogicTableMapper() {
         return logicalTableMapper;
     }
 
-    @Override
-    public TableNamesMapper getActualTableMapper() {
-        return new TableNamesMapper();
-    }
-
     @Override
     public TableNamesMapper getDistributedTableMapper() {
         return new TableNamesMapper();

diff --git a/...g/core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingTableMapperRule.java b/...g/core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingTableMapperRule.java
@@ -61,11 +61,11 @@ public TableNamesMapper getActualTableMapper() {
 
     @Override
     public TableNamesMapper getDistributedTableMapper() {
-        return getLogicTableMapper();
+        return logicalTableMapper;
     }
 
     @Override
     public TableNamesMapper getEnhancedTableMapper() {
-        return getLogicTableMapper();
+        return logicalTableMapper;
     }
 }
diff --git a/...main/java/org/apache/shardingsphere/infra/rule/identifier/type/table/TableMapperRule.java b/...main/java/org/apache/shardingsphere/infra/rule/identifier/type/table/TableMapperRule.java
@@ -34,7 +34,9 @@ public interface TableMapperRule {
      *
      * @return actual table mapper
      */
-    TableNamesMapper getActualTableMapper();
+    default TableNamesMapper getActualTableMapper() {
+        return new TableNamesMapper();
+    }
 
     /**
      * Get distributed table mapper.

diff --git a/...identifier/type/TableNamesMapperTest.java → ...fier/type/table/TableNamesMapperTest.java b/...identifier/type/TableNamesMapperTest.java → ...fier/type/table/TableNamesMapperTest.java
@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.infra.rule.identifier.type;
+package org.apache.shardingsphere.infra.rule.identifier.type.table;
 
-import org.apache.shardingsphere.infra.rule.identifier.type.table.TableNamesMapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

diff --git a/...ingle/core/src/main/java/org/apache/shardingsphere/single/rule/SingleTableMapperRule.java b/...ingle/core/src/main/java/org/apache/shardingsphere/single/rule/SingleTableMapperRule.java
@@ -41,11 +41,6 @@ public TableNamesMapper getLogicTableMapper() {
         return logicTableMapper;
     }
 
-    @Override
-    public TableNamesMapper getActualTableMapper() {
-        return new TableNamesMapper();
-    }
-
     @Override
     public TableNamesMapper getDistributedTableMapper() {
         return new TableNamesMapper();

diff --git a/...single/core/src/main/java/org/apache/shardingsphere/single/util/SingleTableLoadUtils.java b/...single/core/src/main/java/org/apache/shardingsphere/single/util/SingleTableLoadUtils.java
@@ -84,11 +84,10 @@ private static Map<String, DataSource> getAggregatedDataSourceMap(final Map<Stri
     public static Collection<String> getExcludedTables(final Collection<ShardingSphereRule> builtRules) {
         Collection<String> result = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
         for (ShardingSphereRule each : builtRules) {
-            if (!(each instanceof TableMapperContainedRule)) {
-                continue;
+            if (each instanceof TableMapperContainedRule) {
+                result.addAll(((TableMapperContainedRule) each).getTableMapperRule().getDistributedTableMapper().getTableNames());
+                result.addAll(((TableMapperContainedRule) each).getTableMapperRule().getActualTableMapper().getTableNames());
             }
-            result.addAll(((TableMapperContainedRule) each).getTableMapperRule().getDistributedTableMapper().getTableNames());
-            result.addAll(((TableMapperContainedRule) each).getTableMapperRule().getActualTableMapper().getTableNames());
         }
         return result;
     }