This is an automated email from the ASF dual-hosted git repository.
cwylie 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 f20428911bc pass test framework jsonMapper to
QueryComponentSupplier.addSegmentsToWalker so IndexBuilder can use the same
mapper (#18906)
f20428911bc is described below
commit f20428911bcf3a0170d9ea83a3f229b617f7fe02
Author: Clint Wylie <[email protected]>
AuthorDate: Wed Jan 14 16:01:27 2026 -0800
pass test framework jsonMapper to
QueryComponentSupplier.addSegmentsToWalker so IndexBuilder can use the same
mapper (#18906)
---
.../query/MSQWindowFunctionsBenchmark.java | 8 ++++++--
.../CompressedBigDecimalSqlAggregatorTestBase.java | 8 ++++++--
.../sql/Bitmap64ExactCountSqlAggregatorTest.java | 9 ++++++---
.../sql/SpectatorHistogramSqlAggregatorTest.java | 8 ++++++--
.../sql/TDigestSketchSqlAggregatorTest.java | 8 ++++++--
.../hll/sql/HllSketchSqlAggregatorTest.java | 8 ++++++--
.../sql/DoublesSketchSqlAggregatorTest.java | 8 ++++++--
.../theta/sql/ThetaSketchSqlAggregatorTest.java | 8 ++++++--
.../sql/ArrayOfDoublesSketchSqlAggregatorTest.java | 8 ++++++--
.../bloom/sql/BloomFilterSqlAggregatorTest.java | 7 +++++--
...edBucketsHistogramQuantileSqlAggregatorTest.java | 8 ++++++--
.../histogram/sql/QuantileSqlAggregatorTest.java | 8 ++++++--
.../variance/sql/VarianceSqlAggregatorTest.java | 8 ++++++--
.../apache/druid/msq/sql/MSQTaskQueryMakerTest.java | 7 ++++---
.../msq/test/AbstractDartComponentSupplier.java | 11 +++++++----
.../druid/quidem/KttmNestedComponentSupplier.java | 8 ++++++--
.../sql/calcite/CalciteNestedDataQueryTest.java | 8 ++++++--
.../druid/sql/calcite/CalciteSubqueryTest.java | 10 +++++++---
.../druid/sql/calcite/DrillWindowQueryTest.java | 8 ++++++--
.../druid/sql/calcite/MultiComponentSupplier.java | 6 +++++-
.../druid/sql/calcite/util/SqlTestFramework.java | 21 +++++++++++++++------
.../druid/sql/calcite/util/TestDataBuilder.java | 10 ++++++----
22 files changed, 139 insertions(+), 54 deletions(-)
diff --git
a/benchmarks/src/test/java/org/apache/druid/benchmark/query/MSQWindowFunctionsBenchmark.java
b/benchmarks/src/test/java/org/apache/druid/benchmark/query/MSQWindowFunctionsBenchmark.java
index df9cac28c64..bd52171f216 100644
---
a/benchmarks/src/test/java/org/apache/druid/benchmark/query/MSQWindowFunctionsBenchmark.java
+++
b/benchmarks/src/test/java/org/apache/druid/benchmark/query/MSQWindowFunctionsBenchmark.java
@@ -19,6 +19,7 @@
package org.apache.druid.benchmark.query;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableMap;
import org.apache.druid.java.util.common.io.Closer;
import org.apache.druid.java.util.common.logger.Logger;
@@ -199,9 +200,12 @@ public class MSQWindowFunctionsBenchmark extends
BaseCalciteQueryTest
}
@Override
- public SpecificSegmentsQuerySegmentWalker
addSegmentsToWalker(SpecificSegmentsQuerySegmentWalker walker)
+ public SpecificSegmentsQuerySegmentWalker addSegmentsToWalker(
+ SpecificSegmentsQuerySegmentWalker walker,
+ ObjectMapper jsonMapper
+ )
{
- walker = super.addSegmentsToWalker(walker);
+ walker = super.addSegmentsToWalker(walker, jsonMapper);
TestDataBuilder.attachIndexesForBenchmarkDatasource(walker);
return walker;
}
diff --git
a/extensions-contrib/compressed-bigdecimal/src/test/java/org/apache/druid/compressedbigdecimal/aggregator/CompressedBigDecimalSqlAggregatorTestBase.java
b/extensions-contrib/compressed-bigdecimal/src/test/java/org/apache/druid/compressedbigdecimal/aggregator/CompressedBigDecimalSqlAggregatorTestBase.java
index 06a6bcb12d5..8f32af45e4b 100644
---
a/extensions-contrib/compressed-bigdecimal/src/test/java/org/apache/druid/compressedbigdecimal/aggregator/CompressedBigDecimalSqlAggregatorTestBase.java
+++
b/extensions-contrib/compressed-bigdecimal/src/test/java/org/apache/druid/compressedbigdecimal/aggregator/CompressedBigDecimalSqlAggregatorTestBase.java
@@ -19,6 +19,7 @@
package org.apache.druid.compressedbigdecimal.aggregator;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableList;
import org.apache.druid.compressedbigdecimal.CompressedBigDecimalModule;
import
org.apache.druid.compressedbigdecimal.aggregator.CompressedBigDecimalSqlAggregatorTestBase.CompressedBigDecimalComponentSupplier;
@@ -82,10 +83,13 @@ public abstract class
CompressedBigDecimalSqlAggregatorTestBase extends BaseCalc
}
@Override
- public SpecificSegmentsQuerySegmentWalker
addSegmentsToWalker(SpecificSegmentsQuerySegmentWalker walker)
+ public SpecificSegmentsQuerySegmentWalker addSegmentsToWalker(
+ SpecificSegmentsQuerySegmentWalker walker,
+ ObjectMapper jsonMapper
+ )
{
QueryableIndex index =
- IndexBuilder.create()
+ IndexBuilder.create(jsonMapper)
.tmpDir(tempDirProducer.newTempFolder())
.segmentWriteOutMediumFactory(OffHeapMemorySegmentWriteOutMediumFactory.instance())
.schema(
diff --git
a/extensions-contrib/druid-exact-count-bitmap/src/test/java/org/apache/druid/query/aggregation/exact/count/bitmap64/sql/Bitmap64ExactCountSqlAggregatorTest.java
b/extensions-contrib/druid-exact-count-bitmap/src/test/java/org/apache/druid/query/aggregation/exact/count/bitmap64/sql/Bitmap64ExactCountSqlAggregatorTest.java
index 7f9bf0c4db0..306cfd9ca42 100644
---
a/extensions-contrib/druid-exact-count-bitmap/src/test/java/org/apache/druid/query/aggregation/exact/count/bitmap64/sql/Bitmap64ExactCountSqlAggregatorTest.java
+++
b/extensions-contrib/druid-exact-count-bitmap/src/test/java/org/apache/druid/query/aggregation/exact/count/bitmap64/sql/Bitmap64ExactCountSqlAggregatorTest.java
@@ -19,6 +19,7 @@
package org.apache.druid.query.aggregation.exact.count.bitmap64.sql;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableList;
import org.apache.druid.error.DruidException;
import org.apache.druid.initialization.DruidModule;
@@ -41,7 +42,6 @@ import org.apache.druid.sql.calcite.BaseCalciteQueryTest;
import org.apache.druid.sql.calcite.SqlTestFrameworkConfig;
import org.apache.druid.sql.calcite.TempDirProducer;
import org.apache.druid.sql.calcite.filtration.Filtration;
-import org.apache.druid.sql.calcite.util.CalciteTests;
import org.apache.druid.sql.calcite.util.DruidModuleCollection;
import
org.apache.druid.sql.calcite.util.SqlTestFramework.StandardComponentSupplier;
import org.apache.druid.sql.calcite.util.TestDataBuilder;
@@ -72,11 +72,14 @@ public class Bitmap64ExactCountSqlAggregatorTest extends
BaseCalciteQueryTest
}
@Override
- public SpecificSegmentsQuerySegmentWalker
addSegmentsToWalker(SpecificSegmentsQuerySegmentWalker walker)
+ public SpecificSegmentsQuerySegmentWalker addSegmentsToWalker(
+ SpecificSegmentsQuerySegmentWalker walker,
+ ObjectMapper jsonMapper
+ )
{
Bitmap64ExactCountModule.registerSerde();
final QueryableIndex index =
- IndexBuilder.create(CalciteTests.getJsonMapper())
+ IndexBuilder.create(jsonMapper)
.tmpDir(tempDirProducer.newTempFolder())
.segmentWriteOutMediumFactory(OffHeapMemorySegmentWriteOutMediumFactory.instance())
.schema(
diff --git
a/extensions-contrib/spectator-histogram/src/test/java/org/apache/druid/spectator/histogram/sql/SpectatorHistogramSqlAggregatorTest.java
b/extensions-contrib/spectator-histogram/src/test/java/org/apache/druid/spectator/histogram/sql/SpectatorHistogramSqlAggregatorTest.java
index 63c8f35e8cc..1d2d68092ba 100644
---
a/extensions-contrib/spectator-histogram/src/test/java/org/apache/druid/spectator/histogram/sql/SpectatorHistogramSqlAggregatorTest.java
+++
b/extensions-contrib/spectator-histogram/src/test/java/org/apache/druid/spectator/histogram/sql/SpectatorHistogramSqlAggregatorTest.java
@@ -19,6 +19,7 @@
package org.apache.druid.spectator.histogram.sql;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import org.apache.druid.data.input.InputRow;
@@ -105,12 +106,15 @@ public class SpectatorHistogramSqlAggregatorTest extends
BaseCalciteQueryTest
}
@Override
- public SpecificSegmentsQuerySegmentWalker
addSegmentsToWalker(SpecificSegmentsQuerySegmentWalker walker)
+ public SpecificSegmentsQuerySegmentWalker addSegmentsToWalker(
+ SpecificSegmentsQuerySegmentWalker walker,
+ ObjectMapper jsonMapper
+ )
{
SpectatorHistogramModule.registerSerde();
final QueryableIndex index =
- IndexBuilder.create(CalciteTests.getJsonMapper())
+ IndexBuilder.create(jsonMapper)
.tmpDir(tempDirProducer.newTempFolder())
.segmentWriteOutMediumFactory(OffHeapMemorySegmentWriteOutMediumFactory.instance())
.schema(
diff --git
a/extensions-contrib/tdigestsketch/src/test/java/org/apache/druid/query/aggregation/tdigestsketch/sql/TDigestSketchSqlAggregatorTest.java
b/extensions-contrib/tdigestsketch/src/test/java/org/apache/druid/query/aggregation/tdigestsketch/sql/TDigestSketchSqlAggregatorTest.java
index c53edfc5ca2..a67fe1c4fda 100644
---
a/extensions-contrib/tdigestsketch/src/test/java/org/apache/druid/query/aggregation/tdigestsketch/sql/TDigestSketchSqlAggregatorTest.java
+++
b/extensions-contrib/tdigestsketch/src/test/java/org/apache/druid/query/aggregation/tdigestsketch/sql/TDigestSketchSqlAggregatorTest.java
@@ -19,6 +19,7 @@
package org.apache.druid.query.aggregation.tdigestsketch.sql;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableList;
import org.apache.druid.initialization.DruidModule;
import org.apache.druid.java.util.common.granularity.Granularities;
@@ -74,12 +75,15 @@ public class TDigestSketchSqlAggregatorTest extends
BaseCalciteQueryTest
}
@Override
- public SpecificSegmentsQuerySegmentWalker
addSegmentsToWalker(SpecificSegmentsQuerySegmentWalker walker)
+ public SpecificSegmentsQuerySegmentWalker addSegmentsToWalker(
+ SpecificSegmentsQuerySegmentWalker walker,
+ ObjectMapper jsonMapper
+ )
{
TDigestSketchModule.registerSerde();
final QueryableIndex index =
- IndexBuilder.create(CalciteTests.getJsonMapper())
+ IndexBuilder.create(jsonMapper)
.tmpDir(tempDirProducer.newTempFolder())
.segmentWriteOutMediumFactory(OffHeapMemorySegmentWriteOutMediumFactory.instance())
.schema(
diff --git
a/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/hll/sql/HllSketchSqlAggregatorTest.java
b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/hll/sql/HllSketchSqlAggregatorTest.java
index 6f664c589c0..3ed7b540b1c 100644
---
a/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/hll/sql/HllSketchSqlAggregatorTest.java
+++
b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/hll/sql/HllSketchSqlAggregatorTest.java
@@ -19,6 +19,7 @@
package org.apache.druid.query.aggregation.datasketches.hll.sql;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -260,11 +261,14 @@ public class HllSketchSqlAggregatorTest extends
BaseCalciteQueryTest
}
@Override
- public SpecificSegmentsQuerySegmentWalker
addSegmentsToWalker(SpecificSegmentsQuerySegmentWalker walker)
+ public SpecificSegmentsQuerySegmentWalker addSegmentsToWalker(
+ SpecificSegmentsQuerySegmentWalker walker,
+ ObjectMapper jsonMapper
+ )
{
HllSketchModule.registerSerde();
final QueryableIndex index = IndexBuilder
- .create()
+ .create(jsonMapper)
.tmpDir(tempDirProducer.newTempFolder())
.segmentWriteOutMediumFactory(OffHeapMemorySegmentWriteOutMediumFactory.instance())
.schema(
diff --git
a/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/quantiles/sql/DoublesSketchSqlAggregatorTest.java
b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/quantiles/sql/DoublesSketchSqlAggregatorTest.java
index 4c303b9f146..0ee832ffe0a 100644
---
a/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/quantiles/sql/DoublesSketchSqlAggregatorTest.java
+++
b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/quantiles/sql/DoublesSketchSqlAggregatorTest.java
@@ -19,6 +19,7 @@
package org.apache.druid.query.aggregation.datasketches.quantiles.sql;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import org.apache.druid.initialization.DruidModule;
@@ -94,12 +95,15 @@ public class DoublesSketchSqlAggregatorTest extends
BaseCalciteQueryTest
}
@Override
- public SpecificSegmentsQuerySegmentWalker
addSegmentsToWalker(SpecificSegmentsQuerySegmentWalker walker)
+ public SpecificSegmentsQuerySegmentWalker addSegmentsToWalker(
+ SpecificSegmentsQuerySegmentWalker walker,
+ ObjectMapper jsonMapper
+ )
{
DoublesSketchModule.registerSerde();
final QueryableIndex index =
- IndexBuilder.create(CalciteTests.getJsonMapper())
+ IndexBuilder.create(jsonMapper)
.tmpDir(tempDirProducer.newTempFolder())
.segmentWriteOutMediumFactory(OffHeapMemorySegmentWriteOutMediumFactory.instance())
.schema(
diff --git
a/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/theta/sql/ThetaSketchSqlAggregatorTest.java
b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/theta/sql/ThetaSketchSqlAggregatorTest.java
index 3f611a7a20d..073cfa6a9c9 100644
---
a/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/theta/sql/ThetaSketchSqlAggregatorTest.java
+++
b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/theta/sql/ThetaSketchSqlAggregatorTest.java
@@ -19,6 +19,7 @@
package org.apache.druid.query.aggregation.datasketches.theta.sql;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import org.apache.druid.error.DruidException;
@@ -121,11 +122,14 @@ public class ThetaSketchSqlAggregatorTest extends
BaseCalciteQueryTest
}
@Override
- public SpecificSegmentsQuerySegmentWalker
addSegmentsToWalker(SpecificSegmentsQuerySegmentWalker walker)
+ public SpecificSegmentsQuerySegmentWalker addSegmentsToWalker(
+ SpecificSegmentsQuerySegmentWalker walker,
+ ObjectMapper jsonMapper
+ )
{
SketchModule.registerSerde();
- final QueryableIndex index = IndexBuilder.create()
+ final QueryableIndex index = IndexBuilder.create(jsonMapper)
.tmpDir(tempDirProducer.newTempFolder())
.segmentWriteOutMediumFactory(OffHeapMemorySegmentWriteOutMediumFactory.instance())
.schema(
diff --git
a/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/sql/ArrayOfDoublesSketchSqlAggregatorTest.java
b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/sql/ArrayOfDoublesSketchSqlAggregatorTest.java
index d71ad2a6af7..003c959a49d 100644
---
a/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/sql/ArrayOfDoublesSketchSqlAggregatorTest.java
+++
b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/tuple/sql/ArrayOfDoublesSketchSqlAggregatorTest.java
@@ -19,6 +19,7 @@
package org.apache.druid.query.aggregation.datasketches.tuple.sql;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import org.apache.druid.data.input.InputRow;
@@ -115,11 +116,14 @@ public class ArrayOfDoublesSketchSqlAggregatorTest
extends BaseCalciteQueryTest
}
@Override
- public SpecificSegmentsQuerySegmentWalker
addSegmentsToWalker(SpecificSegmentsQuerySegmentWalker walker)
+ public SpecificSegmentsQuerySegmentWalker addSegmentsToWalker(
+ SpecificSegmentsQuerySegmentWalker walker,
+ ObjectMapper jsonMapper
+ )
{
ArrayOfDoublesSketchModule.registerSerde();
- final QueryableIndex index = IndexBuilder.create()
+ final QueryableIndex index = IndexBuilder.create(jsonMapper)
.tmpDir(tempDirProducer.newTempFolder())
.segmentWriteOutMediumFactory(
OffHeapMemorySegmentWriteOutMediumFactory.instance()
diff --git
a/extensions-core/druid-bloom-filter/src/test/java/org/apache/druid/query/aggregation/bloom/sql/BloomFilterSqlAggregatorTest.java
b/extensions-core/druid-bloom-filter/src/test/java/org/apache/druid/query/aggregation/bloom/sql/BloomFilterSqlAggregatorTest.java
index 857521fbf9f..0af07a10fff 100644
---
a/extensions-core/druid-bloom-filter/src/test/java/org/apache/druid/query/aggregation/bloom/sql/BloomFilterSqlAggregatorTest.java
+++
b/extensions-core/druid-bloom-filter/src/test/java/org/apache/druid/query/aggregation/bloom/sql/BloomFilterSqlAggregatorTest.java
@@ -78,10 +78,13 @@ public class BloomFilterSqlAggregatorTest extends
BaseCalciteQueryTest
}
@Override
- public SpecificSegmentsQuerySegmentWalker
addSegmentsToWalker(SpecificSegmentsQuerySegmentWalker walker)
+ public SpecificSegmentsQuerySegmentWalker addSegmentsToWalker(
+ SpecificSegmentsQuerySegmentWalker walker,
+ ObjectMapper jsonMapper
+ )
{
final QueryableIndex index =
- IndexBuilder.create()
+ IndexBuilder.create(jsonMapper)
.tmpDir(tempDirProducer.newTempFolder())
.segmentWriteOutMediumFactory(OffHeapMemorySegmentWriteOutMediumFactory.instance())
.schema(
diff --git
a/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/sql/FixedBucketsHistogramQuantileSqlAggregatorTest.java
b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/sql/FixedBucketsHistogramQuantileSqlAggregatorTest.java
index 9187fedfa32..cb40c4730c6 100644
---
a/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/sql/FixedBucketsHistogramQuantileSqlAggregatorTest.java
+++
b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/sql/FixedBucketsHistogramQuantileSqlAggregatorTest.java
@@ -19,6 +19,7 @@
package org.apache.druid.query.aggregation.histogram.sql;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import org.apache.druid.initialization.DruidModule;
@@ -78,11 +79,14 @@ public class FixedBucketsHistogramQuantileSqlAggregatorTest
extends BaseCalciteQ
}
@Override
- public SpecificSegmentsQuerySegmentWalker
addSegmentsToWalker(SpecificSegmentsQuerySegmentWalker walker)
+ public SpecificSegmentsQuerySegmentWalker addSegmentsToWalker(
+ SpecificSegmentsQuerySegmentWalker walker,
+ ObjectMapper jsonMapper
+ )
{
ApproximateHistogramDruidModule.registerSerde();
- final QueryableIndex index =
IndexBuilder.create(CalciteTests.getJsonMapper())
+ final QueryableIndex index = IndexBuilder.create(jsonMapper)
.tmpDir(tempDirProducer.newTempFolder())
.segmentWriteOutMediumFactory(OffHeapMemorySegmentWriteOutMediumFactory.instance())
.schema(
diff --git
a/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/sql/QuantileSqlAggregatorTest.java
b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/sql/QuantileSqlAggregatorTest.java
index 083de994e63..83f67d6912e 100644
---
a/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/sql/QuantileSqlAggregatorTest.java
+++
b/extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/sql/QuantileSqlAggregatorTest.java
@@ -19,6 +19,7 @@
package org.apache.druid.query.aggregation.histogram.sql;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableList;
import org.apache.druid.initialization.DruidModule;
import org.apache.druid.java.util.common.granularity.Granularities;
@@ -77,11 +78,14 @@ public class QuantileSqlAggregatorTest extends
BaseCalciteQueryTest
}
@Override
- public SpecificSegmentsQuerySegmentWalker
addSegmentsToWalker(SpecificSegmentsQuerySegmentWalker walker)
+ public SpecificSegmentsQuerySegmentWalker addSegmentsToWalker(
+ SpecificSegmentsQuerySegmentWalker walker,
+ ObjectMapper jsonMapper
+ )
{
ApproximateHistogramDruidModule.registerSerde();
- final QueryableIndex index =
IndexBuilder.create(CalciteTests.getJsonMapper())
+ final QueryableIndex index = IndexBuilder.create(jsonMapper)
.tmpDir(tempDirProducer.newTempFolder())
.segmentWriteOutMediumFactory(OffHeapMemorySegmentWriteOutMediumFactory.instance())
.schema(
diff --git
a/extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/sql/VarianceSqlAggregatorTest.java
b/extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/sql/VarianceSqlAggregatorTest.java
index a7cefae2394..0397f3346c0 100644
---
a/extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/sql/VarianceSqlAggregatorTest.java
+++
b/extensions-core/stats/src/test/java/org/apache/druid/query/aggregation/variance/sql/VarianceSqlAggregatorTest.java
@@ -19,6 +19,7 @@
package org.apache.druid.query.aggregation.variance.sql;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableList;
import org.apache.druid.data.input.InputRow;
import org.apache.druid.data.input.impl.DimensionSchema;
@@ -89,12 +90,15 @@ public class VarianceSqlAggregatorTest extends
BaseCalciteQueryTest
}
@Override
- public SpecificSegmentsQuerySegmentWalker
addSegmentsToWalker(SpecificSegmentsQuerySegmentWalker walker)
+ public SpecificSegmentsQuerySegmentWalker addSegmentsToWalker(
+ SpecificSegmentsQuerySegmentWalker walker,
+ ObjectMapper jsonMapper
+ )
{
ComplexMetrics.registerSerde(VarianceSerde.TYPE_NAME, new
VarianceSerde());
final QueryableIndex index =
- IndexBuilder.create(CalciteTests.getJsonMapper().registerModules(new
DruidStatsModule().getJacksonModules()))
+ IndexBuilder.create(jsonMapper)
.tmpDir(tempDirProducer.newTempFolder())
.segmentWriteOutMediumFactory(OffHeapMemorySegmentWriteOutMediumFactory.instance())
.schema(
diff --git
a/multi-stage-query/src/test/java/org/apache/druid/msq/sql/MSQTaskQueryMakerTest.java
b/multi-stage-query/src/test/java/org/apache/druid/msq/sql/MSQTaskQueryMakerTest.java
index be911d59638..8b28e77508a 100644
---
a/multi-stage-query/src/test/java/org/apache/druid/msq/sql/MSQTaskQueryMakerTest.java
+++
b/multi-stage-query/src/test/java/org/apache/druid/msq/sql/MSQTaskQueryMakerTest.java
@@ -177,9 +177,12 @@ public class MSQTaskQueryMakerTest
@Before
public void setUp() throws Exception
{
+ objectMapper = TestHelper.makeJsonMapper();
+ indexIO = new IndexIO(objectMapper, ColumnConfig.DEFAULT);
walker = TestDataBuilder.addDataSetsToWalker(
FileUtils.getTempDir().toFile(),
-
SpecificSegmentsQuerySegmentWalker.createWalker(QueryStackTests.createQueryRunnerFactoryConglomerate(CLOSER))
+
SpecificSegmentsQuerySegmentWalker.createWalker(QueryStackTests.createQueryRunnerFactoryConglomerate(CLOSER)),
+ objectMapper
);
final TestSegmentManager testSegmentManager = new TestSegmentManager();
for (SpecificSegmentsQuerySegmentWalker.CompleteSegment completeSegment :
walker.getCompleteSegments()) {
@@ -187,9 +190,7 @@ public class MSQTaskQueryMakerTest
}
segmentManager = testSegmentManager.getSegmentManager();
- objectMapper = TestHelper.makeJsonMapper();
jsonMapper = new DefaultObjectMapper();
- indexIO = new IndexIO(objectMapper, ColumnConfig.DEFAULT);
queryProcessingPool = new
ForwardingQueryProcessingPool(Execs.singleThreaded("Test-runner-processing-pool"));
groupingEngine = GroupByQueryRunnerTest.makeQueryRunnerFactory(
new GroupByQueryConfig(),
diff --git
a/multi-stage-query/src/test/java/org/apache/druid/msq/test/AbstractDartComponentSupplier.java
b/multi-stage-query/src/test/java/org/apache/druid/msq/test/AbstractDartComponentSupplier.java
index c7313c4c098..dd0370008ad 100644
---
a/multi-stage-query/src/test/java/org/apache/druid/msq/test/AbstractDartComponentSupplier.java
+++
b/multi-stage-query/src/test/java/org/apache/druid/msq/test/AbstractDartComponentSupplier.java
@@ -19,6 +19,7 @@
package org.apache.druid.msq.test;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.inject.Binder;
import com.google.inject.Provides;
import org.apache.druid.client.coordinator.CoordinatorClient;
@@ -41,7 +42,6 @@ import org.apache.druid.msq.exec.WorkerRunRef;
import org.apache.druid.query.TestBufferPool;
import org.apache.druid.rpc.ServiceClientFactory;
import org.apache.druid.rpc.guice.ServiceClientModule;
-import org.apache.druid.segment.TestHelper;
import org.apache.druid.server.SpecificSegmentsQuerySegmentWalker;
import org.apache.druid.sql.avatica.DartDruidMeta;
import org.apache.druid.sql.avatica.DruidMeta;
@@ -72,10 +72,13 @@ public abstract class AbstractDartComponentSupplier extends
AbstractMSQComponent
}
@Override
- public SpecificSegmentsQuerySegmentWalker
addSegmentsToWalker(SpecificSegmentsQuerySegmentWalker walker)
+ public SpecificSegmentsQuerySegmentWalker addSegmentsToWalker(
+ SpecificSegmentsQuerySegmentWalker walker,
+ ObjectMapper jsonMapper
+ )
{
- walker.add(TestDataSet.NUMBERS, TestHelper.JSON_MAPPER,
getTempDirProducer().newTempFolder("tmp_numbers"));
- return super.addSegmentsToWalker(walker);
+ walker.add(TestDataSet.NUMBERS, jsonMapper,
getTempDirProducer().newTempFolder("tmp_numbers"));
+ return super.addSegmentsToWalker(walker, jsonMapper);
}
@Override
public DruidModule getCoreModule()
diff --git
a/quidem-ut/src/main/java/org/apache/druid/quidem/KttmNestedComponentSupplier.java
b/quidem-ut/src/main/java/org/apache/druid/quidem/KttmNestedComponentSupplier.java
index 26ea7c726be..caec860ea0f 100644
---
a/quidem-ut/src/main/java/org/apache/druid/quidem/KttmNestedComponentSupplier.java
+++
b/quidem-ut/src/main/java/org/apache/druid/quidem/KttmNestedComponentSupplier.java
@@ -19,6 +19,7 @@
package org.apache.druid.quidem;
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.druid.data.input.InputSource;
import org.apache.druid.data.input.ResourceInputSource;
import org.apache.druid.data.input.impl.DimensionSchema;
@@ -57,9 +58,12 @@ public class KttmNestedComponentSupplier extends
StandardComponentSupplier
}
@Override
- public SpecificSegmentsQuerySegmentWalker
addSegmentsToWalker(SpecificSegmentsQuerySegmentWalker walker)
+ public SpecificSegmentsQuerySegmentWalker addSegmentsToWalker(
+ SpecificSegmentsQuerySegmentWalker walker,
+ ObjectMapper jsonMapper
+ )
{
- walker = super.addSegmentsToWalker(walker);
+ walker = super.addSegmentsToWalker(walker, jsonMapper);
QueryableIndex idx = makeKttmIndex(tempDirProducer.newTempFolder());
walker.add(
diff --git
a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteNestedDataQueryTest.java
b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteNestedDataQueryTest.java
index 64c17a82f4d..dc6ac141adb 100644
---
a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteNestedDataQueryTest.java
+++
b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteNestedDataQueryTest.java
@@ -19,6 +19,7 @@
package org.apache.druid.sql.calcite;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -239,11 +240,14 @@ public abstract class CalciteNestedDataQueryTest extends
BaseCalciteQueryTest
}
@Override
- public SpecificSegmentsQuerySegmentWalker
addSegmentsToWalker(SpecificSegmentsQuerySegmentWalker walker)
+ public SpecificSegmentsQuerySegmentWalker addSegmentsToWalker(
+ SpecificSegmentsQuerySegmentWalker walker,
+ ObjectMapper jsonMapper
+ )
{
BuiltInTypesModule.registerHandlersAndSerde();
final QueryableIndex index =
- IndexBuilder.create()
+ IndexBuilder.create(jsonMapper)
.tmpDir(tempDirProducer.newTempFolder())
.segmentWriteOutMediumFactory(OffHeapMemorySegmentWriteOutMediumFactory.instance())
.schema(
diff --git
a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteSubqueryTest.java
b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteSubqueryTest.java
index 05bd18f0be2..31c5e5ae9b4 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteSubqueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteSubqueryTest.java
@@ -19,6 +19,7 @@
package org.apache.druid.sql.calcite;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import org.apache.druid.data.input.InputRow;
@@ -1611,7 +1612,10 @@ public class CalciteSubqueryTest extends
BaseCalciteQueryTest
}
@Override
- public SpecificSegmentsQuerySegmentWalker
addSegmentsToWalker(SpecificSegmentsQuerySegmentWalker walker)
+ public SpecificSegmentsQuerySegmentWalker addSegmentsToWalker(
+ SpecificSegmentsQuerySegmentWalker walker,
+ ObjectMapper jsonMapper
+ )
{
final String datasource1 = "dsMissingCol";
@@ -1639,7 +1643,7 @@ public class CalciteSubqueryTest extends
BaseCalciteQueryTest
))
.collect(Collectors.toList());
final QueryableIndex queryableIndex1 = IndexBuilder
- .create()
+ .create(jsonMapper)
.tmpDir(new File(tmpFolder, datasource1))
.segmentWriteOutMediumFactory(OnHeapMemorySegmentWriteOutMediumFactory.instance())
.schema(new IncrementalIndexSchema.Builder()
@@ -1697,7 +1701,7 @@ public class CalciteSubqueryTest extends
BaseCalciteQueryTest
.rows(rows2)
.buildMMappedIndex();
- super.addSegmentsToWalker(walker);
+ super.addSegmentsToWalker(walker, jsonMapper);
walker.add(
DataSegment.builder()
.dataSource(datasource1)
diff --git
a/sql/src/test/java/org/apache/druid/sql/calcite/DrillWindowQueryTest.java
b/sql/src/test/java/org/apache/druid/sql/calcite/DrillWindowQueryTest.java
index 5ef5eac695f..e502266d1d8 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/DrillWindowQueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/DrillWindowQueryTest.java
@@ -19,6 +19,7 @@
package org.apache.druid.sql.calcite;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableMap;
import com.google.common.io.ByteStreams;
@@ -223,9 +224,12 @@ public class DrillWindowQueryTest extends
BaseCalciteQueryTest
}
@Override
- public SpecificSegmentsQuerySegmentWalker
addSegmentsToWalker(SpecificSegmentsQuerySegmentWalker walker)
+ public SpecificSegmentsQuerySegmentWalker addSegmentsToWalker(
+ SpecificSegmentsQuerySegmentWalker walker,
+ ObjectMapper jsonMapper
+ )
{
- super.addSegmentsToWalker(walker);
+ super.addSegmentsToWalker(walker, jsonMapper);
final File tmpFolder = tempDirProducer.newTempFolder();
TestDataBuilder.attachIndexesForDrillTestDatasources(walker, tmpFolder);
return walker;
diff --git
a/sql/src/test/java/org/apache/druid/sql/calcite/MultiComponentSupplier.java
b/sql/src/test/java/org/apache/druid/sql/calcite/MultiComponentSupplier.java
index b6efbc9b351..27028e87809 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/MultiComponentSupplier.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/MultiComponentSupplier.java
@@ -19,6 +19,7 @@
package org.apache.druid.sql.calcite;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.inject.Module;
import org.apache.druid.error.DruidException;
import org.apache.druid.guice.DruidInjectorBuilder;
@@ -116,7 +117,10 @@ public abstract class MultiComponentSupplier implements
QueryComponentSupplier
}
@Override
- public SpecificSegmentsQuerySegmentWalker
addSegmentsToWalker(SpecificSegmentsQuerySegmentWalker walker)
+ public SpecificSegmentsQuerySegmentWalker addSegmentsToWalker(
+ SpecificSegmentsQuerySegmentWalker walker,
+ ObjectMapper jsonMapper
+ )
{
throw unsupportedException();
}
diff --git
a/sql/src/test/java/org/apache/druid/sql/calcite/util/SqlTestFramework.java
b/sql/src/test/java/org/apache/druid/sql/calcite/util/SqlTestFramework.java
index 38ddba751b5..607b159ad8f 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/util/SqlTestFramework.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/util/SqlTestFramework.java
@@ -201,7 +201,10 @@ public class SqlTestFramework
Class<? extends SqlEngine> getSqlEngineClass();
- SpecificSegmentsQuerySegmentWalker
addSegmentsToWalker(SpecificSegmentsQuerySegmentWalker walker);
+ SpecificSegmentsQuerySegmentWalker addSegmentsToWalker(
+ SpecificSegmentsQuerySegmentWalker walker,
+ ObjectMapper jsonMapper
+ );
/**
* Should return a module which provides the core Druid components.
@@ -280,9 +283,12 @@ public class SqlTestFramework
}
@Override
- public SpecificSegmentsQuerySegmentWalker
addSegmentsToWalker(SpecificSegmentsQuerySegmentWalker walker)
+ public SpecificSegmentsQuerySegmentWalker addSegmentsToWalker(
+ SpecificSegmentsQuerySegmentWalker walker,
+ ObjectMapper jsonMapper
+ )
{
- return delegate.addSegmentsToWalker(walker);
+ return delegate.addSegmentsToWalker(walker, jsonMapper);
}
@Override
@@ -605,9 +611,12 @@ public class SqlTestFramework
}
@Override
- public SpecificSegmentsQuerySegmentWalker
addSegmentsToWalker(SpecificSegmentsQuerySegmentWalker walker)
+ public SpecificSegmentsQuerySegmentWalker addSegmentsToWalker(
+ SpecificSegmentsQuerySegmentWalker walker,
+ ObjectMapper jsonMapper
+ )
{
- return
TestDataBuilder.addDataSetsToWalker(tempDirProducer.newTempFolder("segments"),
walker);
+ return
TestDataBuilder.addDataSetsToWalker(tempDirProducer.newTempFolder("segments"),
walker, jsonMapper);
}
@Override
@@ -1056,7 +1065,7 @@ public class SqlTestFramework
{
builder.resourceCloser.register(walker);
if (testDataSets.isEmpty()) {
- builder.componentSupplier.addSegmentsToWalker(walker);
+ builder.componentSupplier.addSegmentsToWalker(walker, jsonMapper);
} else {
for (TestDataSet testDataSet : testDataSets) {
walker.add(testDataSet, jsonMapper,
builder.componentSupplier.getTempDirProducer().newTempFolder());
diff --git
a/sql/src/test/java/org/apache/druid/sql/calcite/util/TestDataBuilder.java
b/sql/src/test/java/org/apache/druid/sql/calcite/util/TestDataBuilder.java
index 65d511c55d6..ddb13708fa8 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/util/TestDataBuilder.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/util/TestDataBuilder.java
@@ -714,7 +714,8 @@ public class TestDataBuilder
final QueryRunnerFactoryConglomerate conglomerate,
final File tmpDir,
final QueryScheduler scheduler,
- final JoinableFactoryWrapper joinableFactoryWrapper)
+ final JoinableFactoryWrapper joinableFactoryWrapper
+ )
{
SpecificSegmentsQuerySegmentWalker walker =
SpecificSegmentsQuerySegmentWalker.createWalker(
injector,
@@ -723,17 +724,18 @@ public class TestDataBuilder
joinableFactoryWrapper,
scheduler
);
- return addDataSetsToWalker(tmpDir, walker);
+ return addDataSetsToWalker(tmpDir, walker,
injector.getInstance(ObjectMapper.class));
}
@SuppressWarnings("resource")
public static SpecificSegmentsQuerySegmentWalker addDataSetsToWalker(
final File tmpDir,
- SpecificSegmentsQuerySegmentWalker walker
+ SpecificSegmentsQuerySegmentWalker walker,
+ ObjectMapper jsonMapper
)
{
final QueryableIndex index1 = IndexBuilder
- .create()
+ .create(jsonMapper)
.tmpDir(new File(tmpDir, "1"))
.segmentWriteOutMediumFactory(OffHeapMemorySegmentWriteOutMediumFactory.instance())
.schema(INDEX_SCHEMA)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
