[shardingsphere] branch master updated: Optimize ComplexInlineShardingAlgorithm exception message and rename param in StandardShardingAlgorithm (#18937)

[tuichenchuxin]

This is an automated email from the ASF dual-hosted git repository.

tuichenchuxin 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 07a9e230a1c Optimize ComplexInlineShardingAlgorithm exception message 
and rename param in StandardShardingAlgorithm (#18937)
07a9e230a1c is described below

commit 07a9e230a1c4ecebfdc648a3e1b880f64b7fcf09
Author: Zhengqiang Duan <duanzhengqi...@apache.org>
AuthorDate: Thu Jul 7 17:21:53 2022 +0800

    Optimize ComplexInlineShardingAlgorithm exception message and rename param 
in StandardShardingAlgorithm (#18937)
---
 .../sharding/api/sharding/standard/StandardShardingAlgorithm.java   | 6 +++---
 .../algorithm/sharding/complex/ComplexInlineShardingAlgorithm.java  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/sharding/standard/StandardShardingAlgorithm.java
 
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/sharding/standard/StandardShardingAlgorithm.java
index 7ae7d9a0058..2dd2994e143 100644
--- 
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/sharding/standard/StandardShardingAlgorithm.java
+++ 
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/sharding/standard/StandardShardingAlgorithm.java
@@ -58,9 +58,9 @@ public interface StandardShardingAlgorithm<T extends 
Comparable<?>> extends Shar
      * @return matched target name
      */
     default Optional<String> findMatchedTargetName(final Collection<String> 
availableTargetNames, final String suffix, final DataNodeInfo dataNodeInfo) {
-        String result = dataNodeInfo.getPrefix() + Strings.padStart(suffix, 
dataNodeInfo.getSuffixMinLength(), dataNodeInfo.getPaddingChar());
-        if (availableTargetNames.contains(result)) {
-            return Optional.of(result);
+        String targetName = dataNodeInfo.getPrefix() + 
Strings.padStart(suffix, dataNodeInfo.getSuffixMinLength(), 
dataNodeInfo.getPaddingChar());
+        if (availableTargetNames.contains(targetName)) {
+            return Optional.of(targetName);
         }
         return Optional.empty();
     }
diff --git 
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/complex/ComplexInlineShardingAlgorithm.java
 
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/complex/ComplexInlineShardingAlgorithm.java
index d48f70def8a..ba66904ccba 100644
--- 
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/complex/ComplexInlineShardingAlgorithm.java
+++ 
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/complex/ComplexInlineShardingAlgorithm.java
@@ -88,7 +88,7 @@ public final class ComplexInlineShardingAlgorithm implements 
ComplexKeysSharding
         }
         Map<String, Collection<Comparable<?>>> columnNameAndShardingValuesMap 
= shardingValue.getColumnNameAndShardingValuesMap();
         if (!shardingColumns.isEmpty() && shardingColumns.size() != 
columnNameAndShardingValuesMap.size()) {
-            throw new IllegalArgumentException("Complex inline need " + 
shardingColumns.stream() + " sharing columns, but only found " + 
columnNameAndShardingValuesMap.size());
+            throw new IllegalArgumentException("Complex inline need " + 
shardingColumns.size() + " sharing columns, but only found " + 
columnNameAndShardingValuesMap.size());
         }
         Collection<Map<String, Comparable<?>>> combine = 
combine(columnNameAndShardingValuesMap);
         return 
combine.stream().map(this::doSharding).collect(Collectors.toList());