(shardingsphere) branch master updated: Remove useless lastColumn in SubstitutableColumnNameToken (#32358)

[ch...@apache.org]

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

chengzhang 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 96e73b10d88 Remove useless lastColumn in SubstitutableColumnNameToken (#32358)
96e73b10d88 is described below

commit 96e73b10d88790d3d707a4cbda3a155ca5734437
Author: Zhengqiang Duan <du...@apache.org>
AuthorDate: Fri Aug 2 09:35:52 2024 +0800

    Remove useless lastColumn in SubstitutableColumnNameToken (#32358)
---
 .../pojo/generic/SubstitutableColumnNameToken.java   | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/pojo/generic/SubstitutableColumnNameToken.java b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/pojo/generic/SubstitutableColumnNameToken.java
index 6587868b099..791d3008300 100644
--- a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/pojo/generic/SubstitutableColumnNameToken.java
+++ b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/pojo/generic/SubstitutableColumnNameToken.java
@@ -34,7 +34,6 @@ import org.apache.shardingsphere.sql.parser.statement.core.value.identifier.Iden
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -50,33 +49,26 @@ public final class SubstitutableColumnNameToken extends SQLToken implements Subs
     
     private final Collection<Projection> projections;
     
-    private final boolean lastColumn;
-    
     private final QuoteCharacter quoteCharacter;
     
     public SubstitutableColumnNameToken(final int startIndex, final int stopIndex, final Collection<Projection> projections, final DatabaseType databaseType) {
         super(startIndex);
         this.stopIndex = stopIndex;
-        lastColumn = false;
         quoteCharacter = new DatabaseTypeRegistry(databaseType).getDialectDatabaseMetaData().getQuoteCharacter();
         this.projections = projections;
     }
     
     @Override
     public String toString(final RouteUnit routeUnit) {
-        Map<String, String> logicAndActualTables = new HashMap<>();
-        if (null != routeUnit) {
-            logicAndActualTables.putAll(getLogicAndActualTables(routeUnit));
-        }
+        Map<String, String> logicAndActualTables = getLogicAndActualTables(routeUnit);
         StringBuilder result = new StringBuilder();
-        int count = 0;
+        int index = 0;
         for (Projection each : projections) {
-            if (0 == count && !lastColumn) {
-                result.append(getColumnExpression(each, logicAndActualTables));
-            } else {
-                result.append(COLUMN_NAME_SPLITTER).append(getColumnExpression(each, logicAndActualTables));
+            if (index > 0) {
+                result.append(COLUMN_NAME_SPLITTER);
             }
-            count++;
+            result.append(getColumnExpression(each, logicAndActualTables));
+            index++;
         }
         return result.toString();
     }