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 3d3aad4648c Refactor TableMapperRule (#30306)
3d3aad4648c is described below
commit 3d3aad4648c9c6e933e4fe6ad589fc64c5c08ee1
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Feb 27 00:23:51 2024 +0800
Refactor TableMapperRule (#30306)
---
.../shardingsphere/broadcast/rule/BroadcastTableMapperRule.java | 7 +------
.../apache/shardingsphere/encrypt/rule/EncryptTableMapperRule.java | 7 +------
.../org/apache/shardingsphere/mask/rule/MaskTableMapperRule.java | 5 -----
.../shardingsphere/sharding/rule/ShardingTableMapperRule.java | 4 ++--
.../infra/rule/identifier/type/table/TableMapperRule.java | 4 +++-
.../rule/identifier/type/{ => table}/TableNamesMapperTest.java | 3 +--
.../apache/shardingsphere/single/rule/SingleTableMapperRule.java | 5 -----
.../apache/shardingsphere/single/util/SingleTableLoadUtils.java | 7 +++----
8 files changed, 11 insertions(+), 31 deletions(-)
diff --git
a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/BroadcastTableMapperRule.java
b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/BroadcastTableMapperRule.java
index 56234af3a00..1f6f0e30125 100644
---
a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/BroadcastTableMapperRule.java
+++
b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/BroadcastTableMapperRule.java
@@ -39,14 +39,9 @@ public final class BroadcastTableMapperRule implements
TableMapperRule {
return logicalTableMapper;
}
- @Override
- public TableNamesMapper getActualTableMapper() {
- return new TableNamesMapper();
- }
-
@Override
public TableNamesMapper getDistributedTableMapper() {
- return getLogicTableMapper();
+ return logicalTableMapper;
}
@Override
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptTableMapperRule.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptTableMapperRule.java
index 7a6f0e9fd96..fc50d70d55e 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptTableMapperRule.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptTableMapperRule.java
@@ -40,11 +40,6 @@ public final class EncryptTableMapperRule implements
TableMapperRule {
return logicalTableMapper;
}
- @Override
- public TableNamesMapper getActualTableMapper() {
- return new TableNamesMapper();
- }
-
@Override
public TableNamesMapper getDistributedTableMapper() {
return new TableNamesMapper();
@@ -52,6 +47,6 @@ public final class EncryptTableMapperRule implements
TableMapperRule {
@Override
public TableNamesMapper getEnhancedTableMapper() {
- return getLogicTableMapper();
+ return logicalTableMapper;
}
}
diff --git
a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/rule/MaskTableMapperRule.java
b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/rule/MaskTableMapperRule.java
index 143733dc69a..4e86c31a0ca 100644
---
a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/rule/MaskTableMapperRule.java
+++
b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/rule/MaskTableMapperRule.java
@@ -40,11 +40,6 @@ public final class MaskTableMapperRule implements
TableMapperRule {
return logicalTableMapper;
}
- @Override
- public TableNamesMapper getActualTableMapper() {
- return new TableNamesMapper();
- }
-
@Override
public TableNamesMapper getDistributedTableMapper() {
return new TableNamesMapper();
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingTableMapperRule.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingTableMapperRule.java
index 91ba970de60..dc967616858 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingTableMapperRule.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingTableMapperRule.java
@@ -61,11 +61,11 @@ public final class ShardingTableMapperRule implements
TableMapperRule {
@Override
public TableNamesMapper getDistributedTableMapper() {
- return getLogicTableMapper();
+ return logicalTableMapper;
}
@Override
public TableNamesMapper getEnhancedTableMapper() {
- return getLogicTableMapper();
+ return logicalTableMapper;
}
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/rule/identifier/type/table/TableMapperRule.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/rule/identifier/type/table/TableMapperRule.java
index 0426eb198be..6116db31a84 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/rule/identifier/type/table/TableMapperRule.java
+++
b/infra/common/src/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/infra/common/src/test/java/org/apache/shardingsphere/infra/rule/identifier/type/TableNamesMapperTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/rule/identifier/type/table/TableNamesMapperTest.java
similarity index 94%
rename from
infra/common/src/test/java/org/apache/shardingsphere/infra/rule/identifier/type/TableNamesMapperTest.java
rename to
infra/common/src/test/java/org/apache/shardingsphere/infra/rule/identifier/type/table/TableNamesMapperTest.java
index a6ad177ac71..2cf0f54b72e 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/rule/identifier/type/TableNamesMapperTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/rule/identifier/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/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/SingleTableMapperRule.java
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/SingleTableMapperRule.java
index b2da473492e..a1f1ba390fb 100644
---
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/SingleTableMapperRule.java
+++
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/SingleTableMapperRule.java
@@ -41,11 +41,6 @@ public final class SingleTableMapperRule implements
TableMapperRule {
return logicTableMapper;
}
- @Override
- public TableNamesMapper getActualTableMapper() {
- return new TableNamesMapper();
- }
-
@Override
public TableNamesMapper getDistributedTableMapper() {
return new TableNamesMapper();
diff --git
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/util/SingleTableLoadUtils.java
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/util/SingleTableLoadUtils.java
index 916348091c7..522f411fe6e 100644
---
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/util/SingleTableLoadUtils.java
+++
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/util/SingleTableLoadUtils.java
@@ -84,11 +84,10 @@ public final class SingleTableLoadUtils {
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;
}
