add test + small fix for other test

guod08 · Apr 22, 2014 · 4721ba3 · 4721ba3
1 parent 65c71a4
commit 4721ba3
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 11 deletions.
diff --git a/processing/src/main/java/io/druid/query/topn/TopNQueryQueryToolChest.java b/processing/src/main/java/io/druid/query/topn/TopNQueryQueryToolChest.java
@@ -210,7 +210,7 @@ public Map<String, Object> apply(DimensionAndMetricValueExtractor input)
                     final Map<String, Object> values = Maps.newHashMap();
                     // put non finalized aggregators for calculating dependent post Aggregators
                     for (AggregatorFactory agg : query.getAggregatorSpecs()) {
-                      values.put(agg.getName(), fn.manipulate(agg, input.getMetric(agg.getName())));
+                      values.put(agg.getName(), input.getMetric(agg.getName()));
                     }
 
                     for (PostAggregator postAgg : query.getPostAggregatorSpecs()) {

diff --git a/processing/src/test/java/io/druid/query/topn/TopNBinaryFnTest.java b/processing/src/test/java/io/druid/query/topn/TopNBinaryFnTest.java
@@ -294,17 +294,20 @@ public void testMergeByPostAgg()
                 ImmutableMap.<String, Object>of(
                     "rows", 1L,
                     "index", 2L,
-                    "testdim", "1"
+                    "testdim", "1",
+                    "addrowsindexconstant", 3.0
                 ),
                 ImmutableMap.<String, Object>of(
                     "rows", 2L,
                     "index", 4L,
-                    "testdim", "2"
+                    "testdim", "2",
+                    "addrowsindexconstant", 7.0
                 ),
                 ImmutableMap.<String, Object>of(
                     "rows", 0L,
                     "index", 2L,
-                    "testdim", "3"
+                    "testdim", "3",
+                    "addrowsindexconstant", 3.0
                 )
             )
         )
@@ -316,17 +319,20 @@ public void testMergeByPostAgg()
                 ImmutableMap.<String, Object>of(
                     "rows", 2L,
                     "index", 3L,
-                    "testdim", "1"
+                    "testdim", "1",
+                    "addrowsindexconstant", 6.0
                 ),
                 ImmutableMap.<String, Object>of(
                     "rows", 2L,
                     "index", 0L,
-                    "testdim", "2"
+                    "testdim", "2",
+                    "addrowsindexconstant", 3.0
                 ),
                 ImmutableMap.<String, Object>of(
-                    "rows", 0L,
-                    "index", 1L,
-                    "testdim", "3"
+                    "rows", 4L,
+                    "index", 5L,
+                    "testdim", "other",
+                    "addrowsindexconstant", 10.0
                 )
             )
         )
@@ -336,6 +342,12 @@ public void testMergeByPostAgg()
         currTime,
         new TopNResultValue(
             ImmutableList.<Map<String, Object>>of(
+                ImmutableMap.<String, Object>of(
+                    "testdim", "other",
+                    "rows", 4L,
+                    "index", 5L,
+                    "addrowsindexconstant", 10.0
+                ),
                 ImmutableMap.<String, Object>of(
                     "testdim", "1",
                     "rows", 3L,
@@ -357,7 +369,7 @@ public void testMergeByPostAgg()
         QueryGranularity.ALL,
         new DefaultDimensionSpec("testdim", null),
         new NumericTopNMetricSpec("addrowsindexconstant"),
-        2,
+        3,
         aggregatorFactories,
         postAggregators
     ).apply(
@@ -428,7 +440,8 @@ public void testMergeShiftedTimestamp()
                 ImmutableMap.<String, Object>of(
                     "testdim", "2",
                     "rows", 4L,
-                    "index", 4L                )
+                    "index", 4L
+                )
             )
         )
     );