From 4fb8ec30fc01e65a9a42e790b2d33c9eceff4cd6 Mon Sep 17 00:00:00 2001 From: Yash Tiwari Date: Sat, 4 Jan 2025 18:10:40 +0530 Subject: [PATCH 1/2] Update in Sharding Rule --- .../sharding/rule/checker/ShardingRuleChecker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/checker/ShardingRuleChecker.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/checker/ShardingRuleChecker.java index 4713cd900a6c0..60cbb31a7ed04 100644 --- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/checker/ShardingRuleChecker.java +++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/checker/ShardingRuleChecker.java @@ -64,7 +64,7 @@ public void check(final ShardingRuleConfiguration ruleConfig) { private void checkUniqueActualDataNodesInTableRules() { Collection uniqueActualDataNodes = new HashSet<>(shardingRule.getShardingTables().size(), 1F); - shardingRule.getShardingTables().forEach((key, value) -> checkUniqueActualDataNodes(uniqueActualDataNodes, key, value.getActualDataNodes().iterator().next())); + shardingRule.getShardingTables().forEach((key, value) -> value.getActualDataNodes().forEach(each -> checkUniqueActualDataNodes(uniqueActualDataNodes, key, each))); } private void checkUniqueActualDataNodes(final Collection uniqueActualDataNodes, final String logicTable, final DataNode sampleActualDataNode) { From 534fb8acdf4967a7997399114fd74dde6231a7c7 Mon Sep 17 00:00:00 2001 From: Yash Tiwari Date: Sat, 4 Jan 2025 22:00:09 +0530 Subject: [PATCH 2/2] Updated ShardingRuleChecker for checking unique actual auto tables. --- .../sharding/rule/checker/ShardingRuleChecker.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/checker/ShardingRuleChecker.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/checker/ShardingRuleChecker.java index 60cbb31a7ed04..83c112f8a45a1 100644 --- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/checker/ShardingRuleChecker.java +++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/checker/ShardingRuleChecker.java @@ -191,8 +191,8 @@ public void checkToBeAddedDataNodes(final Map> toBe if (isAlteration && toBeAddedDataNodes.containsKey(key)) { return; } - checkUniqueActualDataNodes(uniqueActualDataNodes, key, value.getActualDataNodes().iterator().next()); + value.getActualDataNodes().forEach(each -> checkUniqueActualDataNodes(uniqueActualDataNodes, key, each)); }); - toBeAddedDataNodes.forEach((key, value) -> checkUniqueActualDataNodes(uniqueActualDataNodes, key, value.iterator().next())); + toBeAddedDataNodes.forEach((key, value) -> value.forEach(each -> checkUniqueActualDataNodes(uniqueActualDataNodes, key, each))); } }