hadoop-hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zs...@apache.org
Subject svn commit: r763518 - in /hadoop/hive/branches/branch-0.3: CHANGES.txt ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
Date Thu, 09 Apr 2009 05:26:26 GMT
Author: zshao
Date: Thu Apr  9 05:26:25 2009
New Revision: 763518

URL: http://svn.apache.org/viewvc?rev=763518&view=rev
Log:
HIVE-400. Fix bug in genColList. (Namit Jain via zshao)

Modified:
    hadoop/hive/branches/branch-0.3/CHANGES.txt
    hadoop/hive/branches/branch-0.3/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java

Modified: hadoop/hive/branches/branch-0.3/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.3/CHANGES.txt?rev=763518&r1=763517&r2=763518&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.3/CHANGES.txt (original)
+++ hadoop/hive/branches/branch-0.3/CHANGES.txt Thu Apr  9 05:26:25 2009
@@ -116,6 +116,8 @@
     HIVE-324. Fix AccessControlException when loading data.
     (Ashish Thusoo via zshao)
 
+    HIVE-400. Fix bug in genColList. (Namit Jain via zshao)
+
 Release 0.2.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/hive/branches/branch-0.3/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.3/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java?rev=763518&r1=763517&r2=763518&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.3/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
(original)
+++ hadoop/hive/branches/branch-0.3/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
Thu Apr  9 05:26:25 2009
@@ -946,7 +946,7 @@
   }
 
   @SuppressWarnings("nls")
-  private void genColList(String tabAlias, String alias, ASTNode sel,
+  private Integer genColList(String tabAlias, String alias, ASTNode sel,
     ArrayList<exprNodeDesc> col_list, RowResolver input, Integer pos,
     RowResolver output) throws SemanticException {
 
@@ -973,6 +973,7 @@
       output.put(tmp[0], tmp[1], new ColumnInfo(pos.toString(), colInfo.getType()));
       pos = Integer.valueOf(pos.intValue() + 1);
     }
+    return pos;
   }
 
   /**
@@ -1149,7 +1150,7 @@
         tabAlias = null;
         if (sel.getChildCount() == 1)
           tabAlias = unescapeIdentifier(sel.getChild(0).getText().toLowerCase());
-        genColList(tabAlias, alias, sel, col_list, inputRR, pos, out_rwsch);
+        pos = genColList(tabAlias, alias, sel, col_list, inputRR, pos, out_rwsch);
         selectStar = true;
       } else if (sel.getToken().getType() == HiveParser.TOK_TRANSFORM) {
         if (i > 0) {
@@ -1164,7 +1165,7 @@
             if (sel.getChildCount() == 1)
               tabAlias = unescapeIdentifier(sel.getChild(0).getText().toLowerCase());
 
-            genColList(tabAlias, alias, expr, col_list, inputRR, pos, out_rwsch);
+            pos = genColList(tabAlias, alias, expr, col_list, inputRR, pos, out_rwsch);
             selectStar = true;
           } else {
             exprNodeDesc exp = genExprNodeDesc(expr, inputRR);



Mime
View raw message