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 084c421..ad9abce 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 @@ -193,9 +193,9 @@ tableSource : tabname=tableName ((tableProperties) => props=tableProperties)? ((tableSample) => ts=tableSample)? - ((KW_AS) => (KW_AS alias=Identifier) + ((KW_AS) => (KW_AS alias=identifier) | - (Identifier) => (alias=Identifier))? + (identifier) => (alias=identifier))? -> ^(TOK_TABREF $tabname $props? $ts? $alias?) ; 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 3f74551..99c886b 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 @@ -206,7 +206,7 @@ functionName | (functionIdentifier) => functionIdentifier | - {!useSQL11ReservedKeywordsForIdentifier()}? sql11ReservedKeywordsUsedAsCastFunctionName -> Identifier[$sql11ReservedKeywordsUsedAsCastFunctionName.text] + {!useSQL11ReservedKeywordsForIdentifier()}? sql11ReservedKeywordsUsedAsCastFunctionName -> Identifier[$sql11ReservedKeywordsUsedAsCastFunctionName.start] ; castExpression @@ -614,10 +614,10 @@ descFuncNames identifier : Identifier - | nonReserved -> Identifier[$nonReserved.text] + | nonReserved -> Identifier[$nonReserved.start] // If it decides to support SQL11 reserved keywords, i.e., useSQL11ReservedKeywordsForIdentifier()=false, // the sql11keywords in existing q tests will NOT be added back. - | {useSQL11ReservedKeywordsForIdentifier()}? sql11ReservedKeywordsUsedAsIdentifier -> Identifier[$sql11ReservedKeywordsUsedAsIdentifier.text] + | {useSQL11ReservedKeywordsForIdentifier()}? sql11ReservedKeywordsUsedAsIdentifier -> Identifier[$sql11ReservedKeywordsUsedAsIdentifier.start] ; functionIdentifier diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/SelectClauseParser.g b/ql/src/java/org/apache/hadoop/hive/ql/parse/SelectClauseParser.g index 48bc8b0..5f06ff4 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/SelectClauseParser.g +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/SelectClauseParser.g @@ -175,14 +175,14 @@ window_defn @init { gParent.pushMsg("window_defn", state); } @after { gParent.popMsg(state); } : - Identifier KW_AS window_specification -> ^(TOK_WINDOWDEF Identifier window_specification) + identifier KW_AS window_specification -> ^(TOK_WINDOWDEF identifier window_specification) ; window_specification @init { gParent.pushMsg("window_specification", state); } @after { gParent.popMsg(state); } : - (Identifier | ( LPAREN Identifier? partitioningSpec? window_frame? RPAREN)) -> ^(TOK_WINDOWSPEC Identifier? partitioningSpec? window_frame?) + (identifier | ( LPAREN identifier? partitioningSpec? window_frame? RPAREN)) -> ^(TOK_WINDOWSPEC identifier? partitioningSpec? window_frame?) ; window_frame :