drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject [4/5] drill git commit: DRILL-3542: Distinct aggregate expansion should convert to join. Add JoinPushExpressionRule.
Date Wed, 26 Aug 2015 22:08:20 GMT
DRILL-3542: Distinct aggregate expansion should convert to join. Add JoinPushExpressionRule.

The changes are result of CALCITE-732 and CALCITE-850.


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/7da2b629
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/7da2b629
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/7da2b629

Branch: refs/heads/master
Commit: 7da2b6295940da13ae3e819aaae3a471f5797b5e
Parents: b852759
Author: Jinfeng Ni <jni@apache.org>
Authored: Wed Aug 5 17:51:05 2015 -0700
Committer: Jinfeng Ni <jni@apache.org>
Committed: Wed Aug 26 12:08:17 2015 -0700

----------------------------------------------------------------------
 .../org/apache/drill/exec/planner/logical/DrillRuleSets.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/7da2b629/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillRuleSets.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillRuleSets.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillRuleSets.java
index 6af23c5..84fd343 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillRuleSets.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillRuleSets.java
@@ -24,6 +24,7 @@ import java.util.List;
 import org.apache.calcite.rel.rules.AggregateExpandDistinctAggregatesRule;
 import org.apache.calcite.rel.rules.AggregateRemoveRule;
 import org.apache.calcite.rel.rules.FilterSetOpTransposeRule;
+import org.apache.calcite.rel.rules.JoinPushExpressionsRule;
 import org.apache.calcite.rel.rules.JoinPushThroughJoinRule;
 import org.apache.calcite.rel.rules.ProjectRemoveRule;
 import org.apache.calcite.rel.rules.ReduceExpressionsRule;
@@ -106,6 +107,7 @@ public class DrillRuleSets {
       // Add support for WHERE style joins.
       DrillFilterJoinRules.DRILL_FILTER_ON_JOIN,
       DrillFilterJoinRules.DRILL_JOIN,
+      JoinPushExpressionsRule.INSTANCE,
       // End support for WHERE style joins.
 
       /*
@@ -119,7 +121,7 @@ public class DrillRuleSets {
       ProjectRemoveRule.INSTANCE,
       SortRemoveRule.INSTANCE,
 
-      AggregateExpandDistinctAggregatesRule.INSTANCE,
+      AggregateExpandDistinctAggregatesRule.JOIN,
       DrillReduceAggregatesRule.INSTANCE,
 
       /*


Mime
View raw message