Merge pull request apache#2322 from himanshug/fix_regression

fixing regressions
zy0001 · Jan 22, 2016 · 073c101 · 073c101
2 parents 7a6109f + dccf636
commit 073c101
Show file tree

Hide file tree

Showing 4 changed files with 92 additions and 5 deletions.
diff --git a/integration-tests/src/test/resources/queries/twitterstream_queries.json b/integration-tests/src/test/resources/queries/twitterstream_queries.json
@@ -594,41 +594,47 @@
                 "columns": {
                     "has_links": {
                         "type": "STRING",
+                        "hasMultipleValues": false,
                         "size": 7773438,
                         "cardinality": 2,
                         "errorMessage": null
                     }
                 },
                 "size": 747056474,
-                "numRows": 3702583
+                "numRows": 3702583,
+                "aggregators": null
             },
             {
                 "id": "twitterstream_2013-01-02T00:00:00.000Z_2013-01-03T00:00:00.000Z_2013-01-03T03:44:58.791Z_v9",
                 "intervals": ["2013-01-02T00:00:00.000Z/2013-01-03T00:00:00.000Z"],
                 "columns": {
                     "has_links": {
                         "type": "STRING",
+                        "hasMultipleValues": false,
                         "size": 7901000,
                         "cardinality": 2,
                         "errorMessage": null
                     }
                 },
                 "size": 755796690,
-                "numRows": 3743002
+                "numRows": 3743002,
+                "aggregators": null
             },
             {
                 "id": "twitterstream_2013-01-03T00:00:00.000Z_2013-01-04T00:00:00.000Z_2013-01-04T04:09:13.590Z_v9",
                 "intervals": ["2013-01-03T00:00:00.000Z/2013-01-04T00:00:00.000Z"],
                 "columns": {
                     "has_links": {
                         "type": "STRING",
+                        "hasMultipleValues": false,
                         "size": 7405654,
                         "cardinality": 2,
                         "errorMessage": null
                     }
                 },
                 "size": 706893542,
-                "numRows":3502959
+                "numRows":3502959,
+                "aggregators": null
             }
         ]
     },

diff --git a/integration-tests/src/test/resources/queries/wikipedia_editstream_queries.json b/integration-tests/src/test/resources/queries/wikipedia_editstream_queries.json
@@ -1045,19 +1045,22 @@
                 "columns": {
                     "country_name": {
                         "type": "STRING",
+                        "hasMultipleValues": false,
                         "size": 41922148,
                         "cardinality": 208,
                         "errorMessage": null
                     },
                     "language": {
                         "type": "STRING",
+                        "hasMultipleValues": false,
                         "size": 8924222,
                         "cardinality": 36,
                         "errorMessage": null
                     }
                 },
                 "size": 902457341,
-                "numRows": 4462111
+                "numRows": 4462111,
+                "aggregators": null
             }
         ]
     }

diff --git a/processing/src/main/java/io/druid/segment/serde/DictionaryEncodedColumnPartSerde.java b/processing/src/main/java/io/druid/segment/serde/DictionaryEncodedColumnPartSerde.java
@@ -31,6 +31,7 @@
 import io.druid.segment.column.ColumnBuilder;
 import io.druid.segment.column.ColumnConfig;
 import io.druid.segment.column.ValueType;
+import io.druid.segment.data.BitmapSerde;
 import io.druid.segment.data.BitmapSerdeFactory;
 import io.druid.segment.data.ByteBufferSerializer;
 import io.druid.segment.data.ByteBufferWriter;
@@ -93,7 +94,11 @@ public static DictionaryEncodedColumnPartSerde createDeserializer(
       @NotNull @JsonProperty("byteOrder") ByteOrder byteOrder
   )
   {
-    return new DictionaryEncodedColumnPartSerde(byteOrder, bitmapSerdeFactory, null);
+    return new DictionaryEncodedColumnPartSerde(
+        byteOrder,
+        bitmapSerdeFactory != null ? bitmapSerdeFactory : new BitmapSerde.LegacyBitmapSerdeFactory(),
+        null
+    );
   }
 
   private final ByteOrder byteOrder;

diff --git a/processing/src/test/java/io/druid/segment/serde/DictionaryEncodedColumnPartSerdeTest.java b/processing/src/test/java/io/druid/segment/serde/DictionaryEncodedColumnPartSerdeTest.java
@@ -0,0 +1,73 @@
+/*
+ * 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.segment.serde;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.druid.segment.TestHelper;
+import io.druid.segment.data.ConciseBitmapSerdeFactory;
+import io.druid.segment.data.RoaringBitmapSerdeFactory;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.nio.ByteOrder;
+
+/**
+ */
+public class DictionaryEncodedColumnPartSerdeTest
+{
+  @Test
+  public void testSerde() throws Exception
+  {
+    //bitmapSerdeFactory not specified
+    String json = "{\n"
+                  + " \"type\": \"stringDictionary\",\n"
+                  + " \"byteOrder\": \"BIG_ENDIAN\"\n"
+                  + "}\n";
+
+    ObjectMapper mapper = TestHelper.getObjectMapper();
+
+    DictionaryEncodedColumnPartSerde serde = (DictionaryEncodedColumnPartSerde) mapper.readValue(
+        mapper.writeValueAsString(
+            mapper.readValue(json, ColumnPartSerde.class)
+        ),
+        ColumnPartSerde.class
+    );
+
+    Assert.assertEquals(ByteOrder.BIG_ENDIAN, serde.getByteOrder());
+    Assert.assertTrue(serde.getBitmapSerdeFactory() instanceof ConciseBitmapSerdeFactory);
+
+    //bitmapSerdeFactory specified
+    json = "{\n"
+           + "\"type\": \"stringDictionary\",\n"
+           + "\"byteOrder\": \"LITTLE_ENDIAN\",\n"
+           + "\"bitmapSerdeFactory\": { \"type\": \"roaring\" }\n"
+           + "}";
+
+    serde = (DictionaryEncodedColumnPartSerde) mapper.readValue(
+        mapper.writeValueAsString(
+            mapper.readValue(json, ColumnPartSerde.class)
+        ),
+        ColumnPartSerde.class
+    );
+
+    Assert.assertEquals(ByteOrder.LITTLE_ENDIAN, serde.getByteOrder());
+    Assert.assertTrue(serde.getBitmapSerdeFactory() instanceof RoaringBitmapSerdeFactory);
+  }
+}