Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unique actual data nodes issue in sharding rule checker #34251

Closed
wants to merge 4 commits into from
Closed

Unique actual data nodes issue in sharding rule checker #34251

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4fb8ec3
Update in Sharding Rule
Yash-cor Jan 4, 2025
677b786
Sync with master branch
Yash-cor Jan 4, 2025
534fb8a
Updated ShardingRuleChecker for checking unique actual auto tables.
Yash-cor Jan 4, 2025
63f5a62
Merge branch 'apache:master' into UNIQUE_ACTUAL_DATA_NODES_ISSUE_IN_S…
Yash-cor Jan 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...re/src/main/java/org/apache/shardingsphere/sharding/rule/checker/ShardingRuleChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public void check(final ShardingRuleConfiguration ruleConfig) {

private void checkUniqueActualDataNodesInTableRules() {
Collection<DataNode> 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)));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If actualDataNodes contains many nodes, checking all nodes will take more time. Is it possible to add a props to control whether to check all actualDataNodes or sampleDataNode?

}

private void checkUniqueActualDataNodes(final Collection<DataNode> uniqueActualDataNodes, final String logicTable, final DataNode sampleActualDataNode) {
Expand Down Expand Up @@ -191,8 +191,8 @@ public void checkToBeAddedDataNodes(final Map<String, Collection<DataNode>> 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)));
}
}
Loading