From fe3c7d44d83d941b4b0dd1a3551ab5ff6242be59 Mon Sep 17 00:00:00 2001 From: jon-wei Date: Tue, 10 Oct 2017 11:52:14 -0700 Subject: [PATCH 1/2] Remove unused limitFn in GroupByQuery --- .../src/main/java/io/druid/query/groupby/GroupByQuery.java | 1 - 1 file changed, 1 deletion(-) diff --git a/processing/src/main/java/io/druid/query/groupby/GroupByQuery.java b/processing/src/main/java/io/druid/query/groupby/GroupByQuery.java index 81776df032cb..dbf05c50b6a7 100644 --- a/processing/src/main/java/io/druid/query/groupby/GroupByQuery.java +++ b/processing/src/main/java/io/druid/query/groupby/GroupByQuery.java @@ -102,7 +102,6 @@ public static Builder builder() private final List aggregatorSpecs; private final List postAggregatorSpecs; - private final Function, Sequence> limitFn; private final boolean applyLimitPushDown; private final Function, Sequence> postProcessingFn; From 2483e53f09cf44649f0379d7378aacf2bd3af8cb Mon Sep 17 00:00:00 2001 From: jon-wei Date: Tue, 10 Oct 2017 12:11:37 -0700 Subject: [PATCH 2/2] Remove unused limitFn creation logic --- .../io/druid/query/groupby/GroupByQuery.java | 38 ------------------- 1 file changed, 38 deletions(-) diff --git a/processing/src/main/java/io/druid/query/groupby/GroupByQuery.java b/processing/src/main/java/io/druid/query/groupby/GroupByQuery.java index dbf05c50b6a7..f017cad0d2a8 100644 --- a/processing/src/main/java/io/druid/query/groupby/GroupByQuery.java +++ b/processing/src/main/java/io/druid/query/groupby/GroupByQuery.java @@ -25,7 +25,6 @@ import com.google.common.base.Function; import com.google.common.base.Functions; import com.google.common.base.Preconditions; -import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; @@ -55,7 +54,6 @@ import io.druid.query.groupby.orderby.LimitSpec; import io.druid.query.groupby.orderby.NoopLimitSpec; import io.druid.query.groupby.orderby.OrderByColumnSpec; -import io.druid.query.groupby.strategy.GroupByStrategyV2; import io.druid.query.ordering.StringComparator; import io.druid.query.ordering.StringComparators; import io.druid.query.spec.LegacySegmentSpec; @@ -200,42 +198,6 @@ private GroupByQuery( // Check if limit push down configuration is valid and check if limit push down will be applied this.applyLimitPushDown = determineApplyLimitPushDown(); - - // On an inner query, we may sometimes get a LimitSpec so that row orderings can be determined for limit push down - // However, it's not necessary to build the real limitFn from it at this stage. - Function, Sequence> postProcFn; - if (getContextBoolean(GroupByStrategyV2.CTX_KEY_OUTERMOST, true)) { - postProcFn = this.limitSpec.build(this.dimensions, this.aggregatorSpecs, this.postAggregatorSpecs); - } else { - postProcFn = NoopLimitSpec.INSTANCE.build(this.dimensions, this.aggregatorSpecs, this.postAggregatorSpecs); - } - - if (havingSpec != null) { - postProcFn = Functions.compose( - postProcFn, - new Function, Sequence>() - { - @Override - public Sequence apply(Sequence input) - { - GroupByQuery.this.havingSpec.setRowSignature(GroupByQueryHelper.rowSignatureFor(GroupByQuery.this)); - return Sequences.filter( - input, - new Predicate() - { - @Override - public boolean apply(Row input) - { - return GroupByQuery.this.havingSpec.eval(input); - } - } - ); - } - } - ); - } - - limitFn = postProcFn; } @JsonProperty