diff --git a/pom.xml b/pom.xml index 1893530..1eceed9 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ 1.6.0 5.5.0 1.9.1 - 3.4 + 3.5.2 1.5.6 0.1 1.8.0 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 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) } ;