You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2017/11/22 19:13:22 UTC
hive git commit: HIVE-18109 : fix identifier usage in parser (Sergey
Shelukhin via Ashutosh Chauhan)
Repository: hive
Updated Branches:
refs/heads/master b5ba82738 -> 388543b3e
HIVE-18109 : fix identifier usage in parser (Sergey Shelukhin via Ashutosh Chauhan)
Signed-off-by: Ashutosh Chauhan <ha...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/388543b3
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/388543b3
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/388543b3
Branch: refs/heads/master
Commit: 388543b3e47770575a83459248aa0ddb25483819
Parents: b5ba827
Author: Sergey Shelukhin <se...@apache.org>
Authored: Wed Nov 22 11:12:02 2017 -0800
Committer: Ashutosh Chauhan <ha...@apache.org>
Committed: Wed Nov 22 11:12:02 2017 -0800
----------------------------------------------------------------------
ql/src/java/org/apache/hadoop/hive/ql/parse/FromClauseParser.g | 4 ++--
ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/388543b3/ql/src/java/org/apache/hadoop/hive/ql/parse/FromClauseParser.g
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/FromClauseParser.g b/ql/src/java/org/apache/hadoop/hive/ql/parse/FromClauseParser.g
index 00109f4..3496d9e 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/FromClauseParser.g
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/FromClauseParser.g
@@ -261,10 +261,10 @@ partitionedTableFunction
@init { gParent.pushMsg("ptf clause", state); }
@after { gParent.popMsg(state); }
:
- name=Identifier LPAREN KW_ON
+ name=identifier LPAREN KW_ON
((partitionTableFunctionSource) => (ptfsrc=partitionTableFunctionSource spec=partitioningSpec?))
((Identifier LPAREN expression RPAREN ) => Identifier LPAREN expression RPAREN ( COMMA Identifier LPAREN expression RPAREN)*)?
- ((RPAREN) => (RPAREN)) ((Identifier) => alias=Identifier)?
+ ((RPAREN) => (RPAREN)) ((Identifier) => alias=identifier)?
-> ^(TOK_PTBLFUNCTION $name $alias? $ptfsrc $spec? expression*)
;
http://git-wip-us.apache.org/repos/asf/hive/blob/388543b3/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g b/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g
index f90bb8a..e99d5fb 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g
@@ -1764,7 +1764,7 @@ showStatement
| KW_SHOW KW_TBLPROPERTIES tableName (LPAREN prptyName=StringLiteral RPAREN)? -> ^(TOK_SHOW_TBLPROPERTIES tableName $prptyName?)
| KW_SHOW KW_LOCKS
(
- (KW_DATABASE|KW_SCHEMA) => (KW_DATABASE|KW_SCHEMA) (dbName=Identifier) (isExtended=KW_EXTENDED)? -> ^(TOK_SHOWDBLOCKS $dbName $isExtended?)
+ (KW_DATABASE|KW_SCHEMA) => (KW_DATABASE|KW_SCHEMA) (dbName=identifier) (isExtended=KW_EXTENDED)? -> ^(TOK_SHOWDBLOCKS $dbName $isExtended?)
|
(parttype=partTypeExpr)? (isExtended=KW_EXTENDED)? -> ^(TOK_SHOWLOCKS $parttype? $isExtended?)
)
@@ -1789,7 +1789,7 @@ lockStatement
lockDatabase
@init { pushMsg("lock database statement", state); }
@after { popMsg(state); }
- : KW_LOCK (KW_DATABASE|KW_SCHEMA) (dbName=Identifier) lockMode -> ^(TOK_LOCKDB $dbName lockMode)
+ : KW_LOCK (KW_DATABASE|KW_SCHEMA) (dbName=identifier) lockMode -> ^(TOK_LOCKDB $dbName lockMode)
;
lockMode
@@ -1807,7 +1807,7 @@ unlockStatement
unlockDatabase
@init { pushMsg("unlock database statement", state); }
@after { popMsg(state); }
- : KW_UNLOCK (KW_DATABASE|KW_SCHEMA) (dbName=Identifier) -> ^(TOK_UNLOCKDB $dbName)
+ : KW_UNLOCK (KW_DATABASE|KW_SCHEMA) (dbName=identifier) -> ^(TOK_UNLOCKDB $dbName)
;
createRoleStatement