This is an automated email from the ASF dual-hosted git repository. volodymyr pushed a commit to branch mongo in repository https://gitbox.apache.org/repos/asf/drill.git
commit d50d038c3ac000d3085f44f28abfa6afe7c31204 Author: Volodymyr Vysotskyi <[email protected]> AuthorDate: Thu Aug 5 20:17:12 2021 +0300 More cleanup --- .../apache/drill/exec/planner/PlannerPhase.java | 1 - .../logical/DrillPushProjectIntoScanRule.java | 26 +++++----------------- .../exec/planner/physical/StreamAggPrule.java | 1 - .../drill/exec/store/PluginRulesProvider.java | 8 +++++++ .../exec/store/plan/rule/PluginUnionRule.java | 8 ------- 5 files changed, 14 insertions(+), 30 deletions(-) diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PlannerPhase.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PlannerPhase.java index cb0fd3c..97b34e1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PlannerPhase.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PlannerPhase.java @@ -347,7 +347,6 @@ public enum PlannerPhase { // RuleInstance.PROJECT_SET_OP_TRANSPOSE_RULE, RuleInstance.PROJECT_WINDOW_TRANSPOSE_RULE, DrillPushProjectIntoScanRule.INSTANCE, - DrillPushProjectIntoScanRule.LOGICAL_INSTANCE, DrillPushProjectIntoScanRule.DRILL_LOGICAL_INSTANCE, /* diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushProjectIntoScanRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushProjectIntoScanRule.java index d54bb42..91875bb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushProjectIntoScanRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushProjectIntoScanRule.java @@ -56,16 +56,11 @@ public class DrillPushProjectIntoScanRule extends RelOptRule { } }; - public static final RelOptRule LOGICAL_INSTANCE = + public static final RelOptRule DRILL_LOGICAL_INSTANCE = new DrillPushProjectIntoScanRule(LogicalProject.class, DrillScanRel.class, "DrillPushProjectIntoScanRule:logical"); - public static final RelOptRule DRILL_LOGICAL_INSTANCE = - new DrillPushProjectIntoScanRule(DrillProjectRel.class, - DrillScanRel.class, - "DrillPushProjectIntoScanRule:drill_logical"); - public static final RelOptRule DRILL_PHYSICAL_INSTANCE = new DrillPushProjectIntoScanRule(ProjectPrel.class, ScanPrel.class, @@ -172,20 +167,11 @@ public class DrillPushProjectIntoScanRule extends RelOptRule { * @return new scan instance */ protected TableScan createScan(TableScan scan, ProjectPushInfo projectPushInfo) { - if (scan instanceof DrillScanRel) { - return new DrillScanRel(scan.getCluster(), - scan.getTraitSet().plus(DrillRel.DRILL_LOGICAL), - scan.getTable(), - ((DrillScanRel) scan).getGroupScan().clone(projectPushInfo.getFields()), - projectPushInfo.createNewRowType(scan.getCluster().getTypeFactory()), - projectPushInfo.getFields()); - } else { - return new DrillScanRel(scan.getCluster(), - scan.getTraitSet().plus(DrillRel.DRILL_LOGICAL), - scan.getTable(), - projectPushInfo.createNewRowType(scan.getCluster().getTypeFactory()), - projectPushInfo.getFields()); - } + return new DrillScanRel(scan.getCluster(), + scan.getTraitSet().plus(DrillRel.DRILL_LOGICAL), + scan.getTable(), + projectPushInfo.createNewRowType(scan.getCluster().getTypeFactory()), + projectPushInfo.getFields()); } /** diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StreamAggPrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StreamAggPrule.java index 9fd789c..0b68014 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StreamAggPrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StreamAggPrule.java @@ -54,7 +54,6 @@ public class StreamAggPrule extends AggPruleBase { @Override public void onMatch(RelOptRuleCall call) { - final DrillAggregateRel aggregate = call.rel(0); RelNode input = aggregate.getInput(); final RelCollation collation = getCollation(aggregate); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/PluginRulesProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/PluginRulesProvider.java index ab566ba..1e64dfe 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/PluginRulesProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/PluginRulesProvider.java @@ -6,12 +6,20 @@ import java.util.List; public interface PluginRulesProvider { List<RelOptRule> sortRules(); + List<RelOptRule> limitRules(); + List<RelOptRule> filterRules(); + List<RelOptRule> projectRules(); + List<RelOptRule> aggregateRules(); + List<RelOptRule> unionRules(); + List<RelOptRule> joinRules(); + RelOptRule vertexRule(); + RelOptRule prelConverterRule(); } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/plan/rule/PluginUnionRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/plan/rule/PluginUnionRule.java index 4d058e9..cd4c20e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/plan/rule/PluginUnionRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/plan/rule/PluginUnionRule.java @@ -1,7 +1,6 @@ package org.apache.drill.exec.store.plan.rule; import org.apache.calcite.plan.Convention; -import org.apache.calcite.plan.RelOptRuleCall; import org.apache.calcite.plan.RelTrait; import org.apache.calcite.rel.InvalidRelException; import org.apache.calcite.rel.RelNode; @@ -33,11 +32,4 @@ public class PluginUnionRule extends PluginConverterRule { return null; } } - -// @Override -// public boolean matches(RelOptRuleCall call) { -// // allow converting for union all only, since Drill adds extra aggregation for union distinct, -// // so we will convert both union all and aggregation later -// return call.<Union>rel(0).all && super.matches(call); -// } }
