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 dbeef681f4a Refactor getDataSourceNames method logic for reducing loop
(#19159)
dbeef681f4a is described below
commit dbeef681f4ae3f3a48390864deab69942d246c34
Author: Zhengqiang Duan <[email protected]>
AuthorDate: Fri Jul 15 09:55:32 2022 +0800
Refactor getDataSourceNames method logic for reducing loop (#19159)
* Refactor getDataSourceNames method logic for reducing loop
* Refactor name and javadoc of ReadQueryLoadBalanceAlgorithm implementation
class
* Inline datasourceName to add method
* Revert "Refactor name and javadoc of ReadQueryLoadBalanceAlgorithm
implementation class"
This reverts commit b08335d15cbc4b4329c18da98ba83aa7a02bddcc.
---
.../handler/checker/ShardingTableRuleStatementChecker.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java
index 5af31d54b01..848f117ebff 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java
@@ -162,12 +162,11 @@ public final class ShardingTableRuleStatementChecker {
}
private static Collection<String> getDataSourceNames(final
Collection<String> actualDataNodes) {
- return actualDataNodes.stream().map(each -> {
- if (isValidDataNode(each)) {
- return actualDataNodes.stream().map(each1 -> new
DataNode(each1).getDataSourceName()).collect(Collectors.toList());
- }
- return Collections.singletonList(each);
-
}).flatMap(Collection::stream).collect(Collectors.toCollection(LinkedHashSet::new));
+ Collection<String> result = new HashSet<>();
+ for (String each : actualDataNodes) {
+ result.add(isValidDataNode(each) ? new
DataNode(each).getDataSourceName() : each);
+ }
+ return result;
}
private static Collection<String> getDataSourceNames(final
Collection<ShardingTableRuleConfiguration> tableRuleConfigs,