diff options
Diffstat (limited to 'exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillFilterAggregateTransposeRule.java')
| -rw-r--r-- | exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillFilterAggregateTransposeRule.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillFilterAggregateTransposeRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillFilterAggregateTransposeRule.java index 9f2088d9b..6bb409ee7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillFilterAggregateTransposeRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillFilterAggregateTransposeRule.java @@ -24,18 +24,22 @@ import org.apache.calcite.rel.core.Aggregate; import org.apache.calcite.rel.core.Filter; import org.apache.calcite.rel.core.RelFactories; import org.apache.calcite.rel.rules.FilterAggregateTransposeRule; +import org.apache.calcite.tools.RelBuilderFactory; import org.apache.drill.exec.planner.DrillRelBuilder; public class DrillFilterAggregateTransposeRule extends FilterAggregateTransposeRule{ // Since Calcite's default FilterAggregateTransposeRule would match Filter on top of Aggregate, it potentially will match Rels with mixed CONVENTION trait. - // Here override match method, such that the rule matchs with Rel in the same CONVENTION. + // Here override match method, such that the rule matches with Rel in the same CONVENTION. - public static final FilterAggregateTransposeRule INSTANCE = new DrillFilterAggregateTransposeRule(); + public static final FilterAggregateTransposeRule INSTANCE = new DrillFilterAggregateTransposeRule( + DrillRelBuilder.proto(Contexts.of(RelFactories.DEFAULT_FILTER_FACTORY))); - private DrillFilterAggregateTransposeRule() { - super(Filter.class, DrillRelBuilder.proto(Contexts.of(RelFactories.DEFAULT_FILTER_FACTORY)), - Aggregate.class); + public static final FilterAggregateTransposeRule DRILL_LOGICAL_INSTANCE = new DrillFilterAggregateTransposeRule( + DrillRelBuilder.proto(DrillRelFactories.DRILL_LOGICAL_FILTER_FACTORY, DrillRelFactories.DRILL_LOGICAL_AGGREGATE_FACTORY)); + + private DrillFilterAggregateTransposeRule(RelBuilderFactory relBuilderFactory) { + super(Filter.class, relBuilderFactory, Aggregate.class); } @Override |