apache · gianm · Jan 9, 2025 · Jan 7, 2025 · Jan 7, 2025 · Jan 7, 2025
diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/BoundFilterBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/BoundFilterBenchmark.java
@@ -25,7 +25,6 @@
 import org.apache.druid.collections.bitmap.ImmutableBitmap;
 import org.apache.druid.collections.bitmap.MutableBitmap;
 import org.apache.druid.collections.bitmap.RoaringBitmapFactory;
-import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.extendedset.intset.ConciseSetUtils;
 import org.apache.druid.java.util.common.StringUtils;
 import org.apache.druid.query.filter.BoundDimFilter;
@@ -60,10 +59,6 @@
 @Measurement(iterations = 10)
 public class BoundFilterBenchmark
 {
-  static {
-    NullHandling.initializeForTests();
-  }
-
   private static final int START_INT = 1_000_000_000;
   private static final int END_INT = ConciseSetUtils.MAX_ALLOWED_INTEGER;
 

diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/DataSketchesHllBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/DataSketchesHllBenchmark.java
@@ -20,7 +20,6 @@
 package org.apache.druid.benchmark;
 
 import org.apache.datasketches.hll.HllSketch;
-import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.query.aggregation.AggregatorFactory;
 import org.apache.druid.query.aggregation.BufferAggregator;
 import org.apache.druid.query.aggregation.datasketches.hll.HllSketchMergeAggregatorFactory;
@@ -55,10 +54,6 @@
 @State(Scope.Benchmark)
 public class DataSketchesHllBenchmark
 {
-  static {
-    NullHandling.initializeForTests();
-  }
-
   private final AggregatorFactory aggregatorFactory = new HllSketchMergeAggregatorFactory(
       "hll",
       "hll",

diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/DelimitedInputFormatBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/DelimitedInputFormatBenchmark.java
@@ -20,7 +20,6 @@
 package org.apache.druid.benchmark;
 
 import com.google.common.collect.ImmutableList;
-import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.data.input.ColumnsFilter;
 import org.apache.druid.data.input.InputEntityReader;
 import org.apache.druid.data.input.InputRow;
@@ -83,10 +82,6 @@ public class DelimitedInputFormatBenchmark
           "delta"
       );
 
-  static {
-    NullHandling.initializeForTests();
-  }
-
   @Param({"false", "true"})
   private boolean fromHeader;
 

diff --git a/...c/test/java/org/apache/druid/benchmark/DictionaryEncodedStringIndexSupplierBenchmark.java b/...c/test/java/org/apache/druid/benchmark/DictionaryEncodedStringIndexSupplierBenchmark.java
@@ -24,7 +24,6 @@
 import org.apache.druid.collections.bitmap.ImmutableBitmap;
 import org.apache.druid.collections.bitmap.MutableBitmap;
 import org.apache.druid.collections.bitmap.RoaringBitmapFactory;
-import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.java.util.common.ByteBufferUtils;
 import org.apache.druid.java.util.common.StringUtils;
 import org.apache.druid.segment.data.BitmapSerdeFactory;
@@ -64,10 +63,6 @@
 @Measurement(iterations = 10)
 public class DictionaryEncodedStringIndexSupplierBenchmark
 {
-  static {
-    NullHandling.initializeForTests();
-  }
-
   @State(Scope.Benchmark)
   public static class BenchmarkState
   {

diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/DimensionPredicateFilterBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/DimensionPredicateFilterBenchmark.java
@@ -25,7 +25,6 @@
 import org.apache.druid.collections.bitmap.ImmutableBitmap;
 import org.apache.druid.collections.bitmap.MutableBitmap;
 import org.apache.druid.collections.bitmap.RoaringBitmapFactory;
-import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.java.util.common.StringUtils;
 import org.apache.druid.query.filter.ColumnIndexSelector;
 import org.apache.druid.query.filter.DruidDoublePredicate;
@@ -63,10 +62,6 @@
 @Measurement(iterations = 10)
 public class DimensionPredicateFilterBenchmark
 {
-  static {
-    NullHandling.initializeForTests();
-  }
-
   private static final int START_INT = 1_000_000_000;
 
   private static final DimensionPredicateFilter IS_EVEN = new DimensionPredicateFilter(

diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/ExpressionAggregationBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/ExpressionAggregationBenchmark.java
@@ -20,7 +20,6 @@
 package org.apache.druid.benchmark;
 
 import com.google.common.collect.ImmutableList;
-import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.java.util.common.Intervals;
 import org.apache.druid.java.util.common.granularity.Granularities;
 import org.apache.druid.java.util.common.io.Closer;
@@ -70,10 +69,6 @@
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 public class ExpressionAggregationBenchmark
 {
-  static {
-    NullHandling.initializeForTests();
-  }
-
   @Param({"1000000"})
   private int rowsPerSegment;
 

diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/ExpressionFilterBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/ExpressionFilterBenchmark.java
@@ -20,7 +20,6 @@
 package org.apache.druid.benchmark;
 
 import com.google.common.collect.ImmutableList;
-import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.java.util.common.Intervals;
 import org.apache.druid.java.util.common.granularity.Granularities;
 import org.apache.druid.java.util.common.io.Closer;
@@ -69,7 +68,6 @@
 public class ExpressionFilterBenchmark
 {
   static {
-    NullHandling.initializeForTests();
     ExpressionProcessing.initializeForTests();
   }
 

diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/ExpressionSelectorBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/ExpressionSelectorBenchmark.java
@@ -20,7 +20,6 @@
 package org.apache.druid.benchmark;
 
 import com.google.common.collect.ImmutableList;
-import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.java.util.common.Intervals;
 import org.apache.druid.java.util.common.StringUtils;
 import org.apache.druid.java.util.common.granularity.Granularities;
@@ -81,7 +80,6 @@
 public class ExpressionSelectorBenchmark
 {
   static {
-    NullHandling.initializeForTests();
     ExpressionProcessing.initializeForTests();
   }
 

diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/ExpressionVectorSelectorBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/ExpressionVectorSelectorBenchmark.java
@@ -20,7 +20,6 @@
 package org.apache.druid.benchmark;
 
 import com.google.common.collect.ImmutableList;
-import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.java.util.common.granularity.Granularities;
 import org.apache.druid.java.util.common.io.Closer;
 import org.apache.druid.math.expr.Expr;
@@ -73,10 +72,6 @@
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
 public class ExpressionVectorSelectorBenchmark
 {
-  static {
-    NullHandling.initializeForTests();
-  }
-
   @Param({"1000000"})
   private int rowsPerSegment;
 

diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/FilterPartitionBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/FilterPartitionBenchmark.java
@@ -21,7 +21,6 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
-import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.data.input.InputRow;
 import org.apache.druid.jackson.DefaultObjectMapper;
 import org.apache.druid.java.util.common.FileUtils;
@@ -99,10 +98,6 @@
 @Measurement(iterations = 25)
 public class FilterPartitionBenchmark
 {
-  static {
-    NullHandling.initializeForTests();
-  }
-
   @Param({"750000"})
   private int rowsPerSegment;
 
@@ -548,14 +543,12 @@ public Filter toFilter()
       if (extractionFn == null) {
         return new NoBitmapSelectorFilter(dimension, value);
       } else {
-        final String valueOrNull = NullHandling.emptyToNullIfNeeded(value);
-
         final DruidPredicateFactory predicateFactory = new DruidPredicateFactory()
         {
           @Override
           public DruidObjectPredicate<String> makeStringPredicate()
           {
-            return valueOrNull == null ? DruidObjectPredicate.isNull() : DruidObjectPredicate.equalTo(valueOrNull);
+            return value == null ? DruidObjectPredicate.isNull() : DruidObjectPredicate.equalTo(value);
           }
 
           @Override

diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/FilteredAggregatorBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/FilteredAggregatorBenchmark.java
@@ -23,7 +23,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableMap;
 import org.apache.druid.benchmark.query.QueryBenchmarkUtil;
-import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.data.input.InputRow;
 import org.apache.druid.jackson.DefaultObjectMapper;
 import org.apache.druid.java.util.common.FileUtils;
@@ -104,10 +103,6 @@
 @Measurement(iterations = 25)
 public class FilteredAggregatorBenchmark
 {
-  static {
-    NullHandling.initializeForTests();
-  }
-
   @Param({"75000"})
   private int rowsPerSegment;
 

diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/FixedHistogramAddBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/FixedHistogramAddBenchmark.java
@@ -20,7 +20,6 @@
 package org.apache.druid.benchmark;
 
 import org.apache.commons.math3.distribution.NormalDistribution;
-import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.query.aggregation.histogram.FixedBucketsHistogram;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
@@ -47,10 +46,6 @@
 @OutputTimeUnit(TimeUnit.MICROSECONDS)
 public class FixedHistogramAddBenchmark
 {
-  static {
-    NullHandling.initializeForTests();
-  }
-
   private static final int LOWER_LIMIT = 0;
   private static final int UPPER_LIMIT = 100000;
 

diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/FixedHistogramBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/FixedHistogramBenchmark.java
@@ -19,7 +19,6 @@
 
 package org.apache.druid.benchmark;
 
-import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.java.util.common.logger.Logger;
 import org.apache.druid.query.aggregation.histogram.FixedBucketsHistogram;
 import org.openjdk.jmh.annotations.Benchmark;
@@ -47,10 +46,6 @@
 @OutputTimeUnit(TimeUnit.MICROSECONDS)
 public class FixedHistogramBenchmark
 {
-  static {
-    NullHandling.initializeForTests();
-  }
-
   private static final Logger log = new Logger(FixedHistogramBenchmark.class);
 
   private static final int LOWER_LIMIT = 0;

diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/FrontCodedIndexedBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/FrontCodedIndexedBenchmark.java
@@ -21,7 +21,6 @@
 
 import com.google.common.base.Preconditions;
 import org.apache.druid.benchmark.compression.EncodingSizeProfiler;
-import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.java.util.common.FileUtils;
 import org.apache.druid.java.util.common.StringUtils;
 import org.apache.druid.java.util.common.io.smoosh.FileSmoosher;
@@ -76,10 +75,6 @@
 @State(Scope.Benchmark)
 public class FrontCodedIndexedBenchmark
 {
-  static {
-    NullHandling.initializeForTests();
-  }
-
   @Param({"10000", "100000"})
   public int numElements;
 

diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/GenericIndexedBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/GenericIndexedBenchmark.java
@@ -20,7 +20,6 @@
 package org.apache.druid.benchmark;
 
 import com.google.common.primitives.Ints;
-import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.java.util.common.FileUtils;
 import org.apache.druid.java.util.common.io.smoosh.FileSmoosher;
 import org.apache.druid.java.util.common.io.smoosh.SmooshedFileMapper;
@@ -61,10 +60,6 @@
 @State(Scope.Benchmark)
 public class GenericIndexedBenchmark
 {
-  static {
-    NullHandling.initializeForTests();
-  }
-
   public static final int ITERATIONS = 10000;
 
   static final ObjectStrategy<byte[]> BYTE_ARRAY_STRATEGY = new ObjectStrategy<>()

diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/GroupByDeserializationBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/GroupByDeserializationBenchmark.java
@@ -22,7 +22,6 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableMap;
-import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.guice.BuiltInTypesModule;
 import org.apache.druid.jackson.AggregatorsModule;
 import org.apache.druid.java.util.common.DateTimes;
@@ -66,9 +65,7 @@
 @Measurement(iterations = 5)
 public class GroupByDeserializationBenchmark
 {
-
   static {
-    NullHandling.initializeForTests();
     BuiltInTypesModule.registerHandlersAndSerde();
     AggregatorsModule.registerComplexMetricsAndSerde();
   }

diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/GroupByTypeInterfaceBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/GroupByTypeInterfaceBenchmark.java
@@ -28,7 +28,6 @@
 import org.apache.druid.collections.DefaultBlockingPool;
 import org.apache.druid.collections.NonBlockingPool;
 import org.apache.druid.collections.StupidPool;
-import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.data.input.InputRow;
 import org.apache.druid.jackson.DefaultObjectMapper;
 import org.apache.druid.java.util.common.FileUtils;
@@ -109,10 +108,6 @@
 @Measurement(iterations = 30)
 public class GroupByTypeInterfaceBenchmark
 {
-  static {
-    NullHandling.initializeForTests();
-  }
-
   private static final SegmentId Q_INDEX_SEGMENT_ID = SegmentId.dummy("qIndex");
 
   @Param({"4"})

diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/InFilterBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/InFilterBenchmark.java
@@ -24,7 +24,6 @@
 import org.apache.druid.collections.bitmap.ImmutableBitmap;
 import org.apache.druid.collections.bitmap.MutableBitmap;
 import org.apache.druid.collections.bitmap.RoaringBitmapFactory;
-import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.java.util.common.StringUtils;
 import org.apache.druid.query.filter.ColumnIndexSelector;
 import org.apache.druid.query.filter.InDimFilter;
@@ -59,10 +58,6 @@
 @Measurement(iterations = 3)
 public class InFilterBenchmark
 {
-  static {
-    NullHandling.initializeForTests();
-  }
-
   private static final int START_INT = 10_000_000;
 
   private InDimFilter inFilter;

diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/IncrementalIndexRowTypeBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/IncrementalIndexRowTypeBenchmark.java
@@ -21,7 +21,6 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.google.common.collect.ImmutableMap;
-import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.data.input.InputRow;
 import org.apache.druid.data.input.MapBasedInputRow;
 import org.apache.druid.java.util.common.StringUtils;
@@ -52,10 +51,6 @@
 @State(Scope.Benchmark)
 public class IncrementalIndexRowTypeBenchmark
 {
-  static {
-    NullHandling.initializeForTests();
-  }
-
   @Param({"250000"})
   private int rowsPerSegment;
 

diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/IndexedTableJoinCursorBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/IndexedTableJoinCursorBenchmark.java
@@ -22,7 +22,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
-import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.java.util.common.IAE;
 import org.apache.druid.java.util.common.Intervals;
 import org.apache.druid.java.util.common.StringUtils;
@@ -92,10 +91,6 @@
 @Measurement(iterations = 5)
 public class IndexedTableJoinCursorBenchmark
 {
-  static {
-    NullHandling.initializeForTests();
-  }
-
   private static final List<Set<String>> PROJECTIONS = ImmutableList.of(
       // 0 string key rhs
       ImmutableSet.of("j0.stringKey"),