Author: nzhang
Date: Wed Jul 13 15:30:38 2011
New Revision: 1146100
URL: http://svn.apache.org/viewvc?rev=1146100&view=rev
Log:
HIVE-2281. Regression introduced from HIVE-2155 (Syed S. Albiz via Ning Zhang)
Added:
hive/trunk/ql/src/test/queries/clientnegative/nonkey_groupby.q
hive/trunk/ql/src/test/results/clientnegative/nonkey_groupby.q.out
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java?rev=1146100&r1=1146099&r2=1146100&view=diff
==============================================================================
---
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java
(original)
+++
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java
Wed Jul 13 15:30:38 2011
@@ -384,8 +384,15 @@ public final class TypeCheckProcFactory
if (colInfo == null) {
// It's not a column or a table alias.
if (input.getIsExprResolver()) {
- stack.pop();
- ctx.setError(ErrorMsg.NON_KEY_EXPR_IN_GROUPBY.getMsg((ASTNode)
stack.peek()), expr);
+ ASTNode exprNode = expr;
+ if (!stack.empty()) {
+ ASTNode tmp = (ASTNode) stack.pop();
+ if (!stack.empty()) {
+ exprNode = (ASTNode) stack.peek();
+ }
+ stack.push(tmp);
+ }
+ ctx.setError(ErrorMsg.NON_KEY_EXPR_IN_GROUPBY.getMsg(exprNode),
expr);
return null;
} else {
ctx.setError(ErrorMsg.INVALID_TABLE_OR_COLUMN.getMsg(expr
Added: hive/trunk/ql/src/test/queries/clientnegative/nonkey_groupby.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/nonkey_groupby.q?rev=1146100&view=auto
==============================================================================
--- hive/trunk/ql/src/test/queries/clientnegative/nonkey_groupby.q (added)
+++ hive/trunk/ql/src/test/queries/clientnegative/nonkey_groupby.q Wed Jul 13
15:30:38 2011
@@ -0,0 +1 @@
+EXPLAIN SELECT key, count(1) FROM src;
Added: hive/trunk/ql/src/test/results/clientnegative/nonkey_groupby.q.out
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/nonkey_groupby.q.out?rev=1146100&view=auto
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/nonkey_groupby.q.out (added)
+++ hive/trunk/ql/src/test/results/clientnegative/nonkey_groupby.q.out Wed Jul
13 15:30:38 2011
@@ -0,0 +1 @@
+FAILED: Error in semantic analysis: Line 1:15 Expression not in GROUP BY key
'key'
