You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by nz...@apache.org on 2011/06/03 19:19:57 UTC
svn commit: r1131114 - in /hive/trunk/ql/src:
java/org/apache/hadoop/hive/ql/parse/Hive.g
test/queries/clientpositive/udf_notop.q
test/results/clientpositive/udf_notop.q.out
Author: nzhang
Date: Fri Jun 3 17:19:56 2011
New Revision: 1131114
URL: http://svn.apache.org/viewvc?rev=1131114&view=rev
Log:
HIVE-1740. support NOT IN and NOT LIKE syntax (Eric Hassold via Ning Zhang)
Added:
hive/trunk/ql/src/test/queries/clientpositive/udf_notop.q
hive/trunk/ql/src/test/results/clientpositive/udf_notop.q.out
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/Hive.g
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/Hive.g
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/Hive.g?rev=1131114&r1=1131113&r2=1131114&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/Hive.g (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/Hive.g Fri Jun 3 17:19:56 2011
@@ -1933,20 +1933,30 @@ precedenceBitwiseOrExpression
;
-precedenceEqualOperator
+// Equal operators supporting NOT prefix
+precedenceEqualNegatableOperator
:
- EQUAL | NOTEQUAL | LESSTHANOREQUALTO | LESSTHAN | GREATERTHANOREQUALTO | GREATERTHAN
- | KW_LIKE | KW_RLIKE | KW_REGEXP
+ KW_LIKE | KW_RLIKE | KW_REGEXP
;
-precedenceEqualExpression
+precedenceEqualOperator
:
- precedenceBitwiseOrExpression ( (precedenceEqualOperator^ precedenceBitwiseOrExpression) | (inOperator^ expressions) )*
+ precedenceEqualNegatableOperator | EQUAL | NOTEQUAL | LESSTHANOREQUALTO | LESSTHAN | GREATERTHANOREQUALTO | GREATERTHAN
;
-inOperator
+precedenceEqualExpression
:
- KW_IN -> ^(TOK_FUNCTION KW_IN)
+ (left=precedenceBitwiseOrExpression -> $left)
+ (
+ (KW_NOT precedenceEqualNegatableOperator notExpr=precedenceBitwiseOrExpression)
+ -> ^(KW_NOT ^(precedenceEqualNegatableOperator $precedenceEqualExpression $notExpr))
+ | (precedenceEqualOperator equalExpr=precedenceBitwiseOrExpression)
+ -> ^(precedenceEqualOperator $precedenceEqualExpression $equalExpr)
+ | (KW_NOT KW_IN expressions)
+ -> ^(KW_NOT ^(TOK_FUNCTION KW_IN $precedenceEqualExpression expressions))
+ | (KW_IN expressions)
+ -> ^(TOK_FUNCTION KW_IN $precedenceEqualExpression expressions)
+ )*
;
expressions
Added: hive/trunk/ql/src/test/queries/clientpositive/udf_notop.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/udf_notop.q?rev=1131114&view=auto
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/udf_notop.q (added)
+++ hive/trunk/ql/src/test/queries/clientpositive/udf_notop.q Fri Jun 3 17:19:56 2011
@@ -0,0 +1,10 @@
+SELECT 1 NOT IN (1, 2, 3),
+ 4 NOT IN (1, 2, 3),
+ 1 = 2 NOT IN (true, false),
+ "abc" NOT LIKE "a%",
+ "abc" NOT LIKE "b%",
+ "abc" NOT RLIKE "^ab",
+ "abc" NOT RLIKE "^bc",
+ "abc" NOT REGEXP "^ab",
+ "abc" NOT REGEXP "^bc",
+ 1 IN (1, 2) AND "abc" NOT LIKE "bc%" FROM src LIMIT 1;
Added: hive/trunk/ql/src/test/results/clientpositive/udf_notop.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/udf_notop.q.out?rev=1131114&view=auto
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/udf_notop.q.out (added)
+++ hive/trunk/ql/src/test/results/clientpositive/udf_notop.q.out Fri Jun 3 17:19:56 2011
@@ -0,0 +1,27 @@
+PREHOOK: query: SELECT 1 NOT IN (1, 2, 3),
+ 4 NOT IN (1, 2, 3),
+ 1 = 2 NOT IN (true, false),
+ "abc" NOT LIKE "a%",
+ "abc" NOT LIKE "b%",
+ "abc" NOT RLIKE "^ab",
+ "abc" NOT RLIKE "^bc",
+ "abc" NOT REGEXP "^ab",
+ "abc" NOT REGEXP "^bc",
+ 1 IN (1, 2) AND "abc" NOT LIKE "bc%" FROM src LIMIT 1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: file:/tmp/ehassold/hive_2011-06-02_14-36-13_085_5783843972339431665/-mr-10000
+POSTHOOK: query: SELECT 1 NOT IN (1, 2, 3),
+ 4 NOT IN (1, 2, 3),
+ 1 = 2 NOT IN (true, false),
+ "abc" NOT LIKE "a%",
+ "abc" NOT LIKE "b%",
+ "abc" NOT RLIKE "^ab",
+ "abc" NOT RLIKE "^bc",
+ "abc" NOT REGEXP "^ab",
+ "abc" NOT REGEXP "^bc",
+ 1 IN (1, 2) AND "abc" NOT LIKE "bc%" FROM src LIMIT 1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: file:/tmp/ehassold/hive_2011-06-02_14-36-13_085_5783843972339431665/-mr-10000
+false true false false true false true false true true