[Backport] Reduce the number of tasks in ITUnionQueryTest

api/pom.xml

@@ -28,7 +28,7 @@
     <parent>
         <groupId>io.druid</groupId>
         <artifactId>druid</artifactId>
-        <version>0.10.1-SNAPSHOT</version>
+        <version>0.10.1-rc2-SNAPSHOT</version>
     </parent>
 
     <dependencies>

api/src/main/java/io/druid/data/input/impl/CSVParseSpec.java

@@ -21,7 +21,6 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import io.druid.java.util.common.parsers.CSVParser;
 import io.druid.java.util.common.parsers.Parser;
@@ -114,7 +113,7 @@ public void verify(List<String> usedCols)
   @Override
   public Parser<String, Object> makeParser()
   {
-    return new CSVParser(Optional.fromNullable(listDelimiter), columns, hasHeaderRow, skipHeaderRows);
+    return new CSVParser(listDelimiter, columns, hasHeaderRow, skipHeaderRows);
   }
 
   @Override

api/src/main/java/io/druid/data/input/impl/DelimitedParseSpec.java

@@ -21,7 +21,6 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import io.druid.java.util.common.parsers.DelimitedParser;
 import io.druid.java.util.common.parsers.Parser;
@@ -125,8 +124,8 @@ public void verify(List<String> usedCols)
   public Parser<String, Object> makeParser()
   {
     return new DelimitedParser(
-        Optional.fromNullable(delimiter),
-        Optional.fromNullable(listDelimiter),
+        delimiter,
+        listDelimiter,
         columns,
         hasHeaderRow,
         skipHeaderRows

api/src/main/java/io/druid/data/input/impl/MapInputRowParser.java

@@ -23,11 +23,9 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-
 import io.druid.data.input.InputRow;
 import io.druid.data.input.MapBasedInputRow;
 import io.druid.java.util.common.parsers.ParseException;
-
 import org.joda.time.DateTime;
 
 import java.util.List;

api/src/test/java/io/druid/jackson/JacksonExtremeDoubleValuesSerdeTest.java

@@ -0,0 +1,41 @@
+/*
+ * 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.jackson;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.IOException;
+
+public class JacksonExtremeDoubleValuesSerdeTest
+{
+  @Test
+  public void testExtremeDoubleValuesSerde() throws IOException
+  {
+    ObjectMapper objectMapper = new ObjectMapper();
+    for (double value : new double[] {Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY}) {
+      String serialized = objectMapper.writeValueAsString(value);
+      Assert.assertEquals(new Double(value), objectMapper.readValue(serialized, Double.class));
+    }
+    String negativeInfinityString = objectMapper.writeValueAsString(Double.NaN);
+    Assert.assertTrue(objectMapper.readValue(negativeInfinityString, Double.class).isNaN());
+  }
+}

aws-common/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>io.druid</groupId>
         <artifactId>druid</artifactId>
-        <version>0.10.1-SNAPSHOT</version>
+        <version>0.10.1-rc2-SNAPSHOT</version>
     </parent>
 
     <dependencies>

benchmarks/pom.xml

@@ -27,7 +27,7 @@
   <parent>
     <groupId>io.druid</groupId>
     <artifactId>druid</artifactId>
-    <version>0.10.1-SNAPSHOT</version>
+    <version>0.10.1-rc2-SNAPSHOT</version>
   </parent>
 
   <prerequisites>

benchmarks/src/main/java/io/druid/benchmark/GroupByTypeInterfaceBenchmark.java

@@ -32,6 +32,8 @@
 import io.druid.benchmark.datagen.BenchmarkSchemas;
 import io.druid.benchmark.query.QueryBenchmarkUtil;
 import io.druid.collections.BlockingPool;
+import io.druid.collections.DefaultBlockingPool;
+import io.druid.collections.NonBlockingPool;
 import io.druid.collections.StupidPool;
 import io.druid.concurrent.Execs;
 import io.druid.data.input.InputRow;
@@ -348,15 +350,15 @@ public void setup() throws IOException
       }
     }
 
-    StupidPool<ByteBuffer> bufferPool = new StupidPool<>(
+    NonBlockingPool<ByteBuffer> bufferPool = new StupidPool<>(
         "GroupByBenchmark-computeBufferPool",
         new OffheapBufferGenerator("compute", 250_000_000),
         0,
         Integer.MAX_VALUE
     );
 
     // limit of 2 is required since we simulate both historical merge and broker merge in the same process
-    BlockingPool<ByteBuffer> mergePool = new BlockingPool<>(
+    BlockingPool<ByteBuffer> mergePool = new DefaultBlockingPool<>(
         new OffheapBufferGenerator("merge", 250_000_000),
         2
     );

benchmarks/src/main/java/io/druid/benchmark/StupidPoolConcurrencyBenchmark.java

@@ -21,6 +21,7 @@
 
 import com.google.common.base.Supplier;
 
+import io.druid.collections.NonBlockingPool;
 import io.druid.collections.ResourceHolder;
 import io.druid.collections.StupidPool;
 import io.druid.java.util.common.logger.Logger;
@@ -64,7 +65,7 @@ public void teardown()
   public static class BenchmarkPool
   {
     private final AtomicLong numPools = new AtomicLong(0L);
-    private final StupidPool<Object> pool = new StupidPool<>(
+    private final NonBlockingPool<Object> pool = new StupidPool<>(
         "simpleObject pool",
         new Supplier<Object>()
         {

benchmarks/src/main/java/io/druid/benchmark/query/GroupByBenchmark.java

@@ -32,6 +32,8 @@
 import io.druid.benchmark.datagen.BenchmarkSchemaInfo;
 import io.druid.benchmark.datagen.BenchmarkSchemas;
 import io.druid.collections.BlockingPool;
+import io.druid.collections.DefaultBlockingPool;
+import io.druid.collections.NonBlockingPool;
 import io.druid.collections.StupidPool;
 import io.druid.concurrent.Execs;
 import io.druid.data.input.InputRow;
@@ -392,15 +394,15 @@ public void setup() throws IOException
       }
     }
 
-    StupidPool<ByteBuffer> bufferPool = new StupidPool<>(
+    NonBlockingPool<ByteBuffer> bufferPool = new StupidPool<>(
         "GroupByBenchmark-computeBufferPool",
         new OffheapBufferGenerator("compute", 250_000_000),
         0,
         Integer.MAX_VALUE
     );
 
     // limit of 2 is required since we simulate both historical merge and broker merge in the same process
-    BlockingPool<ByteBuffer> mergePool = new BlockingPool<>(
+    BlockingPool<ByteBuffer> mergePool = new DefaultBlockingPool<>(
         new OffheapBufferGenerator("merge", 250_000_000),
         2
     );

bytebuffer-collections/pom.xml

@@ -18,14 +18,13 @@
   ~ under the License.
   -->
 
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<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>
 
   <parent>
     <groupId>io.druid</groupId>
     <artifactId>druid</artifactId>
-    <version>0.10.1-SNAPSHOT</version>
+    <version>0.10.1-rc2-SNAPSHOT</version>
   </parent>
 
   <artifactId>bytebuffer-collections</artifactId>

bytebuffer-collections/src/main/java/io/druid/collections/spatial/Node.java

@@ -151,9 +151,9 @@ public boolean enclose()
   {
     boolean retVal = false;
     float[] minCoords = new float[getNumDims()];
-    Arrays.fill(minCoords, Float.MAX_VALUE);
+    Arrays.fill(minCoords, Float.POSITIVE_INFINITY);
     float[] maxCoords = new float[getNumDims()];
-    Arrays.fill(maxCoords, -Float.MAX_VALUE);
+    Arrays.fill(maxCoords, Float.NEGATIVE_INFINITY);
 
     for (Node child : getChildren()) {
       for (int i = 0; i < getNumDims(); i++) {

bytebuffer-collections/src/main/java/io/druid/collections/spatial/RTree.java

@@ -128,8 +128,8 @@ private Node buildRoot(boolean isLeaf)
   {
     float[] initMinCoords = new float[numDims];
     float[] initMaxCoords = new float[numDims];
-    Arrays.fill(initMinCoords, -Float.MAX_VALUE);
-    Arrays.fill(initMaxCoords, Float.MAX_VALUE);
+    Arrays.fill(initMinCoords, Float.NEGATIVE_INFINITY);
+    Arrays.fill(initMaxCoords, Float.POSITIVE_INFINITY);
 
     return new Node(initMinCoords, initMaxCoords, isLeaf, bitmapFactory);
   }
@@ -178,7 +178,7 @@ private Node chooseLeaf(Node node, Point point)
       return node;
     }
 
-    double minCost = Double.MAX_VALUE;
+    double minCost = Double.POSITIVE_INFINITY;
     Node optimal = node.getChildren().get(0);
     for (Node child : node.getChildren()) {
       double cost = RTreeUtils.getExpansionCost(child, point);

bytebuffer-collections/src/main/java/io/druid/collections/spatial/split/LinearGutmanSplitStrategy.java

@@ -58,10 +58,10 @@ public Node[] pickSeeds(List<Node> nodes)
 
     double bestNormalized = 0.0;
     for (int i = 0; i < numDims; i++) {
-      float minCoord = Float.MAX_VALUE;
-      float maxCoord = -Float.MAX_VALUE;
-      float highestLowSide = -Float.MAX_VALUE;
-      float lowestHighside = Float.MAX_VALUE;
+      float minCoord = Float.POSITIVE_INFINITY;
+      float maxCoord = Float.NEGATIVE_INFINITY;
+      float lowestHighside = Float.POSITIVE_INFINITY;
+      float highestLowSide = Float.NEGATIVE_INFINITY;
       int highestLowSideIndex = 0;
       int lowestHighSideIndex = 0;
 

bytebuffer-collections/src/main/java/io/druid/collections/spatial/split/QuadraticGutmanSplitStrategy.java

@@ -37,7 +37,7 @@ public QuadraticGutmanSplitStrategy(int minNumChildren, int maxNumChildren, Bitm
   @Override
   public Node[] pickSeeds(List<Node> nodes)
   {
-    double highestCost = Double.MIN_VALUE;
+    double highestCost = Double.NEGATIVE_INFINITY;
     int[] highestCostIndices = new int[2];
 
     for (int i = 0; i < nodes.size() - 1; i++) {
@@ -58,7 +58,7 @@ public Node[] pickSeeds(List<Node> nodes)
   @Override
   public Node pickNext(List<Node> nodes, Node[] groups)
   {
-    double highestCost = Double.MIN_VALUE;
+    double highestCost = Double.NEGATIVE_INFINITY;
     Node costlyNode = null;
     int counter = 0;
     int index = -1;

codestyle/checkstyle.xml

@@ -71,5 +71,31 @@
       <property name="illegalPattern" value="true"/>
       <property name="message" value="Use Comparators.naturalNullsFirst() instead of Ordering.natural().nullsFirst()"/>
     </module>
+
+    <module name="Regexp">
+      <property name="format" value="(Byte|Character|Short|Integer|Long|Float|Double)\.TYPE"/>
+      <property name="illegalPattern" value="true"/>
+      <property name="message" value="Use primitive.class instead. But check twice that you don't actually need BoxedPrimitive.class instead of BoxedPrimitive.TYPE"/>
+    </module>
+    <module name="Regexp">
+      <property name="format" value="Float\.MAX_VALUE"/>
+      <property name="illegalPattern" value="true"/>
+      <property name="message" value="Use Float.POSITIVE_INFINITY"/>
+    </module>
+    <module name="Regexp">
+      <property name="format" value="Float\.MIN_VALUE"/>
+      <property name="illegalPattern" value="true"/>
+      <property name="message" value="Use Float.NEGATIVE_INFINITY"/>
+    </module>
+    <module name="Regexp">
+      <property name="format" value="Double\.MAX_VALUE"/>
+      <property name="illegalPattern" value="true"/>
+      <property name="message" value="Use Double.POSITIVE_INFINITY"/>
+    </module>
+    <module name="Regexp">
+      <property name="format" value="Double\.MIN_VALUE"/>
+      <property name="illegalPattern" value="true"/>
+      <property name="message" value="Use Double.NEGATIVE_INFINITY"/>
+    </module>
   </module>
 </module>

common/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>io.druid</groupId>
         <artifactId>druid</artifactId>
-        <version>0.10.1-SNAPSHOT</version>
+        <version>0.10.1-rc2-SNAPSHOT</version>
     </parent>
 
     <dependencies>