diff --git common/src/java/org/apache/hadoop/hive/ql/log/PerfLogger.java common/src/java/org/apache/hadoop/hive/ql/log/PerfLogger.java index 2707987f0b..f1181fd268 100644 --- common/src/java/org/apache/hadoop/hive/ql/log/PerfLogger.java +++ common/src/java/org/apache/hadoop/hive/ql/log/PerfLogger.java @@ -218,11 +218,11 @@ public Long getDuration(String method) { } - public ImmutableMap getStartTimes() { + public Map getStartTimes() { return ImmutableMap.copyOf(startTimes); } - public ImmutableMap getEndTimes() { + public Map getEndTimes() { return ImmutableMap.copyOf(endTimes); } diff --git ql/pom.xml ql/pom.xml index e5eed46947..7aa550e2de 100644 --- ql/pom.xml +++ ql/pom.xml @@ -999,7 +999,13 @@ io.dropwizard.metrics:metrics-jvm io.dropwizard.metrics:metrics-json com.zaxxer:HikariCP + org.apache.calcite:calcite-core + org.apache.calcite:calcite-druid + org.apache.calcite.avatica:avatica + + org.apache.calcite.avatica:avatica-core + @@ -1023,8 +1029,12 @@ org.apache.hive.com.zaxxer.hikari - com.google.guava - org.apache.hive.com.google.guava + com.google.common + org.apache.hive.com.google.common + + + com.google.thirdparty.publicsuffix + org.apache.hive.com.google.thirdparty.publicsuffix diff --git ql/src/java/org/apache/hadoop/hive/ql/QueryDisplay.java ql/src/java/org/apache/hadoop/hive/ql/QueryDisplay.java index ddeb954d9b..a2c14be8e9 100644 --- ql/src/java/org/apache/hadoop/hive/ql/QueryDisplay.java +++ ql/src/java/org/apache/hadoop/hive/ql/QueryDisplay.java @@ -17,7 +17,6 @@ */ package org.apache.hadoop.hive.ql; -import com.google.common.collect.ImmutableMap; import org.apache.hadoop.hive.common.LogUtils; import org.apache.hadoop.hive.ql.exec.Task; import org.apache.hadoop.hive.ql.exec.TaskResult; @@ -303,7 +302,7 @@ public synchronized void setExplainPlan(String explainPlan) { * @param phase phase of query * @param hmsTimings map of HMS Client method-calls and duration in miliseconds, during given phase. */ - public synchronized void setHmsTimings(Phase phase, ImmutableMap hmsTimings) { + public synchronized void setHmsTimings(Phase phase, Map hmsTimings) { hmsTimingMap.put(phase, hmsTimings); } @@ -319,7 +318,7 @@ public synchronized void setHmsTimings(Phase phase, ImmutableMap h * @param phase phase of query * @param perfLogStarts map of PerfLogger call-trace name and start time in miliseconds, during given phase. */ - public synchronized void setPerfLogStarts(Phase phase, ImmutableMap perfLogStarts) { + public synchronized void setPerfLogStarts(Phase phase, Map perfLogStarts) { perfLogStartMap.put(phase, perfLogStarts); } @@ -335,7 +334,7 @@ public synchronized void setPerfLogStarts(Phase phase, ImmutableMap perfLogEnds) { + public synchronized void setPerfLogEnds(Phase phase, Map perfLogEnds) { perfLogEndMap.put(phase, perfLogEnds); } diff --git ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveAggregate.java ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveAggregate.java index 6b841a5a29..d15112dc1a 100644 --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveAggregate.java +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveAggregate.java @@ -77,12 +77,12 @@ public boolean isBucketedInput() { @Override protected RelDataType deriveRowType() { return deriveRowType(getCluster().getTypeFactory(), getInput().getRowType(), - indicator, groupSet, groupSets, aggCalls); + indicator, groupSet, aggCalls); } public static RelDataType deriveRowType(RelDataTypeFactory typeFactory, final RelDataType inputRowType, boolean indicator, - ImmutableBitSet groupSet, List groupSets, + ImmutableBitSet groupSet, final List aggCalls) { final List groupList = groupSet.asList(); assert groupList.size() == groupSet.cardinality(); diff --git ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveRelDecorrelator.java ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveRelDecorrelator.java index 068b6875b3..3a1779e434 100644 --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveRelDecorrelator.java +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveRelDecorrelator.java @@ -2428,7 +2428,7 @@ public void onMatch(RelOptRuleCall call) { operand(LogicalCorrelate.class, operand(RelNode.class, any()), operand(Project.class, - operand(Aggregate.class, null, Aggregate.IS_SIMPLE, + operandJ(Aggregate.class, null, Aggregate::isSimple, operand(Project.class, operand(RelNode.class, any())))))); } diff --git ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveSubQueryRemoveRule.java ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveSubQueryRemoveRule.java index 2a2c384d0c..6017aa4a89 100644 --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveSubQueryRemoveRule.java +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/HiveSubQueryRemoveRule.java @@ -46,13 +46,13 @@ import org.apache.calcite.util.Pair; import org.apache.calcite.util.Util; -import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.Set; +import java.util.function.Predicate; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.ql.optimizer.calcite.CalciteSubqueryRuntimeException; @@ -79,10 +79,10 @@ */ public class HiveSubQueryRemoveRule extends RelOptRule { - private HiveConf conf; + private final HiveConf conf; public HiveSubQueryRemoveRule(HiveConf conf) { - super(operand(RelNode.class, null, HiveSubQueryFinder.RELNODE_PREDICATE, any()), + super(operandJ(RelNode.class, null, HiveSubQueryFinder.RELNODE_PREDICATE, any()), HiveRelFactories.HIVE_BUILDER, "SubQueryRemoveRule:Filter"); this.conf = conf; } @@ -597,7 +597,7 @@ private RexInputRef field(HiveSubQRemoveRelBuilder builder, int inputCount, int * Returns whether a {@link Project} contains a sub-query. */ public static final Predicate RELNODE_PREDICATE = new Predicate() { - @Override public boolean apply(RelNode relNode) { + @Override public boolean test(RelNode relNode) { if (relNode instanceof Project) { Project project = (Project) relNode; for (RexNode node : project.getProjects()) {