diff --git ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/cost/HiveCostModel.java ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/cost/HiveCostModel.java index 2f349ab..95fb4d7 100644 --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/cost/HiveCostModel.java +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/cost/HiveCostModel.java @@ -85,7 +85,7 @@ public RelOptCost getJoinCost(HiveJoin join) { * Interface for join algorithm. */ public interface JoinAlgorithm { - public String getName(); + public String toString(); public boolean isExecutable(HiveJoin join); public RelOptCost getCost(HiveJoin join); public ImmutableList getCollation(HiveJoin join); diff --git ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/cost/HiveDefaultCostModel.java ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/cost/HiveDefaultCostModel.java index 95f9b49..27fba04 100644 --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/cost/HiveDefaultCostModel.java +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/cost/HiveDefaultCostModel.java @@ -21,7 +21,6 @@ import org.apache.calcite.rel.RelCollation; import org.apache.calcite.rel.RelDistribution; import org.apache.calcite.rel.metadata.RelMetadataQuery; -import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveAggregate; import org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveJoin; @@ -65,11 +64,11 @@ public RelOptCost getAggregateCost(HiveAggregate aggregate) { public static class DefaultJoinAlgorithm implements JoinAlgorithm { public static final JoinAlgorithm INSTANCE = new DefaultJoinAlgorithm(); - private static final String ALGORITHM_NAME = "None"; + private static final String ALGORITHM_NAME = "none"; @Override - public String getName() { + public String toString() { return ALGORITHM_NAME; } diff --git ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/cost/HiveOnTezCostModel.java ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/cost/HiveOnTezCostModel.java index d6b0202..d8caef4 100644 --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/cost/HiveOnTezCostModel.java +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/cost/HiveOnTezCostModel.java @@ -106,7 +106,7 @@ public RelOptCost getAggregateCost(HiveAggregate aggregate) { @Override - public String getName() { + public String toString() { return ALGORITHM_NAME; } @@ -197,7 +197,7 @@ public Integer getSplitCount(HiveJoin join) { @Override - public String getName() { + public String toString() { return ALGORITHM_NAME; } @@ -321,7 +321,7 @@ public Integer getSplitCount(HiveJoin join) { @Override - public String getName() { + public String toString() { return ALGORITHM_NAME; } @@ -475,7 +475,7 @@ public Integer getSplitCount(HiveJoin join) { @Override - public String getName() { + public String toString() { return ALGORITHM_NAME; } diff --git ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveJoin.java ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveJoin.java index f28cbc4..375d47c 100644 --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveJoin.java +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveJoin.java @@ -112,10 +112,6 @@ public void setJoinAlgorithm(JoinAlgorithm joinAlgorithm) { this.joinAlgorithm = joinAlgorithm; } - public String getJoinAlgorithmName() { - return joinAlgorithm.getName(); - } - public ImmutableList getCollation() { return joinAlgorithm.getCollation(this); } @@ -212,9 +208,10 @@ public RelOptCost computeSelfCost(RelOptPlanner planner) { @Override public RelWriter explainTerms(RelWriter pw) { return super.explainTerms(pw) - .item("joinAlgorithm", joinAlgorithm == null ? - "None" : joinAlgorithm.getName()) - .item("cost", joinCost); + .item("algorithm", joinAlgorithm == null ? + "none" : joinAlgorithm) + .item("cost", joinCost == null ? + "not available" : joinCost); } /**