rename some variable name & fix comment error

apache · Nov 29, 2019 · 27692d3 · 27692d3
1 parent 7d1a5bc
commit 27692d3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 18 deletions.
diff --git a/core/src/main/codegen/templates/Parser.jj b/core/src/main/codegen/templates/Parser.jj
@@ -1728,8 +1728,8 @@ List<SqlNode> SelectList() :
 SqlNode SelectItem() :
 {
     SqlNode e;
-    SqlIdentifier id;
-    final List<SqlNode> ids = new ArrayList();
+    SqlIdentifier columnAlias;
+    final List<SqlNode> columnAliases = new ArrayList();
     final Span s = span();
 }
 {
@@ -1738,24 +1738,25 @@ SqlNode SelectItem() :
       (
        LOOKAHEAD(2) (
           [ <AS> ]
-          id = SimpleIdentifier()
+          columnAlias = SimpleIdentifier()
           {
-            e = SqlStdOperatorTable.AS.createCall(s.end(e), e, id);
+            e = SqlStdOperatorTable.AS.createCall(s.end(e), e, columnAlias);
           }
         )
       |
          (
           <AS> <LPAREN>
-          id = SimpleIdentifier() {
-             ids.add(id);
+          columnAlias = SimpleIdentifier() {
+             columnAliases.add(columnAlias);
           }
-          ( <COMMA> id = SimpleIdentifier() { ids.add(id);} )*
+          ( <COMMA> columnAlias = SimpleIdentifier() { columnAliases.add(columnAlias);} )*
             <RPAREN> {
              if (!this.conformance.allowSelectTableFunction()) {
                throw SqlUtil.newContextException(getPos(),
-                     RESOURCE.notAllowTableFunctionInSelect());
+                 RESOURCE.notAllowTableFunctionInSelect());
              }
-             e = SqlStdOperatorTable.AS.createCall(s.end(e), e, new SqlNodeList(ids, s.end(e)));
+             e = SqlStdOperatorTable.AS.createCall(s.end(e), e,
+               new SqlNodeList(columnAliases, s.end(e)));
            }
         )
       )

diff --git a/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorImpl.java b/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorImpl.java
@@ -162,11 +162,6 @@ public class SqlValidatorImpl implements SqlValidatorWithHints {
    */
   public static final String UPDATE_ANON_PREFIX = "SYS$ANON";
 
-  /**
-   * Prefix for table function.
-   */
-  private static final String TABLE_FUNCTION_PREFIX = "_table_function_";
-
   //~ Instance fields --------------------------------------------------------
 
   private final SqlOperatorTable opTab;
@@ -299,7 +294,7 @@ public class SqlValidatorImpl implements SqlValidatorWithHints {
   // Flag saying if we enable the implicit type coercion.
   private boolean enableTypeCoercion;
 
-  // Maping the table function and the select node.
+  // Mapping the table function and the select node.
   private final Map<SqlSelect, SqlBasicCall> selectTableFunctions =
       new IdentityHashMap<>();
   //~ Constructors -----------------------------------------------------------
@@ -4333,7 +4328,7 @@ private void handleTableFunctionInSelect(
     }
     aliases.addAll(aliasList);
 
-    String tableAlias = TABLE_FUNCTION_PREFIX + nextGeneratedId++;
+    String tableAlias = functionCall.getOperator().getName();
     // Expand the table function alias
     for (String alias : aliasList) {
       SqlIdentifier id = new SqlIdentifier(Lists.newArrayList

diff --git a/site/_docs/reference.md b/site/_docs/reference.md
@@ -213,7 +213,7 @@ selectWithoutFrom:
 
 projectItem:
       expression [ [ AS ] columnAlias ]
-  |   expression AS '(' columnAlias [, columnAlias ]* ')'    
+  |   expression AS '(' columnAlias [, columnAlias ]* ')'
   |   tableAlias . *
 
 tableExpression:
@@ -300,7 +300,7 @@ the <em>n</em>th item in the SELECT clause.
 In *query*, *count* and *start* may each be either an unsigned integer literal
 or a dynamic parameter whose value is an integer.
 
-In *projectItem*, *expression* followed by a *As* column alias list is only allowed in 
+In *projectItem*, *expression* followed by a *As* column alias list is only allowed in
 certain [conformance levels] ({{ site.apiRoot }}/org/apache/calcite/sql/validate/SqlConformance.html#allowSelectTableFunction--);
 in those same conformance levels, table function can be used in the select list.
 An aggregate query is a query that contains a GROUP BY or a HAVING