Repository: hive Updated Branches: refs/heads/master 9e1fa0ce6 -> 805362474
HIVE-13615 : nomore_ambiguous_table_col.q is failing on master (Hari Sankar via Ashutosh Chauhan) Signed-off-by: Ashutosh Chauhan <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/80536247 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/80536247 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/80536247 Branch: refs/heads/master Commit: 8053624748cee00d945e93548c1e1b3467d3a413 Parents: 9e1fa0c Author: Hari Subramaniyan <[email protected]> Authored: Fri Apr 29 15:21:00 2016 -0800 Committer: Ashutosh Chauhan <[email protected]> Committed: Sun May 1 09:58:03 2016 -0700 ---------------------------------------------------------------------- .../hadoop/hive/ql/parse/FromClauseParser.g | 4 +- .../hadoop/hive/ql/parse/IdentifiersParser.g | 6 +- .../hadoop/hive/ql/parse/SelectClauseParser.g | 4 +- .../results/clientnegative/subq_insert.q.out | 2 +- .../results/clientpositive/groupby1_limit.q.out | 2 +- .../results/clientpositive/regexp_extract.q.out | 137 ------------------- .../compiler/errors/missing_overwrite.q.out | 2 +- 7 files changed, 10 insertions(+), 147 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/80536247/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 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?) ; http://git-wip-us.apache.org/repos/asf/hive/blob/80536247/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 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 http://git-wip-us.apache.org/repos/asf/hive/blob/80536247/ql/src/java/org/apache/hadoop/hive/ql/parse/SelectClauseParser.g ---------------------------------------------------------------------- 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 : http://git-wip-us.apache.org/repos/asf/hive/blob/80536247/ql/src/test/results/clientnegative/subq_insert.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientnegative/subq_insert.q.out b/ql/src/test/results/clientnegative/subq_insert.q.out index 620409b..4847634 100644 --- a/ql/src/test/results/clientnegative/subq_insert.q.out +++ b/ql/src/test/results/clientnegative/subq_insert.q.out @@ -1 +1 @@ -FAILED: SemanticException [Error 10024]: Line 2:38 Cannot insert in a subquery. Inserting to table 'src1' +FAILED: ParseException line 2:22 cannot recognize input near 'INSERT' 'OVERWRITE' 'TABLE' in from source http://git-wip-us.apache.org/repos/asf/hive/blob/80536247/ql/src/test/results/clientpositive/groupby1_limit.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/groupby1_limit.q.out b/ql/src/test/results/clientpositive/groupby1_limit.q.out index 8d7fbfa..aacd23c 100644 --- a/ql/src/test/results/clientpositive/groupby1_limit.q.out +++ b/ql/src/test/results/clientpositive/groupby1_limit.q.out @@ -68,7 +68,7 @@ STAGE PLANS: Map Operator Tree: TableScan Reduce Output Operator - sort order: + sort order: Statistics: Num rows: 5 Data size: 50 Basic stats: COMPLETE Column stats: NONE TopN Hash Memory Usage: 0.1 value expressions: _col0 (type: string), _col1 (type: double) http://git-wip-us.apache.org/repos/asf/hive/blob/80536247/ql/src/test/results/clientpositive/regexp_extract.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/regexp_extract.q.out b/ql/src/test/results/clientpositive/regexp_extract.q.out index 6622278..7026df3 100644 --- a/ql/src/test/results/clientpositive/regexp_extract.q.out +++ b/ql/src/test/results/clientpositive/regexp_extract.q.out @@ -16,75 +16,6 @@ FROM ( ) tmap SELECT tmap.key, regexp_extract(tmap.value, 'val_(\\d+\\t\\d+)',1) WHERE tmap.key < 100 POSTHOOK: type: QUERY -ABSTRACT SYNTAX TREE: - -TOK_QUERY - TOK_FROM - TOK_SUBQUERY - TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TRANSFORM - TOK_EXPLIST - . - TOK_TABLE_OR_COL - src - key - . - TOK_TABLE_OR_COL - src - value - + - 1 - 2 - + - 3 - 4 - TOK_SERDE - TOK_RECORDWRITER - 'cat' - TOK_SERDE - TOK_RECORDREADER - TOK_CLUSTERBY - TOK_TABLE_OR_COL - key - tmap - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - tmap - key - TOK_SELEXPR - TOK_FUNCTION - regexp_extract - . - TOK_TABLE_OR_COL - tmap - value - 'val_(\\d+\\t\\d+)' - 1 - TOK_WHERE - < - . - TOK_TABLE_OR_COL - tmap - key - 100 - - STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 @@ -334,74 +265,6 @@ FROM ( ) tmap SELECT tmap.key, regexp_extract(tmap.value, 'val_(\\d+\\t\\d+)') WHERE tmap.key < 100 POSTHOOK: type: QUERY -ABSTRACT SYNTAX TREE: - -TOK_QUERY - TOK_FROM - TOK_SUBQUERY - TOK_QUERY - TOK_FROM - TOK_TABREF - TOK_TABNAME - src - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - TOK_TRANSFORM - TOK_EXPLIST - . - TOK_TABLE_OR_COL - src - key - . - TOK_TABLE_OR_COL - src - value - + - 1 - 2 - + - 3 - 4 - TOK_SERDE - TOK_RECORDWRITER - 'cat' - TOK_SERDE - TOK_RECORDREADER - TOK_CLUSTERBY - TOK_TABLE_OR_COL - key - tmap - TOK_INSERT - TOK_DESTINATION - TOK_DIR - TOK_TMP_FILE - TOK_SELECT - TOK_SELEXPR - . - TOK_TABLE_OR_COL - tmap - key - TOK_SELEXPR - TOK_FUNCTION - regexp_extract - . - TOK_TABLE_OR_COL - tmap - value - 'val_(\\d+\\t\\d+)' - TOK_WHERE - < - . - TOK_TABLE_OR_COL - tmap - key - 100 - - STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 depends on stages: Stage-1 http://git-wip-us.apache.org/repos/asf/hive/blob/80536247/ql/src/test/results/compiler/errors/missing_overwrite.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/compiler/errors/missing_overwrite.q.out b/ql/src/test/results/compiler/errors/missing_overwrite.q.out index 441558a..7fed7a5 100644 --- a/ql/src/test/results/compiler/errors/missing_overwrite.q.out +++ b/ql/src/test/results/compiler/errors/missing_overwrite.q.out @@ -1 +1 @@ -Parse Error: line 2:0 cannot recognize input near 'INSERT' 'TABLE' 'dest1' in insert clause \ No newline at end of file +Parse Error: line 2:7 cannot recognize input near 'INSERT' 'TABLE' 'dest1' in table source \ No newline at end of file
