You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by GitBox <gi...@apache.org> on 2018/10/26 18:31:12 UTC
[GitHub] fjy closed pull request #6504: Remove unused code
fjy closed pull request #6504: Remove unused code
URL: https://github.com/apache/incubator-druid/pull/6504
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/processing/src/test/java/org/apache/druid/query/groupby/NestedQueryPushDownTest.java b/processing/src/test/java/org/apache/druid/query/groupby/NestedQueryPushDownTest.java
index 7f21731901f..659112bde58 100644
--- a/processing/src/test/java/org/apache/druid/query/groupby/NestedQueryPushDownTest.java
+++ b/processing/src/test/java/org/apache/druid/query/groupby/NestedQueryPushDownTest.java
@@ -394,15 +394,11 @@ public void testSimpleDoubleAggregation()
.builder()
.setDataSource("blah")
.setQuerySegmentSpec(intervalSpec)
- .setDimensions(Lists.newArrayList(
- new DefaultDimensionSpec("dimA", "dimA"),
- new DefaultDimensionSpec("dimB", "dimB")
- ))
+ .setDimensions(new DefaultDimensionSpec("dimA", "dimA"), new DefaultDimensionSpec("dimB", "dimB"))
.setAggregatorSpecs(
- Arrays.asList(
- new LongSumAggregatorFactory("metASum", "metA"),
- new LongSumAggregatorFactory("metBSum", "metB")
- ))
+ new LongSumAggregatorFactory("metASum", "metA"),
+ new LongSumAggregatorFactory("metBSum", "metB")
+ )
.setGranularity(Granularities.ALL)
.build();
@@ -410,12 +406,8 @@ public void testSimpleDoubleAggregation()
.builder()
.setDataSource(query)
.setQuerySegmentSpec(intervalSpec)
- .setDimensions(Collections.singletonList(
- new DefaultDimensionSpec("dimB", "dimB")
- ))
- .setAggregatorSpecs(
- Collections.singletonList(new LongSumAggregatorFactory("totalSum", "metASum"))
- )
+ .setDimensions(new DefaultDimensionSpec("dimB", "dimB"))
+ .setAggregatorSpecs(new LongSumAggregatorFactory("totalSum", "metASum"))
.setContext(
ImmutableMap.of(
GroupByQueryConfig.CTX_KEY_FORCE_PUSH_DOWN_NESTED_QUERY, true
@@ -455,15 +447,11 @@ public void testNestedQueryWithRenamedDimensions()
.builder()
.setDataSource("blah")
.setQuerySegmentSpec(intervalSpec)
- .setDimensions(Lists.newArrayList(
- new DefaultDimensionSpec("dimA", "dimA"),
- new DefaultDimensionSpec("dimB", "newDimB")
- ))
+ .setDimensions(new DefaultDimensionSpec("dimA", "dimA"), new DefaultDimensionSpec("dimB", "newDimB"))
.setAggregatorSpecs(
- Arrays.asList(
- new LongSumAggregatorFactory("metASum", "metA"),
- new LongSumAggregatorFactory("metBSum", "metB")
- ))
+ new LongSumAggregatorFactory("metASum", "metA"),
+ new LongSumAggregatorFactory("metBSum", "metB")
+ )
.setGranularity(Granularities.ALL)
.build();
@@ -471,12 +459,8 @@ public void testNestedQueryWithRenamedDimensions()
.builder()
.setDataSource(query)
.setQuerySegmentSpec(intervalSpec)
- .setDimensions(Collections.singletonList(
- new DefaultDimensionSpec("newDimB", "renamedDimB")
- ))
- .setAggregatorSpecs(
- Collections.singletonList(new LongMaxAggregatorFactory("maxBSum", "metBSum"))
- )
+ .setDimensions(new DefaultDimensionSpec("newDimB", "renamedDimB"))
+ .setAggregatorSpecs(new LongMaxAggregatorFactory("maxBSum", "metBSum"))
.setContext(
ImmutableMap.of(
GroupByQueryConfig.CTX_KEY_FORCE_PUSH_DOWN_NESTED_QUERY, true
@@ -512,15 +496,11 @@ public void testDimensionFilterOnOuterAndInnerQueries()
GroupByQuery query = GroupByQuery
.builder()
.setDataSource("blah")
- .setDimensions(Lists.newArrayList(
- new DefaultDimensionSpec("dimA", "dimA"),
- new DefaultDimensionSpec("dimB", "dimB")
- ))
+ .setDimensions(new DefaultDimensionSpec("dimA", "dimA"), new DefaultDimensionSpec("dimB", "dimB"))
.setAggregatorSpecs(
- Arrays.asList(
- new LongSumAggregatorFactory("metASum", "metA"),
- new LongSumAggregatorFactory("metBSum", "metB")
- ))
+ new LongSumAggregatorFactory("metASum", "metA"),
+ new LongSumAggregatorFactory("metBSum", "metB")
+ )
.setGranularity(Granularities.ALL)
.setQuerySegmentSpec(intervalSpec)
.setDimFilter(new JavaScriptDimFilter(
@@ -534,12 +514,8 @@ public void testDimensionFilterOnOuterAndInnerQueries()
GroupByQuery nestedQuery = GroupByQuery
.builder()
.setDataSource(query)
- .setDimensions(Collections.singletonList(
- new DefaultDimensionSpec("dimA", "newDimA")
- ))
- .setAggregatorSpecs(
- Collections.singletonList(new LongSumAggregatorFactory("finalSum", "metASum"))
- )
+ .setDimensions(new DefaultDimensionSpec("dimA", "newDimA"))
+ .setAggregatorSpecs(new LongSumAggregatorFactory("finalSum", "metASum"))
.setContext(
ImmutableMap.of(
GroupByQueryConfig.CTX_KEY_FORCE_PUSH_DOWN_NESTED_QUERY, true
@@ -570,15 +546,11 @@ public void testDimensionFilterOnOuterQuery()
GroupByQuery query = GroupByQuery
.builder()
.setDataSource("blah")
- .setDimensions(Lists.newArrayList(
- new DefaultDimensionSpec("dimA", "dimA"),
- new DefaultDimensionSpec("dimB", "dimB")
- ))
+ .setDimensions(new DefaultDimensionSpec("dimA", "dimA"), new DefaultDimensionSpec("dimB", "dimB"))
.setAggregatorSpecs(
- Arrays.asList(
- new LongSumAggregatorFactory("metASum", "metA"),
- new LongSumAggregatorFactory("metBSum", "metB")
- ))
+ new LongSumAggregatorFactory("metASum", "metA"),
+ new LongSumAggregatorFactory("metBSum", "metB")
+ )
.setGranularity(Granularities.ALL)
.setQuerySegmentSpec(intervalSpec)
.build();
@@ -586,12 +558,8 @@ public void testDimensionFilterOnOuterQuery()
GroupByQuery nestedQuery = GroupByQuery
.builder()
.setDataSource(query)
- .setDimensions(Collections.singletonList(
- new DefaultDimensionSpec("dimA", "newDimA")
- ))
- .setAggregatorSpecs(
- Collections.singletonList(new LongSumAggregatorFactory("finalSum", "metASum"))
- )
+ .setDimensions(new DefaultDimensionSpec("dimA", "newDimA"))
+ .setAggregatorSpecs(new LongSumAggregatorFactory("finalSum", "metASum"))
.setContext(
ImmutableMap.of(
GroupByQueryConfig.CTX_KEY_FORCE_PUSH_DOWN_NESTED_QUERY, true
@@ -628,15 +596,11 @@ public void testDimensionFilterOnInnerQuery()
GroupByQuery query = GroupByQuery
.builder()
.setDataSource("blah")
- .setDimensions(Lists.newArrayList(
- new DefaultDimensionSpec("dimA", "dimA"),
- new DefaultDimensionSpec("dimB", "dimB")
- ))
+ .setDimensions(new DefaultDimensionSpec("dimA", "dimA"), new DefaultDimensionSpec("dimB", "dimB"))
.setAggregatorSpecs(
- Arrays.asList(
- new LongSumAggregatorFactory("metASum", "metA"),
- new LongSumAggregatorFactory("metBSum", "metB")
- ))
+ new LongSumAggregatorFactory("metASum", "metA"),
+ new LongSumAggregatorFactory("metBSum", "metB")
+ )
.setGranularity(Granularities.ALL)
.setQuerySegmentSpec(intervalSpec)
.setDimFilter(new JavaScriptDimFilter(
@@ -650,12 +614,8 @@ public void testDimensionFilterOnInnerQuery()
GroupByQuery nestedQuery = GroupByQuery
.builder()
.setDataSource(query)
- .setDimensions(Collections.singletonList(
- new DefaultDimensionSpec("dimA", "newDimA")
- ))
- .setAggregatorSpecs(
- Collections.singletonList(new LongSumAggregatorFactory("finalSum", "metASum"))
- )
+ .setDimensions(new DefaultDimensionSpec("dimA", "newDimA"))
+ .setAggregatorSpecs(new LongSumAggregatorFactory("finalSum", "metASum"))
.setContext(
ImmutableMap.of(
GroupByQueryConfig.CTX_KEY_FORCE_PUSH_DOWN_NESTED_QUERY, true
@@ -686,15 +646,11 @@ public void testSubqueryWithExtractionFnInOuterQuery()
GroupByQuery query = GroupByQuery
.builder()
.setDataSource("blah")
- .setDimensions(Lists.newArrayList(
- new DefaultDimensionSpec("dimA", "dimA"),
- new DefaultDimensionSpec("dimB", "dimB")
- ))
+ .setDimensions(new DefaultDimensionSpec("dimA", "dimA"), new DefaultDimensionSpec("dimB", "dimB"))
.setAggregatorSpecs(
- Arrays.asList(
- new LongSumAggregatorFactory("metASum", "metA"),
- new LongSumAggregatorFactory("metBSum", "metB")
- ))
+ new LongSumAggregatorFactory("metASum", "metA"),
+ new LongSumAggregatorFactory("metBSum", "metB")
+ )
.setGranularity(Granularities.ALL)
.setQuerySegmentSpec(intervalSpec)
.build();
@@ -702,20 +658,10 @@ public void testSubqueryWithExtractionFnInOuterQuery()
GroupByQuery nestedQuery = GroupByQuery
.builder()
.setDataSource(query)
- .setDimensions(Collections.singletonList(
- new DefaultDimensionSpec("dimA", "newDimA")
- ))
- .setDimensions(Collections.singletonList(
- new ExtractionDimensionSpec(
- "dimA",
- "extractedDimA",
- new RegexDimExtractionFn("^(p)", true, "replacement")
- )
- )
- )
- .setAggregatorSpecs(
- Collections.singletonList(new LongSumAggregatorFactory("finalSum", "metASum"))
- )
+ .setDimensions(new ExtractionDimensionSpec("dimA", "extractedDimA", new RegexDimExtractionFn("^(p)", true,
+ "replacement"
+ )))
+ .setAggregatorSpecs(new LongSumAggregatorFactory("finalSum", "metASum"))
.setContext(
ImmutableMap.of(
GroupByQueryConfig.CTX_KEY_FORCE_PUSH_DOWN_NESTED_QUERY, true
@@ -752,15 +698,11 @@ public void testHavingClauseInNestedPushDownQuery()
GroupByQuery innerQuery = GroupByQuery
.builder()
.setDataSource("blah")
- .setDimensions(Lists.newArrayList(
- new DefaultDimensionSpec("dimA", "dimA"),
- new DefaultDimensionSpec("dimB", "dimB")
- ))
+ .setDimensions(new DefaultDimensionSpec("dimA", "dimA"), new DefaultDimensionSpec("dimB", "dimB"))
.setAggregatorSpecs(
- Arrays.asList(
- new LongSumAggregatorFactory("metASum", "metA"),
- new LongSumAggregatorFactory("metBSum", "metB")
- ))
+ new LongSumAggregatorFactory("metASum", "metA"),
+ new LongSumAggregatorFactory("metBSum", "metB")
+ )
.setGranularity(Granularities.ALL)
.setQuerySegmentSpec(intervalSpec)
.build();
@@ -768,12 +710,8 @@ public void testHavingClauseInNestedPushDownQuery()
GroupByQuery nestedQuery = GroupByQuery
.builder()
.setDataSource(innerQuery)
- .setDimensions(Collections.singletonList(
- new DefaultDimensionSpec("dimB", "dimB")
- ))
- .setAggregatorSpecs(
- Collections.singletonList(new LongSumAggregatorFactory("finalSum", "metBSum"))
- )
+ .setDimensions(new DefaultDimensionSpec("dimB", "dimB"))
+ .setAggregatorSpecs(new LongSumAggregatorFactory("finalSum", "metBSum"))
.setHavingSpec(new GreaterThanHavingSpec("finalSum", 70L))
.setContext(
ImmutableMap.of(
@@ -869,15 +807,11 @@ public void testQueryRewriteForPushDown()
.builder()
.setDataSource("blah")
.setQuerySegmentSpec(intervalSpec)
- .setDimensions(Lists.newArrayList(
- new DefaultDimensionSpec("dimA", "dimA"),
- new DefaultDimensionSpec("dimB", "dimB")
- ))
+ .setDimensions(new DefaultDimensionSpec("dimA", "dimA"), new DefaultDimensionSpec("dimB", "dimB"))
.setAggregatorSpecs(
- Arrays.asList(
- new LongSumAggregatorFactory("metASum", "metA"),
- new LongSumAggregatorFactory("metBSum", "metB")
- ))
+ new LongSumAggregatorFactory("metASum", "metA"),
+ new LongSumAggregatorFactory("metBSum", "metB")
+ )
.setGranularity(Granularities.ALL)
.build();
@@ -885,12 +819,8 @@ public void testQueryRewriteForPushDown()
.builder()
.setDataSource(query)
.setQuerySegmentSpec(intervalSpec)
- .setDimensions(Collections.singletonList(
- new DefaultDimensionSpec("dimB", outputNameB)
- ))
- .setAggregatorSpecs(
- Collections.singletonList(new LongSumAggregatorFactory(outputNameAgg, "metASum"))
- )
+ .setDimensions(new DefaultDimensionSpec("dimB", outputNameB))
+ .setAggregatorSpecs(new LongSumAggregatorFactory(outputNameAgg, "metASum"))
.setContext(
ImmutableMap.of(
GroupByQueryConfig.CTX_KEY_FORCE_PUSH_DOWN_NESTED_QUERY, true
@@ -904,32 +834,6 @@ public void testQueryRewriteForPushDown()
Assert.assertEquals(outputNameAgg, rewrittenQuery.getAggregatorSpecs().get(0).getName());
}
- private List<QueryRunner<Row>> getRunner1()
- {
- List<QueryRunner<Row>> runners = Lists.newArrayList();
- QueryableIndex index = groupByIndices.get(0);
- QueryRunner<Row> runner = makeQueryRunner(
- groupByFactory,
- index.toString(),
- new QueryableIndexSegment(index.toString(), index)
- );
- runners.add(groupByFactory.getToolchest().preMergeQueryDecoration(runner));
- return runners;
- }
-
- private List<QueryRunner<Row>> getRunner2()
- {
- List<QueryRunner<Row>> runners = Lists.newArrayList();
- QueryableIndex index2 = groupByIndices.get(1);
- QueryRunner<Row> tooSmallRunner = makeQueryRunner(
- groupByFactory2,
- index2.toString(),
- new QueryableIndexSegment(index2.toString(), index2)
- );
- runners.add(groupByFactory2.getToolchest().preMergeQueryDecoration(tooSmallRunner));
- return runners;
- }
-
public static <T, QueryType extends Query<T>> QueryRunner<T> makeQueryRunner(
QueryRunnerFactory<T, QueryType> factory,
String segmentId,
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org