You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2017/02/16 03:53:09 UTC

[4/8] kylin git commit: KYLIN-1770 upgrade calcite to 1.10

KYLIN-1770 upgrade calcite to 1.10


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/344c7076
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/344c7076
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/344c7076

Branch: refs/heads/yang22-cdh5.7
Commit: 344c7076838f73bed10510cb1b61909e29e2028b
Parents: 4b413a2
Author: Hongbin Ma <ma...@apache.org>
Authored: Thu Feb 16 10:37:36 2017 +0800
Committer: Hongbin Ma <ma...@apache.org>
Committed: Thu Feb 16 10:37:36 2017 +0800

----------------------------------------------------------------------
 .../main/java/org/apache/kylin/query/relnode/OLAPTableScan.java    | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/344c7076/query/src/main/java/org/apache/kylin/query/relnode/OLAPTableScan.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/org/apache/kylin/query/relnode/OLAPTableScan.java b/query/src/main/java/org/apache/kylin/query/relnode/OLAPTableScan.java
index 14758c9..c743870 100644
--- a/query/src/main/java/org/apache/kylin/query/relnode/OLAPTableScan.java
+++ b/query/src/main/java/org/apache/kylin/query/relnode/OLAPTableScan.java
@@ -45,6 +45,7 @@ import org.apache.calcite.rel.rules.AggregateExpandDistinctAggregatesRule;
 import org.apache.calcite.rel.rules.AggregateJoinTransposeRule;
 import org.apache.calcite.rel.rules.AggregateProjectMergeRule;
 import org.apache.calcite.rel.rules.AggregateUnionTransposeRule;
+import org.apache.calcite.rel.rules.DateRangeRules;
 import org.apache.calcite.rel.rules.FilterJoinRule;
 import org.apache.calcite.rel.rules.FilterProjectTransposeRule;
 import org.apache.calcite.rel.rules.JoinCommuteRule;
@@ -172,6 +173,7 @@ public class OLAPTableScan extends TableScan implements OLAPRel, EnumerableRel {
         planner.removeRule(JoinUnionTransposeRule.LEFT_UNION);
         planner.removeRule(JoinUnionTransposeRule.RIGHT_UNION);
         planner.removeRule(AggregateUnionTransposeRule.INSTANCE);
+        planner.removeRule(DateRangeRules.FILTER_INSTANCE);
         // distinct count will be split into a separated query that is joined with the left query
         planner.removeRule(AggregateExpandDistinctAggregatesRule.INSTANCE);