This is an automated email from the ASF dual-hosted git repository. liyang pushed a commit to branch sync in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 246448b9af55e76cf8fc0849f0b37e778d149956 Author: Li Yang <[email protected]> AuthorDate: Sat Jun 30 19:07:48 2018 +0800 minor, fix compile --- .../kylin/query/optrule/AggregateMultipleExpandRule.java | 16 +++++++++------- .../org/apache/kylin/query/relnode/OLAPFilterRel.java | 2 ++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/query/src/main/java/org/apache/kylin/query/optrule/AggregateMultipleExpandRule.java b/query/src/main/java/org/apache/kylin/query/optrule/AggregateMultipleExpandRule.java index cdd6004..39c90e8 100644 --- a/query/src/main/java/org/apache/kylin/query/optrule/AggregateMultipleExpandRule.java +++ b/query/src/main/java/org/apache/kylin/query/optrule/AggregateMultipleExpandRule.java @@ -18,8 +18,12 @@ package org.apache.kylin.query.optrule; -import com.google.common.base.Predicate; -import com.google.common.collect.ImmutableList; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import javax.annotation.Nullable; + import org.apache.calcite.plan.RelOptRule; import org.apache.calcite.plan.RelOptRuleCall; import org.apache.calcite.plan.RelOptRuleOperand; @@ -33,13 +37,11 @@ import org.apache.calcite.rex.RexNode; import org.apache.calcite.tools.RelBuilder; import org.apache.calcite.util.ImmutableBitSet; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; +import com.google.common.base.Predicate; +import com.google.common.collect.ImmutableList; /** - * Supoort grouping query. Expand the non-simple aggregate to more than one simple aggregates. + * Support grouping query. Expand the non-simple aggregate to more than one simple aggregates. * Add project on expanded simple aggregate to add indicators of origin aggregate. * All projects on aggregate added into one union, which replace the origin aggregate. * The new aggregates will be transformed by {@link org.apache.kylin.query.optrule.AggregateProjectReduceRule}, to reduce rolled up dimensions. diff --git a/query/src/main/java/org/apache/kylin/query/relnode/OLAPFilterRel.java b/query/src/main/java/org/apache/kylin/query/relnode/OLAPFilterRel.java index 14e89ea..b34b42e 100644 --- a/query/src/main/java/org/apache/kylin/query/relnode/OLAPFilterRel.java +++ b/query/src/main/java/org/apache/kylin/query/relnode/OLAPFilterRel.java @@ -39,7 +39,9 @@ import org.apache.calcite.rex.RexNode; import org.apache.calcite.rex.RexProgram; import org.apache.calcite.rex.RexProgramBuilder; import org.apache.kylin.metadata.filter.FilterOptimizeTransformer; +import org.apache.kylin.metadata.filter.LogicalTupleFilter; import org.apache.kylin.metadata.filter.TupleFilter; +import org.apache.kylin.metadata.filter.TupleFilter.FilterOperatorEnum; import org.apache.kylin.metadata.model.TblColRef; import org.apache.kylin.query.relnode.visitor.TupleFilterVisitor;
