diff --git a/jdbc-handler/pom.xml b/jdbc-handler/pom.xml index e892708a90..f90892f127 100644 --- a/jdbc-handler/pom.xml +++ b/jdbc-handler/pom.xml @@ -86,6 +86,12 @@ + + commons-dbcp + commons-dbcp + ${commons-dbcp.version} + + org.hamcrest hamcrest-all diff --git a/pom.xml b/pom.xml index 79b5ee6126..d92bd1f884 100644 --- a/pom.xml +++ b/pom.xml @@ -122,10 +122,10 @@ 0.1 0.8.0 - 1.11.0 + 1.12.0 1.8.2 0.8.0.RELEASE - 1.16.0 + 1.17.0 4.2.4 4.1.17 4.1.19 diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveAggregateJoinTransposeRule.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveAggregateJoinTransposeRule.java index a09e7f6036..f43ef01293 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveAggregateJoinTransposeRule.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveAggregateJoinTransposeRule.java @@ -52,7 +52,6 @@ import org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveAggregate; import org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveJoin; -import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; @@ -223,11 +222,7 @@ public void onMatch(RelOptRuleCall call) { // Update condition final Mapping mapping = (Mapping) Mappings.target( - new Function() { - public Integer apply(Integer a0) { - return map.get(a0); - } - }, + map::get, join.getRowType().getFieldCount(), belowOffset); final RexNode newCondition =