hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ser...@apache.org
Subject [11/13] hive git commit: HIVE-14908: Upgrade ANTLR to 3.5.2 (Pengcheng Xiong, reviewed by Ashutosh Chauhan)
Date Tue, 15 Nov 2016 03:31:34 GMT
HIVE-14908: Upgrade ANTLR to 3.5.2 (Pengcheng Xiong, reviewed by Ashutosh Chauhan)


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

Branch: refs/heads/hive-14535
Commit: 45b2f9515e69b35d3d084d02b99188d788fb5b8d
Parents: e44efe0
Author: Pengcheng Xiong <pxiong@apache.org>
Authored: Mon Nov 7 17:25:34 2016 -0800
Committer: Pengcheng Xiong <pxiong@apache.org>
Committed: Mon Nov 7 17:25:34 2016 -0800

----------------------------------------------------------------------
 pom.xml                                                        | 2 +-
 ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g       | 6 +++---
 .../java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g   | 2 +-
 .../columnstats_partlvl_multiple_part_clause.q.out             | 2 +-
 ql/src/test/results/compiler/errors/missing_overwrite.q.out    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/45b2f951/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1893530..1eceed9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,7 @@
     <accumulo.version>1.6.0</accumulo.version>
     <activemq.version>5.5.0</activemq.version>
     <ant.version>1.9.1</ant.version>
-    <antlr.version>3.4</antlr.version>
+    <antlr.version>3.5.2</antlr.version>
     <apache-directory-server.version>1.5.6</apache-directory-server.version>
     <apache-directory-clientapi.version>0.1</apache-directory-clientapi.version>
     <avatica.version>1.8.0</avatica.version>

http://git-wip-us.apache.org/repos/asf/hive/blob/45b2f951/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 7b56be5..8aa39b0 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
@@ -2455,7 +2455,7 @@ selectStatement
 setOpSelectStatement[CommonTree t]
    :
    (u=setOperator b=atomSelectStatement
-   -> {$setOpSelectStatement.tree != null && u.tree.getType()==HiveParser.TOK_UNIONDISTINCT}?
+   -> {$setOpSelectStatement.tree != null && ((CommonTree)u.getTree()).getType()==HiveParser.TOK_UNIONDISTINCT}?
       ^(TOK_QUERY
           ^(TOK_FROM
             ^(TOK_SUBQUERY
@@ -2468,9 +2468,9 @@ setOpSelectStatement[CommonTree t]
              ^(TOK_SELECTDI ^(TOK_SELEXPR TOK_ALLCOLREF))
           )
        )
-   -> {$setOpSelectStatement.tree != null && u.tree.getType()!=HiveParser.TOK_UNIONDISTINCT}?
+   -> {$setOpSelectStatement.tree != null && ((CommonTree)u.getTree()).getType()!=HiveParser.TOK_UNIONDISTINCT}?
       ^($u {$setOpSelectStatement.tree} $b)
-   -> {$setOpSelectStatement.tree == null && u.tree.getType()==HiveParser.TOK_UNIONDISTINCT}?
+   -> {$setOpSelectStatement.tree == null && ((CommonTree)u.getTree()).getType()==HiveParser.TOK_UNIONDISTINCT}?
       ^(TOK_QUERY
           ^(TOK_FROM
             ^(TOK_SUBQUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/45b2f951/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 13e2d17..58ddf7a 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
@@ -339,7 +339,7 @@ intervalLiteral
     :
     KW_INTERVAL StringLiteral qualifiers=intervalQualifiers ->
     {
-      adaptor.create(qualifiers.tree.token.getType(), $StringLiteral.text)
+      adaptor.create(((CommonTree)qualifiers.getTree()).getType(), $StringLiteral.text)
     }
     ;
 

http://git-wip-us.apache.org/repos/asf/hive/blob/45b2f951/ql/src/test/results/clientnegative/columnstats_partlvl_multiple_part_clause.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/columnstats_partlvl_multiple_part_clause.q.out
b/ql/src/test/results/clientnegative/columnstats_partlvl_multiple_part_clause.q.out
index feae5ef..5252e6c 100644
--- a/ql/src/test/results/clientnegative/columnstats_partlvl_multiple_part_clause.q.out
+++ b/ql/src/test/results/clientnegative/columnstats_partlvl_multiple_part_clause.q.out
@@ -66,4 +66,4 @@ POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@employee_part
 POSTHOOK: Output: default@employee_part@employeesalary=3000.0/country=UK
-FAILED: ParseException line 5:79 cannot recognize input near 'partition' '(' 'employeeSalary'
in analyze statement
+FAILED: ParseException line 5:79 mismatched input 'partition' expecting KW_CACHE near ')'
in analyze statement

http://git-wip-us.apache.org/repos/asf/hive/blob/45b2f951/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..7d3a201 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 insert clause
\ No newline at end of file


Mime
View raw message