Use DoubleSumAggregatorFactory instead of CountAggregatorFactory, add…

… test for non-integers
jackar · Sep 30, 2015 · 8e20a1e · 8e20a1e
1 parent 70ae5ca
commit 8e20a1e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/processing/src/main/java/io/druid/query/groupby/GroupByQueryQueryToolChest.java b/processing/src/main/java/io/druid/query/groupby/GroupByQueryQueryToolChest.java
@@ -57,7 +57,7 @@
 import io.druid.query.QueryToolChest;
 import io.druid.query.SubqueryQueryRunner;
 import io.druid.query.aggregation.AggregatorFactory;
-import io.druid.query.aggregation.CountAggregatorFactory;
+import io.druid.query.aggregation.DoubleSumAggregatorFactory;
 import io.druid.query.aggregation.MetricManipulationFn;
 import io.druid.query.aggregation.PostAggregator;
 import io.druid.query.dimension.DefaultDimensionSpec;
@@ -184,7 +184,10 @@ private Sequence<Row> mergeGroupByResults(
       // We need the inner incremental index to have all the columns required by the outer query
       final List<AggregatorFactory> aggs = Lists.newArrayList(subquery.getAggregatorSpecs());
       for (PostAggregator postAgg : subquery.getPostAggregatorSpecs()) {
-        aggs.add(new CountAggregatorFactory(postAgg.getName())); // aggregator type doesn't matter here
+        // This causes the post aggregators from the inner query to be copied to the incremental index so that they are
+        // available as columns for the outer query. The data isn't modified by the aggregator since it has already
+        // been fully grouped by the inner query. Somewhat of a hack to get this working with an incremental index.
+        aggs.add(new DoubleSumAggregatorFactory(postAgg.getName(), postAgg.getName()));
       }
 
       final GroupByQuery innerQuery = new GroupByQuery.Builder(subquery)

diff --git a/processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerTest.java b/processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerTest.java
@@ -2460,6 +2460,14 @@ public void testDifferentGroupingSubqueryMultipleAggregatorsOnSameField()
                         new FieldAccessPostAggregator("idx", "idx"),
                         new FieldAccessPostAggregator("idx", "idx")
                     )
+                ),
+                new ArithmeticPostAggregator(
+                    "post_agg2",
+                    "quotient",
+                    Lists.<PostAggregator>newArrayList(
+                        new FieldAccessPostAggregator("idx", "idx"),
+                        new ConstantPostAggregator("constant", 1.23)
+                    )
                 )
             )
         )
@@ -2474,15 +2482,18 @@ public void testDifferentGroupingSubqueryMultipleAggregatorsOnSameField()
             Arrays.<AggregatorFactory>asList(
                 new DoubleMaxAggregatorFactory("idx1", "idx"),
                 new DoubleMaxAggregatorFactory("idx2", "idx"),
-                new DoubleMaxAggregatorFactory("idx3", "post_agg")
+                new DoubleMaxAggregatorFactory("idx3", "post_agg"),
+                new DoubleMaxAggregatorFactory("idx4", "post_agg2")
             )
         )
         .setGranularity(QueryRunnerTestHelper.dayGran)
         .build();
 
     List<Row> expectedResults = Arrays.asList(
-        GroupByQueryRunnerTestHelper.createExpectedRow("2011-04-01", "idx1", 2900.0, "idx2", 2900.0, "idx3", 5800.0),
-        GroupByQueryRunnerTestHelper.createExpectedRow("2011-04-02", "idx1", 2505.0, "idx2", 2505.0, "idx3", 5010.0)
+        GroupByQueryRunnerTestHelper.createExpectedRow("2011-04-01", "idx1", 2900.0, "idx2", 2900.0,
+            "idx3", 5800.0, "idx4", 2357.7236328125),
+        GroupByQueryRunnerTestHelper.createExpectedRow("2011-04-02", "idx1", 2505.0, "idx2", 2505.0,
+            "idx3", 5010.0, "idx4", 2036.5853271484375)
     );
 
     Iterable<Row> results = GroupByQueryRunnerTestHelper.runQuery(factory, runner, query);