Optimize props check for weight load balancer (#34140)

apache · Dec 24, 2024 · 91d84ad · 91d84ad
1 parent fc69347
commit 91d84ad
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/...re/readwritesplitting/distsql/handler/checker/ReadwriteSplittingRuleStatementChecker.java b/...re/readwritesplitting/distsql/handler/checker/ReadwriteSplittingRuleStatementChecker.java
@@ -237,10 +237,10 @@ private static void checkProperties(final ReadwriteSplittingRuleSegment each) {
     }
 
     private static void checkDataSource(final ReadwriteSplittingRuleSegment ruleSegment) {
-        for (Object each : ruleSegment.getLoadBalancer().getProps().keySet()) {
-            String dataSourceName = (String) each;
-            ShardingSpherePreconditions.checkState(ruleSegment.getReadDataSources().contains(dataSourceName) || ruleSegment.getWriteDataSource().equals(dataSourceName),
-                    () -> new InvalidAlgorithmConfigurationException("Load balancer", ruleSegment.getLoadBalancer().getName()));
-        }
+        Collection<String> weightKeys = ruleSegment.getLoadBalancer().getProps().stringPropertyNames();
+        weightKeys.forEach(each -> ShardingSpherePreconditions.checkContains(ruleSegment.getReadDataSources(), each,
+                () -> new InvalidAlgorithmConfigurationException("Load balancer", ruleSegment.getLoadBalancer().getName(), String.format("Can not find read storge unit '%s'", each))));
+        ruleSegment.getReadDataSources().forEach(each -> ShardingSpherePreconditions.checkContains(weightKeys, each,
+                () -> new InvalidAlgorithmConfigurationException("Load balancer", ruleSegment.getLoadBalancer().getName(), String.format("Weight of '%s' is required", each))));
     }
 }
diff --git a/...shardingsphere/infra/algorithm/core/exception/InvalidAlgorithmConfigurationException.java b/...shardingsphere/infra/algorithm/core/exception/InvalidAlgorithmConfigurationException.java
@@ -34,4 +34,8 @@ public InvalidAlgorithmConfigurationException(final String algorithmType, final
     public InvalidAlgorithmConfigurationException(final String algorithmType) {
         super(XOpenSQLState.CHECK_OPTION_VIOLATION, 4, "Invalid %s algorithm configuration.", algorithmType);
     }
+
+    public InvalidAlgorithmConfigurationException(final String algorithmType, final String algorithm, final String message) {
+        super(XOpenSQLState.CHECK_OPTION_VIOLATION, 4, "Invalid %s algorithm configuration '%s'. %s.", algorithmType, algorithm, message);
+    }
 }