reformat datasketches module to satisfy druid style guidelines

metamx · Nov 19, 2015 · f99bad7 · f99bad7
1 parent fde9df2
commit f99bad7
Show file tree

Hide file tree

Showing 16 changed files with 254 additions and 183 deletions.
diff --git a/extensions/datasketches/pom.xml b/extensions/datasketches/pom.xml
@@ -18,102 +18,103 @@
   ~ under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
 
-    <groupId>io.druid.extensions</groupId>
-    <artifactId>druid-datasketches</artifactId>
-    <name>druid-datasketches</name>
-    <description>Druid Aggregators based on datasketches lib http://datasketches.github.io/</description>
+  <groupId>io.druid.extensions</groupId>
+  <artifactId>druid-datasketches</artifactId>
+  <name>druid-datasketches</name>
+  <description>Druid Aggregators based on datasketches lib http://datasketches.github.io/</description>
 
-    <parent>
-        <groupId>io.druid</groupId>
-        <artifactId>druid</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
+  <parent>
+    <groupId>io.druid</groupId>
+    <artifactId>druid</artifactId>
+    <version>0.9.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
+  </parent>
 
-    <dependencies>
-        <dependency>
-            <groupId>com.yahoo.datasketches</groupId>
-            <artifactId>sketches-core</artifactId>
-            <version>0.2.2</version>
-        </dependency>
-        <dependency>
-            <groupId>io.druid</groupId>
-            <artifactId>druid-api</artifactId>
-            <version>${druid.api.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.druid</groupId>
-            <artifactId>druid-processing</artifactId>
-            <version>${project.parent.version}</version>
-            <scope>provided</scope>
-        </dependency>
+  <dependencies>
+    <dependency>
+      <groupId>com.yahoo.datasketches</groupId>
+      <artifactId>sketches-core</artifactId>
+      <version>0.2.2</version>
+    </dependency>
+    <dependency>
+      <groupId>io.druid</groupId>
+      <artifactId>druid-api</artifactId>
+      <version>${druid.api.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.druid</groupId>
+      <artifactId>druid-processing</artifactId>
+      <version>${project.parent.version}</version>
+      <scope>provided</scope>
+    </dependency>
 
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>${jackson.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${jackson.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-guava</artifactId>
-            <version>${jackson.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-joda</artifactId>
-            <version>${jackson.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-smile</artifactId>
-            <version>${jackson.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
-            <artifactId>jackson-jaxrs-json-provider</artifactId>
-            <version>${jackson.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
-            <artifactId>jackson-jaxrs-smile-provider</artifactId>
-            <version>${jackson.version}</version>
-            <scope>provided</scope>
-        </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <version>${jackson.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+      <version>${jackson.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>${jackson.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-guava</artifactId>
+      <version>${jackson.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-joda</artifactId>
+      <version>${jackson.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-smile</artifactId>
+      <version>${jackson.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.jaxrs</groupId>
+      <artifactId>jackson-jaxrs-json-provider</artifactId>
+      <version>${jackson.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.jaxrs</groupId>
+      <artifactId>jackson-jaxrs-smile-provider</artifactId>
+      <version>${jackson.version}</version>
+      <scope>provided</scope>
+    </dependency>
 
-        <!-- Test Dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.druid</groupId>
-            <artifactId>druid-processing</artifactId>
-             <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+    <!-- Test Dependencies -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.druid</groupId>
+      <artifactId>druid-processing</artifactId>
+      <version>${project.parent.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
 </project>
diff --git a/...s/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchBufferAggregator.java b/...s/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchBufferAggregator.java
@@ -90,7 +90,7 @@ public Object get(ByteBuffer buf, int position)
   private Union getUnion(ByteBuffer buf, int position)
   {
     Union union = unions.get(position);
-    if(union == null) {
+    if (union == null) {
       Memory mem = new MemoryRegion(nm, position, maxIntermediateSize);
       union = (Union) SetOperation.wrap(mem);
       unions.put(position, union);
@@ -111,7 +111,8 @@ public long getLong(ByteBuffer buf, int position)
   }
 
   @Override
-  public void close() {
+  public void close()
+  {
     unions.clear();
   }
 

diff --git a/...hes/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchJsonSerializer.java b/...hes/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchJsonSerializer.java
@@ -30,7 +30,8 @@
 public class SketchJsonSerializer extends JsonSerializer<Sketch>
 {
   @Override
-  public void serialize(Sketch sketch, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException
+  public void serialize(Sketch sketch, JsonGenerator jgen, SerializerProvider provider)
+      throws IOException, JsonProcessingException
   {
     jgen.writeBinary(sketch.toByteArray());
   }

diff --git a/...main/java/io/druid/query/aggregation/datasketches/theta/SketchMergeAggregatorFactory.java b/...main/java/io/druid/query/aggregation/datasketches/theta/SketchMergeAggregatorFactory.java
@@ -86,6 +86,7 @@ public boolean getIsInputThetaSketch()
    * sketch.
    *
    * @param object the sketch object
+   *
    * @return sketch object
    */
   @Override

diff --git a/...ketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchOperations.java b/...ketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchOperations.java
@@ -73,13 +73,13 @@ public static Sketch deserializeFromBase64EncodedString(String str)
   public static Sketch deserializeFromByteArray(byte[] data)
   {
     NativeMemory mem = new NativeMemory(data);
-    if(Sketch.getSerializationVersion(mem) < 3) {
+    if (Sketch.getSerializationVersion(mem) < 3) {
       return Sketches.heapifySketch(mem);
     } else {
       return Sketches.wrapSketch(mem);
     }
   }
-  
+
   public static Sketch sketchSetOperation(Func func, int sketchSize, Sketch... sketches)
   {
     //in the code below, I am returning SetOp.getResult(false, null)
@@ -90,22 +90,22 @@ public static Sketch sketchSetOperation(Func func, int sketchSize, Sketch... ske
     switch (func) {
       case UNION:
         Union union = (Union) SetOperation.builder().build(sketchSize, Family.UNION);
-        for(Sketch sketch : sketches) {
+        for (Sketch sketch : sketches) {
           union.update(sketch);
         }
         return union.getResult(false, null);
       case INTERSECT:
         Intersection intersection = (Intersection) SetOperation.builder().build(sketchSize, Family.INTERSECTION);
-        for(Sketch sketch : sketches) {
+        for (Sketch sketch : sketches) {
           intersection.update(sketch);
         }
         return intersection.getResult(false, null);
       case NOT:
-        if(sketches.length < 1) {
+        if (sketches.length < 1) {
           throw new IllegalArgumentException("A-Not-B requires atleast 1 sketch");
         }
 
-        if(sketches.length == 1) {
+        if (sketches.length == 1) {
           return sketches[0];
         }
 

diff --git a/.../src/main/java/io/druid/query/aggregation/datasketches/theta/SketchSetPostAggregator.java b/.../src/main/java/io/druid/query/aggregation/datasketches/theta/SketchSetPostAggregator.java
@@ -24,7 +24,6 @@
 import com.google.common.collect.Sets;
 import com.metamx.common.IAE;
 import com.metamx.common.logger.Logger;
-
 import com.yahoo.sketches.Util;
 import com.yahoo.sketches.theta.Sketch;
 import io.druid.query.aggregation.PostAggregator;
@@ -118,7 +117,17 @@ public int getSize()
   @Override
   public String toString()
   {
-    return "SketchSetPostAggregator{" + "name='" + name + '\'' + ", fields=" + fields + ", func=" + func + ", size=" + maxSketchSize +"}";
+    return "SketchSetPostAggregator{"
+           + "name='"
+           + name
+           + '\''
+           + ", fields="
+           + fields
+           + ", func="
+           + func
+           + ", size="
+           + maxSketchSize
+           + "}";
   }
 
   @Override

diff --git a/...rc/main/java/io/druid/query/aggregation/datasketches/theta/oldapi/OldApiSketchModule.java b/...rc/main/java/io/druid/query/aggregation/datasketches/theta/oldapi/OldApiSketchModule.java
@@ -23,7 +23,6 @@
 import com.fasterxml.jackson.databind.jsontype.NamedType;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.google.inject.Binder;
-
 import com.yahoo.sketches.theta.Sketch;
 import io.druid.initialization.DruidModule;
 import io.druid.query.aggregation.datasketches.theta.SketchBuildComplexMetricSerde;

diff --git a/...es/src/test/java/io/druid/query/aggregation/datasketches/theta/SketchAggregationTest.java b/...es/src/test/java/io/druid/query/aggregation/datasketches/theta/SketchAggregationTest.java
@@ -183,7 +183,8 @@ public void testSketchMergeFinalization() throws Exception
     Assert.assertEquals(sketch, agg.finalizeComputation(sketch));
   }
 
-  private void assertAggregatorFactorySerde(AggregatorFactory agg) throws Exception{
+  private void assertAggregatorFactorySerde(AggregatorFactory agg) throws Exception
+  {
     Assert.assertEquals(
         agg,
         helper.getObjectMapper().readValue(
@@ -220,7 +221,8 @@ public void testSketchSetPostAggregatorSerde() throws Exception
     );
   }
 
-  private void assertPostAggregatorSerde(PostAggregator agg) throws Exception{
+  private void assertPostAggregatorSerde(PostAggregator agg) throws Exception
+  {
     Assert.assertEquals(
         agg,
         helper.getObjectMapper().readValue(

diff --git a/...ava/io/druid/query/aggregation/datasketches/theta/oldapi/OldApiSketchAggregationTest.java b/...ava/io/druid/query/aggregation/datasketches/theta/oldapi/OldApiSketchAggregationTest.java
@@ -139,7 +139,8 @@ public void testSketchBuildAggregatorFactorySerde() throws Exception
     assertAggregatorFactorySerde(new OldSketchBuildAggregatorFactory("name", "fieldName", 16));
   }
 
-  private void assertAggregatorFactorySerde(AggregatorFactory agg) throws Exception{
+  private void assertAggregatorFactorySerde(AggregatorFactory agg) throws Exception
+  {
     Assert.assertEquals(
         agg,
         helper.getObjectMapper().readValue(
@@ -176,7 +177,8 @@ public void testSketchSetPostAggregatorSerde() throws Exception
     );
   }
 
-  private void assertPostAggregatorSerde(PostAggregator agg) throws Exception{
+  private void assertPostAggregatorSerde(PostAggregator agg) throws Exception
+  {
     Assert.assertEquals(
         agg,
         helper.getObjectMapper().readValue(