This is an automated email from the ASF dual-hosted git repository.
frankchen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new f8e99f750d1 Removed constructors deprecated in Java 9 (#18636)
f8e99f750d1 is described below
commit f8e99f750d1b963c8ff2cfc93bc3ec392a000872
Author: Virushade <[email protected]>
AuthorDate: Thu Oct 16 09:53:20 2025 +0800
Removed constructors deprecated in Java 9 (#18636)
* Replace double constructor from string, deprecated since Java9
* Forbidden api
* Fix forbidden apis
* Fix unit test
* Add missing constructor
* Remove float constructors
* Tidy up test file
---
codestyle/druid-forbidden-apis.txt | 18 ++++-
.../ArrayCompressedBigDecimalTest.java | 4 +-
.../druid/data/input/influx/InfluxParser.java | 2 +-
.../averagers/DoubleMinAveragerTest.java | 2 +-
.../averagers/DoubleSumAveragerTest.java | 2 +-
.../tuple/ArrayOfDoublesSketchAggregationTest.java | 20 +++---
.../indexing/kafka/KafkaRecordSupplierTest.java | 8 +--
.../parallel/DimensionCardinalityReportTest.java | 6 +-
.../indexing/input/GeneratorInputSourceTest.java | 2 +-
.../apache/druid/common/guava/GuavaUtilsTest.java | 2 +-
.../druid/hll/HyperLogLogSerdeBenchmarkTest.java | 26 +++----
.../JacksonExtremeDoubleValuesSerdeTest.java | 2 +-
.../query/aggregation/DoubleSumAggregatorTest.java | 4 +-
.../first/StringFirstBufferAggregatorTest.java | 6 +-
.../last/StringLastBufferAggregatorTest.java | 6 +-
.../post/FieldAccessPostAggregatorTest.java | 4 +-
.../FinalizingFieldAccessPostAggregatorTest.java | 12 ++--
.../extraction/SubstringDimExtractionFnTest.java | 2 +-
.../org/apache/druid/query/scan/ScanQueryTest.java | 4 +-
.../ScanResultValueTimestampComparatorTest.java | 16 ++---
.../timeseries/TimeseriesQueryRunnerTest.java | 84 +++++++++++-----------
.../topn/TopNMetricSpecOptimizationsTest.java | 20 +++---
.../druid/query/topn/TopNQueryRunnerTest.java | 12 ++--
23 files changed, 139 insertions(+), 125 deletions(-)
diff --git a/codestyle/druid-forbidden-apis.txt
b/codestyle/druid-forbidden-apis.txt
index 8dbf92ec8e4..6e6928e748b 100644
--- a/codestyle/druid-forbidden-apis.txt
+++ b/codestyle/druid-forbidden-apis.txt
@@ -28,6 +28,23 @@ com.google.common.io.Files#createTempDir() @ Use
org.apache.druid.java.util.comm
com.google.common.io.Files#write(java.lang.CharSequence, java.io.File,
java.nio.charset.Charset) @ Use com.google.common.io.Files.asCharSink(to,
charset).write(from) instead.
java.io.File#mkdirs() @ Use org.apache.druid.java.util.common.FileUtils.mkdirp
instead
java.io.File#toURL() @ Use java.io.File#toURI() and java.net.URI#toURL()
instead
+java.lang.Boolean#<init>(boolean) @ Use primitive boolean,
Boolean.valueOf(boolean), or either of Boolean.TRUE / Boolean.FALSE instead.
+java.lang.Boolean#<init>(java.lang.String) @ Use parseBoolean(String) to
convert a string to a boolean primitive, or use valueOf(String) to convert a
string to a Boolean object.
+java.lang.Byte#<init>(byte) @ Use primitive byte, or Byte.valueOf(byte)
instead.
+java.lang.Byte#<init>(java.lang.String) @ Use parseByte(String) to convert a
string to a byte primitive, or use valueOf(String) to convert a string to a
Byte object.
+java.lang.Character#<init>(char) @ Use Character.valueOf(char) instead.
+java.lang.Class#getCanonicalName() @ Class.getCanonicalName can return null
for anonymous types, use Class.getName instead.
+java.lang.Double#<init>(double) @ Use primitive double, or
Double.valueOf(double) instead.
+java.lang.Double#<init>(java.lang.String) @ Use parseDouble(String) to convert
a string to a double primitive, or use valueOf(String) to convert a string to a
Double object.
+java.lang.Float#<init>(double) @ Use primitive float, or Float.valueOf(float)
instead.
+java.lang.Float#<init>(float) @ Use primitive float, or Float.valueOf(float)
instead.
+java.lang.Float#<init>(java.lang.String) @ Use parseFloat(String) to convert a
string to a float primitive, or use valueOf(String) to convert a string to a
Float object.
+java.lang.Integer#<init>(int) @ Use primitive int, or Integer.valueOf(int)
instead.
+java.lang.Integer#<init>(java.lang.String) @ Use parseInt(String) to convert a
string to a int primitive, or use valueOf(String) to convert a string to an
Integer object.
+java.lang.Long#<init>(java.lang.String) @ Use parseLong(String) to convert a
string to a long primitive, or use valueOf(String) to convert a string to a
Long object.
+java.lang.Long#<init>(long) @ Use primitive long, or Long.valueOf(long)
instead.
+java.lang.Short#<init>(java.lang.String) @ Use parseShort(String) to convert a
string to a short primitive, or use valueOf(String) to convert a string to a
Short object.
+java.lang.Short#<init>(short) @ Use Short.valueOf(short) instead
java.lang.String#matches(java.lang.String) @ Use startsWith(), endsWith(),
contains(), or compile and cache a Pattern explicitly
java.lang.String#replace(java.lang.CharSequence,java.lang.CharSequence) @ Use
one of the appropriate methods in StringUtils instead
java.lang.String#replaceAll(java.lang.String,java.lang.String) @ Use one of
the appropriate methods in StringUtils instead, or compile and cache a Pattern
explicitly
@@ -63,7 +80,6 @@ org.apache.datasketches.memory.Memory#wrap(byte[], int, int,
java.nio.ByteOrder)
org.apache.druid.testing.simulate.EmbeddedMiddleManager#<init>() @ Middle
Managers should be used for local embedded tests only and not pushed as they
are slower and launch tasks as child processes. Use EmbeddedIndexer instead.
org.apache.hadoop.fs.FileSystem#isDirectory(org.apache.hadoop.fs.Path) @ Use
fileSystem.getFileStatus(path)#isDirectory() instead.
org.apache.hadoop.fs.FileSystem#isFile(org.apache.hadoop.fs.Path) @ Use
fileSystem.getFileStatus(path)#isPath instead.
-java.lang.Class#getCanonicalName() @ Class.getCanonicalName can return null
for anonymous types, use Class.getName instead.
java.util.concurrent.Executors#newFixedThreadPool(int) @ Executor is
non-daemon and can prevent JVM shutdown, use
org.apache.druid.java.util.common.concurrent.Execs#multiThreaded(int,
java.lang.String) instead.
@defaultMessage Use Locale.ENGLISH
diff --git
a/extensions-contrib/compressed-bigdecimal/src/test/java/org/apache/druid/compressedbigdecimal/ArrayCompressedBigDecimalTest.java
b/extensions-contrib/compressed-bigdecimal/src/test/java/org/apache/druid/compressedbigdecimal/ArrayCompressedBigDecimalTest.java
index b6791e12da3..82e435ea21c 100644
---
a/extensions-contrib/compressed-bigdecimal/src/test/java/org/apache/druid/compressedbigdecimal/ArrayCompressedBigDecimalTest.java
+++
b/extensions-contrib/compressed-bigdecimal/src/test/java/org/apache/druid/compressedbigdecimal/ArrayCompressedBigDecimalTest.java
@@ -493,8 +493,8 @@ public class ArrayCompressedBigDecimalTest
CompressedBigDecimal cbd = new ByteBufferCompressedBigDecimal(buf, 0, d);
assertEquals(0, cbd.getScale());
assertEquals(8388607, cbd.intValue());
- assertEquals(new Long(8388607L).doubleValue(), cbd.floatValue(), 0.001);
- assertEquals(new Long(8388607L).doubleValue(), cbd.doubleValue(), 0.001);
+ assertEquals(Long.valueOf(8388607L).doubleValue(), cbd.floatValue(),
0.001);
+ assertEquals(Long.valueOf(8388607L).doubleValue(), cbd.doubleValue(),
0.001);
}
/**
diff --git
a/extensions-contrib/influx-extensions/src/main/java/org/apache/druid/data/input/influx/InfluxParser.java
b/extensions-contrib/influx-extensions/src/main/java/org/apache/druid/data/input/influx/InfluxParser.java
index 3716bc976f9..a1520668613 100644
---
a/extensions-contrib/influx-extensions/src/main/java/org/apache/druid/data/input/influx/InfluxParser.java
+++
b/extensions-contrib/influx-extensions/src/main/java/org/apache/druid/data/input/influx/InfluxParser.java
@@ -127,7 +127,7 @@ public class InfluxParser implements Parser<String, Object>
return Long.valueOf(raw.substring(0, raw.length() - 1));
}
- return new Double(raw);
+ return Double.valueOf(raw);
}
private Object parseBool(String raw)
diff --git
a/extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/averagers/DoubleMinAveragerTest.java
b/extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/averagers/DoubleMinAveragerTest.java
index 0fcabf52f6f..156ebc78d27 100644
---
a/extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/averagers/DoubleMinAveragerTest.java
+++
b/extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/averagers/DoubleMinAveragerTest.java
@@ -40,7 +40,7 @@ public class DoubleMinAveragerTest
avg.addElement(Collections.singletonMap("field", 1.0), new HashMap<>());
Assert.assertEquals(-1.1e100, avg.computeResult(), 0.0);
- avg.addElement(Collections.singletonMap("field", new Integer(1)), new
HashMap<>());
+ avg.addElement(Collections.singletonMap("field", 1), new HashMap<>());
Assert.assertEquals(-1.1e100, avg.computeResult(), 0.0);
avg.addElement(Collections.singletonMap("field", 5.0), new HashMap<>());
diff --git
a/extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/averagers/DoubleSumAveragerTest.java
b/extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/averagers/DoubleSumAveragerTest.java
index e08896c4e2b..17a7ca95862 100644
---
a/extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/averagers/DoubleSumAveragerTest.java
+++
b/extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/averagers/DoubleSumAveragerTest.java
@@ -41,7 +41,7 @@ public class DoubleSumAveragerTest
avg.addElement(Collections.singletonMap("field", 3.0), new HashMap<>());
Assert.assertEquals(6.0, avg.computeResult(), 0.0);
- avg.addElement(Collections.singletonMap("field", new Integer(0)), new
HashMap<>());
+ avg.addElement(Collections.singletonMap("field", 0), new HashMap<>());
Assert.assertEquals(6.0, avg.computeResult(), 0.0);
avg.addElement(Collections.singletonMap("field", 2.5), new HashMap<>());
diff --git
a/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregationTest.java
b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregationTest.java
index bcf17bb3ae9..2b5acab5a34 100755
---
a/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregationTest.java
+++
b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/ArrayOfDoublesSketchAggregationTest.java
@@ -764,12 +764,12 @@ public class ArrayOfDoublesSketchAggregationTest extends
InitializedNullHandling
List<ResultRow> results = seq.toList();
Assert.assertEquals(1, results.size());
ResultRow row = results.get(0);
- Assert.assertEquals("cnt", 40.0, new Double(row.get(1).toString()), 0);
+ Assert.assertEquals("cnt", 40.0,
Double.parseDouble(row.get(1).toString()), 0);
Assert.assertEquals("sketch", 40.0, (double) row.get(0), 0);
- Assert.assertEquals("estimate", 40.0, new Double(row.get(2).toString()),
0);
- Assert.assertEquals("union", 40.0, new Double(row.get(4).toString()), 0);
- Assert.assertEquals("intersection", 40.0, new
Double(row.get(5).toString()), 0);
- Assert.assertEquals("anotb", 0, new Double(row.get(6).toString()), 0);
+ Assert.assertEquals("estimate", 40.0,
Double.parseDouble(row.get(2).toString()), 0);
+ Assert.assertEquals("union", 40.0,
Double.parseDouble(row.get(4).toString()), 0);
+ Assert.assertEquals("intersection", 40.0,
Double.parseDouble(row.get(5).toString()), 0);
+ Assert.assertEquals("anotb", 0, Double.parseDouble(row.get(6).toString()),
0);
Object obj = row.get(3); // quantiles-sketch
Assert.assertTrue(obj instanceof DoublesSketch);
@@ -852,12 +852,12 @@ public class ArrayOfDoublesSketchAggregationTest extends
InitializedNullHandling
List<ResultRow> results = seq.toList();
Assert.assertEquals(1, results.size());
ResultRow row = results.get(0);
- Assert.assertEquals("cnt", 40.0, new Double(row.get(1).toString()), 0);
+ Assert.assertEquals("cnt", 40.0,
Double.parseDouble(row.get(1).toString()), 0);
Assert.assertEquals("sketch", 40.0, (double) row.get(0), 0);
- Assert.assertEquals("estimate", 40.0, new Double(row.get(2).toString()),
0);
- Assert.assertEquals("union", 40.0, new Double(row.get(4).toString()), 0);
- Assert.assertEquals("intersection", 40.0, new
Double(row.get(5).toString()), 0);
- Assert.assertEquals("anotb", 0, new Double(row.get(6).toString()), 0);
+ Assert.assertEquals("estimate", 40.0,
Double.parseDouble(row.get(2).toString()), 0);
+ Assert.assertEquals("union", 40.0,
Double.parseDouble(row.get(4).toString()), 0);
+ Assert.assertEquals("intersection", 40.0,
Double.parseDouble(row.get(5).toString()), 0);
+ Assert.assertEquals("anotb", 0, Double.parseDouble(row.get(6).toString()),
0);
Object obj = row.get(3); // quantiles-sketch
Assert.assertTrue(obj instanceof DoublesSketch);
diff --git
a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaRecordSupplierTest.java
b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaRecordSupplierTest.java
index 8884592bdfa..fbd7b64d988 100644
---
a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaRecordSupplierTest.java
+++
b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaRecordSupplierTest.java
@@ -722,7 +722,7 @@ public class KafkaRecordSupplierTest
Set<StreamPartition<KafkaTopicPartition>> partitions =
ImmutableSet.of(streamPartition);
recordSupplier.assign(partitions);
recordSupplier.seekToEarliest(partitions);
- Assert.assertEquals(new Long(0),
recordSupplier.getLatestSequenceNumber(streamPartition));
+ Assert.assertEquals(Long.valueOf(0),
recordSupplier.getLatestSequenceNumber(streamPartition));
}
@Test
@@ -734,7 +734,7 @@ public class KafkaRecordSupplierTest
Set<StreamPartition<KafkaTopicPartition>> partitions =
ImmutableSet.of(streamPartition);
recordSupplier.assign(partitions);
recordSupplier.seekToEarliest(partitions);
- Assert.assertEquals(new Long(0),
recordSupplier.getEarliestSequenceNumber(streamPartition));
+ Assert.assertEquals(Long.valueOf(0),
recordSupplier.getEarliestSequenceNumber(streamPartition));
}
@Test
@@ -746,7 +746,7 @@ public class KafkaRecordSupplierTest
Set<StreamPartition<KafkaTopicPartition>> partitions =
ImmutableSet.of(streamPartition);
recordSupplier.assign(partitions);
recordSupplier.seekToLatest(partitions);
- Assert.assertEquals(new Long(0),
recordSupplier.getLatestSequenceNumber(streamPartition));
+ Assert.assertEquals(Long.valueOf(0),
recordSupplier.getLatestSequenceNumber(streamPartition));
}
@Test
@@ -758,7 +758,7 @@ public class KafkaRecordSupplierTest
Set<StreamPartition<KafkaTopicPartition>> partitions =
ImmutableSet.of(streamPartition);
recordSupplier.assign(partitions);
recordSupplier.seekToLatest(partitions);
- Assert.assertEquals(new Long(0),
recordSupplier.getEarliestSequenceNumber(streamPartition));
+ Assert.assertEquals(Long.valueOf(0),
recordSupplier.getEarliestSequenceNumber(streamPartition));
}
@Test
diff --git
a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/DimensionCardinalityReportTest.java
b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/DimensionCardinalityReportTest.java
index 0c540fa8a24..f30eedee5fd 100644
---
a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/DimensionCardinalityReportTest.java
+++
b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/DimensionCardinalityReportTest.java
@@ -317,7 +317,7 @@ public class DimensionCardinalityReportTest
Map<Interval, Union> intervalToUnion = ImmutableMap.of(interval,
negativeUnion);
Map<Interval, Integer> intervalToNumShards =
ParallelIndexSupervisorTask.computeIntervalToNumShards(10,
intervalToUnion);
- Assert.assertEquals(new Integer(7), intervalToNumShards.get(interval));
+ Assert.assertEquals(Integer.valueOf(7), intervalToNumShards.get(interval));
List<LogEvent> loggingEvents = logger.getLogEvents();
String expectedLogMessage =
@@ -343,7 +343,7 @@ public class DimensionCardinalityReportTest
Map<Interval, Union> intervalToUnion = ImmutableMap.of(interval, union);
Map<Interval, Integer> intervalToNumShards =
ParallelIndexSupervisorTask.computeIntervalToNumShards(6,
intervalToUnion);
- Assert.assertEquals(new Integer(4), intervalToNumShards.get(interval));
+ Assert.assertEquals(Integer.valueOf(4), intervalToNumShards.get(interval));
}
@Test
@@ -356,7 +356,7 @@ public class DimensionCardinalityReportTest
Map<Interval, Union> intervalToUnion = ImmutableMap.of(interval, union);
Map<Interval, Integer> intervalToNumShards =
ParallelIndexSupervisorTask.computeIntervalToNumShards(24,
intervalToUnion);
- Assert.assertEquals(new Integer(1), intervalToNumShards.get(interval));
+ Assert.assertEquals(Integer.valueOf(1), intervalToNumShards.get(interval));
List<LogEvent> loggingEvents = logger.getLogEvents();
String expectedLogMessage =
diff --git
a/indexing-service/src/test/java/org/apache/druid/indexing/input/GeneratorInputSourceTest.java
b/indexing-service/src/test/java/org/apache/druid/indexing/input/GeneratorInputSourceTest.java
index 3f87dd4c056..94aecc2f443 100644
---
a/indexing-service/src/test/java/org/apache/druid/indexing/input/GeneratorInputSourceTest.java
+++
b/indexing-service/src/test/java/org/apache/druid/indexing/input/GeneratorInputSourceTest.java
@@ -173,7 +173,7 @@ public class GeneratorInputSourceTest
Assert.assertFalse(inputSource.needsFormat());
Assert.assertEquals(2, inputSource.createSplits(null, null).count());
Assert.assertEquals(
- new Long(2048L),
+ Long.valueOf(2048L),
((GeneratorInputSource) inputSource.withSplit(new
InputSplit<>(2048L))).getSeed()
);
}
diff --git
a/processing/src/test/java/org/apache/druid/common/guava/GuavaUtilsTest.java
b/processing/src/test/java/org/apache/druid/common/guava/GuavaUtilsTest.java
index 110268ba84e..e2b433b7192 100644
--- a/processing/src/test/java/org/apache/druid/common/guava/GuavaUtilsTest.java
+++ b/processing/src/test/java/org/apache/druid/common/guava/GuavaUtilsTest.java
@@ -57,7 +57,7 @@ public class GuavaUtilsTest
Assert.assertNull(GuavaUtils.tryParseLong("++100"));
Assert.assertEquals((Object) Long.parseLong("+100"),
GuavaUtils.tryParseLong("+100"));
Assert.assertEquals((Object) Long.parseLong("-100"),
GuavaUtils.tryParseLong("-100"));
- Assert.assertNotEquals(new Long(100), GuavaUtils.tryParseLong("+101"));
+ Assert.assertNotEquals(Long.valueOf(100L),
GuavaUtils.tryParseLong("+101"));
}
@Test
diff --git
a/processing/src/test/java/org/apache/druid/hll/HyperLogLogSerdeBenchmarkTest.java
b/processing/src/test/java/org/apache/druid/hll/HyperLogLogSerdeBenchmarkTest.java
index 18758de67d5..0e002d8ca31 100644
---
a/processing/src/test/java/org/apache/druid/hll/HyperLogLogSerdeBenchmarkTest.java
+++
b/processing/src/test/java/org/apache/druid/hll/HyperLogLogSerdeBenchmarkTest.java
@@ -35,8 +35,8 @@ import org.junit.runners.Parameterized;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
-import java.util.Arrays;
import java.util.Collection;
+import java.util.List;
import java.util.Random;
/**
@@ -61,18 +61,18 @@ public class HyperLogLogSerdeBenchmarkTest extends
AbstractBenchmark
public static Collection<Object[]> getParameters()
{
return ImmutableList.of(
- (Object[]) Arrays.asList(new priorByteBufferSerializer(), new Long(1
<< 10)).toArray(),
- (Object[]) Arrays.asList(new newByteBufferSerializer(), new Long(1 <<
10)).toArray(),
- (Object[]) Arrays.asList(new newByteBufferSerializerWithPuts(), new
Long(1 << 10)).toArray(),
- (Object[]) Arrays.asList(new priorByteBufferSerializer(), new Long(1
<< 8)).toArray(),
- (Object[]) Arrays.asList(new newByteBufferSerializer(), new Long(1 <<
8)).toArray(),
- (Object[]) Arrays.asList(new newByteBufferSerializerWithPuts(), new
Long(1 << 8)).toArray(),
- (Object[]) Arrays.asList(new priorByteBufferSerializer(), new Long(1
<< 5)).toArray(),
- (Object[]) Arrays.asList(new newByteBufferSerializer(), new Long(1 <<
5)).toArray(),
- (Object[]) Arrays.asList(new newByteBufferSerializerWithPuts(), new
Long(1 << 5)).toArray(),
- (Object[]) Arrays.asList(new priorByteBufferSerializer(), new Long(1
<< 2)).toArray(),
- (Object[]) Arrays.asList(new newByteBufferSerializer(), new Long(1 <<
2)).toArray(),
- (Object[]) Arrays.asList(new newByteBufferSerializerWithPuts(), new Long(1
<< 2)).toArray()
+ List.of(new priorByteBufferSerializer(), (long) (1 << 10)).toArray(),
+ List.of(new newByteBufferSerializer(), (long) (1 << 10)).toArray(),
+ List.of(new newByteBufferSerializerWithPuts(), (long) (1 <<
10)).toArray(),
+ List.of(new priorByteBufferSerializer(), (long) (1 << 8)).toArray(),
+ List.of(new newByteBufferSerializer(), (long) (1 << 8)).toArray(),
+ List.of(new newByteBufferSerializerWithPuts(), (long) (1 <<
8)).toArray(),
+ List.of(new priorByteBufferSerializer(), (long) (1 << 5)).toArray(),
+ List.of(new newByteBufferSerializer(), (long) (1 << 5)).toArray(),
+ List.of(new newByteBufferSerializerWithPuts(), (long) (1 <<
5)).toArray(),
+ List.of(new priorByteBufferSerializer(), (long) (1 << 2)).toArray(),
+ List.of(new newByteBufferSerializer(), (long) (1 << 2)).toArray(),
+ List.of(new newByteBufferSerializerWithPuts(), (long) (1 <<
2)).toArray()
);
}
diff --git
a/processing/src/test/java/org/apache/druid/jackson/JacksonExtremeDoubleValuesSerdeTest.java
b/processing/src/test/java/org/apache/druid/jackson/JacksonExtremeDoubleValuesSerdeTest.java
index a2f8fcebfe9..905a00dc405 100644
---
a/processing/src/test/java/org/apache/druid/jackson/JacksonExtremeDoubleValuesSerdeTest.java
+++
b/processing/src/test/java/org/apache/druid/jackson/JacksonExtremeDoubleValuesSerdeTest.java
@@ -33,7 +33,7 @@ public class JacksonExtremeDoubleValuesSerdeTest
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));
+ Assert.assertEquals(Double.valueOf(value),
objectMapper.readValue(serialized, Double.class));
}
String negativeInfinityString =
objectMapper.writeValueAsString(Double.NaN);
Assert.assertTrue(objectMapper.readValue(negativeInfinityString,
Double.class).isNaN());
diff --git
a/processing/src/test/java/org/apache/druid/query/aggregation/DoubleSumAggregatorTest.java
b/processing/src/test/java/org/apache/druid/query/aggregation/DoubleSumAggregatorTest.java
index 0732a8497c7..51c08fe211a 100644
---
a/processing/src/test/java/org/apache/druid/query/aggregation/DoubleSumAggregatorTest.java
+++
b/processing/src/test/java/org/apache/druid/query/aggregation/DoubleSumAggregatorTest.java
@@ -41,8 +41,8 @@ public class DoubleSumAggregatorTest
final TestDoubleColumnSelectorImpl selector = new
TestDoubleColumnSelectorImpl(values);
DoubleSumAggregator agg = new DoubleSumAggregator(selector);
- double expectedFirst = new Double(values[0]).doubleValue();
- double expectedSecond = new Double(values[1]).doubleValue() +
expectedFirst;
+ double expectedFirst = values[0];
+ double expectedSecond = values[1] + expectedFirst;
Assert.assertEquals(0.0d, agg.get());
Assert.assertEquals(0.0d, agg.get());
diff --git
a/processing/src/test/java/org/apache/druid/query/aggregation/firstlast/first/StringFirstBufferAggregatorTest.java
b/processing/src/test/java/org/apache/druid/query/aggregation/firstlast/first/StringFirstBufferAggregatorTest.java
index 9f72ff8fd31..71e582c078a 100644
---
a/processing/src/test/java/org/apache/druid/query/aggregation/firstlast/first/StringFirstBufferAggregatorTest.java
+++
b/processing/src/test/java/org/apache/druid/query/aggregation/firstlast/first/StringFirstBufferAggregatorTest.java
@@ -77,7 +77,7 @@ public class StringFirstBufferAggregatorTest
Assert.assertEquals("expected last string value", strings[0], sp.rhs);
- Assert.assertEquals("last string timestamp is the biggest", new
Long(timestamps[0]), sp.lhs);
+ Assert.assertEquals("last string timestamp is the biggest",
Long.valueOf(timestamps[0]), sp.lhs);
}
@Test
@@ -114,7 +114,7 @@ public class StringFirstBufferAggregatorTest
Assert.assertEquals("expected last string value", strings[0], sp.rhs);
- Assert.assertEquals("last string timestamp is the biggest", new
Long(timestamps[0]), sp.lhs);
+ Assert.assertEquals("last string timestamp is the biggest",
Long.valueOf(timestamps[0]), sp.lhs);
}
@Test
@@ -152,7 +152,7 @@ public class StringFirstBufferAggregatorTest
Assert.assertEquals("expected last string value", strings[1], sp.rhs);
- Assert.assertEquals("last string timestamp is the biggest", new
Long(timestamps[1]), sp.lhs);
+ Assert.assertEquals("last string timestamp is the biggest",
Long.valueOf(timestamps[1]), sp.lhs);
}
diff --git
a/processing/src/test/java/org/apache/druid/query/aggregation/firstlast/last/StringLastBufferAggregatorTest.java
b/processing/src/test/java/org/apache/druid/query/aggregation/firstlast/last/StringLastBufferAggregatorTest.java
index 4c3d7fea39e..9e8c9117a32 100644
---
a/processing/src/test/java/org/apache/druid/query/aggregation/firstlast/last/StringLastBufferAggregatorTest.java
+++
b/processing/src/test/java/org/apache/druid/query/aggregation/firstlast/last/StringLastBufferAggregatorTest.java
@@ -78,7 +78,7 @@ public class StringLastBufferAggregatorTest
Assert.assertEquals("expected last string value", "DDDD", sp.rhs);
- Assert.assertEquals("last string timestamp is the biggest", new
Long(1526725900L), sp.lhs);
+ Assert.assertEquals("last string timestamp is the biggest",
Long.valueOf(1526725900L), sp.lhs);
}
@@ -116,7 +116,7 @@ public class StringLastBufferAggregatorTest
Assert.assertEquals("expected last string value", "DDDD", sp.rhs);
- Assert.assertEquals("last string timestamp is the biggest", new
Long(1526725900L), sp.lhs);
+ Assert.assertEquals("last string timestamp is the biggest",
Long.valueOf(1526725900L), sp.lhs);
}
@Test
@@ -154,7 +154,7 @@ public class StringLastBufferAggregatorTest
Assert.assertEquals("expected last string value", strings[2], sp.rhs);
- Assert.assertEquals("last string timestamp is the biggest", new
Long(timestamps[2]), sp.lhs);
+ Assert.assertEquals("last string timestamp is the biggest",
Long.valueOf(timestamps[2]), sp.lhs);
}
diff --git
a/processing/src/test/java/org/apache/druid/query/aggregation/post/FieldAccessPostAggregatorTest.java
b/processing/src/test/java/org/apache/druid/query/aggregation/post/FieldAccessPostAggregatorTest.java
index f477b5db5ab..6ccc73a4446 100644
---
a/processing/src/test/java/org/apache/druid/query/aggregation/post/FieldAccessPostAggregatorTest.java
+++
b/processing/src/test/java/org/apache/druid/query/aggregation/post/FieldAccessPostAggregatorTest.java
@@ -89,13 +89,13 @@ public class FieldAccessPostAggregatorTest extends
InitializedNullHandlingTest
CountAggregator agg = new CountAggregator();
Map<String, Object> metricValues = new HashMap<>();
metricValues.put(aggName, agg.get());
- Assert.assertEquals(new Long(0L),
fieldAccessPostAggregator.compute(metricValues));
+ Assert.assertEquals(0L, fieldAccessPostAggregator.compute(metricValues));
agg.aggregate();
agg.aggregate();
agg.aggregate();
metricValues.put(aggName, agg.get());
- Assert.assertEquals(new Long(3L),
fieldAccessPostAggregator.compute(metricValues));
+ Assert.assertEquals(3L, fieldAccessPostAggregator.compute(metricValues));
}
@Test
diff --git
a/processing/src/test/java/org/apache/druid/query/aggregation/post/FinalizingFieldAccessPostAggregatorTest.java
b/processing/src/test/java/org/apache/druid/query/aggregation/post/FinalizingFieldAccessPostAggregatorTest.java
index f5a19119b84..9f84464b1d9 100644
---
a/processing/src/test/java/org/apache/druid/query/aggregation/post/FinalizingFieldAccessPostAggregatorTest.java
+++
b/processing/src/test/java/org/apache/druid/query/aggregation/post/FinalizingFieldAccessPostAggregatorTest.java
@@ -75,7 +75,7 @@ public class FinalizingFieldAccessPostAggregatorTest extends
InitializedNullHand
metricValues.put(aggName, agg.get());
FinalizingFieldAccessPostAggregator postAgg = new
FinalizingFieldAccessPostAggregator("final_rows", aggName);
- Assert.assertEquals(new Long(3L), postAgg.compute(metricValues));
+ Assert.assertEquals(3L, postAgg.compute(metricValues));
}
@Test
@@ -98,7 +98,7 @@ public class FinalizingFieldAccessPostAggregatorTest extends
InitializedNullHand
Map<String, Object> metricValues = new HashMap<>();
metricValues.put(aggName, "test");
- Assert.assertEquals(new Long(3L), postAgg.compute(metricValues));
+ Assert.assertEquals(3L, postAgg.compute(metricValues));
EasyMock.verify(aggFactory);
}
@@ -124,7 +124,7 @@ public class FinalizingFieldAccessPostAggregatorTest
extends InitializedNullHand
ArithmeticPostAggregator arithmeticPostAggregator = new
ArithmeticPostAggregator("add", "+", postAggsList);
- Assert.assertEquals(new Double(9.0f),
arithmeticPostAggregator.compute(metricValues));
+ Assert.assertEquals(9.0, arithmeticPostAggregator.compute(metricValues));
EasyMock.verify();
}
@@ -134,13 +134,13 @@ public class FinalizingFieldAccessPostAggregatorTest
extends InitializedNullHand
String aggName = "billy";
AggregatorFactory aggFactory =
EasyMock.createMock(AggregatorFactory.class);
EasyMock.expect(aggFactory.finalizeComputation("test_val1"))
- .andReturn(new Long(10L))
+ .andReturn(10L)
.times(1);
EasyMock.expect(aggFactory.finalizeComputation("test_val2"))
- .andReturn(new Long(21))
+ .andReturn(21L)
.times(1);
EasyMock.expect(aggFactory.finalizeComputation("test_val3"))
- .andReturn(new Long(3))
+ .andReturn(3L)
.times(1);
EasyMock.expect(aggFactory.finalizeComputation("test_val4"))
.andReturn(null)
diff --git
a/processing/src/test/java/org/apache/druid/query/extraction/SubstringDimExtractionFnTest.java
b/processing/src/test/java/org/apache/druid/query/extraction/SubstringDimExtractionFnTest.java
index 1a3d3be9f66..77a5608f613 100644
---
a/processing/src/test/java/org/apache/druid/query/extraction/SubstringDimExtractionFnTest.java
+++
b/processing/src/test/java/org/apache/druid/query/extraction/SubstringDimExtractionFnTest.java
@@ -108,7 +108,7 @@ public class SubstringDimExtractionFnTest
SubstringDimExtractionFn extractionFnNoLength = (SubstringDimExtractionFn)
objectMapper.readValue(jsonNoLength, ExtractionFn.class);
Assert.assertEquals(1, extractionFn.getIndex());
- Assert.assertEquals(new Integer(3), extractionFn.getLength());
+ Assert.assertEquals(Integer.valueOf(3), extractionFn.getLength());
Assert.assertEquals(1, extractionFnNoLength.getIndex());
Assert.assertEquals(null, extractionFnNoLength.getLength());
diff --git
a/processing/src/test/java/org/apache/druid/query/scan/ScanQueryTest.java
b/processing/src/test/java/org/apache/druid/query/scan/ScanQueryTest.java
index 847226ccb0d..48861d6c537 100644
--- a/processing/src/test/java/org/apache/druid/query/scan/ScanQueryTest.java
+++ b/processing/src/test/java/org/apache/druid/query/scan/ScanQueryTest.java
@@ -76,7 +76,7 @@ public class ScanQueryTest extends InitializedNullHandlingTest
ArrayList<HashMap<String, Object>> events1 = new ArrayList<>();
HashMap<String, Object> event1 = new HashMap<>();
- event1.put(ColumnHolder.TIME_COLUMN_NAME, new Long(42));
+ event1.put(ColumnHolder.TIME_COLUMN_NAME, 42L);
events1.add(event1);
s1 = new ScanResultValue(
@@ -87,7 +87,7 @@ public class ScanQueryTest extends InitializedNullHandlingTest
ArrayList<HashMap<String, Object>> events2 = new ArrayList<>();
HashMap<String, Object> event2 = new HashMap<>();
- event2.put(ColumnHolder.TIME_COLUMN_NAME, new Long(43));
+ event2.put(ColumnHolder.TIME_COLUMN_NAME, 43L);
events2.add(event2);
s2 = new ScanResultValue(
diff --git
a/processing/src/test/java/org/apache/druid/query/scan/ScanResultValueTimestampComparatorTest.java
b/processing/src/test/java/org/apache/druid/query/scan/ScanResultValueTimestampComparatorTest.java
index 91f0ef0c4a6..36e57a927f7 100644
---
a/processing/src/test/java/org/apache/druid/query/scan/ScanResultValueTimestampComparatorTest.java
+++
b/processing/src/test/java/org/apache/druid/query/scan/ScanResultValueTimestampComparatorTest.java
@@ -63,7 +63,7 @@ public class ScanResultValueTimestampComparatorTest
ArrayList<HashMap<String, Object>> events1 = new ArrayList<>();
HashMap<String, Object> event1 = new HashMap<>();
- event1.put(ColumnHolder.TIME_COLUMN_NAME, new Long(42));
+ event1.put(ColumnHolder.TIME_COLUMN_NAME, 42L);
events1.add(event1);
ScanResultValue s1 = new ScanResultValue(
@@ -74,7 +74,7 @@ public class ScanResultValueTimestampComparatorTest
ArrayList<HashMap<String, Object>> events2 = new ArrayList<>();
HashMap<String, Object> event2 = new HashMap<>();
- event2.put(ColumnHolder.TIME_COLUMN_NAME, new Long(43));
+ event2.put(ColumnHolder.TIME_COLUMN_NAME, 43L);
events2.add(event2);
ScanResultValue s2 = new ScanResultValue(
@@ -100,7 +100,7 @@ public class ScanResultValueTimestampComparatorTest
ArrayList<HashMap<String, Object>> events1 = new ArrayList<>();
HashMap<String, Object> event1 = new HashMap<>();
- event1.put(ColumnHolder.TIME_COLUMN_NAME, new Long(42));
+ event1.put(ColumnHolder.TIME_COLUMN_NAME, 42L);
events1.add(event1);
ScanResultValue s1 = new ScanResultValue(
@@ -111,7 +111,7 @@ public class ScanResultValueTimestampComparatorTest
ArrayList<HashMap<String, Object>> events2 = new ArrayList<>();
HashMap<String, Object> event2 = new HashMap<>();
- event2.put(ColumnHolder.TIME_COLUMN_NAME, new Long(43));
+ event2.put(ColumnHolder.TIME_COLUMN_NAME, 43L);
events2.add(event2);
ScanResultValue s2 = new ScanResultValue(
@@ -136,7 +136,7 @@ public class ScanResultValueTimestampComparatorTest
ScanResultValueTimestampComparator comparator = new
ScanResultValueTimestampComparator(query);
List<List<Object>> events1 = new ArrayList<>();
- List<Object> event1 = Collections.singletonList(new Long(42));
+ List<Object> event1 = Collections.singletonList(42L);
events1.add(event1);
ScanResultValue s1 = new ScanResultValue(
@@ -146,7 +146,7 @@ public class ScanResultValueTimestampComparatorTest
);
List<List<Object>> events2 = new ArrayList<>();
- List<Object> event2 = Collections.singletonList(new Long(43));
+ List<Object> event2 = Collections.singletonList(43L);
events2.add(event2);
ScanResultValue s2 = new ScanResultValue(
@@ -171,7 +171,7 @@ public class ScanResultValueTimestampComparatorTest
ScanResultValueTimestampComparator comparator = new
ScanResultValueTimestampComparator(query);
List<List<Object>> events1 = new ArrayList<>();
- List<Object> event1 = Collections.singletonList(new Long(42));
+ List<Object> event1 = Collections.singletonList(42L);
events1.add(event1);
ScanResultValue s1 = new ScanResultValue(
@@ -181,7 +181,7 @@ public class ScanResultValueTimestampComparatorTest
);
List<List<Object>> events2 = new ArrayList<>();
- List<Object> event2 = Collections.singletonList(new Long(43));
+ List<Object> event2 = Collections.singletonList(43L);
events2.add(event2);
ScanResultValue s2 = new ScanResultValue(
diff --git
a/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesQueryRunnerTest.java
b/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesQueryRunnerTest.java
index 3bbd83c7720..52cc5b14966 100644
---
a/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesQueryRunnerTest.java
+++
b/processing/src/test/java/org/apache/druid/query/timeseries/TimeseriesQueryRunnerTest.java
@@ -24,7 +24,6 @@ import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
-import com.google.common.primitives.Doubles;
import org.apache.druid.java.util.common.DateTimes;
import org.apache.druid.java.util.common.HumanReadableBytes;
import org.apache.druid.java.util.common.Intervals;
@@ -261,20 +260,19 @@ public class TimeseriesQueryRunnerTest extends
InitializedNullHandlingTest
if (!QueryRunnerTestHelper.SKIPPED_DAY.equals(current)) {
Assert.assertEquals(
result.toString(),
- Doubles.tryParse(expectedIndex[count]).doubleValue(),
- value.getDoubleMetric("index").doubleValue(),
- value.getDoubleMetric("index").doubleValue() * 1e-6
+ Double.parseDouble(expectedIndex[count]),
+ value.getDoubleMetric("index"),
+ value.getDoubleMetric("index") * 1e-6
);
Assert.assertEquals(
result.toString(),
- new Double(expectedIndex[count]) +
- 13L + 1L,
+ Double.parseDouble(expectedIndex[count]) + 13L + 1L,
value.getDoubleMetric("addRowsIndexConstant"),
value.getDoubleMetric("addRowsIndexConstant") * 1e-6
);
Assert.assertEquals(
- value.getDoubleMetric("uniques"),
9.0d,
+ value.getDoubleMetric("uniques"),
0.02
);
} else {
@@ -287,8 +285,8 @@ public class TimeseriesQueryRunnerTest extends
InitializedNullHandlingTest
value.getDoubleMetric("addRowsIndexConstant")
);
Assert.assertEquals(
- value.getDoubleMetric("uniques"),
0.0d,
+ value.getDoubleMetric("uniques"),
0.02
);
}
@@ -1003,7 +1001,7 @@ public class TimeseriesQueryRunnerTest extends
InitializedNullHandlingTest
final Iterable<Interval> iterable = Granularities.HOUR.getIterable(
new Interval(DateTimes.of("2011-04-14T01"), DateTimes.of("2011-04-15"))
);
- Map noRowsResult = new HashMap<>();
+ Map<String, Object> noRowsResult = new HashMap<>();
noRowsResult.put("rows", 0L);
noRowsResult.put("idx", null);
for (Interval interval : iterable) {
@@ -1496,8 +1494,8 @@ public class TimeseriesQueryRunnerTest extends
InitializedNullHandlingTest
new TimeseriesResultValue(
ImmutableMap.of(
"rows", 1L,
- "index", new Float(135.885094).doubleValue(),
- "addRowsIndexConstant", new
Float(137.885094).doubleValue(),
+ "index", 135.885094F,
+ "addRowsIndexConstant", 137.885094F,
"uniques", QueryRunnerTestHelper.UNIQUES_1
)
)
@@ -1507,8 +1505,8 @@ public class TimeseriesQueryRunnerTest extends
InitializedNullHandlingTest
new TimeseriesResultValue(
ImmutableMap.of(
"rows", 1L,
- "index", new Float(147.425935).doubleValue(),
- "addRowsIndexConstant", new
Float(149.425935).doubleValue(),
+ "index", 147.425935F,
+ "addRowsIndexConstant", 149.425935F,
"uniques", QueryRunnerTestHelper.UNIQUES_1
)
)
@@ -1543,8 +1541,8 @@ public class TimeseriesQueryRunnerTest extends
InitializedNullHandlingTest
new TimeseriesResultValue(
ImmutableMap.of(
"rows", 1L,
- "index", new Float(118.570340).doubleValue(),
- "addRowsIndexConstant", new
Float(120.570340).doubleValue(),
+ "index", 118.570340F,
+ "addRowsIndexConstant", 120.570340F,
"uniques", QueryRunnerTestHelper.UNIQUES_1
)
)
@@ -1554,8 +1552,8 @@ public class TimeseriesQueryRunnerTest extends
InitializedNullHandlingTest
new TimeseriesResultValue(
ImmutableMap.of(
"rows", 1L,
- "index", new Float(112.987027).doubleValue(),
- "addRowsIndexConstant", new
Float(114.987027).doubleValue(),
+ "index", 112.987027F,
+ "addRowsIndexConstant", 114.987027F,
"uniques", QueryRunnerTestHelper.UNIQUES_1
)
)
@@ -2046,8 +2044,8 @@ public class TimeseriesQueryRunnerTest extends
InitializedNullHandlingTest
DateTimes.of("2011-01-01"),
new TimeseriesResultValue(
ImmutableMap.of(
- "first", new Float(100.000000).doubleValue(),
- "last", new Float(943.497198).doubleValue()
+ "first", 100.000000F,
+ "last", 943.497198F
)
)
),
@@ -2055,8 +2053,8 @@ public class TimeseriesQueryRunnerTest extends
InitializedNullHandlingTest
DateTimes.of("2011-02-01"),
new TimeseriesResultValue(
ImmutableMap.of(
- "first", new Float(132.123776).doubleValue(),
- "last", new Float(1101.918270).doubleValue()
+ "first", 132.123776F,
+ "last", 1101.918270F
)
)
),
@@ -2064,8 +2062,8 @@ public class TimeseriesQueryRunnerTest extends
InitializedNullHandlingTest
DateTimes.of("2011-03-01"),
new TimeseriesResultValue(
ImmutableMap.of(
- "first", new Float(153.059937).doubleValue(),
- "last", new Float(1063.201156).doubleValue()
+ "first", 153.059937F,
+ "last", 1063.201156F
)
)
),
@@ -2073,8 +2071,8 @@ public class TimeseriesQueryRunnerTest extends
InitializedNullHandlingTest
DateTimes.of("2011-04-01"),
new TimeseriesResultValue(
ImmutableMap.of(
- "first", new Float(135.885094).doubleValue(),
- "last", new Float(780.271977).doubleValue()
+ "first", 135.885094F,
+ "last", 780.271977F
)
)
)
@@ -2085,8 +2083,8 @@ public class TimeseriesQueryRunnerTest extends
InitializedNullHandlingTest
DateTimes.of("2011-04-01"),
new TimeseriesResultValue(
ImmutableMap.of(
- "first", new Float(1234.247546).doubleValue(),
- "last", new Float(106.793700).doubleValue()
+ "first", 1234.247546F,
+ "last", 106.793700F
)
)
),
@@ -2094,8 +2092,8 @@ public class TimeseriesQueryRunnerTest extends
InitializedNullHandlingTest
DateTimes.of("2011-03-01"),
new TimeseriesResultValue(
ImmutableMap.of(
- "first", new Float(1004.940887).doubleValue(),
- "last", new Float(151.752485).doubleValue()
+ "first", 1004.940887F,
+ "last", 151.752485F
)
)
),
@@ -2103,8 +2101,8 @@ public class TimeseriesQueryRunnerTest extends
InitializedNullHandlingTest
DateTimes.of("2011-02-01"),
new TimeseriesResultValue(
ImmutableMap.of(
- "first", new Float(913.561076).doubleValue(),
- "last", new Float(122.258195).doubleValue()
+ "first", 913.561076F,
+ "last", 122.258195F
)
)
),
@@ -2112,8 +2110,8 @@ public class TimeseriesQueryRunnerTest extends
InitializedNullHandlingTest
DateTimes.of("2011-01-01"),
new TimeseriesResultValue(
ImmutableMap.of(
- "first", new Float(800.000000).doubleValue(),
- "last", new Float(133.740047).doubleValue()
+ "first", 800.000000F,
+ "last", 133.740047F
)
)
)
@@ -2763,17 +2761,17 @@ public class TimeseriesQueryRunnerTest extends
InitializedNullHandlingTest
if (QueryRunnerTestHelper.SKIPPED_DAY.getMillis() != current) {
Assert.assertEquals(
- Doubles.tryParse(expectedIndexToUse[count]).doubleValue(),
+ Double.parseDouble(expectedIndexToUse[count]),
(Double) result[3],
(Double) result[3] * 1e-6
);
Assert.assertEquals(
- (Double) result[4],
9.0d,
+ (Double) result[4],
0.02
);
Assert.assertEquals(
- new Double(expectedIndexToUse[count]) + 13L + 1L,
+ Double.parseDouble(expectedIndexToUse[count]) + 13L + 1L,
(Double) result[5],
(Double) result[5] * 1e-6
);
@@ -2782,8 +2780,8 @@ public class TimeseriesQueryRunnerTest extends
InitializedNullHandlingTest
result[3]
);
Assert.assertEquals(
- (Double) result[4],
0.0,
+ (Double) result[4],
0.02
);
Assert.assertNull(
@@ -2863,20 +2861,20 @@ public class TimeseriesQueryRunnerTest extends
InitializedNullHandlingTest
if (!QueryRunnerTestHelper.SKIPPED_DAY.equals(current)) {
Assert.assertEquals(
result.toString(),
- Doubles.tryParse(expectedIndexToUse[count]).doubleValue(),
- value.getDoubleMetric("index").doubleValue(),
- value.getDoubleMetric("index").doubleValue() * 1e-6
+ Double.parseDouble(expectedIndexToUse[count]),
+ value.getDoubleMetric("index"),
+ value.getDoubleMetric("index") * 1e-6
);
Assert.assertEquals(
result.toString(),
- new Double(expectedIndexToUse[count]) +
+ Double.parseDouble(expectedIndexToUse[count]) +
13L + 1L,
value.getDoubleMetric("addRowsIndexConstant"),
value.getDoubleMetric("addRowsIndexConstant") * 1e-6
);
Assert.assertEquals(
- value.getDoubleMetric("uniques"),
9.0d,
+ value.getDoubleMetric("uniques"),
0.02
);
} else {
@@ -2889,8 +2887,8 @@ public class TimeseriesQueryRunnerTest extends
InitializedNullHandlingTest
value.getDoubleMetric("addRowsIndexConstant")
);
Assert.assertEquals(
- value.getDoubleMetric("uniques"),
0.0d,
+ value.getDoubleMetric("uniques"),
0.02
);
}
diff --git
a/processing/src/test/java/org/apache/druid/query/topn/TopNMetricSpecOptimizationsTest.java
b/processing/src/test/java/org/apache/druid/query/topn/TopNMetricSpecOptimizationsTest.java
index c374602ecf4..ae42acfa6f4 100644
---
a/processing/src/test/java/org/apache/druid/query/topn/TopNMetricSpecOptimizationsTest.java
+++
b/processing/src/test/java/org/apache/druid/query/topn/TopNMetricSpecOptimizationsTest.java
@@ -83,8 +83,8 @@ public class TopNMetricSpecOptimizationsTest extends
InitializedNullHandlingTest
arrayProviderToTest.ignoreAfterThreshold();
Pair<Integer, Integer> thePair =
arrayProviderToTest.computeStartEnd(cardinality);
- Assert.assertEquals(new Integer(0), thePair.lhs);
- Assert.assertEquals(new Integer(threshold), thePair.rhs);
+ Assert.assertEquals(Integer.valueOf(0), thePair.lhs);
+ Assert.assertEquals(Integer.valueOf(threshold), thePair.rhs);
}
@Test
@@ -116,8 +116,8 @@ public class TopNMetricSpecOptimizationsTest extends
InitializedNullHandlingTest
arrayProviderToTest.ignoreAfterThreshold();
Pair<Integer, Integer> thePair =
arrayProviderToTest.computeStartEnd(cardinality);
- Assert.assertEquals(new Integer(0), thePair.lhs);
- Assert.assertEquals(new Integer(threshold), thePair.rhs);
+ Assert.assertEquals(Integer.valueOf(0), thePair.lhs);
+ Assert.assertEquals(Integer.valueOf(threshold), thePair.rhs);
}
@Test
@@ -149,8 +149,8 @@ public class TopNMetricSpecOptimizationsTest extends
InitializedNullHandlingTest
arrayProviderToTest.ignoreAfterThreshold();
Pair<Integer, Integer> thePair =
arrayProviderToTest.computeStartEnd(cardinality);
- Assert.assertEquals(new Integer(0), thePair.lhs);
- Assert.assertEquals(new Integer(cardinality), thePair.rhs);
+ Assert.assertEquals(Integer.valueOf(0), thePair.lhs);
+ Assert.assertEquals(Integer.valueOf(cardinality), thePair.rhs);
}
@Test
@@ -182,8 +182,8 @@ public class TopNMetricSpecOptimizationsTest extends
InitializedNullHandlingTest
arrayProviderToTest.ignoreAfterThreshold();
Pair<Integer, Integer> thePair =
arrayProviderToTest.computeStartEnd(cardinality);
- Assert.assertEquals(new Integer(0), thePair.lhs);
- Assert.assertEquals(new Integer(cardinality), thePair.rhs);
+ Assert.assertEquals(Integer.valueOf(0), thePair.lhs);
+ Assert.assertEquals(Integer.valueOf(cardinality), thePair.rhs);
}
@Test
@@ -213,8 +213,8 @@ public class TopNMetricSpecOptimizationsTest extends
InitializedNullHandlingTest
);
Pair<Integer, Integer> thePair =
arrayProviderToTest.computeStartEnd(cardinality);
- Assert.assertEquals(new Integer(0), thePair.lhs);
- Assert.assertEquals(new Integer(cardinality), thePair.rhs);
+ Assert.assertEquals(Integer.valueOf(0), thePair.lhs);
+ Assert.assertEquals(Integer.valueOf(cardinality), thePair.rhs);
}
private TopNCursorInspector makeCursorInspector(String start, String end,
int cardinality)
diff --git
a/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTest.java
b/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTest.java
index 93bb462578e..810539125d1 100644
---
a/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTest.java
+++
b/processing/src/test/java/org/apache/druid/query/topn/TopNQueryRunnerTest.java
@@ -1548,22 +1548,22 @@ public class TopNQueryRunnerTest extends
InitializedNullHandlingTest
ImmutableMap.of(
QueryRunnerTestHelper.MARKET_DIMENSION, "upfront",
"rows", 1L,
- "index", new Float(1447.341160).doubleValue(),
- "addRowsIndexConstant", new
Float(1449.341160).doubleValue(),
+ "index", 1447.341160F,
+ "addRowsIndexConstant", 1449.341160F,
"uniques", QueryRunnerTestHelper.UNIQUES_1
),
ImmutableMap.of(
QueryRunnerTestHelper.MARKET_DIMENSION, "total_market",
"rows", 1L,
- "index", new Float(1314.839715).doubleValue(),
- "addRowsIndexConstant", new
Float(1316.839715).doubleValue(),
+ "index", 1314.839715F,
+ "addRowsIndexConstant", 1316.839715F,
"uniques", QueryRunnerTestHelper.UNIQUES_1
),
ImmutableMap.of(
QueryRunnerTestHelper.MARKET_DIMENSION, "spot",
"rows", 1L,
- "index", new Float(109.705815).doubleValue(),
- "addRowsIndexConstant", new
Float(111.705815).doubleValue(),
+ "index", 109.705815F,
+ "addRowsIndexConstant", 111.705815F,
"uniques", QueryRunnerTestHelper.UNIQUES_1
)
)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
