(shardingsphere) branch master updated: Code format on JoinTableSegmentBinder (#35175)

[zhangliang]

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 d870fcfc5a1 Code format on JoinTableSegmentBinder (#35175)
d870fcfc5a1 is described below

commit d870fcfc5a1031f9d24bf04797fabe1cb1cb86e6
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat Apr 12 23:17:49 2025 +0800

    Code format on JoinTableSegmentBinder (#35175)
---
 .../engine/segment/dml/from/type/JoinTableSegmentBinder.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git 
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/from/type/JoinTableSegmentBinder.java
 
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/from/type/JoinTableSegmentBinder.java
index fda8fc2a42a..53424ab4f4e 100644
--- 
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/from/type/JoinTableSegmentBinder.java
+++ 
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/from/type/JoinTableSegmentBinder.java
@@ -76,12 +76,14 @@ public final class JoinTableSegmentBinder {
         
result.setCondition(ExpressionSegmentBinder.bind(segment.getCondition(), 
SegmentType.JOIN_ON, binderContext, tableBinderContexts, 
outerTableBinderContexts));
         result.setUsing(bindUsingColumns(segment.getUsing(), 
tableBinderContexts));
         result.getUsing().forEach(each -> 
binderContext.getUsingColumnNames().add(each.getIdentifier().getValue()));
-        Map<String, ProjectionSegment> usingColumnsByNaturalJoin = 
Collections.emptyMap();
+        Map<String, ProjectionSegment> usingColumnsByNaturalJoin;
         if (result.isNatural()) {
             usingColumnsByNaturalJoin = getUsingColumnsByNaturalJoin(result, 
tableBinderContexts);
             Collection<ColumnSegment> derivedUsingColumns = 
getDerivedUsingColumns(usingColumnsByNaturalJoin);
             result.setDerivedUsing(bindUsingColumns(derivedUsingColumns, 
tableBinderContexts));
             result.getDerivedUsing().forEach(each -> 
binderContext.getUsingColumnNames().add(each.getIdentifier().getValue()));
+        } else {
+            usingColumnsByNaturalJoin = Collections.emptyMap();
         }
         result.getDerivedJoinTableProjectionSegments()
                 .addAll(getDerivedJoinTableProjectionSegments(result, 
binderContext.getSqlStatement().getDatabaseType(), usingColumnsByNaturalJoin, 
tableBinderContexts));
@@ -117,8 +119,9 @@ public final class JoinTableSegmentBinder {
         }
         Collection<ProjectionSegment> result = new LinkedList<>();
         Map<String, ProjectionSegment> originalUsingColumns = 
segment.getUsing().isEmpty() ? usingColumnsByNaturalJoin : 
getUsingColumns(projectionSegments, segment.getUsing(), segment.getJoinType());
-        Collection<ProjectionSegment> orderedUsingColumns =
-                databaseType instanceof MySQLDatabaseType ? 
getJoinUsingColumnsByProjectionOrder(projectionSegments, originalUsingColumns) 
: originalUsingColumns.values();
+        Collection<ProjectionSegment> orderedUsingColumns = databaseType 
instanceof MySQLDatabaseType
+                ? getJoinUsingColumnsByProjectionOrder(projectionSegments, 
originalUsingColumns)
+                : originalUsingColumns.values();
         result.addAll(orderedUsingColumns);
         result.addAll(getJoinRemainingColumns(projectionSegments, 
originalUsingColumns));
         return result;
@@ -186,8 +189,7 @@ public final class JoinTableSegmentBinder {
         return result;
     }
     
-    private static Collection<ProjectionSegment> 
getJoinUsingColumnsByProjectionOrder(final Collection<ProjectionSegment> 
projectionSegments,
-                                                                               
       final Map<String, ProjectionSegment> usingColumns) {
+    private static Collection<ProjectionSegment> 
getJoinUsingColumnsByProjectionOrder(final Collection<ProjectionSegment> 
projectionSegments, final Map<String, ProjectionSegment> usingColumns) {
         Map<String, ProjectionSegment> result = new 
CaseInsensitiveMap<>(usingColumns.size(), 1F);
         for (ProjectionSegment each : projectionSegments) {
             String columnLabel = each.getColumnLabel();