fix bug for thetaSketch metric not working with select queries

extensions/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/MemoryJsonSerializer.java

@@ -0,0 +1,40 @@
+/*
+ * Licensed to Metamarkets Group Inc. (Metamarkets) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. Metamarkets licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package io.druid.query.aggregation.datasketches.theta;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.yahoo.sketches.memory.Memory;
+
+import java.io.IOException;
+
+/**
+ */
+public class MemoryJsonSerializer extends JsonSerializer<Memory>
+{
+  @Override
+  public void serialize(Memory mem, JsonGenerator jgen, SerializerProvider provider)
+      throws IOException, JsonProcessingException
+  {
+    jgen.writeBinary(SketchOperations.deserializeFromMemory(mem).toByteArray());
+  }
+}

extensions/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchModule.java

@@ -23,6 +23,7 @@
 import com.fasterxml.jackson.databind.jsontype.NamedType;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.google.inject.Binder;
+import com.yahoo.sketches.memory.Memory;
 import com.yahoo.sketches.theta.Sketch;
 import io.druid.initialization.DruidModule;
 import io.druid.segment.serde.ComplexMetrics;
@@ -66,7 +67,11 @@ public List<? extends Module> getJacksonModules()
                 new NamedType(SketchEstimatePostAggregator.class, THETA_SKETCH_ESTIMATE_POST_AGG),
                 new NamedType(SketchSetPostAggregator.class, THETA_SKETCH_SET_OP_POST_AGG)
             )
-            .addSerializer(Sketch.class, new SketchJsonSerializer())
+            .addSerializer(
+                Sketch.class, new SketchJsonSerializer()
+            )
+            .addSerializer(
+                Memory.class, new MemoryJsonSerializer())
     );
   }
 }

extensions/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchOperations.java

@@ -22,6 +22,7 @@
 import com.google.common.base.Charsets;
 import com.metamx.common.logger.Logger;
 import com.yahoo.sketches.Family;
+import com.yahoo.sketches.memory.Memory;
 import com.yahoo.sketches.memory.NativeMemory;
 import com.yahoo.sketches.theta.AnotB;
 import com.yahoo.sketches.theta.Intersection;
