[shardingsphere] branch master updated: Adjust TableContainedRule implement in BroadcastRule and MaskRule to avoid invalid logic (#27319)

[zhaojinchao]

This is an automated email from the ASF dual-hosted git repository.

zhaojinchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new 733deb5420e Adjust TableContainedRule implement in BroadcastRule and 
MaskRule to avoid invalid logic (#27319)
733deb5420e is described below

commit 733deb5420ee37f24abf6f620b04f3ba0bcc5f1a
Author: Zhengqiang Duan <duanzhengqi...@apache.org>
AuthorDate: Thu Jul 20 11:22:01 2023 +0800

    Adjust TableContainedRule implement in BroadcastRule and MaskRule to avoid 
invalid logic (#27319)
---
 .../org/apache/shardingsphere/broadcast/rule/BroadcastRule.java    | 7 ++-----
 .../main/java/org/apache/shardingsphere/mask/rule/MaskRule.java    | 2 +-
 .../java/org/apache/shardingsphere/single/rule/SingleRule.java     | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git 
a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/BroadcastRule.java
 
b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/BroadcastRule.java
index f80d1a604e2..a6ae174d300 100644
--- 
a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/BroadcastRule.java
+++ 
b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/BroadcastRule.java
@@ -53,15 +53,12 @@ public final class BroadcastRule implements DatabaseRule, 
DataNodeContainedRule,
     
     private final TableNamesMapper logicalTableMapper;
     
-    private final TableNamesMapper actualTableMapper;
-    
     public BroadcastRule(final BroadcastRuleConfiguration configuration, final 
String databaseName, final Map<String, DataSource> dataSources) {
         this.configuration = configuration;
         this.databaseName = databaseName;
         dataSourceNames = getDataSourceNames(dataSources);
         tables = createBroadcastTables(configuration.getTables());
         logicalTableMapper = createTableMapper();
-        actualTableMapper = createTableMapper();
         tableDataNodes = createShardingTableDataNodes(dataSourceNames, tables);
     }
     
@@ -173,7 +170,7 @@ public final class BroadcastRule implements DatabaseRule, 
DataNodeContainedRule,
     
     @Override
     public TableNamesMapper getActualTableMapper() {
-        return actualTableMapper;
+        return new TableNamesMapper();
     }
     
     @Override
@@ -183,6 +180,6 @@ public final class BroadcastRule implements DatabaseRule, 
DataNodeContainedRule,
     
     @Override
     public TableNamesMapper getEnhancedTableMapper() {
-        return getLogicTableMapper();
+        return new TableNamesMapper();
     }
 }
diff --git 
a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/rule/MaskRule.java
 
b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/rule/MaskRule.java
index 488a0d251d1..48fd6ef861f 100644
--- 
a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/rule/MaskRule.java
+++ 
b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/rule/MaskRule.java
@@ -81,7 +81,7 @@ public final class MaskRule implements DatabaseRule, 
TableContainedRule {
     
     @Override
     public TableNamesMapper getEnhancedTableMapper() {
-        return getLogicTableMapper();
+        return new TableNamesMapper();
     }
     
     @Override
diff --git 
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/SingleRule.java
 
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/SingleRule.java
index c6e10441888..67af6345e08 100644
--- 
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/SingleRule.java
+++ 
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/SingleRule.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.single.rule;
 
 import lombok.Getter;
 import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
-import org.apache.shardingsphere.infra.database.spi.DatabaseType;
 import org.apache.shardingsphere.infra.database.DatabaseTypeEngine;
+import org.apache.shardingsphere.infra.database.spi.DatabaseType;
 import org.apache.shardingsphere.infra.datanode.DataNode;
 import org.apache.shardingsphere.infra.datasource.state.DataSourceStateManager;
 import org.apache.shardingsphere.infra.metadata.database.schema.QualifiedTable;