Author: xuefu
Date: Mon Mar 10 17:16:20 2014
New Revision: 1576006
URL: http://svn.apache.org/r1576006
Log:
HIVE-5607: Hive fails to parse the % (mod) sign after brackets (reviewed by
Prasad)
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g
hive/trunk/ql/src/test/queries/clientpositive/parenthesis_star_by.q
hive/trunk/ql/src/test/results/clientpositive/parenthesis_star_by.q.out
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g?rev=1576006&r1=1576005&r2=1576006&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g
(original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g
Mon Mar 10 17:16:20 2014
@@ -106,13 +106,7 @@ orderByClause
@init { gParent.pushMsg("order by clause", state); }
@after { gParent.popMsg(state); }
:
- KW_ORDER KW_BY
- LPAREN columnRefOrder
- ( COMMA columnRefOrder)* RPAREN -> ^(TOK_ORDERBY columnRefOrder+)
- |
- KW_ORDER KW_BY
- columnRefOrder
- ( COMMA columnRefOrder)* -> ^(TOK_ORDERBY columnRefOrder+)
+ KW_ORDER KW_BY columnRefOrder ( COMMA columnRefOrder)* -> ^(TOK_ORDERBY
columnRefOrder+)
;
clusterByClause
Modified: hive/trunk/ql/src/test/queries/clientpositive/parenthesis_star_by.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/parenthesis_star_by.q?rev=1576006&r1=1576005&r2=1576006&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/parenthesis_star_by.q
(original)
+++ hive/trunk/ql/src/test/queries/clientpositive/parenthesis_star_by.q Mon Mar
10 17:16:20 2014
@@ -5,6 +5,6 @@ SELECT * FROM (SELECT key, value FROM sr
SELECT key, value FROM src CLUSTER BY (key, value);
-SELECT key, value FROM src ORDER BY (key ASC, value ASC);
+SELECT key, value FROM src ORDER BY key ASC, value ASC;
SELECT key, value FROM src SORT BY (key, value);
SELECT * FROM (SELECT key, value FROM src DISTRIBUTE BY (key, value))t ORDER
BY key, value;
Modified:
hive/trunk/ql/src/test/results/clientpositive/parenthesis_star_by.q.out
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/parenthesis_star_by.q.out?rev=1576006&r1=1576005&r2=1576006&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/parenthesis_star_by.q.out
(original)
+++ hive/trunk/ql/src/test/results/clientpositive/parenthesis_star_by.q.out Mon
Mar 10 17:16:20 2014
@@ -2538,11 +2538,11 @@ POSTHOOK: Input: default@src
97 val_97
98 val_98
98 val_98
-PREHOOK: query: SELECT key, value FROM src ORDER BY (key ASC, value ASC)
+PREHOOK: query: SELECT key, value FROM src ORDER BY key ASC, value ASC
PREHOOK: type: QUERY
PREHOOK: Input: default@src
#### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM src ORDER BY (key ASC, value ASC)
+POSTHOOK: query: SELECT key, value FROM src ORDER BY key ASC, value ASC
POSTHOOK: type: QUERY
POSTHOOK: Input: default@src
#### A masked pattern was here ####
