hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ser...@apache.org
Subject [24/50] [abbrv] hive git commit: HIVE-16070 fix nonReserved list in IdentifiersParser.q (Eugene Koifman, reviewed by Pengcheng Xiong)
Date Wed, 08 Mar 2017 03:29:02 GMT
HIVE-16070 fix nonReserved list in IdentifiersParser.q (Eugene Koifman, reviewed by Pengcheng
Xiong)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/081f8b64
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/081f8b64
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/081f8b64

Branch: refs/heads/hive-14535
Commit: 081f8b64f8e71bc26dd9471f54839a14b5168f76
Parents: 2dfcea5
Author: Eugene Koifman <ekoifman@hortonworks.com>
Authored: Thu Mar 2 15:40:12 2017 -0800
Committer: Eugene Koifman <ekoifman@hortonworks.com>
Committed: Thu Mar 2 15:40:12 2017 -0800

----------------------------------------------------------------------
 ql/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/081f8b64/ql/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g b/ql/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g
index 81efadc..57fa0f4 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g
@@ -781,7 +781,6 @@ nonReserved
     | KW_VALIDATE
     | KW_NOVALIDATE
     | KW_KEY
-    | KW_MERGE
     | KW_MATCHED
     | KW_REPL | KW_DUMP | KW_BATCH | KW_STATUS
     | KW_CACHE | KW_DAYOFWEEK | KW_VIEWS


Mime
View raw message