You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by se...@apache.org on 2014/10/29 01:44:18 UTC
svn commit: r1635017 -
/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
Author: sershe
Date: Wed Oct 29 00:44:18 2014
New Revision: 1635017
URL: http://svn.apache.org/r1635017
Log:
HIVE-8635 : CBO: ambiguous_col negative test no longer fails (Sergey Shelukhin, reviewed by Ashutosh Chauhan)
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java?rev=1635017&r1=1635016&r2=1635017&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java Wed Oct 29 00:44:18 2014
@@ -14093,7 +14093,6 @@ public class SemanticAnalyzer extends Ba
QBParseInfo qbp = getQBParseInfo(qb);
String selClauseName = qbp.getClauseNames().iterator().next();
ASTNode selExprList = qbp.getSelForClause(selClauseName);
- LOG.error("TODO# for select clause, got " + selExprList.dump());
// 2.Row resolvers for input, output
RowResolver out_rwsch = new RowResolver();
@@ -14215,7 +14214,10 @@ public class SemanticAnalyzer extends Ba
exp.getWritableObjectInspector(), tabAlias, false);
colInfo.setSkewedCol((exp instanceof ExprNodeColumnDesc) ? ((ExprNodeColumnDesc) exp)
.isSkewedCol() : false);
- out_rwsch.put(tabAlias, colAlias, colInfo);
+ if (!out_rwsch.putWithCheck(tabAlias, colAlias, null, colInfo)) {
+ throw new OptiqSemanticException("Cannot add column to RR: " + tabAlias + "."
+ + colAlias + " => " + colInfo + " due to duplication, see previous warnings");
+ }
if (exp instanceof ExprNodeColumnDesc) {
ExprNodeColumnDesc colExp = (ExprNodeColumnDesc) exp;