shaofengshi closed pull request #361: KYLIN-3704 upgrade calcite version to
1.16.0-kylin-r2 version
URL: https://github.com/apache/kylin/pull/361
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/pom.xml b/pom.xml
index 680144f3f2..7474817626 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,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 -->
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 ac6241fa28..8b7c3a31bd 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 @@ public void register(RelOptPlanner planner) {
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 @@ public void register(RelOptPlanner planner) {
// planner.addRule(ValuesReduceRule.PROJECT_INSTANCE);
removeRules(planner, kylinConfig.getCalciteRemoveRule());
- if(!kylinConfig.isEnumerableRulesEnabled()) {
+ if (!kylinConfig.isEnumerableRulesEnabled()) {
for (RelOptRule rule : CalcitePrepareImpl.ENUMERABLE_RULES) {
planner.removeRule(rule);
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
