[shardingsphere] branch master updated: format code (#6410)

[pa...@apache.org]

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

panjuan 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 9132d3d  format code (#6410)
9132d3d is described below

commit 9132d3d56310bd6a3bb943c65aa451376ccbf5ed
Author: JingShang Lu <ji...@gmail.com>
AuthorDate: Thu Jul 23 14:28:16 2020 +0800

    format code (#6410)
---
 .../binder/statement/dml/SelectStatementContext.java  | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-binder/src/main/java/org/apache/shardingsphere/sql/parser/binder/statement/dml/SelectStatementContext.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-binder/src/main/java/org/apache/shardingsphere/sql/parser/binder/statement/dml/SelectStatementContext.java
index 4b29924..64ed1dc 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-binder/src/main/java/org/apache/shardingsphere/sql/parser/binder/statement/dml/SelectStatementContext.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-binder/src/main/java/org/apache/shardingsphere/sql/parser/binder/statement/dml/SelectStatementContext.java
@@ -283,14 +283,13 @@ public final class SelectStatementContext extends CommonSQLStatementContext<Sele
     private Collection<SimpleTableSegment> getTableFromSelect(final SelectStatement selectStatement) {
         Collection<SimpleTableSegment> result = new LinkedList<>();
         Collection<TableSegment> realTables = new LinkedList<>();
-        // TODO rename variable name, avoid name as tmp
-        Collection<TableSegment> tmp = new LinkedList<>();
+        Collection<TableSegment> allTables = new LinkedList<>();
         for (TableReferenceSegment each : selectStatement.getTableReferences()) {
-            tmp.addAll(getTablesFromTableReference(each));
+            allTables.addAll(getTablesFromTableReference(each));
             realTables.addAll(getRealTablesFromTableReference(each));
         }
         if (selectStatement.getWhere().isPresent()) {
-            tmp.addAll(getAllTablesFromWhere(selectStatement.getWhere().get(), realTables));
+            allTables.addAll(getAllTablesFromWhere(selectStatement.getWhere().get(), realTables));
         }
         result.addAll(getAllTablesFromProjections(selectStatement.getProjections(), realTables));
         if (getSqlStatement().getGroupBy().isPresent()) {
@@ -299,7 +298,7 @@ public final class SelectStatementContext extends CommonSQLStatementContext<Sele
         if (getSqlStatement().getOrderBy().isPresent()) {
             result.addAll(getAllTablesFromOrderByItems(getSqlStatement().getOrderBy().get().getOrderByItems(), realTables));
         }
-        for (TableSegment each : tmp) {
+        for (TableSegment each : allTables) {
             if (each instanceof SubqueryTableSegment) {
                 result.addAll(getTableFromSelect(((SubqueryTableSegment) each).getSubquery().getSelect()));
             } else {
@@ -339,7 +338,6 @@ public final class SelectStatementContext extends CommonSQLStatementContext<Sele
         if (null != tableFactorSegment.getTable() && tableFactorSegment.getTable() instanceof SimpleTableSegment) {
             result.add(tableFactorSegment.getTable());
         }
-        // TODO subquery in from support not use alias
         if (null != tableFactorSegment.getTable() && tableFactorSegment.getTable() instanceof SubqueryTableSegment) {
             result.add(tableFactorSegment.getTable());
         }
@@ -356,7 +354,6 @@ public final class SelectStatementContext extends CommonSQLStatementContext<Sele
         if (null != tableFactorSegment.getTable() && tableFactorSegment.getTable() instanceof SimpleTableSegment) {
             result.add(tableFactorSegment.getTable());
         }
-        // TODO subquery in from support not use alias
         if (null != tableFactorSegment.getTable() && tableFactorSegment.getTable() instanceof SubqueryTableSegment) {
             result.add(tableFactorSegment.getTable());
         }
@@ -396,14 +393,14 @@ public final class SelectStatementContext extends CommonSQLStatementContext<Sele
     
     private Collection<TableSegment> getTablesFromJoinTable(final JoinedTableSegment joinedTableSegment, final Collection<TableSegment> tableSegments) {
         Collection<TableSegment> result = new LinkedList<>();
-        Collection<TableSegment> tmp = new LinkedList<>();
-        tmp.addAll(tableSegments);
+        Collection<TableSegment> realTables = new LinkedList<>();
+        realTables.addAll(tableSegments);
         if (null != joinedTableSegment.getTableFactor()) {
             result.addAll(getTablesFromTableFactor(joinedTableSegment.getTableFactor()));
-            tmp.addAll(getTablesFromTableFactor(joinedTableSegment.getTableFactor()));
+            realTables.addAll(getTablesFromTableFactor(joinedTableSegment.getTableFactor()));
         }
         if (null != joinedTableSegment.getJoinSpecification()) {
-            result.addAll(getTablesFromJoinSpecification(joinedTableSegment.getJoinSpecification(), tmp));
+            result.addAll(getTablesFromJoinSpecification(joinedTableSegment.getJoinSpecification(), realTables));
         }
         return result;
     }