commit 4a205c37f96784b05537a52606844c5abdea2edd
author Yifei.Wu <vafuler945@gmail.com> Mon Nov 26 19:11:56 2018 +0800
committer shaofengshi <shaofengshi@apache.org> Mon Nov 26 21:54:08 2018 +0800
tree 616b8e8b248360f568f6531773a74860f42341d6
parent 48a2bec01caa7b764d55bfa74b3da5a4936c598d

KYLIN-3704 upgrade calcite version to 1.16.0-kylin-r2 version

pom.xml

diff --git a/pom.xml b/pom.xml
index 481c43e..6049697 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
         <!-- <reflections.version>0.9.10</reflections.version> -->
 
         <!-- Calcite Version -->
-        <calcite.version>1.16.0-kylin-r2-SNAPSHOT</calcite.version>
+        <calcite.version>1.16.0-kylin-r2</calcite.version>
         <avatica.version>1.10.0</avatica.version>
 
         <!-- Hadoop Common deps, keep compatible with hadoop2.version -->

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 ac6241f..8b7c3a3 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
@@ -73,7 +73,6 @@
 import org.apache.kylin.metadata.model.TableRef;
 import org.apache.kylin.metadata.model.TblColRef;
 import org.apache.kylin.query.enumerator.DictionaryEnumerator;
-import org.apache.kylin.query.optrule.AggregateMultipleExpandRule;
 import org.apache.kylin.query.optrule.AggregateProjectReduceRule;
 import org.apache.kylin.query.optrule.OLAPAggregateRule;
 import org.apache.kylin.query.optrule.OLAPFilterRule;
@@ -163,13 +162,11 @@
         planner.addRule(OLAPUnionRule.INSTANCE);
         planner.addRule(OLAPWindowRule.INSTANCE);
         planner.addRule(OLAPValuesRule.INSTANCE);
-        
-        // Support translate the grouping aggregate into union of simple aggregates
-        planner.addRule(AggregateMultipleExpandRule.INSTANCE);
+
         planner.addRule(AggregateProjectReduceRule.INSTANCE);
 
         // CalcitePrepareImpl.CONSTANT_REDUCTION_RULES
-        if(kylinConfig.isReduceExpressionsRulesEnabled()) {
+        if (kylinConfig.isReduceExpressionsRulesEnabled()) {
             planner.addRule(ReduceExpressionsRule.PROJECT_INSTANCE);
             planner.addRule(ReduceExpressionsRule.FILTER_INSTANCE);
             planner.addRule(ReduceExpressionsRule.CALC_INSTANCE);
@@ -181,7 +178,7 @@
         //        planner.addRule(ValuesReduceRule.PROJECT_INSTANCE);
 
         removeRules(planner, kylinConfig.getCalciteRemoveRule());
-        if(!kylinConfig.isEnumerableRulesEnabled()) {
+        if (!kylinConfig.isEnumerableRulesEnabled()) {
             for (RelOptRule rule : CalcitePrepareImpl.ENUMERABLE_RULES) {
                 planner.removeRule(rule);
             }