@@ -72,7 +73,11 @@ public static Sketch deserializeFromBase64EncodedString(String str)
 
   public static Sketch deserializeFromByteArray(byte[] data)
   {
-    NativeMemory mem = new NativeMemory(data);
+    return deserializeFromMemory(new NativeMemory(data));
+  }
+
+  public static Sketch deserializeFromMemory(Memory mem)
+  {
     if (Sketch.getSerializationVersion(mem) < 3) {
       return Sketches.heapifySketch(mem);
     } else {

extensions/datasketches/src/test/java/io/druid/query/aggregation/datasketches/theta/SketchAggregationTest.java

@@ -20,6 +20,7 @@
 package io.druid.query.aggregation.datasketches.theta;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.io.Files;
 import com.metamx.common.guava.Sequence;
@@ -28,10 +29,12 @@
 import com.yahoo.sketches.theta.Sketches;
 import io.druid.data.input.MapBasedRow;
 import io.druid.granularity.QueryGranularity;
+import io.druid.query.Result;
 import io.druid.query.aggregation.AggregationTestHelper;
 import io.druid.query.aggregation.AggregatorFactory;
 import io.druid.query.aggregation.PostAggregator;
 import io.druid.query.aggregation.post.FieldAccessPostAggregator;
+import io.druid.query.select.SelectResultValue;
 import org.joda.time.DateTime;
 import org.junit.Assert;
 import org.junit.Rule;
@@ -56,11 +59,11 @@ public SketchAggregationTest()
   {
     SketchModule sm = new SketchModule();
     sm.configure(null);
-    helper = new AggregationTestHelper(sm.getJacksonModules(), tempFolder);
+    helper = AggregationTestHelper.createGroupByQueryAggregationTestHelper(sm.getJacksonModules(), tempFolder);
   }
 
   @Test
-  public void testSimpleDataIngestAndQuery() throws Exception
+  public void testSimpleDataIngestAndGpByQuery() throws Exception
   {
     Sequence seq = helper.createIndexAndRunQueryOnSegment(
         new File(this.getClass().getClassLoader().getResource("simple_test_data.tsv").getFile()),
@@ -92,7 +95,33 @@ public void testSimpleDataIngestAndQuery() throws Exception
   }
 
   @Test
-  public void testSketchDataIngestAndQuery() throws Exception
+  public void testSimpleDataIngestAndSelectQuery() throws Exception
+  {
+    SketchModule sm = new SketchModule();
+    sm.configure(null);
+    AggregationTestHelper selectQueryAggregationTestHelper = AggregationTestHelper.createSelectQueryAggregationTestHelper(
+        sm.getJacksonModules(),
+        tempFolder
+    );
+
+    Sequence seq = selectQueryAggregationTestHelper.createIndexAndRunQueryOnSegment(
+        new File(this.getClass().getClassLoader().getResource("simple_test_data.tsv").getFile()),
+        readFileFromClasspathAsString("simple_test_data_record_parser.json"),
+        readFileFromClasspathAsString("simple_test_data_aggregators.json"),
+        0,
+        QueryGranularity.NONE,
+        5000,
+        readFileFromClasspathAsString("select_query.json")
+    );
+
+    Result<SelectResultValue> result = (Result<SelectResultValue>) Iterables.getOnlyElement(Sequences.toList(seq, Lists.newArrayList()));
+    Assert.assertEquals(new DateTime("2014-10-20T00:00:00.000Z"), result.getTimestamp());
+    Assert.assertEquals(100, result.getValue().getEvents().size());
+    Assert.assertEquals("AgMDAAAazJMBAAAAAACAPzz9j7pWTMdR", result.getValue().getEvents().get(0).getEvent().get("pty_country"));
+  }
+
+  @Test
+  public void testSketchDataIngestAndGpByQuery() throws Exception
   {
     Sequence seq = helper.createIndexAndRunQueryOnSegment(
         new File(SketchAggregationTest.class.getClassLoader().getResource("sketch_test_data.tsv").getFile()),

extensions/datasketches/src/test/java/io/druid/query/aggregation/datasketches/theta/oldapi/OldApiSketchAggregationTest.java

@@ -55,7 +55,7 @@ public OldApiSketchAggregationTest()
     OldApiSketchModule sm = new OldApiSketchModule();
     sm.configure(null);
 
-    helper = new AggregationTestHelper(
+    helper = AggregationTestHelper.createGroupByQueryAggregationTestHelper(
         sm.getJacksonModules(),
         tempFolder
     );

extensions/datasketches/src/test/resources/select_query.json

@@ -0,0 +1,11 @@
+{
+  "queryType": "select",
+  "dataSource": "test_datasource",
+  "dimensions":[],
+  "metrics":[],
+  "granularity": "ALL",
+  "intervals": [
+    "2014-10-19T00:00:00.000Z/2014-10-22T00:00:00.000Z"
+  ],
+  "pagingSpec":{"pagingIdentifiers": {}, "threshold":100}
+}

extensions/histogram/src/test/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregationTest.java

@@ -43,7 +43,10 @@ public ApproximateHistogramAggregationTest()
   {
     ApproximateHistogramDruidModule module = new ApproximateHistogramDruidModule();
     module.configure(null);
-    helper = new AggregationTestHelper(Lists.newArrayList(module.getJacksonModules()), tempFolder);
+    helper = AggregationTestHelper.createGroupByQueryAggregationTestHelper(
+        Lists.newArrayList(module.getJacksonModules()),
+        tempFolder
+    );
   }
 
   @Test

processing/src/test/java/io/druid/query/MultiValuedDimensionTest.java

@@ -72,7 +72,7 @@ public class MultiValuedDimensionTest
 
   public MultiValuedDimensionTest() throws Exception
   {
-    helper = new AggregationTestHelper(
+    helper = AggregationTestHelper.createGroupByQueryAggregationTestHelper(
         ImmutableList.<Module>of(), null
     );
   }