This is an automated email from the ASF dual-hosted git repository.
krisztiankasa pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 2665b135d28 HIVE-26747: Remove implementor from HiveRelNode (Krisztian
Kasa, reviewed by Stamatis Zampetakis)
2665b135d28 is described below
commit 2665b135d284c3fe56c49b4b9b480f14d65cc74d
Author: Krisztian Kasa <[email protected]>
AuthorDate: Thu Nov 17 06:32:47 2022 +0100
HIVE-26747: Remove implementor from HiveRelNode (Krisztian Kasa, reviewed
by Stamatis Zampetakis)
---
.../hive/ql/optimizer/calcite/reloperators/HiveAggregate.java | 4 ----
.../hive/ql/optimizer/calcite/reloperators/HiveAntiJoin.java | 5 -----
.../hive/ql/optimizer/calcite/reloperators/HiveExcept.java | 5 -----
.../hive/ql/optimizer/calcite/reloperators/HiveFilter.java | 4 ----
.../hive/ql/optimizer/calcite/reloperators/HiveIntersect.java | 4 ----
.../hive/ql/optimizer/calcite/reloperators/HiveJoin.java | 4 ----
.../hive/ql/optimizer/calcite/reloperators/HiveProject.java | 4 ----
.../hive/ql/optimizer/calcite/reloperators/HiveRelNode.java | 11 +----------
.../hive/ql/optimizer/calcite/reloperators/HiveSemiJoin.java | 5 -----
.../ql/optimizer/calcite/reloperators/HiveSortExchange.java | 4 ----
.../hive/ql/optimizer/calcite/reloperators/HiveSortLimit.java | 4 ----
.../optimizer/calcite/reloperators/HiveTableFunctionScan.java | 5 -----
.../hive/ql/optimizer/calcite/reloperators/HiveTableScan.java | 5 -----
.../hive/ql/optimizer/calcite/reloperators/HiveUnion.java | 3 ---
.../calcite/reloperators/jdbc/HiveJdbcConverter.java | 5 -----
.../calcite/rules/views/HiveMaterializedViewBoxing.java | 4 ----
16 files changed, 1 insertion(+), 75 deletions(-)
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveAggregate.java
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveAggregate.java
index 5e5e928c91b..8775361520a 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveAggregate.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveAggregate.java
@@ -58,10 +58,6 @@ public class HiveAggregate extends Aggregate implements
HiveRelNode {
return new HiveAggregate(getCluster(), traitSet, input, groupSet,
groupSets, aggCalls);
}
- @Override
- public void implement(Implementor implementor) {
- }
-
// getRows will call estimateRowCount
@Override
public double estimateRowCount(RelMetadataQuery mq) {
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveAntiJoin.java
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveAntiJoin.java
index 176cb704358..2c53979115b 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveAntiJoin.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveAntiJoin.java
@@ -89,9 +89,4 @@ public class HiveAntiJoin extends Join implements HiveRelNode
{
throw new AssertionError(e);
}
}
-
- @Override
- public void implement(Implementor implementor) {
- }
-
}
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveExcept.java
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveExcept.java
index 5d2c203b65a..91cb275a3c7 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveExcept.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveExcept.java
@@ -24,7 +24,6 @@ import org.apache.calcite.plan.RelTraitSet;
import org.apache.calcite.rel.RelNode;
import org.apache.calcite.rel.core.Minus;
import org.apache.calcite.rel.core.SetOp;
-import
org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveRelNode.Implementor;
public class HiveExcept extends Minus {
@@ -36,8 +35,4 @@ public class HiveExcept extends Minus {
public SetOp copy(RelTraitSet traitSet, List<RelNode> inputs, boolean all) {
return new HiveExcept(this.getCluster(), traitSet, inputs, all);
}
-
- public void implement(Implementor implementor) {
- }
-
}
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveFilter.java
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveFilter.java
index 23136b0aec0..7f11a2ec341 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveFilter.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveFilter.java
@@ -76,10 +76,6 @@ public class HiveFilter extends Filter implements
HiveRelNode {
return new HiveFilter(getCluster(), traitSet, input, condition);
}
- @Override
- public void implement(Implementor implementor) {
- }
-
private static void findCorrelatedVar(RexNode node, Set<CorrelationId>
allVars) {
if(node instanceof RexCall) {
RexCall nd = (RexCall)node;
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveIntersect.java
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveIntersect.java
index 28c67167c77..4dd8a6e0ea8 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveIntersect.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveIntersect.java
@@ -26,7 +26,6 @@ import org.apache.calcite.rel.RelShuttle;
import org.apache.calcite.rel.core.Intersect;
import org.apache.calcite.rel.core.SetOp;
import org.apache.hadoop.hive.ql.optimizer.calcite.HiveRelShuttle;
-import
org.apache.hadoop.hive.ql.optimizer.calcite.reloperators.HiveRelNode.Implementor;
public class HiveIntersect extends Intersect {
@@ -39,9 +38,6 @@ public class HiveIntersect extends Intersect {
return new HiveIntersect(this.getCluster(), traitSet, inputs, all);
}
- public void implement(Implementor implementor) {
- }
-
//required for HiveRelDecorrelator
public RelNode accept(RelShuttle shuttle) {
if (shuttle instanceof HiveRelShuttle) {
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveJoin.java
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveJoin.java
index 7ad458e758d..6e13854d2b2 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveJoin.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveJoin.java
@@ -93,10 +93,6 @@ public class HiveJoin extends Join implements HiveRelNode {
this.joinAlgorithm = joinAlgo;
}
- @Override
- public void implement(Implementor implementor) {
- }
-
@Override
public final HiveJoin copy(RelTraitSet traitSet, RexNode conditionExpr,
RelNode left,
RelNode right, JoinRelType joinType, boolean semiJoinDone) {
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveProject.java
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveProject.java
index 754571bfe3f..b0abeaac120 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveProject.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveProject.java
@@ -111,10 +111,6 @@ public class HiveProject extends Project implements
HiveRelNode {
return hp;
}
- @Override
- public void implement(Implementor implementor) {
- }
-
// TODO: this should come through RelBuilder to the constructor as opposed to
// set method. This requires calcite change
public void setSynthetic() {
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveRelNode.java
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveRelNode.java
index 4955756635e..b7c0b30c462 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveRelNode.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveRelNode.java
@@ -21,16 +21,7 @@ import org.apache.calcite.plan.Convention;
import org.apache.calcite.rel.RelNode;
public interface HiveRelNode extends RelNode {
- void implement(Implementor implementor);
/** Calling convention for relational operations that occur in Hive. */
- final Convention CONVENTION = new Convention.Impl("HIVE", HiveRelNode.class);
-
- class Implementor {
-
- public void visitChild(int ordinal, RelNode input) {
- assert ordinal == 0;
- ((HiveRelNode) input).implement(this);
- }
- }
+ Convention CONVENTION = new Convention.Impl("HIVE", HiveRelNode.class);
}
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveSemiJoin.java
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveSemiJoin.java
index c7b0e810a3e..a25e247eb85 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveSemiJoin.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveSemiJoin.java
@@ -93,9 +93,4 @@ public class HiveSemiJoin extends Join implements HiveRelNode
{
throw new AssertionError(e);
}
}
-
- @Override
- public void implement(Implementor implementor) {
- }
-
}
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveSortExchange.java
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveSortExchange.java
index ce794cb5b07..17fee95f43c 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveSortExchange.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveSortExchange.java
@@ -105,8 +105,4 @@ public final class HiveSortExchange extends SortExchange
implements HiveRelNode
public void setKeyExpressions(ExprNodeDesc[] keyExpressions) {
this.keyExpressions = keyExpressions;
}
-
- @Override
- public void implement(Implementor implementor) {
- }
}
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveSortLimit.java
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveSortLimit.java
index 860d04a1947..67484f44375 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveSortLimit.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveSortLimit.java
@@ -97,10 +97,6 @@ public class HiveSortLimit extends Sort implements
HiveRelNode {
return this.mapOfInputRefToRexCall;
}
- @Override
- public void implement(Implementor implementor) {
- }
-
public boolean isRuleCreated() {
return ruleCreated;
}
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveTableFunctionScan.java
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveTableFunctionScan.java
index ffa2a1f2625..8ec35d21a19 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveTableFunctionScan.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveTableFunctionScan.java
@@ -67,9 +67,4 @@ public class HiveTableFunctionScan extends TableFunctionScan
implements HiveRelN
elementType, rowType, columnMappings);
}
- @Override
- public void implement(Implementor implementor) {
-
- }
-
}
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveTableScan.java
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveTableScan.java
index dc72ebb8e2f..dfeab795f26 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveTableScan.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveTableScan.java
@@ -215,11 +215,6 @@ public class HiveTableScan extends TableScan implements
HiveRelNode {
}
- @Override
- public void implement(Implementor implementor) {
-
- }
-
@Override
public double estimateRowCount(RelMetadataQuery mq) {
return ((RelOptHiveTable) table).getRowCount();
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveUnion.java
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveUnion.java
index 8356a33134a..0e272f97335 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveUnion.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/HiveUnion.java
@@ -38,9 +38,6 @@ public class HiveUnion extends Union implements HiveRelNode {
return new HiveUnion(this.getCluster(), traitSet, inputs);
}
- @Override
- public void implement(Implementor implementor) {
- }
//required for HiveRelDecorrelator
public RelNode accept(RelShuttle shuttle) {
if (shuttle instanceof HiveRelShuttle) {
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/jdbc/HiveJdbcConverter.java
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/jdbc/HiveJdbcConverter.java
index b50f23e9a0a..7bb7539506e 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/jdbc/HiveJdbcConverter.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/reloperators/jdbc/HiveJdbcConverter.java
@@ -79,11 +79,6 @@ public class HiveJdbcConverter extends ConverterImpl
implements HiveRelNode {
return user;
}
- @Override
- public void implement(Implementor implementor) {
-
- }
-
@Override
public RelNode copy(
RelTraitSet traitSet,
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/HiveMaterializedViewBoxing.java
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/HiveMaterializedViewBoxing.java
index 2b5809b4c18..d57cddcaa47 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/HiveMaterializedViewBoxing.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/HiveMaterializedViewBoxing.java
@@ -186,10 +186,6 @@ public class HiveMaterializedViewBoxing {
return planner.getCostFactory().makeInfiniteCost();
}
- @Override
- public void implement(Implementor implementor) {
- }
-
private static final class BoxRelOptTable extends RelOptAbstractTable {
private BoxRelOptTable(RelOptSchema schema, String name, RelDataType
rowType) {
super(schema, name, rowType);
