From 592611f2ee72e5de037f7c38e7d46927ece32560 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= <xavier@metamarkets.com>
Date: Thu, 9 Oct 2014 17:04:36 -0700
Subject: [PATCH] fix cardinality aggregator serde

---
 .../CardinalityAggregatorFactory.java           | 10 ++++++++--
 .../cardinality/CardinalityAggregatorTest.java  | 17 ++++++++++++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/processing/src/main/java/io/druid/query/aggregation/cardinality/CardinalityAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/cardinality/CardinalityAggregatorFactory.java
index b1db05a2284..071a91b3c3e 100644
--- a/processing/src/main/java/io/druid/query/aggregation/cardinality/CardinalityAggregatorFactory.java
+++ b/processing/src/main/java/io/druid/query/aggregation/cardinality/CardinalityAggregatorFactory.java
@@ -63,12 +63,12 @@ public class CardinalityAggregatorFactory implements AggregatorFactory
   public CardinalityAggregatorFactory(
       @JsonProperty("name") String name,
       @JsonProperty("fieldNames") final List<String> fieldNames,
-      @JsonProperty("byRow") final Boolean byRow
+      @JsonProperty("byRow") final boolean byRow
   )
   {
     this.name = name;
     this.fieldNames = fieldNames;
-    this.byRow = byRow == null ? false : byRow;
+    this.byRow = byRow;
   }
 
   @Override
@@ -203,6 +203,12 @@ public class CardinalityAggregatorFactory implements AggregatorFactory
     return fieldNames;
   }
 
+  @JsonProperty
+  public boolean isByRow()
+  {
+    return byRow;
+  }
+
   @Override
   public byte[] getCacheKey()
   {
diff --git a/processing/src/test/java/io/druid/query/aggregation/cardinality/CardinalityAggregatorTest.java b/processing/src/test/java/io/druid/query/aggregation/cardinality/CardinalityAggregatorTest.java
index 4d27df07303..9d8ac7c721f 100644
--- a/processing/src/test/java/io/druid/query/aggregation/cardinality/CardinalityAggregatorTest.java
+++ b/processing/src/test/java/io/druid/query/aggregation/cardinality/CardinalityAggregatorTest.java
@@ -19,16 +19,20 @@
 
 package io.druid.query.aggregation.cardinality;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Function;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import io.druid.jackson.DefaultObjectMapper;
 import io.druid.query.aggregation.Aggregator;
+import io.druid.query.aggregation.AggregatorFactory;
 import io.druid.query.aggregation.BufferAggregator;
 import io.druid.segment.DimensionSelector;
 import io.druid.segment.data.IndexedInts;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Test;
 
 import javax.annotation.Nullable;
@@ -378,4 +382,15 @@ public class CardinalityAggregatorTest
         0.05
     );
   }
+
+  @Test
+  public void testSerde() throws Exception
+  {
+    CardinalityAggregatorFactory factory = new CardinalityAggregatorFactory("billy", ImmutableList.of("b", "a", "c"), true);
+    ObjectMapper objectMapper = new DefaultObjectMapper();
+    Assert.assertEquals(
+        factory,
+        objectMapper.readValue(objectMapper.writeValueAsString(factory), AggregatorFactory.class)
+    );
+  }
 }