This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 29e7e88595c Use Collection instead of CaseInsensitiveSet on
TableMapperRuleAttribute's impl (#32432)
29e7e88595c is described below
commit 29e7e88595c2ec2edd699c0d4fa0f086c74a14a8
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Aug 9 00:39:33 2024 +0800
Use Collection instead of CaseInsensitiveSet on TableMapperRuleAttribute's
impl (#32432)
---
.../rule/attribute/BroadcastTableNamesRuleAttribute.java | 5 ++---
.../rule/attribute/EncryptTableMapperRuleAttribute.java | 2 +-
.../mask/rule/attribute/MaskTableMapperRuleAttribute.java | 2 +-
.../rule/attribute/ShardingTableNamesRuleAttribute.java | 12 ++++++------
.../single/rule/SingleTableMapperRuleAttribute.java | 2 +-
5 files changed, 11 insertions(+), 12 deletions(-)
diff --git
a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/attribute/BroadcastTableNamesRuleAttribute.java
b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/attribute/BroadcastTableNamesRuleAttribute.java
index 88522da25ce..c05eaba0ff3 100644
---
a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/attribute/BroadcastTableNamesRuleAttribute.java
+++
b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/attribute/BroadcastTableNamesRuleAttribute.java
@@ -28,11 +28,10 @@ import java.util.Collections;
*/
public final class BroadcastTableNamesRuleAttribute implements
TableMapperRuleAttribute {
- private final CaseInsensitiveSet<String> logicalTableNames;
+ private final Collection<String> logicalTableNames;
public BroadcastTableNamesRuleAttribute(final Collection<String> tables) {
- logicalTableNames = new CaseInsensitiveSet<>();
- logicalTableNames.addAll(tables);
+ logicalTableNames = new CaseInsensitiveSet<>(tables);
}
@Override
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/attribute/EncryptTableMapperRuleAttribute.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/attribute/EncryptTableMapperRuleAttribute.java
index 9b6edde3d63..552f41c8653 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/attribute/EncryptTableMapperRuleAttribute.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/attribute/EncryptTableMapperRuleAttribute.java
@@ -28,7 +28,7 @@ import java.util.Collections;
*/
public final class EncryptTableMapperRuleAttribute implements
TableMapperRuleAttribute {
- private final CaseInsensitiveSet<String> logicalTableMapper;
+ private final Collection<String> logicalTableMapper;
public EncryptTableMapperRuleAttribute(final Collection<String>
encryptTableNames) {
logicalTableMapper = new CaseInsensitiveSet<>(encryptTableNames);
diff --git
a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/rule/attribute/MaskTableMapperRuleAttribute.java
b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/rule/attribute/MaskTableMapperRuleAttribute.java
index f928926d87f..7354706ca9f 100644
---
a/features/mask/core/src/main/java/org/apache/shardingsphere/mask/rule/attribute/MaskTableMapperRuleAttribute.java
+++
b/features/mask/core/src/main/java/org/apache/shardingsphere/mask/rule/attribute/MaskTableMapperRuleAttribute.java
@@ -28,7 +28,7 @@ import java.util.Collections;
*/
public final class MaskTableMapperRuleAttribute implements
TableMapperRuleAttribute {
- private final CaseInsensitiveSet<String> logicalTableMapper;
+ private final Collection<String> logicalTableMapper;
public MaskTableMapperRuleAttribute(final Collection<String>
maskTableNames) {
logicalTableMapper = new CaseInsensitiveSet<>(maskTableNames);
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/attribute/ShardingTableNamesRuleAttribute.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/attribute/ShardingTableNamesRuleAttribute.java
index 535a3d848bf..4426ca708fc 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/attribute/ShardingTableNamesRuleAttribute.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/attribute/ShardingTableNamesRuleAttribute.java
@@ -29,23 +29,23 @@ import java.util.Collection;
*/
public final class ShardingTableNamesRuleAttribute implements
TableMapperRuleAttribute {
- private final CaseInsensitiveSet<String> logicalTableNames;
+ private final Collection<String> logicalTableNames;
- private final CaseInsensitiveSet<String> actualTableNames;
+ private final Collection<String> actualTableNames;
public ShardingTableNamesRuleAttribute(final Collection<ShardingTable>
shardingTables) {
logicalTableNames = createLogicalTableNames(shardingTables);
actualTableNames = createActualTableNames(shardingTables);
}
- private CaseInsensitiveSet<String> createLogicalTableNames(final
Collection<ShardingTable> shardingTables) {
- CaseInsensitiveSet<String> result = new CaseInsensitiveSet<>();
+ private Collection<String> createLogicalTableNames(final
Collection<ShardingTable> shardingTables) {
+ Collection<String> result = new CaseInsensitiveSet<>();
shardingTables.forEach(each -> result.add(each.getLogicTable()));
return result;
}
- private CaseInsensitiveSet<String> createActualTableNames(final
Collection<ShardingTable> shardingTables) {
- CaseInsensitiveSet<String> result = new CaseInsensitiveSet<>();
+ private Collection<String> createActualTableNames(final
Collection<ShardingTable> shardingTables) {
+ Collection<String> result = new CaseInsensitiveSet<>();
shardingTables.stream().flatMap(each ->
each.getActualDataNodes().stream()).map(DataNode::getTableName).forEach(result::add);
return result;
}
diff --git
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/SingleTableMapperRuleAttribute.java
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/SingleTableMapperRuleAttribute.java
index 2046551db43..ae69652c2fd 100644
---
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/SingleTableMapperRuleAttribute.java
+++
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/SingleTableMapperRuleAttribute.java
@@ -29,7 +29,7 @@ import java.util.Collections;
*/
public final class SingleTableMapperRuleAttribute implements
TableMapperRuleAttribute {
- private final CaseInsensitiveSet<String> logicTableMapper;
+ private final Collection<String> logicTableMapper;
public SingleTableMapperRuleAttribute(final
Collection<Collection<DataNode>> singleTableDataNodes) {
logicTableMapper = new
CaseInsensitiveSet<>(singleTableDataNodes.size(), 1F);
