diff --git a/docs/ingestion/native-batch.md b/docs/ingestion/native-batch.md index 7039bfb23330..8fdc3977f63c 100644 --- a/docs/ingestion/native-batch.md +++ b/docs/ingestion/native-batch.md @@ -605,8 +605,7 @@ An example of the result is "logParseExceptions": false, "maxParseExceptions": 2147483647, "maxSavedParseExceptions": 0, - "forceGuaranteedRollup": false, - "buildV9Directly": true + "forceGuaranteedRollup": false } } }, diff --git a/extensions-contrib/materialized-view-maintenance/src/main/java/org/apache/druid/indexing/materializedview/MaterializedViewSupervisorSpec.java b/extensions-contrib/materialized-view-maintenance/src/main/java/org/apache/druid/indexing/materializedview/MaterializedViewSupervisorSpec.java index be21a6558fff..6daaad9d73e3 100644 --- a/extensions-contrib/materialized-view-maintenance/src/main/java/org/apache/druid/indexing/materializedview/MaterializedViewSupervisorSpec.java +++ b/extensions-contrib/materialized-view-maintenance/src/main/java/org/apache/druid/indexing/materializedview/MaterializedViewSupervisorSpec.java @@ -192,7 +192,6 @@ public HadoopIndexTask createTask(Interval interval, String version, List> specs combineText, useCombiner, null, - true, numBackgroundPersistThreads, forceExtendableShardSpecs, useExplicitVersion, diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/BatchDeltaIngestionTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/BatchDeltaIngestionTest.java index 913c6481e577..0871ac3c5455 100644 --- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/BatchDeltaIngestionTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/BatchDeltaIngestionTest.java @@ -483,7 +483,6 @@ private HadoopDruidIndexerConfig makeHadoopDruidIndexerConfig( false, null, null, - null, false, false, null, diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/DetermineHashedPartitionsJobTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/DetermineHashedPartitionsJobTest.java index 1bb672cb36c4..e0ce61246c63 100644 --- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/DetermineHashedPartitionsJobTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/DetermineHashedPartitionsJobTest.java @@ -229,7 +229,6 @@ public DetermineHashedPartitionsJobTest( false, null, null, - null, false, false, null, diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/DeterminePartitionsJobTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/DeterminePartitionsJobTest.java index b73b47cacc1b..9469badc8fb6 100644 --- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/DeterminePartitionsJobTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/DeterminePartitionsJobTest.java @@ -338,7 +338,6 @@ public DeterminePartitionsJobTest( false, null, null, - null, false, false, null, diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopDruidIndexerConfigTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopDruidIndexerConfigTest.java index 86e35d08ab9d..aec198a33edb 100644 --- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopDruidIndexerConfigTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopDruidIndexerConfigTest.java @@ -251,7 +251,6 @@ HadoopIngestionSpec build() false, null, null, - null, false, false, null, diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopTuningConfigTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopTuningConfigTest.java index 230c6c0a949d..0bac6b2206ba 100644 --- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopTuningConfigTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopTuningConfigTest.java @@ -57,7 +57,6 @@ public void testSerde() throws Exception true, null, null, - null, true, true, null, diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorJobTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorJobTest.java index 24ff1227ee58..2e42d5916f06 100644 --- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorJobTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorJobTest.java @@ -540,7 +540,6 @@ public void setUp() throws Exception false, useCombiner, null, - true, null, forceExtendableShardSpecs, false, diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/JobHelperTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/JobHelperTest.java index 9115eddfc086..6f8e84af086b 100644 --- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/JobHelperTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/JobHelperTest.java @@ -181,7 +181,6 @@ public void setup() throws Exception false, null, null, - null, false, false, null, diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/path/GranularityPathSpecTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/path/GranularityPathSpecTest.java index 8fc3e6c28084..fcecb0bf0782 100644 --- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/path/GranularityPathSpecTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/path/GranularityPathSpecTest.java @@ -73,7 +73,6 @@ public class GranularityPathSpecTest false, null, null, - null, false, false, null, diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTask.java index e677995f787f..a7985223483a 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTask.java @@ -1481,15 +1481,6 @@ public int getMaxPendingPersists() return maxPendingPersists; } - /** - * Always returns true, doesn't affect the version being built. - */ - @Deprecated - @JsonProperty - public boolean isBuildV9Directly() - { - return true; - } @JsonProperty public boolean isForceGuaranteedRollup() diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskTuningConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskTuningConfig.java index bad2f79c12c9..2d3445f3a8d9 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskTuningConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskTuningConfig.java @@ -73,8 +73,6 @@ public SeekableStreamIndexTaskTuningConfig( @Nullable Integer maxPendingPersists, @Nullable IndexSpec indexSpec, @Nullable IndexSpec indexSpecForIntermediatePersists, - // This parameter is left for compatibility when reading existing configs, to be removed in Druid 0.12. - @Deprecated @JsonProperty("buildV9Directly") @Nullable Boolean buildV9Directly, @Deprecated @Nullable Boolean reportParseExceptions, @Nullable Long handoffConditionTimeout, @Nullable Boolean resetOffsetAutomatically, @@ -223,16 +221,6 @@ public IndexSpec getIndexSpecForIntermediatePersists() return indexSpecForIntermediatePersists; } - /** - * Always returns true, doesn't affect the version being built. - */ - @Deprecated - @JsonProperty - public boolean getBuildV9Directly() - { - return true; - } - @Override @JsonProperty public boolean isReportParseExceptions() diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/RealtimeIndexTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/RealtimeIndexTaskTest.java index 0a2e34d7d6d7..965658d3b105 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/RealtimeIndexTaskTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/RealtimeIndexTaskTest.java @@ -843,7 +843,6 @@ private RealtimeIndexTask makeRealtimeTask( null, null, null, - true, 0, 0, reportParseExceptions, diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/TaskSerdeTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/TaskSerdeTest.java index 2d026d6a61dd..20c7eb4fc213 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/TaskSerdeTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/TaskSerdeTest.java @@ -418,7 +418,6 @@ public void testRealtimeIndexTaskSerde() throws Exception NoneShardSpec.instance(), indexSpec, null, - null, 0, 0, true, diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLifecycleTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLifecycleTest.java index 7c41ba984a77..4256c74aa05c 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLifecycleTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/TaskLifecycleTest.java @@ -1498,7 +1498,6 @@ private RealtimeIndexTask newRealtimeIndexTask() null, null, null, - null, 0, 0, null, diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSupervisorSpecTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSupervisorSpecTest.java index 51a39fc25525..2edcb82b714e 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSupervisorSpecTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSupervisorSpecTest.java @@ -501,7 +501,6 @@ public SeekableStreamIndexTaskTuningConfig convertToTaskTuningConfig() null, null, null, - null, null ) { diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java index 42e8c557705b..91dd10af41fe 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java @@ -925,7 +925,6 @@ public SeekableStreamIndexTaskTuningConfig convertToTaskTuningConfig() null, null, null, - null, null ) { diff --git a/server/src/main/java/org/apache/druid/segment/indexing/RealtimeTuningConfig.java b/server/src/main/java/org/apache/druid/segment/indexing/RealtimeTuningConfig.java index e7b4525793bd..6901fafd79e7 100644 --- a/server/src/main/java/org/apache/druid/segment/indexing/RealtimeTuningConfig.java +++ b/server/src/main/java/org/apache/druid/segment/indexing/RealtimeTuningConfig.java @@ -78,7 +78,6 @@ public static RealtimeTuningConfig makeDefaultTuningConfig(final @Nullable File DEFAULT_SHARD_SPEC, DEFAULT_INDEX_SPEC, DEFAULT_INDEX_SPEC, - true, 0, 0, DEFAULT_REPORT_PARSE_EXCEPTIONS, @@ -127,8 +126,6 @@ public RealtimeTuningConfig( @JsonProperty("shardSpec") ShardSpec shardSpec, @JsonProperty("indexSpec") IndexSpec indexSpec, @JsonProperty("indexSpecForIntermediatePersists") @Nullable IndexSpec indexSpecForIntermediatePersists, - // This parameter is left for compatibility when reading existing configs, to be removed in Druid 0.12. - @JsonProperty("buildV9Directly") Boolean buildV9Directly, @JsonProperty("persistThreadPriority") int persistThreadPriority, @JsonProperty("mergeThreadPriority") int mergeThreadPriority, @JsonProperty("reportParseExceptions") Boolean reportParseExceptions, @@ -268,16 +265,6 @@ public IndexSpec getIndexSpecForIntermediatePersists() return indexSpecForIntermediatePersists; } - /** - * Always returns true, doesn't affect the version being built. - */ - @Deprecated - @JsonProperty - public Boolean getBuildV9Directly() - { - return true; - } - @JsonProperty public int getPersistThreadPriority() { @@ -340,7 +327,6 @@ public RealtimeTuningConfig withVersioningPolicy(VersioningPolicy policy) shardSpec, indexSpec, indexSpecForIntermediatePersists, - true, persistThreadPriority, mergeThreadPriority, reportParseExceptions, @@ -368,7 +354,6 @@ public RealtimeTuningConfig withBasePersistDirectory(File dir) shardSpec, indexSpec, indexSpecForIntermediatePersists, - true, persistThreadPriority, mergeThreadPriority, reportParseExceptions, diff --git a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/AppenderatorPlumberTest.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/AppenderatorPlumberTest.java index 78210d3bc191..c07fbd07cf7f 100644 --- a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/AppenderatorPlumberTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/AppenderatorPlumberTest.java @@ -75,7 +75,6 @@ public AppenderatorPlumberTest() throws Exception null, null, null, - true, 0, 0, false, diff --git a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/AppenderatorTester.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/AppenderatorTester.java index 1231b7721693..600662e1f98c 100644 --- a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/AppenderatorTester.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/AppenderatorTester.java @@ -187,7 +187,6 @@ public AppenderatorTester( null, null, null, - null, 0, 0, null, diff --git a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/DefaultOfflineAppenderatorFactoryTest.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/DefaultOfflineAppenderatorFactoryTest.java index 491f4b26d702..36c9c5bce223 100644 --- a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/DefaultOfflineAppenderatorFactoryTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/DefaultOfflineAppenderatorFactoryTest.java @@ -147,7 +147,6 @@ public int columnCacheSizeBytes() null, null, null, - null, 0, 0, null, diff --git a/server/src/test/java/org/apache/druid/segment/realtime/plumber/RealtimePlumberSchoolTest.java b/server/src/test/java/org/apache/druid/segment/realtime/plumber/RealtimePlumberSchoolTest.java index f2944224a1e7..0039690779ff 100644 --- a/server/src/test/java/org/apache/druid/segment/realtime/plumber/RealtimePlumberSchoolTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/plumber/RealtimePlumberSchoolTest.java @@ -214,7 +214,6 @@ public void setUp() throws Exception null, null, null, - true, 0, 0, false, diff --git a/server/src/test/java/org/apache/druid/segment/realtime/plumber/SinkTest.java b/server/src/test/java/org/apache/druid/segment/realtime/plumber/SinkTest.java index 9c7925152b92..de12c4c60b73 100644 --- a/server/src/test/java/org/apache/druid/segment/realtime/plumber/SinkTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/plumber/SinkTest.java @@ -78,7 +78,6 @@ public void testSwap() throws Exception null, null, null, - null, 0, 0, null, @@ -235,7 +234,6 @@ public void testDedup() throws Exception null, null, null, - null, 0, 0, null, diff --git a/services/src/test/java/org/apache/druid/cli/validate/DruidJsonValidatorTest.java b/services/src/test/java/org/apache/druid/cli/validate/DruidJsonValidatorTest.java index 391d47f60cd5..e26241083772 100644 --- a/services/src/test/java/org/apache/druid/cli/validate/DruidJsonValidatorTest.java +++ b/services/src/test/java/org/apache/druid/cli/validate/DruidJsonValidatorTest.java @@ -169,7 +169,6 @@ public void testTaskValidator() throws Exception NoneShardSpec.instance(), new IndexSpec(), new IndexSpec(), - null, 0, 0, true,