You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by GitBox <gi...@apache.org> on 2018/09/30 19:28:18 UTC

[GitHub] jihoonson closed pull request #6351: Refactoring some APIs in IndexMergerV9 and adding Builders to tuningConfigs

jihoonson closed pull request #6351: Refactoring some APIs in IndexMergerV9 and adding Builders to tuningConfigs
URL: https://github.com/apache/incubator-druid/pull/6351
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/benchmarks/src/main/java/org/apache/druid/benchmark/datagen/SegmentGenerator.java b/benchmarks/src/main/java/org/apache/druid/benchmark/datagen/SegmentGenerator.java
index dd339072584..ef3cb5c38c5 100644
--- a/benchmarks/src/main/java/org/apache/druid/benchmark/datagen/SegmentGenerator.java
+++ b/benchmarks/src/main/java/org/apache/druid/benchmark/datagen/SegmentGenerator.java
@@ -23,6 +23,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.common.io.Files;
+import org.apache.commons.io.FileUtils;
 import org.apache.druid.data.input.InputRow;
 import org.apache.druid.data.input.impl.DimensionSchema;
 import org.apache.druid.data.input.impl.DimensionsSpec;
@@ -33,18 +34,17 @@
 import org.apache.druid.java.util.common.ISE;
 import org.apache.druid.java.util.common.granularity.Granularity;
 import org.apache.druid.java.util.common.logger.Logger;
-import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory;
 import org.apache.druid.query.aggregation.AggregatorFactory;
 import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesSerde;
 import org.apache.druid.segment.IndexBuilder;
 import org.apache.druid.segment.IndexSpec;
 import org.apache.druid.segment.QueryableIndex;
-import org.apache.druid.segment.QueryableIndexIndexableAdapter;
+import org.apache.druid.segment.QueryableIndexAdapter;
 import org.apache.druid.segment.TestHelper;
 import org.apache.druid.segment.incremental.IncrementalIndexSchema;
 import org.apache.druid.segment.serde.ComplexMetrics;
+import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory;
 import org.apache.druid.timeline.DataSegment;
-import org.apache.commons.io.FileUtils;
 
 import java.io.Closeable;
 import java.io.File;
@@ -147,7 +147,7 @@ public QueryableIndex generate(
       try {
         final QueryableIndex merged = TestHelper.getTestIndexIO(OffHeapMemorySegmentWriteOutMediumFactory.instance()).loadIndex(
             TestHelper.getTestIndexMergerV9(OffHeapMemorySegmentWriteOutMediumFactory.instance()).merge(
-                indexes.stream().map(QueryableIndexIndexableAdapter::new).collect(Collectors.toList()),
+                indexes.stream().map(QueryableIndexAdapter::new).collect(Collectors.toList()),
                 false,
                 schemaInfo.getAggs()
                           .stream()
@@ -155,7 +155,7 @@ public QueryableIndex generate(
                           .toArray(AggregatorFactory[]::new),
                 new File(tempDir, "merged"),
                 new IndexSpec()
-            )
+            ).getFile()
         );
 
         for (QueryableIndex index : indexes) {
diff --git a/benchmarks/src/main/java/org/apache/druid/benchmark/indexing/IndexMergeBenchmark.java b/benchmarks/src/main/java/org/apache/druid/benchmark/indexing/IndexMergeBenchmark.java
index 3120daf841a..666ffb7dabd 100644
--- a/benchmarks/src/main/java/org/apache/druid/benchmark/indexing/IndexMergeBenchmark.java
+++ b/benchmarks/src/main/java/org/apache/druid/benchmark/indexing/IndexMergeBenchmark.java
@@ -22,6 +22,7 @@
 import com.fasterxml.jackson.databind.InjectableValues;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.io.Files;
+import org.apache.commons.io.FileUtils;
 import org.apache.druid.benchmark.datagen.BenchmarkDataGenerator;
 import org.apache.druid.benchmark.datagen.BenchmarkSchemaInfo;
 import org.apache.druid.benchmark.datagen.BenchmarkSchemas;
@@ -40,7 +41,6 @@
 import org.apache.druid.segment.incremental.IncrementalIndexSchema;
 import org.apache.druid.segment.serde.ComplexMetrics;
 import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory;
-import org.apache.commons.io.FileUtils;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -193,7 +193,7 @@ public void mergeV9(Blackhole blackhole) throws Exception
           tmpFile,
           new IndexSpec(),
           null
-      );
+      ).getFile();
 
       blackhole.consume(mergedFile);
     }
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 29904a47635..f6f824c3f07 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
@@ -23,10 +23,11 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-import com.google.common.base.Strings;
+import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.druid.data.input.impl.DimensionSchema;
 import org.apache.druid.data.input.impl.DimensionsSpec;
 import org.apache.druid.indexer.HadoopIOConfig;
@@ -51,7 +52,6 @@
 import org.apache.druid.segment.transform.TransformSpec;
 import org.apache.druid.server.security.AuthorizerMapper;
 import org.apache.druid.timeline.DataSegment;
-import org.apache.commons.codec.digest.DigestUtils;
 import org.joda.time.Interval;
 
 import java.util.List;
diff --git a/extensions-contrib/orc-extensions/src/test/java/org/apache/druid/data/input/orc/OrcIndexGeneratorJobTest.java b/extensions-contrib/orc-extensions/src/test/java/org/apache/druid/data/input/orc/OrcIndexGeneratorJobTest.java
index ed59a13b8a6..b3dc2dcea45 100644
--- a/extensions-contrib/orc-extensions/src/test/java/org/apache/druid/data/input/orc/OrcIndexGeneratorJobTest.java
+++ b/extensions-contrib/orc-extensions/src/test/java/org/apache/druid/data/input/orc/OrcIndexGeneratorJobTest.java
@@ -43,7 +43,7 @@
 import org.apache.druid.query.aggregation.LongSumAggregatorFactory;
 import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory;
 import org.apache.druid.segment.QueryableIndex;
-import org.apache.druid.segment.QueryableIndexIndexableAdapter;
+import org.apache.druid.segment.QueryableIndexAdapter;
 import org.apache.druid.segment.RowIterator;
 import org.apache.druid.segment.indexing.DataSchema;
 import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec;
@@ -214,30 +214,13 @@ public void setUp() throws Exception
                 null,
                 outputRoot.getCanonicalPath()
             ),
-            new HadoopTuningConfig(
-                outputRoot.getCanonicalPath(),
-                null,
-                null,
-                null,
-                null,
-                null,
-                null,
-                false,
-                false,
-                false,
-                false,
-                ImmutableMap.of(JobContext.NUM_REDUCES, "0"), //verifies that set num reducers is ignored
-                false,
-                true,
-                null,
-                true,
-                null,
-                false,
-                false,
-                null,
-                null,
-                null
-            )
+            new HadoopTuningConfig.Builder()
+                .setWorkingPath(outputRoot.getCanonicalPath())
+                // verifies that set num reducers is ignored
+                .setJobProperties(ImmutableMap.of(JobContext.NUM_REDUCES, "0"))
+                .setCleanOnFailure(false)
+                .setUseCombiner(true)
+                .build()
         )
     );
     config.setShardSpecs(
@@ -307,7 +290,7 @@ private void verifyJob(IndexGeneratorJob job) throws IOException
         unzip(indexZip, dir);
 
         QueryableIndex index = HadoopDruidIndexerConfig.INDEX_IO.loadIndex(dir);
-        QueryableIndexIndexableAdapter adapter = new QueryableIndexIndexableAdapter(index);
+        QueryableIndexAdapter adapter = new QueryableIndexAdapter(index);
 
         try (RowIterator rowIt = adapter.getRows()) {
           while (rowIt.moveToNext()) {
diff --git a/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaTuningConfig.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaTuningConfig.java
index fd5e666166b..ab47ae1c69c 100644
--- a/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaTuningConfig.java
+++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/KafkaTuningConfig.java
@@ -113,12 +113,16 @@ public KafkaTuningConfig(
       this.maxParseExceptions = 0;
       this.maxSavedParseExceptions = maxSavedParseExceptions == null ? 0 : Math.min(1, maxSavedParseExceptions);
     } else {
-      this.maxParseExceptions = maxParseExceptions == null ? TuningConfig.DEFAULT_MAX_PARSE_EXCEPTIONS : maxParseExceptions;
+      this.maxParseExceptions = maxParseExceptions == null
+                                ? TuningConfig.DEFAULT_MAX_PARSE_EXCEPTIONS
+                                : maxParseExceptions;
       this.maxSavedParseExceptions = maxSavedParseExceptions == null
                                      ? TuningConfig.DEFAULT_MAX_SAVED_PARSE_EXCEPTIONS
                                      : maxSavedParseExceptions;
     }
-    this.logParseExceptions = logParseExceptions == null ? TuningConfig.DEFAULT_LOG_PARSE_EXCEPTIONS : logParseExceptions;
+    this.logParseExceptions = logParseExceptions == null
+                              ? TuningConfig.DEFAULT_LOG_PARSE_EXCEPTIONS
+                              : logParseExceptions;
   }
 
   public static KafkaTuningConfig copyOf(KafkaTuningConfig config)
@@ -360,4 +364,154 @@ public String toString()
            ", maxSavedParseExceptions=" + maxSavedParseExceptions +
            '}';
   }
+
+  public static class Builder
+  {
+    private Integer maxRowsInMemory;
+    private Long maxBytesInMemory;
+    private Integer maxRowsPerSegment;
+    private Long maxTotalRows;
+    private Period intermediatePersistPeriod;
+    private File basePersistDirectory;
+    private Integer maxPendingPersists;
+    private IndexSpec indexSpec;
+    private Boolean reportParseExceptions;
+    private Long handoffConditionTimeout;
+    private Boolean resetOffsetAutomatically;
+    private SegmentWriteOutMediumFactory segmentWriteOutMediumFactory;
+    private Period intermediateHandoffPeriod;
+    private Boolean logParseExceptions;
+    private Integer maxParseExceptions;
+    private Integer maxSavedParseExceptions;
+
+    public Builder setMaxRowsInMemory(int maxRowsInMemory)
+    {
+      this.maxRowsInMemory = maxRowsInMemory;
+      return this;
+    }
+
+    public Builder setMaxBytesInMemory(long maxBytesInMemory)
+    {
+      this.maxBytesInMemory = maxBytesInMemory;
+      return this;
+    }
+
+    public Builder setMaxRowsPerSegment(@Nullable Integer maxRowsPerSegment)
+    {
+      if (maxRowsPerSegment != null) {
+        this.maxRowsPerSegment = maxRowsPerSegment;
+      }
+      return this;
+    }
+
+    public Builder setMaxTotalRows(@Nullable Long maxTotalRows)
+    {
+      if (maxTotalRows != null) {
+        this.maxTotalRows = maxTotalRows;
+      }
+      return this;
+    }
+
+    public Builder setIntermediatePersistePeriod(Period intermediatePersistePeriod)
+    {
+      this.intermediatePersistPeriod = intermediatePersistePeriod;
+      return this;
+    }
+
+    public Builder setBasePersistDirectory(File basePersistDirectory)
+    {
+      this.basePersistDirectory = basePersistDirectory;
+      return this;
+    }
+
+    @Deprecated
+    public Builder setMaxPendingPersists(int maxPendingPersists)
+    {
+      this.maxPendingPersists = maxPendingPersists;
+      return this;
+    }
+
+    public Builder setIndexSpec(IndexSpec indexSpec)
+    {
+      this.indexSpec = indexSpec;
+      return this;
+    }
+
+    public Builder setReportParseExceptions(boolean reportParseExceptions)
+    {
+      this.reportParseExceptions = reportParseExceptions;
+      return this;
+    }
+
+    public Builder setHandoffConditionTimeout(long handoffConditionTimeout)
+    {
+      this.handoffConditionTimeout = handoffConditionTimeout;
+      return this;
+    }
+
+    public Builder setResetOffsetAutomatically(boolean resetOffsetAutomatically)
+    {
+      this.resetOffsetAutomatically = resetOffsetAutomatically;
+      return this;
+    }
+
+    public Builder setSegmentWriteOutMediumFactory(SegmentWriteOutMediumFactory factory)
+    {
+      this.segmentWriteOutMediumFactory = factory;
+      return this;
+    }
+
+    public Builder setIntermediateHandoffPeriod(@Nullable Period intermediateHandoffPeriod)
+    {
+      if (intermediateHandoffPeriod != null) {
+        this.intermediateHandoffPeriod = intermediateHandoffPeriod;
+      }
+      return this;
+    }
+
+    public Builder setLogParseExceptions(boolean logParseExceptions)
+    {
+      this.logParseExceptions = logParseExceptions;
+      return this;
+    }
+
+    public Builder setMaxParseExceptions(@Nullable Integer maxParseExceptions)
+    {
+      if (maxParseExceptions != null) {
+        this.maxParseExceptions = maxParseExceptions;
+      }
+      return this;
+    }
+
+    public Builder setMaxSavedParseExceptions(@Nullable Integer maxSavedParseExceptions)
+    {
+      if (maxSavedParseExceptions != null) {
+        this.maxSavedParseExceptions = maxSavedParseExceptions;
+      }
+      return this;
+    }
+
+    public KafkaTuningConfig build()
+    {
+      return new KafkaTuningConfig(
+          maxRowsInMemory,
+          maxBytesInMemory,
+          maxRowsPerSegment,
+          maxTotalRows,
+          intermediatePersistPeriod,
+          basePersistDirectory,
+          maxPendingPersists,
+          indexSpec,
+          true,
+          reportParseExceptions,
+          handoffConditionTimeout,
+          resetOffsetAutomatically,
+          segmentWriteOutMediumFactory,
+          intermediateHandoffPeriod,
+          logParseExceptions,
+          maxParseExceptions,
+          maxSavedParseExceptions
+      );
+    }
+  }
 }
diff --git a/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorSpec.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorSpec.java
index 28dab02c56e..920c26aed7c 100644
--- a/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorSpec.java
+++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorSpec.java
@@ -77,31 +77,7 @@ public KafkaSupervisorSpec(
     this.dataSchema = Preconditions.checkNotNull(dataSchema, "dataSchema");
     this.tuningConfig = tuningConfig != null
                         ? tuningConfig
-                        : new KafkaSupervisorTuningConfig(
-                            null,
-                            null,
-                            null,
-                            null,
-                            null,
-                            null,
-                            null,
-                            null,
-                            null,
-                            null,
-                            null,
-                            null,
-                            null,
-                            null,
-                            null,
-                            null,
-                            null,
-                            null,
-                            null,
-                            null,
-                            null,
-                            null,
-                            null
-                        );
+                        : new KafkaSupervisorTuningConfig.Builder().build();
     this.ioConfig = Preconditions.checkNotNull(ioConfig, "ioConfig");
     this.context = context;
 
diff --git a/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTuningConfig.java b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTuningConfig.java
index 3416941df78..deca5164aa5 100644
--- a/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTuningConfig.java
+++ b/extensions-core/kafka-indexing-service/src/main/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTuningConfig.java
@@ -21,9 +21,9 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.druid.indexing.kafka.KafkaTuningConfig;
+import org.apache.druid.segment.IndexSpec;
 import org.apache.druid.segment.indexing.TuningConfigs;
 import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory;
-import org.apache.druid.segment.IndexSpec;
 import org.joda.time.Duration;
 import org.joda.time.Period;
 
@@ -163,4 +163,192 @@ private static Duration defaultDuration(final Period period, final String theDef
   {
     return (period == null ? new Period(theDefault) : period).toStandardDuration();
   }
+
+  public static class Builder
+  {
+    private Integer maxRowsInMemory;
+    private Long maxBytesInMemory;
+    private Integer maxRowsPerSegment;
+    private Long maxTotalRows;
+    private Period intermediatePersistPeriod;
+    private File basePersistDirectory;
+    private int maxPendingPersists;
+    private IndexSpec indexSpec;
+    private Boolean reportParseExceptions;
+    private Long handoffConditionTimeout;
+    private Boolean resetOffsetAutomatically;
+    private SegmentWriteOutMediumFactory segmentWriteOutMediumFactory;
+    private Period intermediateHandoffPeriod;
+    private Boolean logParseExceptions;
+    private Integer maxParseExceptions;
+    private Integer maxSavedParseExceptions;
+    private Integer workerThreads;
+    private Integer chatThreads;
+    private Long chatRetries;
+    private Period httpTimeout;
+    private Period shutdownTimeout;
+    private Period offsetFetchPeriod;
+
+    public Builder setMaxRowsInMemory(int maxRowsInMemory)
+    {
+      this.maxRowsInMemory = maxRowsInMemory;
+      return this;
+    }
+
+    public Builder setMaxBytesInMemory(long maxBytesInMemory)
+    {
+      this.maxBytesInMemory = maxBytesInMemory;
+      return this;
+    }
+
+    public Builder setMaxRowsPerSegment(int maxRowsPerSegment)
+    {
+      this.maxRowsPerSegment = maxRowsPerSegment;
+      return this;
+    }
+
+    public Builder setMaxTotalRows(long maxTotalRows)
+    {
+      this.maxTotalRows = maxTotalRows;
+      return this;
+    }
+
+    public Builder setIntermediatePersistePeriod(Period intermediatePersistePeriod)
+    {
+      this.intermediatePersistPeriod = intermediatePersistePeriod;
+      return this;
+    }
+
+    public Builder setBasePersistDirectory(File basePersistDirectory)
+    {
+      this.basePersistDirectory = basePersistDirectory;
+      return this;
+    }
+
+    @Deprecated
+    public Builder setMaxPendingPersists(int maxPendingPersists)
+    {
+      this.maxPendingPersists = maxPendingPersists;
+      return this;
+    }
+
+    public Builder setIndexSpec(IndexSpec indexSpec)
+    {
+      this.indexSpec = indexSpec;
+      return this;
+    }
+
+    public Builder setReportParseExceptions(boolean reportParseExceptions)
+    {
+      this.reportParseExceptions = reportParseExceptions;
+      return this;
+    }
+
+    public Builder setHandoffConditionTimeout(long handoffConditionTimeout)
+    {
+      this.handoffConditionTimeout = handoffConditionTimeout;
+      return this;
+    }
+
+    public Builder setResetOffsetAutomatically(boolean resetOffsetAutomatically)
+    {
+      this.resetOffsetAutomatically = resetOffsetAutomatically;
+      return this;
+    }
+
+    public Builder setSegmentWriteOutMediumFactory(SegmentWriteOutMediumFactory factory)
+    {
+      this.segmentWriteOutMediumFactory = factory;
+      return this;
+    }
+
+    public Builder setIntermediateHandoffPeriod(Period intermediateHandoffPeriod)
+    {
+      this.intermediateHandoffPeriod = intermediateHandoffPeriod;
+      return this;
+    }
+
+    public Builder setLogParseExceptions(boolean logParseExceptions)
+    {
+      this.logParseExceptions = logParseExceptions;
+      return this;
+    }
+
+    public Builder setMaxParseExceptions(int maxParseExceptions)
+    {
+      this.maxParseExceptions = maxParseExceptions;
+      return this;
+    }
+
+    public Builder setMaxSavedParseExceptions(int maxSavedParseExceptions)
+    {
+      this.maxSavedParseExceptions = maxSavedParseExceptions;
+      return this;
+    }
+
+    public Builder setWorkerThreads(int workerThreads)
+    {
+      this.workerThreads = workerThreads;
+      return this;
+    }
+
+    public Builder setChatThreads(int chatThreads)
+    {
+      this.chatThreads = chatThreads;
+      return this;
+    }
+
+    public Builder setChatRetries(long chatRetries)
+    {
+      this.chatRetries = chatRetries;
+      return this;
+    }
+
+    public Builder setHttpTimeout(Period httpTimeout)
+    {
+      this.httpTimeout = httpTimeout;
+      return this;
+    }
+
+    public Builder setShutdownTimeout(Period shutdownTimeout)
+    {
+      this.shutdownTimeout = shutdownTimeout;
+      return this;
+    }
+
+    public Builder setOffsetFetchPeriod(Period offsetFetchPeriod)
+    {
+      this.offsetFetchPeriod = offsetFetchPeriod;
+      return this;
+    }
+
+    public KafkaSupervisorTuningConfig build()
+    {
+      return new KafkaSupervisorTuningConfig(
+          maxRowsInMemory,
+          maxBytesInMemory,
+          maxRowsPerSegment,
+          maxTotalRows,
+          intermediatePersistPeriod,
+          basePersistDirectory,
+          maxPendingPersists,
+          indexSpec,
+          true,
+          reportParseExceptions,
+          handoffConditionTimeout,
+          resetOffsetAutomatically,
+          segmentWriteOutMediumFactory,
+          workerThreads,
+          chatThreads,
+          chatRetries,
+          httpTimeout,
+          shutdownTimeout,
+          offsetFetchPeriod,
+          intermediateHandoffPeriod,
+          logParseExceptions,
+          maxParseExceptions,
+          maxSavedParseExceptions
+      );
+    }
+  }
 }
diff --git a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskTest.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskTest.java
index 611533bbcfb..5541a1a90c9 100644
--- a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskTest.java
+++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaIndexTaskTest.java
@@ -36,6 +36,7 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
+import org.apache.curator.test.TestingCluster;
 import org.apache.druid.client.cache.CacheConfig;
 import org.apache.druid.client.cache.CachePopulatorStats;
 import org.apache.druid.client.cache.MapCache;
@@ -138,7 +139,6 @@
 import org.apache.druid.server.coordination.DataSegmentServerAnnouncer;
 import org.apache.druid.server.coordination.ServerType;
 import org.apache.druid.timeline.DataSegment;
-import org.apache.curator.test.TestingCluster;
 import org.apache.kafka.clients.producer.KafkaProducer;
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.easymock.EasyMock;
@@ -1995,25 +1995,19 @@ private KafkaIndexTask createTask(
       final KafkaIOConfig ioConfig
   )
   {
-    final KafkaTuningConfig tuningConfig = new KafkaTuningConfig(
-        1000,
-        null,
-        maxRowsPerSegment,
-        maxTotalRows,
-        new Period("P1Y"),
-        null,
-        null,
-        null,
-        true,
-        reportParseExceptions,
-        handoffConditionTimeout,
-        resetOffsetAutomatically,
-        null,
-        intermediateHandoffPeriod,
-        logParseExceptions,
-        maxParseExceptions,
-        maxSavedParseExceptions
-    );
+    final KafkaTuningConfig tuningConfig = new KafkaTuningConfig.Builder()
+        .setMaxRowsInMemory(1000)
+        .setMaxRowsPerSegment(maxRowsPerSegment)
+        .setMaxTotalRows(maxTotalRows)
+        .setIntermediatePersistePeriod(new Period("P1Y"))
+        .setReportParseExceptions(reportParseExceptions)
+        .setHandoffConditionTimeout(handoffConditionTimeout)
+        .setResetOffsetAutomatically(resetOffsetAutomatically)
+        .setIntermediateHandoffPeriod(intermediateHandoffPeriod)
+        .setLogParseExceptions(logParseExceptions)
+        .setMaxParseExceptions(maxParseExceptions)
+        .setMaxSavedParseExceptions(maxSavedParseExceptions)
+        .build();
     final Map<String, Object> context = isIncrementalHandoffSupported
                                         ? ImmutableMap.of(KafkaSupervisor.IS_INCREMENTAL_HANDOFF_SUPPORTED, true)
                                         : null;
@@ -2040,25 +2034,17 @@ private KafkaIndexTask createTask(
       final Map<String, Object> context
   )
   {
-    final KafkaTuningConfig tuningConfig = new KafkaTuningConfig(
-        1000,
-        null,
-        maxRowsPerSegment,
-        null,
-        new Period("P1Y"),
-        null,
-        null,
-        null,
-        true,
-        reportParseExceptions,
-        handoffConditionTimeout,
-        resetOffsetAutomatically,
-        null,
-        null,
-        logParseExceptions,
-        maxParseExceptions,
-        maxSavedParseExceptions
-    );
+    final KafkaTuningConfig tuningConfig = new KafkaTuningConfig.Builder()
+        .setMaxRowsInMemory(1000)
+        .setMaxRowsPerSegment(maxRowsPerSegment)
+        .setIntermediatePersistePeriod(new Period("P1Y"))
+        .setReportParseExceptions(reportParseExceptions)
+        .setHandoffConditionTimeout(handoffConditionTimeout)
+        .setResetOffsetAutomatically(resetOffsetAutomatically)
+        .setLogParseExceptions(logParseExceptions)
+        .setMaxParseExceptions(maxParseExceptions)
+        .setMaxSavedParseExceptions(maxSavedParseExceptions)
+        .build();
     if (isIncrementalHandoffSupported) {
       context.put(KafkaSupervisor.IS_INCREMENTAL_HANDOFF_SUPPORTED, true);
     }
diff --git a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaTuningConfigTest.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaTuningConfigTest.java
index 69cf186a3c3..dba2e4f03e7 100644
--- a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaTuningConfigTest.java
+++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaTuningConfigTest.java
@@ -105,25 +105,17 @@ public void testSerdeWithNonDefaults() throws Exception
   @Test
   public void testCopyOf()
   {
-    KafkaTuningConfig original = new KafkaTuningConfig(
-        1,
-        null,
-        2,
-        10L,
-        new Period("PT3S"),
-        new File("/tmp/xxx"),
-        4,
-        new IndexSpec(),
-        true,
-        true,
-        5L,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null
-    );
+    final KafkaTuningConfig original = new KafkaTuningConfig.Builder()
+        .setMaxRowsInMemory(1)
+        .setMaxRowsPerSegment(2)
+        .setMaxTotalRows(10L)
+        .setIntermediatePersistePeriod(new Period("PT3S"))
+        .setBasePersistDirectory(new File("/tmp/xxx"))
+        .setMaxPendingPersists(5)
+        .setIndexSpec(new IndexSpec())
+        .setReportParseExceptions(true)
+        .setHandoffConditionTimeout(5L)
+        .build();
     KafkaTuningConfig copy = KafkaTuningConfig.copyOf(original);
 
     Assert.assertEquals(1, copy.getMaxRowsInMemory());
diff --git a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTest.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTest.java
index 978de2f6886..37a78362497 100644
--- a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTest.java
+++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/supervisor/KafkaSupervisorTest.java
@@ -191,32 +191,16 @@ public void setupTest()
     taskClient = createMock(KafkaIndexTaskClient.class);
     taskQueue = createMock(TaskQueue.class);
 
-    tuningConfig = new KafkaSupervisorTuningConfig(
-        1000,
-        null,
-        50000,
-        null,
-        new Period("P1Y"),
-        new File("/test"),
-        null,
-        null,
-        true,
-        false,
-        null,
-        null,
-        null,
-        numThreads,
-        TEST_CHAT_THREADS,
-        TEST_CHAT_RETRIES,
-        TEST_HTTP_TIMEOUT,
-        TEST_SHUTDOWN_TIMEOUT,
-        null,
-        null,
-        null,
-        null,
-        null
-    );
-
+    tuningConfig = new KafkaSupervisorTuningConfig.Builder()
+        .setMaxRowsInMemory(1000)
+        .setMaxRowsPerSegment(50000)
+        .setIntermediatePersistePeriod(new Period("P1Y"))
+        .setBasePersistDirectory(new File("/test"))
+        .setWorkerThreads(numThreads)
+        .setChatThreads(TEST_CHAT_THREADS)
+        .setChatRetries(TEST_CHAT_RETRIES)
+        .setShutdownTimeout(TEST_SHUTDOWN_TIMEOUT)
+        .build();
     topic = getTopic();
     rowIngestionMetersFactory = new TestUtils().getRowIngestionMetersFactory();
     serviceEmitter = new ExceptionCapturingServiceEmitter();
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopTuningConfig.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopTuningConfig.java
index 1f17fb89fe8..44cee7335fd 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopTuningConfig.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopTuningConfig.java
@@ -49,30 +49,7 @@
 
   public static HadoopTuningConfig makeDefaultTuningConfig()
   {
-    return new HadoopTuningConfig(
-        null,
-        DateTimes.nowUtc().toString(),
-        DEFAULT_PARTITIONS_SPEC,
-        DEFAULT_SHARD_SPECS,
-        DEFAULT_INDEX_SPEC,
-        DEFAULT_ROW_FLUSH_BOUNDARY,
-        0L,
-        false,
-        true,
-        false,
-        false,
-        null,
-        false,
-        false,
-        null,
-        true,
-        DEFAULT_NUM_BACKGROUND_PERSIST_THREADS,
-        false,
-        false,
-        null,
-        null,
-        null
-    );
+    return new Builder().build();
   }
 
   private final String workingPath;
@@ -155,9 +132,13 @@ public HadoopTuningConfig(
     if (!this.ignoreInvalidRows) {
       this.maxParseExceptions = 0;
     } else {
-      this.maxParseExceptions = maxParseExceptions == null ? TuningConfig.DEFAULT_MAX_PARSE_EXCEPTIONS : maxParseExceptions;
+      this.maxParseExceptions = maxParseExceptions == null
+                                ? TuningConfig.DEFAULT_MAX_PARSE_EXCEPTIONS
+                                : maxParseExceptions;
     }
-    this.logParseExceptions = logParseExceptions == null ? TuningConfig.DEFAULT_LOG_PARSE_EXCEPTIONS : logParseExceptions;
+    this.logParseExceptions = logParseExceptions == null
+                              ? TuningConfig.DEFAULT_LOG_PARSE_EXCEPTIONS
+                              : logParseExceptions;
   }
 
   @JsonProperty
@@ -374,4 +355,176 @@ public HadoopTuningConfig withShardSpecs(Map<Long, List<HadoopyShardSpec>> specs
         maxParseExceptions
     );
   }
+
+  public static class Builder
+  {
+    private String workingPath;
+    private String version;
+    private PartitionsSpec partitionsSpec;
+    private Map<Long, List<HadoopyShardSpec>> shardSpecs;
+    private IndexSpec indexSpec;
+    private Integer maxRowsInMemory;
+    private Long maxBytesInMemory;
+    private boolean leaveIntermediate;
+    private Boolean cleanupOnFailure;
+    private boolean overwriteFiles;
+    private boolean ignoreInvalidRows;
+    private Map<String, String> jobProperties;
+    private boolean combineText;
+    private Boolean useCombiner;
+    private Integer numBackgroundPersistThreads;
+    private boolean forceExtendableShardSpecs;
+    private boolean useExplicitVersion;
+    private List<String> allowedHadoopPrefix;
+    private Boolean logParseExceptions;
+    private Integer maxParseExceptions;
+
+    public Builder setWorkingPath(String workingPath)
+    {
+      this.workingPath = workingPath;
+      return this;
+    }
+
+    public Builder setVersion(String version)
+    {
+      this.version = version;
+      return this;
+    }
+
+    public Builder setPartitionsSpec(PartitionsSpec partitionsSpec)
+    {
+      this.partitionsSpec = partitionsSpec;
+      return this;
+    }
+
+    public Builder setShardSpecs(Map<Long, List<HadoopyShardSpec>> shardSpecs)
+    {
+      this.shardSpecs = shardSpecs;
+      return this;
+    }
+
+    public Builder setIndexSpec(IndexSpec indexSpec)
+    {
+      this.indexSpec = indexSpec;
+      return this;
+    }
+
+    public Builder setMaxRowsInMemory(int maxRowsInMemory)
+    {
+      this.maxRowsInMemory = maxRowsInMemory;
+      return this;
+    }
+
+    public Builder setMaxBytesInMemory(long maxBytesInMemory)
+    {
+      this.maxBytesInMemory = maxBytesInMemory;
+      return this;
+    }
+
+    public Builder setleaveIntermediate(boolean leaveIntermediate)
+    {
+      this.leaveIntermediate = leaveIntermediate;
+      return this;
+    }
+
+    public Builder setCleanOnFailure(boolean cleanOnFailure)
+    {
+      this.cleanupOnFailure = cleanOnFailure;
+      return this;
+    }
+
+    public Builder setOverwriteFiles(boolean overwriteFiles)
+    {
+      this.overwriteFiles = overwriteFiles;
+      return this;
+    }
+
+    public Builder setIgnoreInvalidRows(boolean ignoreInvalidRows)
+    {
+      this.ignoreInvalidRows = ignoreInvalidRows;
+      return this;
+    }
+
+    public Builder setJobProperties(Map<String, String> jobProperties)
+    {
+      this.jobProperties = jobProperties;
+      return this;
+    }
+
+    public Builder setCombineText(boolean combineText)
+    {
+      this.combineText = combineText;
+      return this;
+    }
+
+    public Builder setUseCombiner(boolean useCombiner)
+    {
+      this.useCombiner = useCombiner;
+      return this;
+    }
+
+    public Builder setNumBackgroundPersistThreads(int numBackgroundPersistThreads)
+    {
+      this.numBackgroundPersistThreads = numBackgroundPersistThreads;
+      return this;
+    }
+
+    public Builder setForceExtendableShardSpecs(boolean forceExtendableShardSpecs)
+    {
+      this.forceExtendableShardSpecs = forceExtendableShardSpecs;
+      return this;
+    }
+
+    public Builder setUseExplicitVersion(boolean useExplicitVersion)
+    {
+      this.useExplicitVersion = useExplicitVersion;
+      return this;
+    }
+
+    public Builder setAllowedHadoopPrefix(List<String> allowedHadoopPrefix)
+    {
+      this.allowedHadoopPrefix = allowedHadoopPrefix;
+      return this;
+    }
+
+    public Builder setLogParseExceptions(boolean logParseExceptions)
+    {
+      this.logParseExceptions = logParseExceptions;
+      return this;
+    }
+
+    public Builder setMaxParseExceptions(int maxParseExceptions)
+    {
+      this.maxParseExceptions = maxParseExceptions;
+      return this;
+    }
+
+    public HadoopTuningConfig build()
+    {
+      return new HadoopTuningConfig(
+          workingPath,
+          version,
+          partitionsSpec,
+          shardSpecs,
+          indexSpec,
+          maxRowsInMemory,
+          maxBytesInMemory,
+          leaveIntermediate,
+          cleanupOnFailure,
+          overwriteFiles,
+          ignoreInvalidRows,
+          jobProperties,
+          combineText,
+          useCombiner,
+          null,
+          true,
+          numBackgroundPersistThreads,
+          forceExtendableShardSpecs,
+          useExplicitVersion,
+          allowedHadoopPrefix,
+          logParseExceptions,
+          maxParseExceptions
+      );
+    }
+  }
 }
diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/IndexGeneratorJob.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/IndexGeneratorJob.java
index ac34c755ae9..dd1321e8b0c 100644
--- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/IndexGeneratorJob.java
+++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/IndexGeneratorJob.java
@@ -32,6 +32,7 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
+import org.apache.commons.io.FileUtils;
 import org.apache.druid.common.guava.ThreadRenamingRunnable;
 import org.apache.druid.data.input.InputRow;
 import org.apache.druid.data.input.Row;
@@ -55,7 +56,6 @@
 import org.apache.druid.timeline.DataSegment;
 import org.apache.druid.timeline.partition.NumberedShardSpec;
 import org.apache.druid.timeline.partition.ShardSpec;
-import org.apache.commons.io.FileUtils;
 import org.apache.hadoop.conf.Configurable;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileStatus;
@@ -602,8 +602,14 @@ protected File mergeQueryableIndex(
     {
       boolean rollup = config.getSchema().getDataSchema().getGranularitySpec().isRollup();
       return HadoopDruidIndexerConfig.INDEX_MERGER_V9.mergeQueryableIndex(
-          indexes, rollup, aggs, file, config.getIndexSpec(), progressIndicator, null
-      );
+          indexes,
+          rollup,
+          aggs,
+          file,
+          config.getIndexSpec(),
+          progressIndicator,
+          null
+      ).getFile();
     }
 
     @Override
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 70b2abf5df0..da7e7cdf58a 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
@@ -34,6 +34,7 @@
 import org.apache.druid.data.input.impl.StringInputRowParser;
 import org.apache.druid.data.input.impl.TimestampSpec;
 import org.apache.druid.hll.HyperLogLogCollector;
+import org.apache.druid.indexer.HadoopTuningConfig.Builder;
 import org.apache.druid.indexer.hadoop.WindowedDataSegment;
 import org.apache.druid.jackson.DefaultObjectMapper;
 import org.apache.druid.java.util.common.DateTimes;
@@ -473,30 +474,10 @@ private HadoopDruidIndexerConfig makeHadoopDruidIndexerConfig(
                 null,
                 tmpDir.getCanonicalPath()
             ),
-            new HadoopTuningConfig(
-                tmpDir.getCanonicalPath(),
-                null,
-                null,
-                null,
-                null,
-                null,
-                null,
-                false,
-                false,
-                false,
-                false,
-                null,
-                false,
-                false,
-                null,
-                null,
-                null,
-                false,
-                false,
-                null,
-                null,
-                null
-            )
+            new Builder()
+                .setWorkingPath(tmpDir.getCanonicalPath())
+                .setCleanOnFailure(false)
+                .build()
         )
     );
 
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 208e24ed1e7..c7887d23c31 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
@@ -26,6 +26,7 @@
 import org.apache.druid.data.input.impl.DimensionsSpec;
 import org.apache.druid.data.input.impl.StringInputRowParser;
 import org.apache.druid.data.input.impl.TimestampSpec;
+import org.apache.druid.indexer.HadoopTuningConfig.Builder;
 import org.apache.druid.indexer.partitions.HashedPartitionsSpec;
 import org.apache.druid.java.util.common.DateTimes;
 import org.apache.druid.java.util.common.Intervals;
@@ -191,30 +192,11 @@ public DetermineHashedPartitionsJobTest(
                 "static"
             ), null, tmpDir.getAbsolutePath()
         ),
-        new HadoopTuningConfig(
-            tmpDir.getAbsolutePath(),
-            null,
-            new HashedPartitionsSpec(targetPartitionSize, null, true, null, null),
-            null,
-            null,
-            null,
-            null,
-            false,
-            false,
-            false,
-            false,
-            null,
-            false,
-            false,
-            null,
-            null,
-            null,
-            false,
-            false,
-            null,
-            null,
-            null
-        )
+        new Builder()
+            .setWorkingPath(tmpDir.getAbsolutePath())
+            .setPartitionsSpec(new HashedPartitionsSpec(targetPartitionSize, null, true, null, null))
+            .setCleanOnFailure(false)
+            .build()
     );
     this.indexerConfig = new HadoopDruidIndexerConfig(ingestionSpec);
   }
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 320467b5882..222d926e72d 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
@@ -22,10 +22,12 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.io.Files;
+import org.apache.commons.io.FileUtils;
 import org.apache.druid.data.input.impl.CSVParseSpec;
 import org.apache.druid.data.input.impl.DimensionsSpec;
 import org.apache.druid.data.input.impl.StringInputRowParser;
 import org.apache.druid.data.input.impl.TimestampSpec;
+import org.apache.druid.indexer.HadoopTuningConfig.Builder;
 import org.apache.druid.indexer.partitions.SingleDimensionPartitionsSpec;
 import org.apache.druid.java.util.common.Intervals;
 import org.apache.druid.java.util.common.granularity.Granularities;
@@ -34,7 +36,6 @@
 import org.apache.druid.segment.indexing.DataSchema;
 import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec;
 import org.apache.druid.timeline.partition.SingleDimensionShardSpec;
-import org.apache.commons.io.FileUtils;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
@@ -252,30 +253,11 @@ public DeterminePartitionsJobTest(
                 null,
                 tmpDir.getCanonicalPath()
             ),
-            new HadoopTuningConfig(
-                tmpDir.getCanonicalPath(),
-                null,
-                new SingleDimensionPartitionsSpec(null, targetPartitionSize, null, assumeGrouped),
-                null,
-                null,
-                null,
-                null,
-                false,
-                false,
-                false,
-                false,
-                null,
-                false,
-                false,
-                null,
-                null,
-                null,
-                false,
-                false,
-                null,
-                null,
-                null
-            )
+            new Builder()
+                .setWorkingPath(tmpDir.getCanonicalPath())
+                .setPartitionsSpec(new SingleDimensionPartitionsSpec(null, targetPartitionSize, null, assumeGrouped))
+                .setCleanOnFailure(false)
+                .build()
         )
     );
   }
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 aa388261678..1add31cc7ff 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
@@ -25,6 +25,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import org.apache.druid.data.input.MapBasedInputRow;
+import org.apache.druid.indexer.HadoopTuningConfig.Builder;
 import org.apache.druid.jackson.DefaultObjectMapper;
 import org.apache.druid.java.util.common.DateTimes;
 import org.apache.druid.java.util.common.Intervals;
@@ -78,30 +79,10 @@ public void testHashedBucketSelection()
             jsonMapper
         ),
         new HadoopIOConfig(ImmutableMap.of("paths", "bar", "type", "static"), null, null),
-        new HadoopTuningConfig(
-            null,
-            null,
-            null,
-            ImmutableMap.of(DateTimes.of("2010-01-01T01:00:00").getMillis(), specs),
-            null,
-            null,
-            null,
-            false,
-            false,
-            false,
-            false,
-            null,
-            false,
-            false,
-            null,
-            null,
-            null,
-            false,
-            false,
-            null,
-            null,
-            null
-        )
+        new Builder()
+            .setShardSpecs(ImmutableMap.of(DateTimes.of("2010-01-01T01:00:00").getMillis(), specs))
+            .setCleanOnFailure(false)
+            .build()
     );
     HadoopDruidIndexerConfig config = HadoopDruidIndexerConfig.fromSpec(spec);
     final List<String> dims = Arrays.asList("diM1", "dIM2");
@@ -145,40 +126,17 @@ public void testNoneShardSpecBucketSelection()
             jsonMapper
         ),
         new HadoopIOConfig(ImmutableMap.of("paths", "bar", "type", "static"), null, null),
-        new HadoopTuningConfig(
-            null,
-            null,
-            null,
-            ImmutableMap.of(DateTimes.of("2010-01-01T01:00:00").getMillis(),
-                                                              Collections.singletonList(new HadoopyShardSpec(
-                                                                  NoneShardSpec.instance(),
-                                                                  1
-                                                              )),
-                                                              DateTimes.of("2010-01-01T02:00:00").getMillis(),
-                                                              Collections.singletonList(new HadoopyShardSpec(
-                                                                  NoneShardSpec.instance(),
-                                                                  2
-                                                              ))
-            ),
-            null,
-            null,
-            null,
-            false,
-            false,
-            false,
-            false,
-            null,
-            false,
-            false,
-            null,
-            null,
-            null,
-            false,
-            false,
-            null,
-            null,
-            null
-        )
+        new Builder()
+            .setShardSpecs(
+                ImmutableMap.of(
+                    DateTimes.of("2010-01-01T01:00:00").getMillis(),
+                    Collections.singletonList(new HadoopyShardSpec(NoneShardSpec.instance(), 1)),
+                    DateTimes.of("2010-01-01T02:00:00").getMillis(),
+                    Collections.singletonList(new HadoopyShardSpec(NoneShardSpec.instance(), 2))
+                )
+            )
+            .setCleanOnFailure(false)
+            .build()
     );
     HadoopDruidIndexerConfig config = HadoopDruidIndexerConfig.fromSpec(spec);
     final List<String> dims = Arrays.asList("diM1", "dIM2");
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 d5fa7d2051b..3f225ba72f2 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
@@ -22,6 +22,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableMap;
+import org.apache.druid.indexer.HadoopTuningConfig.Builder;
 import org.apache.druid.jackson.DefaultObjectMapper;
 import org.apache.druid.segment.IndexSpec;
 import org.joda.time.DateTime;
@@ -39,30 +40,19 @@
   @Test
   public void testSerde() throws Exception
   {
-    HadoopTuningConfig expected = new HadoopTuningConfig(
-        "/tmp/workingpath",
-        "version",
-        null,
-        null,
-        null,
-        100,
-        null,
-        true,
-        true,
-        true,
-        true,
-        null,
-        true,
-        true,
-        null,
-        null,
-        null,
-        true,
-        true,
-        null,
-        null,
-        null
-    );
+    final HadoopTuningConfig expected = new Builder()
+        .setWorkingPath("/tmp/workingpath")
+        .setVersion("version")
+        .setMaxRowsInMemory(100)
+        .setleaveIntermediate(true)
+        .setCleanOnFailure(true)
+        .setOverwriteFiles(true)
+        .setIgnoreInvalidRows(true)
+        .setCombineText(true)
+        .setUseCombiner(true)
+        .setForceExtendableShardSpecs(true)
+        .setUseExplicitVersion(true)
+        .build();
 
     HadoopTuningConfig actual = jsonReadWriteRead(jsonMapper.writeValueAsString(expected), HadoopTuningConfig.class);
 
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 125ce2fde8c..3e6433b29a7 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
@@ -25,12 +25,14 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import org.apache.commons.io.FileUtils;
 import org.apache.druid.data.input.impl.CSVParseSpec;
 import org.apache.druid.data.input.impl.DimensionsSpec;
 import org.apache.druid.data.input.impl.InputRowParser;
 import org.apache.druid.data.input.impl.JSONParseSpec;
 import org.apache.druid.data.input.impl.StringInputRowParser;
 import org.apache.druid.data.input.impl.TimestampSpec;
+import org.apache.druid.indexer.HadoopTuningConfig.Builder;
 import org.apache.druid.java.util.common.Intervals;
 import org.apache.druid.java.util.common.RE;
 import org.apache.druid.java.util.common.StringUtils;
@@ -46,7 +48,6 @@
 import org.apache.druid.timeline.partition.NumberedShardSpec;
 import org.apache.druid.timeline.partition.ShardSpec;
 import org.apache.druid.timeline.partition.SingleDimensionShardSpec;
-import org.apache.commons.io.FileUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.LocalFileSystem;
@@ -493,6 +494,20 @@ public void setUp() throws Exception
       FileUtils.writeLines(dataFile, data);
     }
 
+    final HadoopTuningConfig.Builder builder = new Builder()
+        .setWorkingPath(tmpDir.getCanonicalPath())
+        .setJobProperties(ImmutableMap.of(JobContext.NUM_REDUCES, "0"))
+        .setCleanOnFailure(false)
+        .setUseCombiner(useCombiner)
+        .setForceExtendableShardSpecs(forceExtendableShardSpecs);
+
+    if (maxRowsInMemory != null) {
+      builder.setMaxRowsInMemory(maxRowsInMemory);
+    }
+    if (maxBytesInMemory != null) {
+      builder.setMaxBytesInMemory(maxBytesInMemory);
+    }
+
     config = new HadoopDruidIndexerConfig(
         new HadoopIngestionSpec(
             new DataSchema(
@@ -513,30 +528,7 @@ public void setUp() throws Exception
                 null,
                 tmpDir.getCanonicalPath()
             ),
-            new HadoopTuningConfig(
-                tmpDir.getCanonicalPath(),
-                null,
-                null,
-                null,
-                null,
-                maxRowsInMemory,
-                maxBytesInMemory,
-                false,
-                false,
-                false,
-                false,
-                ImmutableMap.of(JobContext.NUM_REDUCES, "0"), //verifies that set num reducers is ignored
-                false,
-                useCombiner,
-                null,
-                true,
-                null,
-                forceExtendableShardSpecs,
-                false,
-                null,
-                null,
-                null
-            )
+            builder.build()
         )
     );
 
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 6abdac0eda4..3e1997d352d 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
@@ -25,6 +25,7 @@
 import org.apache.druid.data.input.impl.DimensionsSpec;
 import org.apache.druid.data.input.impl.StringInputRowParser;
 import org.apache.druid.data.input.impl.TimestampSpec;
+import org.apache.druid.indexer.HadoopTuningConfig.Builder;
 import org.apache.druid.java.util.common.CompressionUtils;
 import org.apache.druid.java.util.common.ISE;
 import org.apache.druid.java.util.common.Intervals;
@@ -108,36 +109,18 @@ public void setup() throws Exception
                 null,
                 tmpDir.getCanonicalPath()
             ),
-            new HadoopTuningConfig(
-                tmpDir.getCanonicalPath(),
-                null,
-                null,
-                null,
-                null,
-                null,
-                null,
-                false,
-                false,
-                false,
-                false,
-                //Map of job properties
-                ImmutableMap.of(
-                    "fs.s3.impl",
-                    "org.apache.hadoop.fs.s3native.NativeS3FileSystem",
-                    "fs.s3.awsAccessKeyId",
-                    "THISISMYACCESSKEY"
-                ),
-                false,
-                false,
-                null,
-                null,
-                null,
-                false,
-                false,
-                null,
-                null,
-                null
-            )
+            new Builder()
+                .setWorkingPath(tmpDir.getCanonicalPath())
+                .setCleanOnFailure(false)
+                .setJobProperties(
+                    //Map of job properties
+                    ImmutableMap.of(
+                        "fs.s3.impl",
+                        "org.apache.hadoop.fs.s3native.NativeS3FileSystem",
+                        "fs.s3.awsAccessKeyId",
+                        "THISISMYACCESSKEY"
+                    )
+                ).build()
         )
     );
   }
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 c6721424d48..fae85c3465c 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
@@ -28,6 +28,7 @@
 import org.apache.druid.indexer.HadoopIOConfig;
 import org.apache.druid.indexer.HadoopIngestionSpec;
 import org.apache.druid.indexer.HadoopTuningConfig;
+import org.apache.druid.indexer.HadoopTuningConfig.Builder;
 import org.apache.druid.jackson.DefaultObjectMapper;
 import org.apache.druid.java.util.common.Intervals;
 import org.apache.druid.java.util.common.StringUtils;
@@ -54,30 +55,7 @@
 
 public class GranularityPathSpecTest
 {
-  private static final HadoopTuningConfig DEFAULT_TUNING_CONFIG = new HadoopTuningConfig(
-      null,
-      null,
-      null,
-      null,
-      null,
-      null,
-      null,
-      false,
-      false,
-      false,
-      false,
-      null,
-      false,
-      false,
-      null,
-      null,
-      null,
-      false,
-      false,
-      null,
-      null,
-      null
-  );
+  private static final HadoopTuningConfig DEFAULT_TUNING_CONFIG = new Builder().setCleanOnFailure(false).build();
 
   private GranularityPathSpec granularityPathSpec;
   private final String TEST_STRING_PATH = "TEST";
diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/updater/HadoopConverterJobTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/updater/HadoopConverterJobTest.java
index 52d20afbe6e..a29a8e95f39 100644
--- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/updater/HadoopConverterJobTest.java
+++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/updater/HadoopConverterJobTest.java
@@ -37,7 +37,7 @@
 import org.apache.druid.indexer.HadoopDruidIndexerJob;
 import org.apache.druid.indexer.HadoopIOConfig;
 import org.apache.druid.indexer.HadoopIngestionSpec;
-import org.apache.druid.indexer.HadoopTuningConfig;
+import org.apache.druid.indexer.HadoopTuningConfig.Builder;
 import org.apache.druid.indexer.JobHelper;
 import org.apache.druid.indexer.Jobby;
 import org.apache.druid.indexer.SQLMetadataStorageUpdaterJobHandler;
@@ -193,30 +193,10 @@ public InputStream openStream() throws IOException
                 metadataStorageUpdaterJobSpec,
                 tmpSegmentDir.getAbsolutePath()
             ),
-            new HadoopTuningConfig(
-                scratchFileDir.getAbsolutePath(),
-                null,
-                null,
-                null,
-                null,
-                null,
-                null,
-                false,
-                false,
-                false,
-                false,
-                null,
-                false,
-                false,
-                null,
-                null,
-                null,
-                false,
-                false,
-                null,
-                null,
-                null
-            )
+            new Builder()
+                .setWorkingPath(scratchFileDir.getAbsolutePath())
+                .setCleanOnFailure(false)
+                .build()
         )
     );
     metadataStorageTablesConfigSupplier = derbyConnectorRule.metadataTablesConfigSupplier();
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/index/YeOldePlumberSchool.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/index/YeOldePlumberSchool.java
index 8841cf3833c..ec2029ee2ba 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/index/YeOldePlumberSchool.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/index/YeOldePlumberSchool.java
@@ -30,6 +30,7 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
+import org.apache.commons.io.FileUtils;
 import org.apache.druid.data.input.Committer;
 import org.apache.druid.data.input.InputRow;
 import org.apache.druid.java.util.common.StringUtils;
@@ -52,7 +53,6 @@
 import org.apache.druid.segment.realtime.plumber.PlumberSchool;
 import org.apache.druid.segment.realtime.plumber.Sink;
 import org.apache.druid.timeline.DataSegment;
-import org.apache.commons.io.FileUtils;
 import org.joda.time.Interval;
 
 import java.io.File;
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AppendTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AppendTask.java
index a243d5c9798..e39c23533c2 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AppendTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AppendTask.java
@@ -31,7 +31,7 @@
 import org.apache.druid.segment.IndexMerger;
 import org.apache.druid.segment.IndexSpec;
 import org.apache.druid.segment.IndexableAdapter;
-import org.apache.druid.segment.QueryableIndexIndexableAdapter;
+import org.apache.druid.segment.QueryableIndexAdapter;
 import org.apache.druid.segment.RowFilteringIndexAdapter;
 import org.apache.druid.segment.RowPointer;
 import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory;
@@ -113,7 +113,7 @@ public SegmentToMergeHolder apply(PartitionChunk<DataSegment> chunkInput)
     for (final SegmentToMergeHolder holder : segmentsToMerge) {
       adapters.add(
           new RowFilteringIndexAdapter(
-              new QueryableIndexIndexableAdapter(toolbox.getIndexIO().loadIndex(holder.getFile())),
+              new QueryableIndexAdapter(toolbox.getIndexIO().loadIndex(holder.getFile())),
               (RowPointer rowPointer) -> holder.getInterval().contains(rowPointer.getTimestamp())
           )
       );
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/CompactionTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/CompactionTask.java
index ea1186aa3a7..46684f2bffb 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/CompactionTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/CompactionTask.java
@@ -46,7 +46,6 @@
 import org.apache.druid.indexing.common.stats.RowIngestionMetersFactory;
 import org.apache.druid.indexing.common.task.IndexTask.IndexIOConfig;
 import org.apache.druid.indexing.common.task.IndexTask.IndexIngestionSpec;
-import org.apache.druid.indexing.common.task.IndexTask.IndexTuningConfig;
 import org.apache.druid.indexing.firehose.IngestSegmentFirehoseFactory;
 import org.apache.druid.java.util.common.IAE;
 import org.apache.druid.java.util.common.ISE;
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 5d6bef1b859..c8907c897b2 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
@@ -56,6 +56,7 @@
 import org.apache.druid.indexing.common.stats.RowIngestionMeters;
 import org.apache.druid.indexing.common.stats.RowIngestionMetersFactory;
 import org.apache.druid.indexing.common.stats.TaskRealtimeMetricsMonitor;
+import org.apache.druid.indexing.common.task.IndexTuningConfig.Builder;
 import org.apache.druid.indexing.firehose.IngestSegmentFirehoseFactory;
 import org.apache.druid.java.util.common.ISE;
 import org.apache.druid.java.util.common.Intervals;
@@ -65,17 +66,14 @@
 import org.apache.druid.java.util.common.guava.Comparators;
 import org.apache.druid.java.util.common.logger.Logger;
 import org.apache.druid.java.util.common.parsers.ParseException;
-import org.apache.druid.segment.IndexSpec;
 import org.apache.druid.segment.indexing.DataSchema;
 import org.apache.druid.segment.indexing.IOConfig;
 import org.apache.druid.segment.indexing.IngestionSpec;
 import org.apache.druid.segment.indexing.RealtimeIOConfig;
-import org.apache.druid.segment.indexing.TuningConfig;
 import org.apache.druid.segment.indexing.granularity.GranularitySpec;
 import org.apache.druid.segment.realtime.FireDepartment;
 import org.apache.druid.segment.realtime.FireDepartmentMetrics;
 import org.apache.druid.segment.realtime.appenderator.Appenderator;
-import org.apache.druid.segment.realtime.appenderator.AppenderatorConfig;
 import org.apache.druid.segment.realtime.appenderator.AppenderatorDriverAddResult;
 import org.apache.druid.segment.realtime.appenderator.Appenderators;
 import org.apache.druid.segment.realtime.appenderator.BaseAppenderatorDriver;
@@ -87,7 +85,6 @@
 import org.apache.druid.segment.realtime.firehose.ChatHandler;
 import org.apache.druid.segment.realtime.firehose.ChatHandlerProvider;
 import org.apache.druid.segment.realtime.firehose.CombiningFirehoseFactory;
-import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory;
 import org.apache.druid.server.security.Action;
 import org.apache.druid.server.security.AuthorizerMapper;
 import org.apache.druid.timeline.DataSegment;
@@ -99,7 +96,6 @@
 import org.codehaus.plexus.util.FileUtils;
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
-import org.joda.time.Period;
 
 import javax.annotation.Nullable;
 import javax.servlet.http.HttpServletRequest;
@@ -116,7 +112,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Objects;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeMap;
@@ -1212,7 +1207,7 @@ public IndexIngestionSpec(
 
       this.dataSchema = dataSchema;
       this.ioConfig = ioConfig;
-      this.tuningConfig = tuningConfig == null ? new IndexTuningConfig() : tuningConfig;
+      this.tuningConfig = tuningConfig == null ? new Builder().build() : tuningConfig;
     }
 
     @Override
@@ -1268,370 +1263,4 @@ public boolean isAppendToExisting()
     }
   }
 
-  @JsonTypeName("index")
-  public static class IndexTuningConfig implements TuningConfig, AppenderatorConfig
-  {
-    private static final int DEFAULT_MAX_TOTAL_ROWS = 20_000_000;
-    private static final IndexSpec DEFAULT_INDEX_SPEC = new IndexSpec();
-    private static final int DEFAULT_MAX_PENDING_PERSISTS = 0;
-    private static final boolean DEFAULT_FORCE_EXTENDABLE_SHARD_SPECS = false;
-    private static final boolean DEFAULT_GUARANTEE_ROLLUP = false;
-    private static final boolean DEFAULT_REPORT_PARSE_EXCEPTIONS = false;
-    private static final long DEFAULT_PUSH_TIMEOUT = 0;
-
-    static final int DEFAULT_TARGET_PARTITION_SIZE = 5000000;
-
-    private final Integer targetPartitionSize;
-    private final int maxRowsInMemory;
-    private final long maxBytesInMemory;
-    private final Long maxTotalRows;
-    private final Integer numShards;
-    private final IndexSpec indexSpec;
-    private final File basePersistDirectory;
-    private final int maxPendingPersists;
-
-    /**
-     * This flag is to force to always use an extendableShardSpec (like {@link NumberedShardSpec} even if
-     * {@link #forceGuaranteedRollup} is set.
-     */
-    private final boolean forceExtendableShardSpecs;
-
-    /**
-     * This flag is to force _perfect rollup mode_. {@link IndexTask} will scan the whole input data twice to 1) figure
-     * out proper shard specs for each segment and 2) generate segments. Note that perfect rollup mode basically assumes
-     * that no more data will be appended in the future. As a result, in perfect rollup mode, {@link NoneShardSpec} and
-     * {@link HashBasedNumberedShardSpec} are used for a single shard and two or shards, respectively.
-     */
-    private final boolean forceGuaranteedRollup;
-    private final boolean reportParseExceptions;
-    private final long pushTimeout;
-    private final boolean logParseExceptions;
-    private final int maxParseExceptions;
-    private final int maxSavedParseExceptions;
-
-    @Nullable
-    private final SegmentWriteOutMediumFactory segmentWriteOutMediumFactory;
-
-    @JsonCreator
-    public IndexTuningConfig(
-        @JsonProperty("targetPartitionSize") @Nullable Integer targetPartitionSize,
-        @JsonProperty("maxRowsInMemory") @Nullable Integer maxRowsInMemory,
-        @JsonProperty("maxBytesInMemory") @Nullable Long maxBytesInMemory,
-        @JsonProperty("maxTotalRows") @Nullable Long maxTotalRows,
-        @JsonProperty("rowFlushBoundary") @Nullable Integer rowFlushBoundary_forBackCompatibility, // DEPRECATED
-        @JsonProperty("numShards") @Nullable Integer numShards,
-        @JsonProperty("indexSpec") @Nullable IndexSpec indexSpec,
-        @JsonProperty("maxPendingPersists") @Nullable Integer maxPendingPersists,
-        // This parameter is left for compatibility when reading existing JSONs, to be removed in Druid 0.12.
-        @JsonProperty("buildV9Directly") @Nullable Boolean buildV9Directly,
-        @JsonProperty("forceExtendableShardSpecs") @Nullable Boolean forceExtendableShardSpecs,
-        @JsonProperty("forceGuaranteedRollup") @Nullable Boolean forceGuaranteedRollup,
-        @Deprecated @JsonProperty("reportParseExceptions") @Nullable Boolean reportParseExceptions,
-        @JsonProperty("publishTimeout") @Nullable Long publishTimeout, // deprecated
-        @JsonProperty("pushTimeout") @Nullable Long pushTimeout,
-        @JsonProperty("segmentWriteOutMediumFactory") @Nullable
-            SegmentWriteOutMediumFactory segmentWriteOutMediumFactory,
-        @JsonProperty("logParseExceptions") @Nullable Boolean logParseExceptions,
-        @JsonProperty("maxParseExceptions") @Nullable Integer maxParseExceptions,
-        @JsonProperty("maxSavedParseExceptions") @Nullable Integer maxSavedParseExceptions
-    )
-    {
-      this(
-          targetPartitionSize,
-          maxRowsInMemory != null ? maxRowsInMemory : rowFlushBoundary_forBackCompatibility,
-          maxBytesInMemory != null ? maxBytesInMemory : 0,
-          maxTotalRows,
-          numShards,
-          indexSpec,
-          maxPendingPersists,
-          forceExtendableShardSpecs,
-          forceGuaranteedRollup,
-          reportParseExceptions,
-          pushTimeout != null ? pushTimeout : publishTimeout,
-          null,
-          segmentWriteOutMediumFactory,
-          logParseExceptions,
-          maxParseExceptions,
-          maxSavedParseExceptions
-      );
-    }
-
-    private IndexTuningConfig()
-    {
-      this(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
-    }
-
-    private IndexTuningConfig(
-        @Nullable Integer targetPartitionSize,
-        @Nullable Integer maxRowsInMemory,
-        @Nullable Long maxBytesInMemory,
-        @Nullable Long maxTotalRows,
-        @Nullable Integer numShards,
-        @Nullable IndexSpec indexSpec,
-        @Nullable Integer maxPendingPersists,
-        @Nullable Boolean forceExtendableShardSpecs,
-        @Nullable Boolean forceGuaranteedRollup,
-        @Nullable Boolean reportParseExceptions,
-        @Nullable Long pushTimeout,
-        @Nullable File basePersistDirectory,
-        @Nullable SegmentWriteOutMediumFactory segmentWriteOutMediumFactory,
-        @Nullable Boolean logParseExceptions,
-        @Nullable Integer maxParseExceptions,
-        @Nullable Integer maxSavedParseExceptions
-    )
-    {
-      Preconditions.checkArgument(
-          targetPartitionSize == null || targetPartitionSize.equals(-1) || numShards == null || numShards.equals(-1),
-          "targetPartitionSize and numShards cannot both be set"
-      );
-
-      this.targetPartitionSize = initializeTargetPartitionSize(numShards, targetPartitionSize);
-      this.maxRowsInMemory = maxRowsInMemory == null ? TuningConfig.DEFAULT_MAX_ROWS_IN_MEMORY : maxRowsInMemory;
-      // initializing this to 0, it will be lazily initialized to a value
-      // @see server.src.main.java.org.apache.druid.segment.indexing.TuningConfigs#getMaxBytesInMemoryOrDefault(long)
-      this.maxBytesInMemory = maxBytesInMemory == null ? 0 : maxBytesInMemory;
-      this.maxTotalRows = initializeMaxTotalRows(numShards, maxTotalRows);
-      this.numShards = numShards == null || numShards.equals(-1) ? null : numShards;
-      this.indexSpec = indexSpec == null ? DEFAULT_INDEX_SPEC : indexSpec;
-      this.maxPendingPersists = maxPendingPersists == null ? DEFAULT_MAX_PENDING_PERSISTS : maxPendingPersists;
-      this.forceExtendableShardSpecs = forceExtendableShardSpecs == null
-                                       ? DEFAULT_FORCE_EXTENDABLE_SHARD_SPECS
-                                       : forceExtendableShardSpecs;
-      this.forceGuaranteedRollup = forceGuaranteedRollup == null ? DEFAULT_GUARANTEE_ROLLUP : forceGuaranteedRollup;
-      this.reportParseExceptions = reportParseExceptions == null
-                                   ? DEFAULT_REPORT_PARSE_EXCEPTIONS
-                                   : reportParseExceptions;
-      this.pushTimeout = pushTimeout == null ? DEFAULT_PUSH_TIMEOUT : pushTimeout;
-      this.basePersistDirectory = basePersistDirectory;
-
-      this.segmentWriteOutMediumFactory = segmentWriteOutMediumFactory;
-
-      if (this.reportParseExceptions) {
-        this.maxParseExceptions = 0;
-        this.maxSavedParseExceptions = maxSavedParseExceptions == null ? 0 : Math.min(1, maxSavedParseExceptions);
-      } else {
-        this.maxParseExceptions = maxParseExceptions == null
-                                  ? TuningConfig.DEFAULT_MAX_PARSE_EXCEPTIONS
-                                  : maxParseExceptions;
-        this.maxSavedParseExceptions = maxSavedParseExceptions == null
-                                       ? TuningConfig.DEFAULT_MAX_SAVED_PARSE_EXCEPTIONS
-                                       : maxSavedParseExceptions;
-      }
-      this.logParseExceptions = logParseExceptions == null
-                                ? TuningConfig.DEFAULT_LOG_PARSE_EXCEPTIONS
-                                : logParseExceptions;
-    }
-
-    private static Integer initializeTargetPartitionSize(Integer numShards, Integer targetPartitionSize)
-    {
-      if (numShards == null || numShards == -1) {
-        return targetPartitionSize == null || targetPartitionSize.equals(-1)
-               ? DEFAULT_TARGET_PARTITION_SIZE
-               : targetPartitionSize;
-      } else {
-        return null;
-      }
-    }
-
-    private static Long initializeMaxTotalRows(Integer numShards, Long maxTotalRows)
-    {
-      if (numShards == null || numShards == -1) {
-        return maxTotalRows == null ? DEFAULT_MAX_TOTAL_ROWS : maxTotalRows;
-      } else {
-        return null;
-      }
-    }
-
-    public IndexTuningConfig withBasePersistDirectory(File dir)
-    {
-      return new IndexTuningConfig(
-          targetPartitionSize,
-          maxRowsInMemory,
-          maxBytesInMemory,
-          maxTotalRows,
-          numShards,
-          indexSpec,
-          maxPendingPersists,
-          forceExtendableShardSpecs,
-          forceGuaranteedRollup,
-          reportParseExceptions,
-          pushTimeout,
-          dir,
-          segmentWriteOutMediumFactory,
-          logParseExceptions,
-          maxParseExceptions,
-          maxSavedParseExceptions
-      );
-    }
-
-    @JsonProperty
-    public Integer getTargetPartitionSize()
-    {
-      return targetPartitionSize;
-    }
-
-    @JsonProperty
-    @Override
-    public int getMaxRowsInMemory()
-    {
-      return maxRowsInMemory;
-    }
-
-    @JsonProperty
-    @Override
-    public long getMaxBytesInMemory()
-    {
-      return maxBytesInMemory;
-    }
-
-    @JsonProperty
-    @Override
-    @Nullable
-    public Long getMaxTotalRows()
-    {
-      return maxTotalRows;
-    }
-
-    @JsonProperty
-    public Integer getNumShards()
-    {
-      return numShards;
-    }
-
-    @JsonProperty
-    @Override
-    public IndexSpec getIndexSpec()
-    {
-      return indexSpec;
-    }
-
-    @Override
-    public File getBasePersistDirectory()
-    {
-      return basePersistDirectory;
-    }
-
-    @JsonProperty
-    @Override
-    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 isForceExtendableShardSpecs()
-    {
-      return forceExtendableShardSpecs;
-    }
-
-    @JsonProperty
-    public boolean isForceGuaranteedRollup()
-    {
-      return forceGuaranteedRollup;
-    }
-
-    @JsonProperty
-    @Override
-    public boolean isReportParseExceptions()
-    {
-      return reportParseExceptions;
-    }
-
-    @JsonProperty
-    public long getPushTimeout()
-    {
-      return pushTimeout;
-    }
-
-    @JsonProperty
-    public boolean isLogParseExceptions()
-    {
-      return logParseExceptions;
-    }
-
-    @JsonProperty
-    public int getMaxParseExceptions()
-    {
-      return maxParseExceptions;
-    }
-
-    @JsonProperty
-    public int getMaxSavedParseExceptions()
-    {
-      return maxSavedParseExceptions;
-    }
-
-    @Override
-    public Period getIntermediatePersistPeriod()
-    {
-      return new Period(Integer.MAX_VALUE); // intermediate persist doesn't make much sense for batch jobs
-    }
-
-    @Nullable
-    @Override
-    @JsonProperty
-    public SegmentWriteOutMediumFactory getSegmentWriteOutMediumFactory()
-    {
-      return segmentWriteOutMediumFactory;
-    }
-
-    @Override
-    public boolean equals(Object o)
-    {
-      if (this == o) {
-        return true;
-      }
-      if (o == null || getClass() != o.getClass()) {
-        return false;
-      }
-      IndexTuningConfig that = (IndexTuningConfig) o;
-      return maxRowsInMemory == that.maxRowsInMemory &&
-             Objects.equals(maxTotalRows, that.maxTotalRows) &&
-             maxPendingPersists == that.maxPendingPersists &&
-             forceExtendableShardSpecs == that.forceExtendableShardSpecs &&
-             forceGuaranteedRollup == that.forceGuaranteedRollup &&
-             reportParseExceptions == that.reportParseExceptions &&
-             pushTimeout == that.pushTimeout &&
-             Objects.equals(targetPartitionSize, that.targetPartitionSize) &&
-             Objects.equals(numShards, that.numShards) &&
-             Objects.equals(indexSpec, that.indexSpec) &&
-             Objects.equals(basePersistDirectory, that.basePersistDirectory) &&
-             Objects.equals(segmentWriteOutMediumFactory, that.segmentWriteOutMediumFactory) &&
-             logParseExceptions == that.logParseExceptions &&
-             maxParseExceptions == that.maxParseExceptions &&
-             maxSavedParseExceptions == that.maxSavedParseExceptions;
-    }
-
-    @Override
-    public int hashCode()
-    {
-      return Objects.hash(
-          targetPartitionSize,
-          maxRowsInMemory,
-          maxTotalRows,
-          numShards,
-          indexSpec,
-          basePersistDirectory,
-          maxPendingPersists,
-          forceExtendableShardSpecs,
-          forceGuaranteedRollup,
-          reportParseExceptions,
-          pushTimeout,
-          segmentWriteOutMediumFactory,
-          logParseExceptions,
-          maxParseExceptions,
-          maxSavedParseExceptions
-      );
-    }
-  }
 }
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTuningConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTuningConfig.java
new file mode 100644
index 00000000000..300a722e135
--- /dev/null
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/IndexTuningConfig.java
@@ -0,0 +1,531 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.druid.indexing.common.task;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.google.common.base.Preconditions;
+import org.apache.druid.segment.IndexSpec;
+import org.apache.druid.segment.indexing.TuningConfig;
+import org.apache.druid.segment.realtime.appenderator.AppenderatorConfig;
+import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory;
+import org.apache.druid.timeline.partition.HashBasedNumberedShardSpec;
+import org.apache.druid.timeline.partition.NoneShardSpec;
+import org.apache.druid.timeline.partition.NumberedShardSpec;
+import org.joda.time.Period;
+
+import javax.annotation.Nullable;
+import java.io.File;
+import java.util.Objects;
+
+@JsonTypeName("index")
+public class IndexTuningConfig implements TuningConfig, AppenderatorConfig
+{
+  private static final int DEFAULT_MAX_TOTAL_ROWS = 20_000_000;
+  private static final IndexSpec DEFAULT_INDEX_SPEC = new IndexSpec();
+  private static final int DEFAULT_MAX_PENDING_PERSISTS = 0;
+  private static final boolean DEFAULT_FORCE_EXTENDABLE_SHARD_SPECS = false;
+  private static final boolean DEFAULT_GUARANTEE_ROLLUP = false;
+  private static final boolean DEFAULT_REPORT_PARSE_EXCEPTIONS = false;
+  private static final long DEFAULT_PUSH_TIMEOUT = 0;
+
+  static final int DEFAULT_TARGET_PARTITION_SIZE = 5000000;
+
+  private final Integer targetPartitionSize;
+  private final int maxRowsInMemory;
+  private final long maxBytesInMemory;
+  private final Long maxTotalRows;
+  private final Integer numShards;
+  private final IndexSpec indexSpec;
+  private final File basePersistDirectory;
+  private final int maxPendingPersists;
+
+  /**
+   * This flag is to force to always use an extendableShardSpec (like {@link NumberedShardSpec} even if
+   * {@link #forceGuaranteedRollup} is set.
+   */
+  private final boolean forceExtendableShardSpecs;
+
+  /**
+   * This flag is to force _perfect rollup mode_. {@link IndexTask} will scan the whole input data twice to 1) figure
+   * out proper shard specs for each segment and 2) generate segments. Note that perfect rollup mode basically assumes
+   * that no more data will be appended in the future. As a result, in perfect rollup mode, {@link NoneShardSpec} and
+   * {@link HashBasedNumberedShardSpec} are used for a single shard and two or shards, respectively.
+   */
+  private final boolean forceGuaranteedRollup;
+  private final boolean reportParseExceptions;
+  private final long pushTimeout;
+  private final boolean logParseExceptions;
+  private final int maxParseExceptions;
+  private final int maxSavedParseExceptions;
+
+  @Nullable
+  private final SegmentWriteOutMediumFactory segmentWriteOutMediumFactory;
+
+  @JsonCreator
+  public IndexTuningConfig(
+      @JsonProperty("targetPartitionSize") @Nullable Integer targetPartitionSize,
+      @JsonProperty("maxRowsInMemory") @Nullable Integer maxRowsInMemory,
+      @JsonProperty("maxBytesInMemory") @Nullable Long maxBytesInMemory,
+      @JsonProperty("maxTotalRows") @Nullable Long maxTotalRows,
+      @JsonProperty("rowFlushBoundary") @Nullable Integer rowFlushBoundary_forBackCompatibility, // DEPRECATED
+      @JsonProperty("numShards") @Nullable Integer numShards,
+      @JsonProperty("indexSpec") @Nullable IndexSpec indexSpec,
+      @JsonProperty("maxPendingPersists") @Nullable Integer maxPendingPersists,
+      // This parameter is left for compatibility when reading existing JSONs, to be removed in Druid 0.12.
+      @JsonProperty("buildV9Directly") @Nullable Boolean buildV9Directly,
+      @JsonProperty("forceExtendableShardSpecs") @Nullable Boolean forceExtendableShardSpecs,
+      @JsonProperty("forceGuaranteedRollup") @Nullable Boolean forceGuaranteedRollup,
+      @Deprecated @JsonProperty("reportParseExceptions") @Nullable Boolean reportParseExceptions,
+      @JsonProperty("publishTimeout") @Nullable Long publishTimeout, // deprecated
+      @JsonProperty("pushTimeout") @Nullable Long pushTimeout,
+      @JsonProperty("segmentWriteOutMediumFactory") @Nullable
+          SegmentWriteOutMediumFactory segmentWriteOutMediumFactory,
+      @JsonProperty("logParseExceptions") @Nullable Boolean logParseExceptions,
+      @JsonProperty("maxParseExceptions") @Nullable Integer maxParseExceptions,
+      @JsonProperty("maxSavedParseExceptions") @Nullable Integer maxSavedParseExceptions
+  )
+  {
+    this(
+        targetPartitionSize,
+        maxRowsInMemory != null ? maxRowsInMemory : rowFlushBoundary_forBackCompatibility,
+        maxBytesInMemory != null ? maxBytesInMemory : 0,
+        maxTotalRows,
+        numShards,
+        indexSpec,
+        maxPendingPersists,
+        forceExtendableShardSpecs,
+        forceGuaranteedRollup,
+        reportParseExceptions,
+        pushTimeout != null ? pushTimeout : publishTimeout,
+        null,
+        segmentWriteOutMediumFactory,
+        logParseExceptions,
+        maxParseExceptions,
+        maxSavedParseExceptions
+    );
+  }
+
+  private IndexTuningConfig(
+      @Nullable Integer targetPartitionSize,
+      @Nullable Integer maxRowsInMemory,
+      @Nullable Long maxBytesInMemory,
+      @Nullable Long maxTotalRows,
+      @Nullable Integer numShards,
+      @Nullable IndexSpec indexSpec,
+      @Nullable Integer maxPendingPersists,
+      @Nullable Boolean forceExtendableShardSpecs,
+      @Nullable Boolean forceGuaranteedRollup,
+      @Nullable Boolean reportParseExceptions,
+      @Nullable Long pushTimeout,
+      @Nullable File basePersistDirectory,
+      @Nullable SegmentWriteOutMediumFactory segmentWriteOutMediumFactory,
+      @Nullable Boolean logParseExceptions,
+      @Nullable Integer maxParseExceptions,
+      @Nullable Integer maxSavedParseExceptions
+  )
+  {
+    Preconditions.checkArgument(
+        targetPartitionSize == null || targetPartitionSize.equals(-1) || numShards == null || numShards.equals(-1),
+        "targetPartitionSize and numShards cannot both be set"
+    );
+
+    this.targetPartitionSize = initializeTargetPartitionSize(numShards, targetPartitionSize);
+    this.maxRowsInMemory = maxRowsInMemory == null ? TuningConfig.DEFAULT_MAX_ROWS_IN_MEMORY : maxRowsInMemory;
+    // initializing this to 0, it will be lazily initialized to a value
+    // @see server.src.main.java.org.apache.druid.segment.indexing.TuningConfigs#getMaxBytesInMemoryOrDefault(long)
+    this.maxBytesInMemory = maxBytesInMemory == null ? 0 : maxBytesInMemory;
+    this.maxTotalRows = initializeMaxTotalRows(numShards, maxTotalRows);
+    this.numShards = numShards == null || numShards.equals(-1) ? null : numShards;
+    this.indexSpec = indexSpec == null ? DEFAULT_INDEX_SPEC : indexSpec;
+    this.maxPendingPersists = maxPendingPersists == null ? DEFAULT_MAX_PENDING_PERSISTS : maxPendingPersists;
+    this.forceExtendableShardSpecs = forceExtendableShardSpecs == null
+                                     ? DEFAULT_FORCE_EXTENDABLE_SHARD_SPECS
+                                     : forceExtendableShardSpecs;
+    this.forceGuaranteedRollup = forceGuaranteedRollup == null ? DEFAULT_GUARANTEE_ROLLUP : forceGuaranteedRollup;
+    this.reportParseExceptions = reportParseExceptions == null
+                                 ? DEFAULT_REPORT_PARSE_EXCEPTIONS
+                                 : reportParseExceptions;
+    this.pushTimeout = pushTimeout == null ? DEFAULT_PUSH_TIMEOUT : pushTimeout;
+    this.basePersistDirectory = basePersistDirectory;
+
+    this.segmentWriteOutMediumFactory = segmentWriteOutMediumFactory;
+
+    if (this.reportParseExceptions) {
+      this.maxParseExceptions = 0;
+      this.maxSavedParseExceptions = maxSavedParseExceptions == null ? 0 : Math.min(1, maxSavedParseExceptions);
+    } else {
+      this.maxParseExceptions = maxParseExceptions == null
+                                ? TuningConfig.DEFAULT_MAX_PARSE_EXCEPTIONS
+                                : maxParseExceptions;
+      this.maxSavedParseExceptions = maxSavedParseExceptions == null
+                                     ? TuningConfig.DEFAULT_MAX_SAVED_PARSE_EXCEPTIONS
+                                     : maxSavedParseExceptions;
+    }
+    this.logParseExceptions = logParseExceptions == null
+                              ? TuningConfig.DEFAULT_LOG_PARSE_EXCEPTIONS
+                              : logParseExceptions;
+  }
+
+  private static Integer initializeTargetPartitionSize(Integer numShards, Integer targetPartitionSize)
+  {
+    if (numShards == null || numShards == -1) {
+      return targetPartitionSize == null || targetPartitionSize.equals(-1)
+             ? DEFAULT_TARGET_PARTITION_SIZE
+             : targetPartitionSize;
+    } else {
+      return null;
+    }
+  }
+
+  private static Long initializeMaxTotalRows(Integer numShards, Long maxTotalRows)
+  {
+    if (numShards == null || numShards == -1) {
+      return maxTotalRows == null ? DEFAULT_MAX_TOTAL_ROWS : maxTotalRows;
+    } else {
+      return null;
+    }
+  }
+
+  public IndexTuningConfig withBasePersistDirectory(File dir)
+  {
+    return new IndexTuningConfig(
+        targetPartitionSize,
+        maxRowsInMemory,
+        maxBytesInMemory,
+        maxTotalRows,
+        numShards,
+        indexSpec,
+        maxPendingPersists,
+        forceExtendableShardSpecs,
+        forceGuaranteedRollup,
+        reportParseExceptions,
+        pushTimeout,
+        dir,
+        segmentWriteOutMediumFactory,
+        logParseExceptions,
+        maxParseExceptions,
+        maxSavedParseExceptions
+    );
+  }
+
+  @JsonProperty
+  public Integer getTargetPartitionSize()
+  {
+    return targetPartitionSize;
+  }
+
+  @JsonProperty
+  @Override
+  public int getMaxRowsInMemory()
+  {
+    return maxRowsInMemory;
+  }
+
+  @JsonProperty
+  @Override
+  public long getMaxBytesInMemory()
+  {
+    return maxBytesInMemory;
+  }
+
+  @JsonProperty
+  @Override
+  @Nullable
+  public Long getMaxTotalRows()
+  {
+    return maxTotalRows;
+  }
+
+  @JsonProperty
+  public Integer getNumShards()
+  {
+    return numShards;
+  }
+
+  @JsonProperty
+  @Override
+  public IndexSpec getIndexSpec()
+  {
+    return indexSpec;
+  }
+
+  @Override
+  public File getBasePersistDirectory()
+  {
+    return basePersistDirectory;
+  }
+
+  @JsonProperty
+  @Override
+  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 isForceExtendableShardSpecs()
+  {
+    return forceExtendableShardSpecs;
+  }
+
+  @JsonProperty
+  public boolean isForceGuaranteedRollup()
+  {
+    return forceGuaranteedRollup;
+  }
+
+  @JsonProperty
+  @Override
+  public boolean isReportParseExceptions()
+  {
+    return reportParseExceptions;
+  }
+
+  @JsonProperty
+  public long getPushTimeout()
+  {
+    return pushTimeout;
+  }
+
+  @JsonProperty
+  public boolean isLogParseExceptions()
+  {
+    return logParseExceptions;
+  }
+
+  @JsonProperty
+  public int getMaxParseExceptions()
+  {
+    return maxParseExceptions;
+  }
+
+  @JsonProperty
+  public int getMaxSavedParseExceptions()
+  {
+    return maxSavedParseExceptions;
+  }
+
+  @Override
+  public Period getIntermediatePersistPeriod()
+  {
+    return new Period(Integer.MAX_VALUE); // intermediate persist doesn't make much sense for batch jobs
+  }
+
+  @Nullable
+  @Override
+  @JsonProperty
+  public SegmentWriteOutMediumFactory getSegmentWriteOutMediumFactory()
+  {
+    return segmentWriteOutMediumFactory;
+  }
+
+  @Override
+  public boolean equals(Object o)
+  {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    IndexTuningConfig that = (IndexTuningConfig) o;
+    return maxRowsInMemory == that.maxRowsInMemory &&
+           Objects.equals(maxTotalRows, that.maxTotalRows) &&
+           maxPendingPersists == that.maxPendingPersists &&
+           forceExtendableShardSpecs == that.forceExtendableShardSpecs &&
+           forceGuaranteedRollup == that.forceGuaranteedRollup &&
+           reportParseExceptions == that.reportParseExceptions &&
+           pushTimeout == that.pushTimeout &&
+           Objects.equals(targetPartitionSize, that.targetPartitionSize) &&
+           Objects.equals(numShards, that.numShards) &&
+           Objects.equals(indexSpec, that.indexSpec) &&
+           Objects.equals(basePersistDirectory, that.basePersistDirectory) &&
+           Objects.equals(segmentWriteOutMediumFactory, that.segmentWriteOutMediumFactory) &&
+           logParseExceptions == that.logParseExceptions &&
+           maxParseExceptions == that.maxParseExceptions &&
+           maxSavedParseExceptions == that.maxSavedParseExceptions;
+  }
+
+  @Override
+  public int hashCode()
+  {
+    return Objects.hash(
+        targetPartitionSize,
+        maxRowsInMemory,
+        maxTotalRows,
+        numShards,
+        indexSpec,
+        basePersistDirectory,
+        maxPendingPersists,
+        forceExtendableShardSpecs,
+        forceGuaranteedRollup,
+        reportParseExceptions,
+        pushTimeout,
+        segmentWriteOutMediumFactory,
+        logParseExceptions,
+        maxParseExceptions,
+        maxSavedParseExceptions
+    );
+  }
+
+  public static class Builder
+  {
+    private Integer targetPartitionSize;
+    private Integer maxRowsInMemory;
+    private Long maxBytesInMemory;
+    private Long maxTotalRows;
+    private Integer numShards;
+    private IndexSpec indexSpec;
+    private Integer maxPendingPersists;
+    private Boolean forceExtendableShardSpecs;
+    private Boolean forceGuaranteedRollup;
+    private Boolean reportParseExceptions;
+    private Long pushTimeout;
+    private Boolean logParseExceptions;
+    private Integer maxParseExceptions;
+    private Integer maxSavedParseExceptions;
+    private SegmentWriteOutMediumFactory segmentWriteOutMediumFactory;
+
+    public IndexTuningConfig build()
+    {
+      return new IndexTuningConfig(
+          targetPartitionSize,
+          maxRowsInMemory,
+          maxBytesInMemory,
+          maxTotalRows,
+          null,
+          numShards,
+          indexSpec,
+          maxPendingPersists,
+          true,
+          forceExtendableShardSpecs,
+          forceGuaranteedRollup,
+          reportParseExceptions,
+          null,
+          pushTimeout,
+          segmentWriteOutMediumFactory,
+          logParseExceptions,
+          maxParseExceptions,
+          maxSavedParseExceptions
+      );
+    }
+
+    public Builder setTargetPartitionSize(int targetPartitionSize)
+    {
+      this.targetPartitionSize = targetPartitionSize;
+      return this;
+    }
+
+    public Builder setMaxRowsInMemory(int maxRowsInMemory)
+    {
+      this.maxRowsInMemory = maxRowsInMemory;
+      return this;
+    }
+
+    public Builder setMaxBytesInMemory(long maxBytesInMemory)
+    {
+      this.maxBytesInMemory = maxBytesInMemory;
+      return this;
+    }
+
+    public Builder setMaxTotalRows(long maxTotalRows)
+    {
+      this.maxTotalRows = maxTotalRows;
+      return this;
+    }
+
+    public Builder setNumShards(int numShards)
+    {
+      this.numShards = numShards;
+      return this;
+    }
+
+    public Builder setIndexSpec(IndexSpec indexSpec)
+    {
+      this.indexSpec = indexSpec;
+      return this;
+    }
+
+    public Builder setMaxPendingPersists(int maxPendingPersists)
+    {
+      this.maxPendingPersists = maxPendingPersists;
+      return this;
+    }
+
+    public Builder setForceExtendableShardSpecs(boolean forceExtendableShardSpecs)
+    {
+      this.forceExtendableShardSpecs = forceExtendableShardSpecs;
+      return this;
+    }
+
+    public Builder setForceGuaranteedRollup(boolean forceGuaranteedRollup)
+    {
+      this.forceGuaranteedRollup = forceGuaranteedRollup;
+      return this;
+    }
+
+    public Builder setReportParseExceptions(boolean reportParseExceptions)
+    {
+      this.reportParseExceptions = reportParseExceptions;
+      return this;
+    }
+
+    public Builder setPushTimeout(long pushTimeout)
+    {
+      this.pushTimeout = pushTimeout;
+      return this;
+    }
+
+    public Builder setLogParseExceptions(boolean logParseExceptions)
+    {
+      this.logParseExceptions = logParseExceptions;
+      return this;
+    }
+
+    public Builder setMaxParseExceptions(int maxParseExceptions)
+    {
+      this.maxParseExceptions = maxParseExceptions;
+      return this;
+    }
+
+    public Builder setMaxSavedParseExceptions(int maxSavedParseExceptions)
+    {
+      this.maxSavedParseExceptions = maxSavedParseExceptions;
+      return this;
+    }
+
+    public Builder setSegmentWriteOutMediumFactory(SegmentWriteOutMediumFactory factory)
+    {
+      this.segmentWriteOutMediumFactory = factory;
+      return this;
+    }
+  }
+}
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/MergeTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/MergeTask.java
index c57f16f27ee..75c794f6b34 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/MergeTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/MergeTask.java
@@ -28,11 +28,11 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import org.apache.druid.indexing.common.TaskToolbox;
-import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory;
 import org.apache.druid.query.aggregation.AggregatorFactory;
 import org.apache.druid.segment.IndexMerger;
 import org.apache.druid.segment.IndexSpec;
 import org.apache.druid.segment.QueryableIndex;
+import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory;
 import org.apache.druid.timeline.DataSegment;
 
 import javax.annotation.Nullable;
@@ -96,7 +96,7 @@ public QueryableIndex apply(@Nullable File input)
         outDir,
         indexSpec,
         getSegmentWriteOutMediumFactory()
-    );
+    ).getFile();
   }
 
   @Override
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/SameIntervalMergeTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/SameIntervalMergeTask.java
index f065f3b8be8..e1c0f2bee18 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/SameIntervalMergeTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/SameIntervalMergeTask.java
@@ -26,9 +26,9 @@
 import org.apache.druid.indexing.common.TaskToolbox;
 import org.apache.druid.indexing.common.actions.SegmentListUsedAction;
 import org.apache.druid.java.util.common.DateTimes;
-import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory;
 import org.apache.druid.query.aggregation.AggregatorFactory;
 import org.apache.druid.segment.IndexSpec;
+import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory;
 import org.apache.druid.timeline.DataSegment;
 import org.joda.time.Interval;
 
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTask.java
index b640c56ceb1..0cfb8c4a054 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTask.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTask.java
@@ -40,8 +40,8 @@
 import org.apache.druid.indexing.common.task.AbstractTask;
 import org.apache.druid.indexing.common.task.IndexTask;
 import org.apache.druid.indexing.common.task.IndexTask.IndexIngestionSpec;
-import org.apache.druid.indexing.common.task.IndexTask.IndexTuningConfig;
 import org.apache.druid.indexing.common.task.IndexTaskUtils;
+import org.apache.druid.indexing.common.task.IndexTuningConfig;
 import org.apache.druid.indexing.common.task.TaskResource;
 import org.apache.druid.indexing.common.task.Tasks;
 import org.apache.druid.indexing.common.task.batch.parallel.ParallelIndexTaskRunner.SubTaskSpecStatus;
diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexTuningConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexTuningConfig.java
index e09055948a7..b80ddbb0c7e 100644
--- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexTuningConfig.java
+++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexTuningConfig.java
@@ -22,7 +22,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
-import org.apache.druid.indexing.common.task.IndexTask.IndexTuningConfig;
+import org.apache.druid.indexing.common.task.IndexTuningConfig;
 import org.apache.druid.segment.IndexSpec;
 import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory;
 import org.joda.time.Duration;
@@ -90,7 +90,7 @@ public ParallelIndexTuningConfig(
       @JsonProperty("segmentWriteOutMediumFactory") @Nullable SegmentWriteOutMediumFactory segmentWriteOutMediumFactory,
       @JsonProperty("maxNumSubTasks") @Nullable Integer maxNumSubTasks,
       @JsonProperty("maxRetry") @Nullable Integer maxRetry,
-      @JsonProperty("taskStatusCheckPeriodMs") @Nullable Integer taskStatusCheckPeriodMs,
+      @JsonProperty("taskStatusCheckPeriodMs") @Nullable Long taskStatusCheckPeriodMs,
       @JsonProperty("chatHandlerTimeout") @Nullable Duration chatHandlerTimeout,
       @JsonProperty("chatHandlerNumRetries") @Nullable Integer chatHandlerNumRetries,
       @JsonProperty("logParseExceptions") @Nullable Boolean logParseExceptions,
@@ -192,4 +192,175 @@ public int hashCode()
         chatHandlerNumRetries
     );
   }
+
+  public static class Builder
+  {
+    private Integer targetPartitionSize;
+    private Integer maxRowsInMemory;
+    private Long maxBytesInMemory;
+    private Long maxTotalRows;
+    private Integer numShards;
+    private IndexSpec indexSpec;
+    private Integer maxPendingPersists;
+    private Boolean forceExtendableShardSpecs;
+    private Boolean forceGuaranteedRollup;
+    private Boolean reportParseExceptions;
+    private Long pushTimeout;
+    private Boolean logParseExceptions;
+    private Integer maxParseExceptions;
+    private Integer maxSavedParseExceptions;
+    private SegmentWriteOutMediumFactory segmentWriteOutMediumFactory;
+    private Integer maxNumSubTasks;
+    private Integer maxRetry;
+    private Long taskStatusCheckPeriodMs;
+    private Duration chatHandlerTimeout;
+    private Integer chatHandlerNumRetries;
+
+    public Builder setTargetPartitionSize(int targetPartitionSize)
+    {
+      this.targetPartitionSize = targetPartitionSize;
+      return this;
+    }
+
+    public Builder setMaxRowsInMemory(int maxRowsInMemory)
+    {
+      this.maxRowsInMemory = maxRowsInMemory;
+      return this;
+    }
+
+    public Builder setMaxBytesInMemory(long maxBytesInMemory)
+    {
+      this.maxBytesInMemory = maxBytesInMemory;
+      return this;
+    }
+
+    public Builder setMaxTotalRows(long maxTotalRows)
+    {
+      this.maxTotalRows = maxTotalRows;
+      return this;
+    }
+
+    public Builder setNumShards(int numShards)
+    {
+      this.numShards = numShards;
+      return this;
+    }
+
+    public Builder setIndexSpec(IndexSpec indexSpec)
+    {
+      this.indexSpec = indexSpec;
+      return this;
+    }
+
+    public Builder setMaxPendingPersists(int maxPendingPersists)
+    {
+      this.maxPendingPersists = maxPendingPersists;
+      return this;
+    }
+
+    public Builder setForceExtendableShardSpecs(boolean forceExtendableShardSpecs)
+    {
+      this.forceExtendableShardSpecs = forceExtendableShardSpecs;
+      return this;
+    }
+
+    public Builder setForceGuaranteedRollup(boolean forceGuaranteedRollup)
+    {
+      this.forceGuaranteedRollup = forceGuaranteedRollup;
+      return this;
+    }
+
+    public Builder setReportParseExceptions(boolean reportParseExceptions)
+    {
+      this.reportParseExceptions = reportParseExceptions;
+      return this;
+    }
+
+    public Builder setPushTimeout(long pushTimeout)
+    {
+      this.pushTimeout = pushTimeout;
+      return this;
+    }
+
+    public Builder setLogParseExceptions(boolean logParseExceptions)
+    {
+      this.logParseExceptions = logParseExceptions;
+      return this;
+    }
+
+    public Builder setMaxParseExceptions(int maxParseExceptions)
+    {
+      this.maxParseExceptions = maxParseExceptions;
+      return this;
+    }
+
+    public Builder setMaxSavedParseExceptions(int maxSavedParseExceptions)
+    {
+      this.maxSavedParseExceptions = maxSavedParseExceptions;
+      return this;
+    }
+
+    public Builder setSegmentWriteOutMediumFactory(SegmentWriteOutMediumFactory factory)
+    {
+      this.segmentWriteOutMediumFactory = factory;
+      return this;
+    }
+
+    public Builder setMaxNumSubTasks(int maxNumSubTasks)
+    {
+      this.maxNumSubTasks = maxNumSubTasks;
+      return this;
+    }
+
+    public Builder setMaxRetry(int maxRetry)
+    {
+      this.maxRetry = maxRetry;
+      return this;
+    }
+
+    public Builder setTaskStatusCheckPeriodMs(long taskStatusCheckPeriodMs)
+    {
+      this.taskStatusCheckPeriodMs = taskStatusCheckPeriodMs;
+      return this;
+    }
+
+    public Builder setChatHandlerTimeout(Duration chatHandlerTimeout)
+    {
+      this.chatHandlerTimeout = chatHandlerTimeout;
+      return this;
+    }
+
+    public Builder setChatHandlerNumretries(int chatHandlerNumRetries)
+    {
+      this.chatHandlerNumRetries = chatHandlerNumRetries;
+      return this;
+    }
+
+    public ParallelIndexTuningConfig build()
+    {
+      return new ParallelIndexTuningConfig(
+          targetPartitionSize,
+          maxRowsInMemory,
+          maxBytesInMemory,
+          maxTotalRows,
+          numShards,
+          indexSpec,
+          maxPendingPersists,
+          forceExtendableShardSpecs,
+          forceGuaranteedRollup,
+          reportParseExceptions,
+          pushTimeout,
+          segmentWriteOutMediumFactory,
+          maxNumSubTasks,
+          maxRetry,
+          taskStatusCheckPeriodMs,
+          chatHandlerTimeout,
+          chatHandlerNumRetries,
+          logParseExceptions,
+          maxParseExceptions,
+          maxSavedParseExceptions
+      );
+    }
+
+  }
 }
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/AppenderatorDriverRealtimeIndexTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/AppenderatorDriverRealtimeIndexTaskTest.java
index 9e45b81e899..48f07023826 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/AppenderatorDriverRealtimeIndexTaskTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/AppenderatorDriverRealtimeIndexTaskTest.java
@@ -1404,6 +1404,7 @@ private AppenderatorDriverRealtimeIndexTask makeRealtimeTask(
         null,
         null
     );
+
     RealtimeAppenderatorTuningConfig tuningConfig = new RealtimeAppenderatorTuningConfig(
         1000,
         null,
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskTest.java
index 381b51c549a..1d3d4d3e94f 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskTest.java
@@ -52,7 +52,7 @@
 import org.apache.druid.indexing.common.task.CompactionTask.SegmentProvider;
 import org.apache.druid.indexing.common.task.IndexTask.IndexIOConfig;
 import org.apache.druid.indexing.common.task.IndexTask.IndexIngestionSpec;
-import org.apache.druid.indexing.common.task.IndexTask.IndexTuningConfig;
+import org.apache.druid.indexing.common.task.IndexTuningConfig.Builder;
 import org.apache.druid.indexing.firehose.IngestSegmentFirehoseFactory;
 import org.apache.druid.jackson.DefaultObjectMapper;
 import org.apache.druid.java.util.common.ISE;
@@ -264,31 +264,22 @@ public void configure(Binder binder)
 
   private static IndexTuningConfig createTuningConfig()
   {
-    return new IndexTuningConfig(
-        5000000,
-        500000,
-        1000000L,
-        null,
-        null,
-        null,
-        new IndexSpec(
-            new RoaringBitmapSerdeFactory(true),
-            CompressionStrategy.LZ4,
-            CompressionStrategy.LZF,
-            LongEncodingStrategy.LONGS
-        ),
-        5000,
-        true,
-        false,
-        true,
-        false,
-        null,
-        100L,
-        null,
-        null,
-        null,
-        null
-    );
+    return new Builder()
+        .setTargetPartitionSize(5000000)
+        .setMaxRowsInMemory(500000)
+        .setMaxBytesInMemory(1000000L)
+        .setIndexSpec(
+            new IndexSpec(
+                new RoaringBitmapSerdeFactory(true),
+                CompressionStrategy.LZ4,
+                CompressionStrategy.LZF,
+                LongEncodingStrategy.LONGS
+            )
+        )
+        .setMaxPendingPersists(5000)
+        .setForceGuaranteedRollup(true)
+        .setPushTimeout(100L)
+        .build();
   }
 
   @Rule
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IndexTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IndexTaskTest.java
index 3e288c5d2f7..fc051456888 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IndexTaskTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IndexTaskTest.java
@@ -54,7 +54,6 @@
 import org.apache.druid.indexing.common.stats.RowIngestionMeters;
 import org.apache.druid.indexing.common.stats.RowIngestionMetersFactory;
 import org.apache.druid.indexing.common.task.IndexTask.IndexIngestionSpec;
-import org.apache.druid.indexing.common.task.IndexTask.IndexTuningConfig;
 import org.apache.druid.indexing.overlord.SegmentPublishResult;
 import org.apache.druid.java.util.common.DateTimes;
 import org.apache.druid.java.util.common.Intervals;
@@ -905,26 +904,14 @@ public void testMultipleParseExceptionsSuccess() throws Exception
       writer.write("this is not JSON\n"); // invalid JSON
     }
 
-    final IndexTask.IndexTuningConfig tuningConfig = new IndexTask.IndexTuningConfig(
-        2,
-        null,
-        null,
-        null,
-        null,
-        null,
-        indexSpec,
-        null,
-        true,
-        false,
-        true,
-        false,
-        null,
-        null,
-        null,
-        true,
-        7,
-        7
-    );
+    final IndexTuningConfig tuningConfig = new IndexTuningConfig.Builder()
+        .setTargetPartitionSize(2)
+        .setIndexSpec(indexSpec)
+        .setForceGuaranteedRollup(true)
+        .setLogParseExceptions(true)
+        .setMaxParseExceptions(7)
+        .setMaxSavedParseExceptions(7)
+        .build();
 
     final IndexIngestionSpec parseExceptionIgnoreSpec = createIngestionSpec(
         tmpDir,
@@ -1026,26 +1013,13 @@ public void testMultipleParseExceptionsFailure() throws Exception
     }
 
     // Allow up to 3 parse exceptions, and save up to 2 parse exceptions
-    final IndexTask.IndexTuningConfig tuningConfig = new IndexTask.IndexTuningConfig(
-        2,
-        null,
-        null,
-        null,
-        null,
-        null,
-        indexSpec,
-        null,
-        true,
-        false,
-        false,
-        false,
-        null,
-        null,
-        null,
-        true,
-        2,
-        5
-    );
+    final IndexTuningConfig tuningConfig = new IndexTuningConfig.Builder()
+        .setTargetPartitionSize(2)
+        .setIndexSpec(indexSpec)
+        .setLogParseExceptions(true)
+        .setMaxParseExceptions(2)
+        .setMaxSavedParseExceptions(5)
+        .build();
 
     final IndexIngestionSpec parseExceptionIgnoreSpec = createIngestionSpec(
         tmpDir,
@@ -1140,26 +1114,14 @@ public void testMultipleParseExceptionsFailureAtDeterminePartitions() throws Exc
     }
 
     // Allow up to 3 parse exceptions, and save up to 2 parse exceptions
-    final IndexTask.IndexTuningConfig tuningConfig = new IndexTask.IndexTuningConfig(
-        2,
-        null,
-        null,
-        null,
-        null,
-        null,
-        indexSpec,
-        null,
-        true,
-        false,
-        true,
-        false,
-        null,
-        null,
-        null,
-        true,
-        2,
-        5
-    );
+    final IndexTuningConfig tuningConfig = new IndexTuningConfig.Builder()
+        .setTargetPartitionSize(2)
+        .setIndexSpec(indexSpec)
+        .setForceGuaranteedRollup(true)
+        .setLogParseExceptions(true)
+        .setMaxParseExceptions(2)
+        .setMaxSavedParseExceptions(5)
+        .build();
 
     final IndexIngestionSpec parseExceptionIgnoreSpec = createIngestionSpec(
         tmpDir,
@@ -1614,26 +1576,29 @@ private static IndexTuningConfig createTuningConfig(
       boolean reportParseException
   )
   {
-    return new IndexTask.IndexTuningConfig(
-        targetPartitionSize,
-        maxRowsInMemory,
-        maxBytesInMemory,
-        maxTotalRows,
-        null,
-        numShards,
-        indexSpec,
-        null,
-        true,
-        forceExtendableShardSpecs,
-        forceGuaranteedRollup,
-        reportParseException,
-        null,
-        null,
-        null,
-        null,
-        null,
-        1
-    );
+    final IndexTuningConfig.Builder builder = new IndexTuningConfig.Builder()
+        .setIndexSpec(indexSpec)
+        .setForceExtendableShardSpecs(forceExtendableShardSpecs)
+        .setForceGuaranteedRollup(forceGuaranteedRollup)
+        .setReportParseExceptions(reportParseException)
+        .setMaxSavedParseExceptions(1);
+
+    if (targetPartitionSize != null) {
+      builder.setTargetPartitionSize(targetPartitionSize);
+    }
+    if (maxRowsInMemory != null) {
+      builder.setMaxRowsInMemory(maxRowsInMemory);
+    }
+    if (maxBytesInMemory != null) {
+      builder.setMaxBytesInMemory(maxBytesInMemory);
+    }
+    if (maxTotalRows != null) {
+      builder.setMaxTotalRows(maxTotalRows);
+    }
+    if (numShards != null) {
+      builder.setNumShards(numShards);
+    }
+    return builder.build();
   }
 
   private IngestionStatsAndErrorsTaskReportData getTaskReportData() throws IOException
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 1663576b725..9fdcaad1558 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
@@ -913,26 +913,16 @@ private RealtimeIndexTask makeRealtimeTask(
         null,
         null
     );
-    RealtimeTuningConfig realtimeTuningConfig = new RealtimeTuningConfig(
-        1000,
-        null,
-        new Period("P1Y"),
-        new Period("PT10M"),
-        null,
-        null,
-        new ServerTimeRejectionPolicyFactory(),
-        null,
-        null,
-        null,
-        true,
-        0,
-        0,
-        reportParseExceptions,
-        handoffTimeout,
-        null,
-        null,
-        null
-    );
+    final RealtimeTuningConfig realtimeTuningConfig = new RealtimeTuningConfig.Builder()
+        .setMaxRowsInMemory(1000)
+        .setIntermediatePersistePeriod(new Period("P1Y"))
+        .setWindowPeriod(new Period("PT10M"))
+        .setRejectionPolicyFactory(new ServerTimeRejectionPolicyFactory())
+        .setPersistThreadPriority(0)
+        .setMergeThreadPriority(0)
+        .setReportParseExceptions(reportParseExceptions)
+        .setHandoffConditionTimeout(handoffTimeout)
+        .build();
     return new RealtimeIndexTask(
         taskId,
         null,
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/SameIntervalMergeTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/SameIntervalMergeTaskTest.java
index d8ab412ec3a..d2dfa8b6106 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/SameIntervalMergeTaskTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/SameIntervalMergeTaskTest.java
@@ -38,6 +38,7 @@
 import org.apache.druid.segment.IndexIO;
 import org.apache.druid.segment.IndexMergerV9;
 import org.apache.druid.segment.IndexSpec;
+import org.apache.druid.segment.MergedIndexMetadata;
 import org.apache.druid.segment.Segment;
 import org.apache.druid.segment.loading.DataSegmentPusher;
 import org.apache.druid.segment.loading.SegmentLoader;
@@ -140,6 +141,19 @@ public void testRun() throws Exception
     Assert.assertTrue(isReady);
     final List<DataSegment> segments = Lists.newArrayList();
 
+    final IndexMergerV9 indexMerger = EasyMock.createMock(IndexMergerV9.class);
+
+    EasyMock.expect(
+        indexMerger.mergeQueryableIndex(
+            EasyMock.anyObject(),
+            EasyMock.anyBoolean(),
+            EasyMock.anyObject(),
+            EasyMock.anyObject(),
+            EasyMock.anyObject(),
+            EasyMock.anyObject())
+    ).andReturn(new MergedIndexMetadata(new File("test"), Collections.emptyList()));
+    EasyMock.replay(indexMerger);
+
     mergeTask.run(
         new TaskToolbox(
             null,
@@ -253,7 +267,7 @@ public void cleanup(DataSegment segment)
             null,
             null,
             null,
-            EasyMock.createMock(IndexMergerV9.class),
+            indexMerger,
             null,
             null,
             null,
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 a2c742e84f1..e7bf10a128f 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
@@ -33,7 +33,7 @@
 import org.apache.druid.indexing.common.stats.RowIngestionMetersFactory;
 import org.apache.druid.indexing.common.task.IndexTask.IndexIOConfig;
 import org.apache.druid.indexing.common.task.IndexTask.IndexIngestionSpec;
-import org.apache.druid.indexing.common.task.IndexTask.IndexTuningConfig;
+import org.apache.druid.indexing.common.task.IndexTuningConfig.Builder;
 import org.apache.druid.java.util.common.Intervals;
 import org.apache.druid.java.util.common.granularity.Granularities;
 import org.apache.druid.query.aggregation.AggregatorFactory;
@@ -101,9 +101,9 @@ public void testIndexTaskIOConfigDefaults() throws Exception
   @Test
   public void testIndexTaskTuningConfigDefaults() throws Exception
   {
-    final IndexTask.IndexTuningConfig tuningConfig = jsonMapper.readValue(
+    final IndexTuningConfig tuningConfig = jsonMapper.readValue(
         "{\"type\":\"index\"}",
-        IndexTask.IndexTuningConfig.class
+        IndexTuningConfig.class
     );
 
     Assert.assertEquals(false, tuningConfig.isForceExtendableShardSpecs());
@@ -119,9 +119,9 @@ public void testIndexTaskTuningConfigDefaults() throws Exception
   @Test
   public void testIndexTaskTuningConfigTargetPartitionSizeOrNumShards() throws Exception
   {
-    IndexTask.IndexTuningConfig tuningConfig = jsonMapper.readValue(
+    IndexTuningConfig tuningConfig = jsonMapper.readValue(
         "{\"type\":\"index\", \"targetPartitionSize\":10}",
-        IndexTask.IndexTuningConfig.class
+        IndexTuningConfig.class
     );
 
     Assert.assertEquals(10, (int) tuningConfig.getTargetPartitionSize());
@@ -129,7 +129,7 @@ public void testIndexTaskTuningConfigTargetPartitionSizeOrNumShards() throws Exc
 
     tuningConfig = jsonMapper.readValue(
         "{\"type\":\"index\", \"numShards\":10}",
-        IndexTask.IndexTuningConfig.class
+        IndexTuningConfig.class
     );
 
     Assert.assertEquals(null, tuningConfig.getTargetPartitionSize());
@@ -137,7 +137,7 @@ public void testIndexTaskTuningConfigTargetPartitionSizeOrNumShards() throws Exc
 
     tuningConfig = jsonMapper.readValue(
         "{\"type\":\"index\", \"targetPartitionSize\":-1, \"numShards\":10}",
-        IndexTask.IndexTuningConfig.class
+        IndexTuningConfig.class
     );
 
     Assert.assertEquals(null, tuningConfig.getTargetPartitionSize());
@@ -145,7 +145,7 @@ public void testIndexTaskTuningConfigTargetPartitionSizeOrNumShards() throws Exc
 
     tuningConfig = jsonMapper.readValue(
         "{\"type\":\"index\", \"targetPartitionSize\":10, \"numShards\":-1}",
-        IndexTask.IndexTuningConfig.class
+        IndexTuningConfig.class
     );
 
     Assert.assertEquals(null, tuningConfig.getNumShards());
@@ -153,12 +153,12 @@ public void testIndexTaskTuningConfigTargetPartitionSizeOrNumShards() throws Exc
 
     tuningConfig = jsonMapper.readValue(
         "{\"type\":\"index\", \"targetPartitionSize\":-1, \"numShards\":-1}",
-        IndexTask.IndexTuningConfig.class
+        IndexTuningConfig.class
     );
 
     Assert.assertEquals(null, tuningConfig.getNumShards());
     Assert.assertEquals(
-        IndexTask.IndexTuningConfig.DEFAULT_TARGET_PARTITION_SIZE,
+        IndexTuningConfig.DEFAULT_TARGET_PARTITION_SIZE,
         (int) tuningConfig.getTargetPartitionSize()
     );
   }
@@ -170,7 +170,7 @@ public void testIndexTaskTuningConfigTargetPartitionSizeAndNumShards() throws Ex
 
     jsonMapper.readValue(
         "{\"type\":\"index\", \"targetPartitionSize\":10, \"numShards\":10}",
-        IndexTask.IndexTuningConfig.class
+        IndexTuningConfig.class
     );
   }
 
@@ -239,8 +239,8 @@ public void testIndexTaskSerde() throws Exception
     Assert.assertTrue(task2IoConfig.getFirehoseFactory() instanceof LocalFirehoseFactory);
     Assert.assertEquals(taskIoConfig.isAppendToExisting(), task2IoConfig.isAppendToExisting());
 
-    IndexTask.IndexTuningConfig taskTuningConfig = task.getIngestionSchema().getTuningConfig();
-    IndexTask.IndexTuningConfig task2TuningConfig = task2.getIngestionSchema().getTuningConfig();
+    IndexTuningConfig taskTuningConfig = task.getIngestionSchema().getTuningConfig();
+    IndexTuningConfig task2TuningConfig = task2.getIngestionSchema().getTuningConfig();
 
     Assert.assertEquals(taskTuningConfig.getBasePersistDirectory(), task2TuningConfig.getBasePersistDirectory());
     Assert.assertEquals(taskTuningConfig.getIndexSpec(), task2TuningConfig.getIndexSpec());
@@ -279,26 +279,13 @@ public void testIndexTaskwithResourceSerde() throws Exception
                 jsonMapper
             ),
             new IndexIOConfig(new LocalFirehoseFactory(new File("lol"), "rofl", null), true),
-            new IndexTuningConfig(
-                10000,
-                10,
-                null,
-                null,
-                null,
-                null,
-                indexSpec,
-                3,
-                true,
-                true,
-                false,
-                null,
-                null,
-                null,
-                null,
-                null,
-                null,
-                null
-            )
+            new Builder()
+                .setTargetPartitionSize(10000)
+                .setMaxRowsInMemory(10)
+                .setIndexSpec(indexSpec)
+                .setMaxPendingPersists(3)
+                .setForceExtendableShardSpecs(true)
+                .build()
         ),
         null,
         AuthTestUtils.TEST_AUTHORIZER_MAPPER,
@@ -542,26 +529,16 @@ public Plumber findPlumber(
                 null
             ),
 
-            new RealtimeTuningConfig(
-                1,
-                null,
-                new Period("PT10M"),
-                null,
-                null,
-                null,
-                null,
-                1,
-                NoneShardSpec.instance(),
-                indexSpec,
-                null,
-                0,
-                0,
-                true,
-                null,
-                null,
-                null,
-                null
-            )
+            new RealtimeTuningConfig.Builder()
+                .setMaxRowsInMemory(1)
+                .setIntermediatePersistePeriod(new Period("PT10M"))
+                .setMaxPendingPersists(1)
+                .setShardSpec(NoneShardSpec.instance())
+                .setIndexSpec(indexSpec)
+                .setPersistThreadPriority(0)
+                .setMergeThreadPriority(0)
+                .setReportParseExceptions(true)
+                .build()
         ),
         null
     );
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskResourceTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskResourceTest.java
index 8a7503b837b..89a9d02ecf4 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskResourceTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskResourceTest.java
@@ -417,28 +417,7 @@ private TestSupervisorTask newTask(
             getObjectMapper()
         ),
         ioConfig,
-        new ParallelIndexTuningConfig(
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            NUM_SUB_TASKS,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null
-        )
+        new ParallelIndexTuningConfig.Builder().setMaxNumSubTasks(NUM_SUB_TASKS).build()
     );
 
     // set up test tools
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskSerdeTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskSerdeTest.java
index 3cbf152be2a..95158b38a9a 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskSerdeTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskSerdeTest.java
@@ -32,6 +32,7 @@
 import org.apache.druid.indexing.common.stats.DropwizardRowIngestionMetersFactory;
 import org.apache.druid.indexing.common.task.Task;
 import org.apache.druid.indexing.common.task.TaskResource;
+import org.apache.druid.indexing.common.task.batch.parallel.ParallelIndexTuningConfig.Builder;
 import org.apache.druid.java.util.common.Intervals;
 import org.apache.druid.java.util.common.granularity.Granularities;
 import org.apache.druid.query.aggregation.AggregatorFactory;
@@ -125,28 +126,7 @@ private ParallelIndexSupervisorTask newTask(
             new LocalFirehoseFactory(new File("tmp"), "test_*", null),
             false
         ),
-        new ParallelIndexTuningConfig(
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            2,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null
-        )
+        new Builder().setMaxNumSubTasks(2).build()
     );
 
     // set up test tools
diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskTest.java
index ba5254db5ce..8873efa7d55 100644
--- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskTest.java
+++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskTest.java
@@ -215,28 +215,7 @@ private ParallelIndexSupervisorTask newTask(
             getObjectMapper()
         ),
         ioConfig,
-        new ParallelIndexTuningConfig(
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            2,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null
-        )
+        new ParallelIndexTuningConfig.Builder().setMaxNumSubTasks(2).build()
     );
 
     // set up test tools
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 0de8debf718..7020bada696 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
@@ -45,10 +45,10 @@
 import org.apache.druid.discovery.DruidNodeAnnouncer;
 import org.apache.druid.discovery.LookupNodeService;
 import org.apache.druid.indexer.TaskState;
+import org.apache.druid.indexer.TaskStatus;
 import org.apache.druid.indexing.common.Counters;
 import org.apache.druid.indexing.common.SegmentLoaderFactory;
 import org.apache.druid.indexing.common.TaskLock;
-import org.apache.druid.indexer.TaskStatus;
 import org.apache.druid.indexing.common.TaskToolbox;
 import org.apache.druid.indexing.common.TaskToolboxFactory;
 import org.apache.druid.indexing.common.TestUtils;
@@ -64,7 +64,7 @@
 import org.apache.druid.indexing.common.task.IndexTask;
 import org.apache.druid.indexing.common.task.IndexTask.IndexIOConfig;
 import org.apache.druid.indexing.common.task.IndexTask.IndexIngestionSpec;
-import org.apache.druid.indexing.common.task.IndexTask.IndexTuningConfig;
+import org.apache.druid.indexing.common.task.IndexTuningConfig.Builder;
 import org.apache.druid.indexing.common.task.KillTask;
 import org.apache.druid.indexing.common.task.NoopTestTaskFileWriter;
 import org.apache.druid.indexing.common.task.RealtimeIndexTask;
@@ -683,26 +683,13 @@ public void testIndexTask() throws Exception
                 mapper
             ),
             new IndexIOConfig(new MockFirehoseFactory(false), false),
-            new IndexTuningConfig(
-                10000,
-                10,
-                null,
-                null,
-                null,
-                null,
-                indexSpec,
-                3,
-                true,
-                true,
-                false,
-                null,
-                null,
-                null,
-                null,
-                null,
-                null,
-                null
-            )
+            new Builder()
+                .setTargetPartitionSize(10000)
+                .setMaxRowsInMemory(10)
+                .setIndexSpec(indexSpec)
+                .setMaxPendingPersists(3)
+                .setForceExtendableShardSpecs(true)
+                .build()
         ),
         null,
         AuthTestUtils.TEST_AUTHORIZER_MAPPER,
@@ -763,26 +750,13 @@ public void testIndexTaskFailure() throws Exception
                 mapper
             ),
             new IndexIOConfig(new MockExceptionalFirehoseFactory(), false),
-            new IndexTuningConfig(
-                10000,
-                10,
-                null,
-                null,
-                null,
-                null,
-                indexSpec,
-                3,
-                true,
-                true,
-                false,
-                null,
-                null,
-                null,
-                null,
-                null,
-                null,
-                null
-            )
+            new Builder()
+                .setTargetPartitionSize(10000)
+                .setMaxRowsInMemory(10)
+                .setIndexSpec(indexSpec)
+                .setMaxPendingPersists(3)
+                .setForceExtendableShardSpecs(true)
+                .build()
         ),
         null,
         AuthTestUtils.TEST_AUTHORIZER_MAPPER,
@@ -1150,26 +1124,11 @@ public void testResumeTasks() throws Exception
                 mapper
             ),
             new IndexIOConfig(new MockFirehoseFactory(false), false),
-            new IndexTuningConfig(
-                10000,
-                10,
-                null,
-                null,
-                null,
-                null,
-                indexSpec,
-                null,
-                false,
-                null,
-                null,
-                null,
-                null,
-                null,
-                null,
-                null,
-                null,
-                null
-            )
+            new Builder()
+                .setTargetPartitionSize(10000)
+                .setMaxRowsInMemory(10)
+                .setIndexSpec(indexSpec)
+                .build()
         ),
         null,
         AuthTestUtils.TEST_AUTHORIZER_MAPPER,
@@ -1279,26 +1238,12 @@ private RealtimeIndexTask newRealtimeIndexTask()
         // PlumberSchool - Realtime Index Task always uses RealtimePlumber which is hardcoded in RealtimeIndexTask class
         null
     );
-    RealtimeTuningConfig realtimeTuningConfig = new RealtimeTuningConfig(
-        1000,
-        null,
-        new Period("P1Y"),
-        null, //default window period of 10 minutes
-        null, // base persist dir ignored by Realtime Index task
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        0,
-        0,
-        null,
-        null,
-        null,
-        null,
-        null
-    );
+    // default window period of 10 minutes
+    // base persist dir ignored by Realtime Index task
+    final RealtimeTuningConfig realtimeTuningConfig = new RealtimeTuningConfig.Builder()
+        .setMaxRowsInMemory(1000)
+        .setIntermediatePersistePeriod(new Period("P1Y"))
+        .build();
     FireDepartment fireDepartment = new FireDepartment(dataSchema, realtimeIOConfig, realtimeTuningConfig);
     return new RealtimeIndexTask(
         taskId,
diff --git a/processing/src/main/java/org/apache/druid/segment/DimensionDesc.java b/processing/src/main/java/org/apache/druid/segment/DimensionDesc.java
new file mode 100644
index 00000000000..df82054fc14
--- /dev/null
+++ b/processing/src/main/java/org/apache/druid/segment/DimensionDesc.java
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.druid.segment;
+
+import com.google.common.base.Preconditions;
+import org.apache.druid.segment.column.ColumnCapabilitiesImpl;
+import org.apache.druid.segment.writeout.SegmentWriteOutMedium;
+
+import javax.annotation.Nullable;
+
+public final class DimensionDesc
+{
+  private final int index;
+  private final String name;
+  private final ColumnCapabilitiesImpl capabilities;
+  private final DimensionHandler handler;
+
+  // Indexer is initialized lazily because it's used in only IncrementalIndex
+  @Nullable
+  private DimensionIndexer indexer = null;
+
+  @Nullable
+  private DimensionMerger merger = null;
+
+  public DimensionDesc(int index, String name, ColumnCapabilitiesImpl capabilities, DimensionHandler handler)
+  {
+    this.index = index;
+    this.name = name;
+    this.capabilities = capabilities;
+    this.handler = handler;
+  }
+
+  public int getIndex()
+  {
+    return index;
+  }
+
+  public String getName()
+  {
+    return name;
+  }
+
+  public ColumnCapabilitiesImpl getCapabilities()
+  {
+    return capabilities;
+  }
+
+  public DimensionHandler getHandler()
+  {
+    return handler;
+  }
+
+  public DimensionIndexer makeOrGetIndexer()
+  {
+    if (indexer == null) {
+      indexer = handler.makeIndexer();
+    }
+    return indexer;
+  }
+
+  public DimensionMerger makeMerger(IndexSpec indexSpec, SegmentWriteOutMedium medium, ProgressIndicator progress)
+  {
+    this.merger = handler.makeMerger(indexSpec, medium, capabilities, progress);
+    return merger;
+  }
+
+  public DimensionMerger getNonNullMerger()
+  {
+    return Preconditions.checkNotNull(merger, "dimensionMerger");
+  }
+}
diff --git a/processing/src/main/java/org/apache/druid/segment/DimensionIndexer.java b/processing/src/main/java/org/apache/druid/segment/DimensionIndexer.java
index 118df7700c0..5c62fc88192 100644
--- a/processing/src/main/java/org/apache/druid/segment/DimensionIndexer.java
+++ b/processing/src/main/java/org/apache/druid/segment/DimensionIndexer.java
@@ -208,7 +208,7 @@
   DimensionSelector makeDimensionSelector(
       DimensionSpec spec,
       IncrementalIndexRowHolder currEntry,
-      IncrementalIndex.DimensionDesc desc
+      DimensionDesc desc
   );
 
   /**
@@ -220,7 +220,7 @@ DimensionSelector makeDimensionSelector(
    */
   ColumnValueSelector<?> makeColumnValueSelector(
       IncrementalIndexRowHolder currEntry,
-      IncrementalIndex.DimensionDesc desc
+      DimensionDesc desc
   );
 
   /**
diff --git a/processing/src/main/java/org/apache/druid/segment/DoubleDimensionIndexer.java b/processing/src/main/java/org/apache/druid/segment/DoubleDimensionIndexer.java
index 9277bb81432..55d6259b1f7 100644
--- a/processing/src/main/java/org/apache/druid/segment/DoubleDimensionIndexer.java
+++ b/processing/src/main/java/org/apache/druid/segment/DoubleDimensionIndexer.java
@@ -26,7 +26,6 @@
 import org.apache.druid.query.dimension.DimensionSpec;
 import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector;
 import org.apache.druid.segment.data.Indexed;
-import org.apache.druid.segment.incremental.IncrementalIndex;
 import org.apache.druid.segment.incremental.IncrementalIndexRowHolder;
 
 import javax.annotation.Nullable;
@@ -87,7 +86,7 @@ public int getCardinality()
   public DimensionSelector makeDimensionSelector(
       DimensionSpec spec,
       IncrementalIndexRowHolder currEntry,
-      IncrementalIndex.DimensionDesc desc
+      DimensionDesc desc
   )
   {
     return new DoubleWrappingDimensionSelector(makeColumnValueSelector(currEntry, desc), spec.getExtractionFn());
@@ -96,7 +95,7 @@ public DimensionSelector makeDimensionSelector(
   @Override
   public ColumnValueSelector<?> makeColumnValueSelector(
       IncrementalIndexRowHolder currEntry,
-      IncrementalIndex.DimensionDesc desc
+      DimensionDesc desc
   )
   {
     final int dimIndex = desc.getIndex();
diff --git a/processing/src/main/java/org/apache/druid/segment/FloatDimensionIndexer.java b/processing/src/main/java/org/apache/druid/segment/FloatDimensionIndexer.java
index 9960e1a12cc..c996d0977f4 100644
--- a/processing/src/main/java/org/apache/druid/segment/FloatDimensionIndexer.java
+++ b/processing/src/main/java/org/apache/druid/segment/FloatDimensionIndexer.java
@@ -26,7 +26,6 @@
 import org.apache.druid.query.dimension.DimensionSpec;
 import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector;
 import org.apache.druid.segment.data.Indexed;
-import org.apache.druid.segment.incremental.IncrementalIndex;
 import org.apache.druid.segment.incremental.IncrementalIndexRowHolder;
 
 import javax.annotation.Nullable;
@@ -88,7 +87,7 @@ public int getCardinality()
   public DimensionSelector makeDimensionSelector(
       DimensionSpec spec,
       IncrementalIndexRowHolder currEntry,
-      IncrementalIndex.DimensionDesc desc
+      DimensionDesc desc
   )
   {
     return new FloatWrappingDimensionSelector(makeColumnValueSelector(currEntry, desc), spec.getExtractionFn());
@@ -97,7 +96,7 @@ public DimensionSelector makeDimensionSelector(
   @Override
   public ColumnValueSelector<?> makeColumnValueSelector(
       IncrementalIndexRowHolder currEntry,
-      IncrementalIndex.DimensionDesc desc
+      DimensionDesc desc
   )
   {
     final int dimIndex = desc.getIndex();
diff --git a/processing/src/main/java/org/apache/druid/segment/IndexIO.java b/processing/src/main/java/org/apache/druid/segment/IndexIO.java
index 5088f9d23ba..c6e63c5c5d5 100644
--- a/processing/src/main/java/org/apache/druid/segment/IndexIO.java
+++ b/processing/src/main/java/org/apache/druid/segment/IndexIO.java
@@ -122,8 +122,8 @@ public void validateTwoSegments(File dir1, File dir2) throws IOException
     try (QueryableIndex queryableIndex1 = loadIndex(dir1)) {
       try (QueryableIndex queryableIndex2 = loadIndex(dir2)) {
         validateTwoSegments(
-            new QueryableIndexIndexableAdapter(queryableIndex1),
-            new QueryableIndexIndexableAdapter(queryableIndex2)
+            new QueryableIndexAdapter(queryableIndex1),
+            new QueryableIndexAdapter(queryableIndex2)
         );
       }
     }
diff --git a/processing/src/main/java/org/apache/druid/segment/IndexMerger.java b/processing/src/main/java/org/apache/druid/segment/IndexMerger.java
index be471f6a3f0..76433b06e39 100644
--- a/processing/src/main/java/org/apache/druid/segment/IndexMerger.java
+++ b/processing/src/main/java/org/apache/druid/segment/IndexMerger.java
@@ -21,6 +21,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;
+import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Lists;
@@ -30,12 +31,16 @@
 import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.common.utils.SerializerUtils;
 import org.apache.druid.java.util.common.ByteBufferUtils;
+import org.apache.druid.java.util.common.IAE;
 import org.apache.druid.java.util.common.ISE;
 import org.apache.druid.java.util.common.Pair;
 import org.apache.druid.java.util.common.guava.Comparators;
 import org.apache.druid.java.util.common.logger.Logger;
 import org.apache.druid.java.util.common.parsers.CloseableIterator;
 import org.apache.druid.query.aggregation.AggregatorFactory;
+import org.apache.druid.segment.column.ColumnCapabilities;
+import org.apache.druid.segment.column.ColumnCapabilitiesImpl;
+import org.apache.druid.segment.column.ValueType;
 import org.apache.druid.segment.data.Indexed;
 import org.apache.druid.segment.incremental.IncrementalIndex;
 import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory;
@@ -47,14 +52,18 @@
 import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Objects;
 import java.util.PriorityQueue;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 @ImplementedBy(IndexMergerV9.class)
 public interface IndexMerger
@@ -64,31 +73,216 @@
   SerializerUtils serializerUtils = new SerializerUtils();
   int INVALID_ROW = -1;
 
-  static List<String> getMergedDimensionsFromQueryableIndexes(List<QueryableIndex> indexes)
-  {
-    return getMergedDimensions(toIndexableAdapters(indexes));
-  }
-
   static List<IndexableAdapter> toIndexableAdapters(List<QueryableIndex> indexes)
   {
-    return indexes.stream().map(QueryableIndexIndexableAdapter::new).collect(Collectors.toList());
+    return indexes.stream().map(QueryableIndexAdapter::new).collect(Collectors.toList());
   }
 
-  static List<String> getMergedDimensions(List<IndexableAdapter> indexes)
+  static List<DimensionDesc> mergeDimensions(List<IndexableAdapter> indexes)
   {
     if (indexes.size() == 0) {
-      return ImmutableList.of();
+      return Collections.emptyList();
     }
-    List<String> commonDimOrder = getLongestSharedDimOrder(indexes);
+    final List<String> commonDimOrder = findLongestSharedDimOrder(indexes);
+    final List<String> mergedDimensionNames;
     if (commonDimOrder == null) {
       log.warn("Indexes have incompatible dimension orders, using lexicographic order.");
-      return getLexicographicMergedDimensions(indexes);
+      mergedDimensionNames = getLexicographicMergedDimensions(indexes);
     } else {
-      return commonDimOrder;
+      mergedDimensionNames = commonDimOrder;
+    }
+    final Map<String, ColumnCapabilitiesImpl> mergedCapabilities = mergeDimensionCapabilities(indexes);
+    final Map<String, DimensionHandler> dimensionHandlers = makeDimensionHandlers(
+        mergedDimensionNames,
+        mergedCapabilities
+    );
+    return IntStream.range(0, mergedDimensionNames.size())
+                    .mapToObj(i -> {
+                      final String dimensionName = mergedDimensionNames.get(i);
+                      return new DimensionDesc(
+                          i,
+                          dimensionName,
+                          mergedCapabilities.get(dimensionName),
+                          dimensionHandlers.get(dimensionName)
+                      );
+                    })
+                    .collect(Collectors.toList());
+  }
+
+  static List<MetricDesc> mergeMetrics(List<IndexableAdapter> indexes, @Nullable AggregatorFactory[] aggregators)
+  {
+    final List<String> mergedMetricNames = mergeIndexed(
+        indexes.stream().map(IndexableAdapter::getMetricNames).collect(Collectors.toList())
+    );
+
+    if (aggregators != null) {
+      final AggregatorFactory[] sortedMetricAggs = new AggregatorFactory[mergedMetricNames.size()];
+      for (AggregatorFactory metricAgg : aggregators) {
+        int metricIndex = mergedMetricNames.indexOf(metricAgg.getName());
+
+        // If metricIndex is negative, one of the metricAggs was not present in the union of metrics from the indices
+        // we are merging
+        if (metricIndex > -1) {
+          sortedMetricAggs[metricIndex] = metricAgg;
+        }
+      }
+
+      // If there is nothing at sortedMetricAggs[i], then we did not have a metricAgg whose name matched the name
+      // of the ith element of mergedMetrics. I.e. There was a metric in the indices to merge that we did not ask for.
+      for (int i = 0; i < sortedMetricAggs.length; i++) {
+        if (sortedMetricAggs[i] == null) {
+          throw new IAE("Indices to merge contained metric[%s], but requested metrics did not", mergedMetricNames.get(i));
+        }
+      }
+
+      for (int i = 0; i < mergedMetricNames.size(); i++) {
+        if (!sortedMetricAggs[i].getName().equals(mergedMetricNames.get(i))) {
+          throw new IAE(
+              "Metric mismatch, index[%d] [%s] != [%s]",
+              i,
+              sortedMetricAggs[i].getName(),
+              mergedMetricNames.get(i)
+          );
+        }
+      }
+
+      // MetricDescs in the result list should have the same name with mergedMetricNames in the same order.
+      return IntStream.range(0, mergedMetricNames.size())
+                      .mapToObj(i -> new MetricDescImpl(i, aggregators[i]))
+                      .collect(Collectors.toList());
+    } else {
+      final Map<String, Pair<ColumnCapabilitiesImpl, String>> mergedCapabilities = mergeMetricCapabilities(indexes);
+      return IntStream.range(0, mergedMetricNames.size())
+                      .mapToObj(
+                          i -> {
+                            final String metricName = mergedMetricNames.get(i);
+                            final Pair<ColumnCapabilitiesImpl, String> pair = Preconditions.checkNotNull(
+                                mergedCapabilities.get(metricName),
+                                "merged capabilities for metric[%s]",
+                                metricName
+                            );
+                            return new MetricDescWithOnlyName(
+                                i,
+                                metricName,
+                                pair.rhs,
+                                pair.lhs
+                            );
+                          }
+                      )
+                      .collect(Collectors.toList());
+    }
+  }
+
+  /**
+   * An implementation of {@link MetricDesc} without {@link AggregatorFactory}.
+   * Used only in {@link IndexMergerV9#convert}.
+   */
+  class MetricDescWithOnlyName implements MetricDesc
+  {
+    private final int index;
+    private final String name;
+    private final String type;
+    private final ColumnCapabilitiesImpl capabilities;
+
+    MetricDescWithOnlyName(int index, String name, String type, ColumnCapabilitiesImpl capabilities)
+    {
+      this.index = index;
+      this.name = name;
+      this.type = type;
+      this.capabilities = capabilities;
+    }
+
+    @Override
+    public int getIndex()
+    {
+      return index;
+    }
+
+    @Override
+    public String getName()
+    {
+      return name;
+    }
+
+    @Nullable
+    @Override
+    public AggregatorFactory getAggregatorFactory()
+    {
+      return null;
+    }
+
+    @Override
+    public String getType()
+    {
+      return type;
+    }
+
+    @Override
+    public ValueType getValueType()
+    {
+      return capabilities.getType();
+    }
+
+    @Override
+    public ColumnCapabilitiesImpl getCapabilities()
+    {
+      return capabilities;
+    }
+  }
+
+  static Map<String, ColumnCapabilitiesImpl> mergeDimensionCapabilities(List<IndexableAdapter> adapters)
+  {
+    final Map<String, ColumnCapabilitiesImpl> capabilitiesMap = new HashMap<>();
+    for (IndexableAdapter adapter : adapters) {
+      for (String dimension : adapter.getDimensionNames()) {
+        ColumnCapabilities capabilities = adapter.getCapabilities(dimension);
+        capabilitiesMap.computeIfAbsent(dimension, d -> new ColumnCapabilitiesImpl()).merge(capabilities);
+      }
+    }
+    return capabilitiesMap;
+  }
+
+  static Map<String, Pair<ColumnCapabilitiesImpl, String>> mergeMetricCapabilities(List<IndexableAdapter> adapters)
+  {
+    final Map<String, Pair<ColumnCapabilitiesImpl, String>> capabilitiesMap = new HashMap<>();
+    for (IndexableAdapter adapter : adapters) {
+      for (String metric : adapter.getMetricNames()) {
+        final ColumnCapabilities capabilities = adapter.getCapabilities(metric);
+        final String metricTypeName = adapter.getMetricType(metric);
+        final Pair<ColumnCapabilitiesImpl, String> pair = capabilitiesMap.get(metric);
+        final ColumnCapabilitiesImpl capabilitiesToMerge;
+        if (pair == null) {
+          capabilitiesToMerge = new ColumnCapabilitiesImpl();
+        } else {
+          capabilitiesToMerge = pair.lhs;
+        }
+        capabilitiesToMerge.merge(capabilities);
+        // is replacing metric type name valid?
+        capabilitiesMap.put(metric, Pair.of(capabilitiesToMerge, metricTypeName));
+      }
+    }
+    return capabilitiesMap;
+  }
+
+  static Map<String, DimensionHandler> makeDimensionHandlers(
+      final List<String> mergedDimensions,
+      final Map<String, ColumnCapabilitiesImpl> dimensionNameToCapabilities
+  )
+  {
+    final Map<String, DimensionHandler> handlers = new HashMap<>();
+    for (String dimensionName : mergedDimensions) {
+      final ColumnCapabilities capabilities = dimensionNameToCapabilities.get(dimensionName);
+      final DimensionHandler handler = DimensionHandlerUtils.getHandlerFromCapabilities(
+          dimensionName,
+          capabilities,
+          null
+      );
+      handlers.put(dimensionName, handler);
     }
+    return handlers;
   }
 
-  static List<String> getLongestSharedDimOrder(List<IndexableAdapter> indexes)
+  static List<String> findLongestSharedDimOrder(List<IndexableAdapter> indexes)
   {
     int maxSize = 0;
     Iterable<String> orderingCandidate = null;
@@ -189,7 +383,7 @@ File persist(
       @Nullable SegmentWriteOutMediumFactory segmentWriteOutMediumFactory
   ) throws IOException;
 
-  File mergeQueryableIndex(
+  MergedIndexMetadata mergeQueryableIndex(
       List<QueryableIndex> indexes,
       boolean rollup,
       AggregatorFactory[] metricAggs,
@@ -198,7 +392,7 @@ File mergeQueryableIndex(
       @Nullable SegmentWriteOutMediumFactory segmentWriteOutMediumFactory
   ) throws IOException;
 
-  File mergeQueryableIndex(
+  MergedIndexMetadata mergeQueryableIndex(
       List<QueryableIndex> indexes,
       boolean rollup,
       AggregatorFactory[] metricAggs,
@@ -209,7 +403,7 @@ File mergeQueryableIndex(
   ) throws IOException;
 
   @VisibleForTesting
-  File merge(
+  MergedIndexMetadata merge(
       List<IndexableAdapter> indexes,
       boolean rollup,
       AggregatorFactory[] metricAggs,
diff --git a/processing/src/main/java/org/apache/druid/segment/IndexMergerV9.java b/processing/src/main/java/org/apache/druid/segment/IndexMergerV9.java
index a828cd604c8..f5a36c4141f 100644
--- a/processing/src/main/java/org/apache/druid/segment/IndexMergerV9.java
+++ b/processing/src/main/java/org/apache/druid/segment/IndexMergerV9.java
@@ -24,26 +24,23 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.common.io.Files;
 import com.google.common.primitives.Ints;
 import com.google.inject.Inject;
+import org.apache.commons.io.FileUtils;
 import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.io.ZeroCopyByteArrayOutputStream;
 import org.apache.druid.java.util.common.DateTimes;
 import org.apache.druid.java.util.common.IAE;
 import org.apache.druid.java.util.common.ISE;
 import org.apache.druid.java.util.common.JodaUtils;
-import org.apache.druid.java.util.common.guava.Comparators;
 import org.apache.druid.java.util.common.io.Closer;
 import org.apache.druid.java.util.common.io.smoosh.FileSmoosher;
 import org.apache.druid.java.util.common.io.smoosh.SmooshedWriter;
 import org.apache.druid.java.util.common.logger.Logger;
 import org.apache.druid.query.aggregation.AggregatorFactory;
 import org.apache.druid.segment.column.Column;
-import org.apache.druid.segment.column.ColumnCapabilities;
-import org.apache.druid.segment.column.ColumnCapabilitiesImpl;
 import org.apache.druid.segment.column.ColumnDescriptor;
 import org.apache.druid.segment.column.ValueType;
 import org.apache.druid.segment.data.GenericIndexed;
@@ -62,7 +59,6 @@
 import org.apache.druid.segment.serde.LongGenericColumnPartSerdeV2;
 import org.apache.druid.segment.writeout.SegmentWriteOutMedium;
 import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory;
-import org.apache.commons.io.FileUtils;
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
 
@@ -75,7 +71,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -101,15 +96,14 @@ public IndexMergerV9(ObjectMapper mapper, IndexIO indexIO, SegmentWriteOutMedium
 
   private File makeIndexFiles(
       final List<IndexableAdapter> adapters,
-      final AggregatorFactory[] metricAggs,
       final File outDir,
       final ProgressIndicator progress,
-      final List<String> mergedDimensions,
-      final List<String> mergedMetrics,
+      final List<DimensionDesc> mergedDimensions,
+      final List<MetricDesc> mergedMetrics,
       final Function<List<TransformableRowIterator>, TimeAndDimsIterator> rowMergerFn,
       final boolean fillRowNumConversions,
       final IndexSpec indexSpec,
-      final @Nullable SegmentWriteOutMediumFactory segmentWriteOutMediumFactory
+      @Nullable final SegmentWriteOutMediumFactory segmentWriteOutMediumFactory
   ) throws IOException
   {
     progress.start();
@@ -118,32 +112,66 @@ private File makeIndexFiles(
     List<Metadata> metadataList = Lists.transform(adapters, IndexableAdapter::getMetadata);
 
     final Metadata segmentMetadata;
-    if (metricAggs != null) {
-      AggregatorFactory[] combiningMetricAggs = new AggregatorFactory[metricAggs.length];
-      for (int i = 0; i < metricAggs.length; i++) {
-        combiningMetricAggs[i] = metricAggs[i].getCombiningFactory();
-      }
+    if (mergedMetrics.stream().allMatch(metricDesc -> metricDesc.getAggregatorFactory() != null)) {
+      // mergedMetrics is empty or all of them have aggregatorFactory
+      final AggregatorFactory[] combiningMetricAggs = mergedMetrics
+          .stream()
+          .map(metricDesc -> metricDesc.getAggregatorFactory().getCombiningFactory())
+          .toArray(AggregatorFactory[]::new);
       segmentMetadata = Metadata.merge(
           metadataList,
           combiningMetricAggs
       );
     } else {
+      // all mergedMetrics shouln't have aggregatorFactory
+      if (mergedMetrics.stream().anyMatch(metricDesc -> metricDesc.getAggregatorFactory() != null)) {
+        throw new ISE("Some metrics[%s] don't have aggregatorFactory.", mergedMetrics);
+      }
       segmentMetadata = Metadata.merge(
           metadataList,
           null
       );
     }
 
-    Closer closer = Closer.create();
+    progress.progress();
+
+    mergeAndWriteFiles(
+        adapters,
+        outDir,
+        progress,
+        mergedDimensions,
+        mergedMetrics,
+        rowMergerFn,
+        fillRowNumConversions,
+        indexSpec,
+        segmentMetadata,
+        segmentWriteOutMediumFactory
+    );
+
+    progress.stop();
+
+    return outDir;
+  }
+
+  private void mergeAndWriteFiles(
+      List<IndexableAdapter> adapters,
+      File outDir,
+      ProgressIndicator progress,
+      List<DimensionDesc> mergedDimensions,
+      List<MetricDesc> mergedMetrics,
+      Function<List<TransformableRowIterator>, TimeAndDimsIterator> rowMergerFn,
+      boolean fillRowNumConversions,
+      IndexSpec indexSpec,
+      @Nullable Metadata segmentMetadata,
+      @Nullable final SegmentWriteOutMediumFactory segmentWriteOutMediumFactory
+  ) throws IOException
+  {
+    final Closer closer = Closer.create();
+
     try {
       final FileSmoosher v9Smoosher = new FileSmoosher(outDir);
       FileUtils.forceMkdir(outDir);
 
-      SegmentWriteOutMediumFactory omf = segmentWriteOutMediumFactory != null ? segmentWriteOutMediumFactory
-                                                                              : defaultSegmentWriteOutMediumFactory;
-      log.info("Using SegmentWriteOutMediumFactory[%s]", omf.getClass().getSimpleName());
-      SegmentWriteOutMedium segmentWriteOutMedium = omf.makeSegmentWriteOutMedium(outDir);
-      closer.register(segmentWriteOutMedium);
       long startTime = System.currentTimeMillis();
       Files.asByteSink(new File(outDir, "version.bin")).write(Ints.toByteArray(IndexIO.V9_VERSION));
       log.info("Completed version.bin in %,d millis.", System.currentTimeMillis() - startTime);
@@ -155,84 +183,70 @@ private File makeIndexFiles(
       }
       log.info("Completed factory.json in %,d millis", System.currentTimeMillis() - startTime);
 
-      progress.progress();
-      final Map<String, ValueType> metricsValueTypes = Maps.newTreeMap(Comparators.<String>naturalNullsFirst());
-      final Map<String, String> metricTypeNames = Maps.newTreeMap(Comparators.<String>naturalNullsFirst());
-      final List<ColumnCapabilitiesImpl> dimCapabilities = Lists.newArrayListWithCapacity(mergedDimensions.size());
-      mergeCapabilities(adapters, mergedDimensions, metricsValueTypes, metricTypeNames, dimCapabilities);
-
-      final Map<String, DimensionHandler> handlers = makeDimensionHandlers(mergedDimensions, dimCapabilities);
-      final List<DimensionMerger> mergers = new ArrayList<>();
-      for (int i = 0; i < mergedDimensions.size(); i++) {
-        DimensionHandler handler = handlers.get(mergedDimensions.get(i));
-        mergers.add(handler.makeMerger(indexSpec, segmentWriteOutMedium, dimCapabilities.get(i), progress));
-      }
+      SegmentWriteOutMediumFactory omf = segmentWriteOutMediumFactory != null ? segmentWriteOutMediumFactory
+                                                                              : defaultSegmentWriteOutMediumFactory;
+      log.info("Using SegmentWriteOutMediumFactory[%s]", omf.getClass().getSimpleName());
+      SegmentWriteOutMedium segmentWriteOutMedium = omf.makeSegmentWriteOutMedium(outDir);
+      closer.register(segmentWriteOutMedium);
+
+      mergedDimensions.forEach(dimensionDesc -> dimensionDesc.makeMerger(indexSpec, segmentWriteOutMedium, progress));
 
       /************* Setup Dim Conversions **************/
       progress.progress();
       startTime = System.currentTimeMillis();
-      writeDimValuesAndSetupDimConversion(adapters, progress, mergedDimensions, mergers);
+      writeDimValuesAndSetupDimConversion(adapters, progress, mergedDimensions);
       log.info("Completed dim conversions in %,d millis.", System.currentTimeMillis() - startTime);
 
       /************* Walk through data sets, merge them, and write merged columns *************/
       progress.progress();
+
       final TimeAndDimsIterator timeAndDimsIterator = makeMergedTimeAndDimsIterator(
           adapters,
           mergedDimensions,
           mergedMetrics,
-          rowMergerFn,
-          handlers,
-          mergers
+          rowMergerFn
       );
       closer.register(timeAndDimsIterator);
       final GenericColumnSerializer timeWriter = setupTimeWriter(segmentWriteOutMedium, indexSpec);
       final ArrayList<GenericColumnSerializer> metricWriters =
-          setupMetricsWriters(segmentWriteOutMedium, mergedMetrics, metricsValueTypes, metricTypeNames, indexSpec);
+          setupMetricsWriters(segmentWriteOutMedium, mergedMetrics, indexSpec);
       List<IntBuffer> rowNumConversions = mergeIndexesAndWriteColumns(
           adapters,
           progress,
           timeAndDimsIterator,
           timeWriter,
           metricWriters,
-          mergers,
+          mergedDimensions,
           fillRowNumConversions
       );
 
       /************ Create Inverted Indexes and Finalize Build Columns *************/
-      final String section = "build inverted index and columns";
-      progress.startSection(section);
       makeTimeColumn(v9Smoosher, progress, timeWriter, indexSpec);
       makeMetricsColumns(
           v9Smoosher,
           progress,
           mergedMetrics,
-          metricsValueTypes,
-          metricTypeNames,
           metricWriters,
           indexSpec
       );
 
-      for (int i = 0; i < mergedDimensions.size(); i++) {
-        DimensionMergerV9 merger = (DimensionMergerV9) mergers.get(i);
+      for (DimensionDesc mergedDimension : mergedDimensions) {
+        DimensionMergerV9 merger = (DimensionMergerV9) mergedDimension.getNonNullMerger();
         merger.writeIndexes(rowNumConversions);
         if (merger.canSkip()) {
           continue;
         }
         ColumnDescriptor columnDesc = merger.makeColumnDescriptor();
-        makeColumn(v9Smoosher, mergedDimensions.get(i), columnDesc);
+        makeColumn(v9Smoosher, mergedDimension.getName(), columnDesc);
       }
 
-      progress.stopSection(section);
 
       /************* Make index.drd & metadata.drd files **************/
       progress.progress();
-      makeIndexBinary(v9Smoosher, adapters, outDir, mergedDimensions, mergedMetrics, progress, indexSpec, mergers);
+      makeIndexBinary(v9Smoosher, adapters, outDir, mergedDimensions, mergedMetrics, progress, indexSpec);
       makeMetadataBinary(v9Smoosher, progress, segmentMetadata);
 
       v9Smoosher.close();
-      progress.stop();
-
-      return outDir;
     }
     catch (Throwable t) {
       throw closer.rethrow(t);
@@ -245,7 +259,7 @@ private File makeIndexFiles(
   private void makeMetadataBinary(
       final FileSmoosher v9Smoosher,
       final ProgressIndicator progress,
-      final Metadata segmentMetadata
+      @Nullable final Metadata segmentMetadata
   ) throws IOException
   {
     if (segmentMetadata != null) {
@@ -259,11 +273,10 @@ private void makeIndexBinary(
       final FileSmoosher v9Smoosher,
       final List<IndexableAdapter> adapters,
       final File outDir,
-      final List<String> mergedDimensions,
-      final List<String> mergedMetrics,
+      final List<DimensionDesc> mergedDimensions,
+      final List<MetricDesc> mergedMetrics,
       final ProgressIndicator progress,
-      final IndexSpec indexSpec,
-      final List<DimensionMerger> mergers
+      final IndexSpec indexSpec
   ) throws IOException
   {
     final String section = "make index.drd";
@@ -272,13 +285,13 @@ private void makeIndexBinary(
     long startTime = System.currentTimeMillis();
     final Set<String> finalDimensions = Sets.newLinkedHashSet();
     final Set<String> finalColumns = Sets.newLinkedHashSet();
-    finalColumns.addAll(mergedMetrics);
-    for (int i = 0; i < mergedDimensions.size(); ++i) {
-      if (mergers.get(i).canSkip()) {
+    finalColumns.addAll(mergedMetrics.stream().map(MetricDesc::getName).collect(Collectors.toList()));
+    for (DimensionDesc mergedDimension : mergedDimensions) {
+      if (mergedDimension.getNonNullMerger().canSkip()) {
         continue;
       }
-      finalColumns.add(mergedDimensions.get(i));
-      finalDimensions.add(mergedDimensions.get(i));
+      finalColumns.add(mergedDimension.getName());
+      finalDimensions.add(mergedDimension.getName());
     }
 
     GenericIndexed<String> cols = GenericIndexed.fromIterable(finalColumns, GenericIndexed.STRING_STRATEGY);
@@ -318,9 +331,7 @@ private void makeIndexBinary(
   private void makeMetricsColumns(
       final FileSmoosher v9Smoosher,
       final ProgressIndicator progress,
-      final List<String> mergedMetrics,
-      final Map<String, ValueType> metricsValueTypes,
-      final Map<String, String> metricTypeNames,
+      final List<MetricDesc> mergedMetrics,
       final List<GenericColumnSerializer> metWriters,
       final IndexSpec indexSpec
   ) throws IOException
@@ -330,12 +341,12 @@ private void makeMetricsColumns(
     long startTime = System.currentTimeMillis();
 
     for (int i = 0; i < mergedMetrics.size(); ++i) {
-      String metric = mergedMetrics.get(i);
+      final MetricDesc metricDesc = mergedMetrics.get(i);
       long metricStartTime = System.currentTimeMillis();
       GenericColumnSerializer writer = metWriters.get(i);
 
       final ColumnDescriptor.Builder builder = ColumnDescriptor.builder();
-      ValueType type = metricsValueTypes.get(metric);
+      final ValueType type = metricDesc.getValueType();
       switch (type) {
         case LONG:
           builder.setValueType(ValueType.LONG);
@@ -350,7 +361,7 @@ private void makeMetricsColumns(
           builder.addSerde(createDoubleColumnPartSerde(writer, indexSpec));
           break;
         case COMPLEX:
-          final String typeName = metricTypeNames.get(metric);
+          final String typeName = metricDesc.getType();
           builder.setValueType(ValueType.COMPLEX);
           builder.addSerde(
               ComplexColumnPartSerde
@@ -363,8 +374,12 @@ private void makeMetricsColumns(
         default:
           throw new ISE("Unknown type[%s]", type);
       }
-      makeColumn(v9Smoosher, metric, builder.build());
-      log.info("Completed metric column[%s] in %,d millis.", metric, System.currentTimeMillis() - metricStartTime);
+      makeColumn(v9Smoosher, metricDesc.getName(), builder.build());
+      log.info(
+          "Completed metric column[%s] in %,d millis.",
+          metricDesc.getName(),
+          System.currentTimeMillis() - metricStartTime
+      );
     }
     log.info("Completed metric columns in %,d millis.", System.currentTimeMillis() - startTime);
     progress.stopSection(section);
@@ -469,7 +484,7 @@ private void makeColumn(
       final TimeAndDimsIterator timeAndDimsIterator,
       final GenericColumnSerializer timeWriter,
       final ArrayList<GenericColumnSerializer> metricWriters,
-      final List<DimensionMerger> mergers,
+      final List<DimensionDesc> mergedDimensions,
       final boolean fillRowNumConversions
   ) throws IOException
   {
@@ -499,7 +514,7 @@ private void makeColumn(
       }
 
       for (int dimIndex = 0; dimIndex < timeAndDims.getNumDimensions(); dimIndex++) {
-        DimensionMerger merger = mergers.get(dimIndex);
+        final DimensionMerger merger = mergedDimensions.get(dimIndex).getNonNullMerger();
         if (merger.canSkip()) {
           continue;
         }
@@ -573,34 +588,32 @@ private GenericColumnSerializer setupTimeWriter(SegmentWriteOutMedium segmentWri
 
   private ArrayList<GenericColumnSerializer> setupMetricsWriters(
       final SegmentWriteOutMedium segmentWriteOutMedium,
-      final List<String> mergedMetrics,
-      final Map<String, ValueType> metricsValueTypes,
-      final Map<String, String> metricTypeNames,
+      final List<MetricDesc> mergedMetrics,
       final IndexSpec indexSpec
   ) throws IOException
   {
     ArrayList<GenericColumnSerializer> metWriters = Lists.newArrayListWithCapacity(mergedMetrics.size());
 
-    for (String metric : mergedMetrics) {
-      ValueType type = metricsValueTypes.get(metric);
+    for (MetricDesc metricDesc : mergedMetrics) {
+      final ValueType type = metricDesc.getValueType();
       GenericColumnSerializer writer;
       switch (type) {
         case LONG:
-          writer = createLongColumnSerializer(segmentWriteOutMedium, metric, indexSpec);
+          writer = createLongColumnSerializer(segmentWriteOutMedium, metricDesc.getName(), indexSpec);
           break;
         case FLOAT:
-          writer = createFloatColumnSerializer(segmentWriteOutMedium, metric, indexSpec);
+          writer = createFloatColumnSerializer(segmentWriteOutMedium, metricDesc.getName(), indexSpec);
           break;
         case DOUBLE:
-          writer = createDoubleColumnSerializer(segmentWriteOutMedium, metric, indexSpec);
+          writer = createDoubleColumnSerializer(segmentWriteOutMedium, metricDesc.getName(), indexSpec);
           break;
         case COMPLEX:
-          final String typeName = metricTypeNames.get(metric);
+          final String typeName = metricDesc.getType();
           ComplexMetricSerde serde = ComplexMetrics.getSerdeForType(typeName);
           if (serde == null) {
             throw new ISE("Unknown type[%s]", typeName);
           }
-          writer = serde.getSerializer(segmentWriteOutMedium, metric);
+          writer = serde.getSerializer(segmentWriteOutMedium, metricDesc.getName());
           break;
         default:
           throw new ISE("Unknown type[%s]", type);
@@ -686,45 +699,18 @@ static GenericColumnSerializer createFloatColumnSerializer(
   private void writeDimValuesAndSetupDimConversion(
       final List<IndexableAdapter> indexes,
       final ProgressIndicator progress,
-      final List<String> mergedDimensions,
-      final List<DimensionMerger> mergers
+      final List<DimensionDesc> mergedDimensions
   ) throws IOException
   {
     final String section = "setup dimension conversions";
     progress.startSection(section);
 
-    for (int dimIndex = 0; dimIndex < mergedDimensions.size(); ++dimIndex) {
-      mergers.get(dimIndex).writeMergedValueDictionary(indexes);
+    for (DimensionDesc dimensionDesc : mergedDimensions) {
+      dimensionDesc.getNonNullMerger().writeMergedValueDictionary(indexes);
     }
     progress.stopSection(section);
   }
 
-  private void mergeCapabilities(
-      final List<IndexableAdapter> adapters,
-      final List<String> mergedDimensions,
-      final Map<String, ValueType> metricsValueTypes,
-      final Map<String, String> metricTypeNames,
-      final List<ColumnCapabilitiesImpl> dimCapabilities
-  )
-  {
-    final Map<String, ColumnCapabilitiesImpl> capabilitiesMap = Maps.newHashMap();
-    for (IndexableAdapter adapter : adapters) {
-      for (String dimension : adapter.getDimensionNames()) {
-        ColumnCapabilities capabilities = adapter.getCapabilities(dimension);
-        capabilitiesMap.computeIfAbsent(dimension, d -> new ColumnCapabilitiesImpl()).merge(capabilities);
-      }
-      for (String metric : adapter.getMetricNames()) {
-        ColumnCapabilities capabilities = adapter.getCapabilities(metric);
-        capabilitiesMap.computeIfAbsent(metric, m -> new ColumnCapabilitiesImpl()).merge(capabilities);
-        metricsValueTypes.put(metric, capabilities.getType());
-        metricTypeNames.put(metric, adapter.getMetricType(metric));
-      }
-    }
-    for (String dim : mergedDimensions) {
-      dimCapabilities.add(capabilitiesMap.get(dim));
-    }
-  }
-
   @Override
   public File persist(
       final IncrementalIndex index,
@@ -776,29 +762,28 @@ public File persist(
     FileUtils.forceMkdir(outDir);
 
     log.info("Starting persist for interval[%s], rows[%,d]", dataInterval, index.size());
+    final IncrementalIndexAdapter adapter = new IncrementalIndexAdapter(
+        dataInterval,
+        index,
+        indexSpec.getBitmapSerdeFactory().getBitmapFactory()
+    );
     return merge(
-        Collections.singletonList(
-            new IncrementalIndexAdapter(
-                dataInterval,
-                index,
-                indexSpec.getBitmapSerdeFactory().getBitmapFactory()
-            )
-        ),
+        Collections.singletonList(adapter),
+        false,
+        index.getMetricAggs(),
         // if index is not rolled up, then it should be not rollup here
         // if index is rolled up, then it is no need to rollup again.
         //                     In this case, true/false won't cause reOrdering in merge stage
         //                     while merging a single iterable
-        false,
-        index.getMetricAggs(),
         outDir,
         indexSpec,
         progress,
         segmentWriteOutMediumFactory
-    );
+    ).getFile();
   }
 
   @Override
-  public File mergeQueryableIndex(
+  public MergedIndexMetadata mergeQueryableIndex(
       List<QueryableIndex> indexes,
       boolean rollup,
       final AggregatorFactory[] metricAggs,
@@ -807,8 +792,8 @@ public File mergeQueryableIndex(
       @Nullable SegmentWriteOutMediumFactory segmentWriteOutMediumFactory
   ) throws IOException
   {
-    return mergeQueryableIndex(
-        indexes,
+    return merge(
+        IndexMerger.toIndexableAdapters(indexes),
         rollup,
         metricAggs,
         outDir,
@@ -819,10 +804,10 @@ public File mergeQueryableIndex(
   }
 
   @Override
-  public File mergeQueryableIndex(
+  public MergedIndexMetadata mergeQueryableIndex(
       List<QueryableIndex> indexes,
       boolean rollup,
-      final AggregatorFactory[] metricAggs,
+      AggregatorFactory[] metricAggs,
       File outDir,
       IndexSpec indexSpec,
       ProgressIndicator progress,
@@ -841,7 +826,7 @@ public File mergeQueryableIndex(
   }
 
   @Override
-  public File merge(
+  public MergedIndexMetadata merge(
       List<IndexableAdapter> indexes,
       boolean rollup,
       final AggregatorFactory[] metricAggs,
@@ -852,10 +837,10 @@ public File merge(
     return merge(indexes, rollup, metricAggs, outDir, indexSpec, new BaseProgressIndicator(), null);
   }
 
-  private File merge(
+  private MergedIndexMetadata merge(
       List<IndexableAdapter> indexes,
-      final boolean rollup,
-      final AggregatorFactory[] metricAggs,
+      boolean rollup,
+      AggregatorFactory[] metricAggs,
       File outDir,
       IndexSpec indexSpec,
       ProgressIndicator progress,
@@ -865,63 +850,29 @@ private File merge(
     FileUtils.deleteDirectory(outDir);
     FileUtils.forceMkdir(outDir);
 
-    final List<String> mergedDimensions = IndexMerger.getMergedDimensions(indexes);
-
-    final List<String> mergedMetrics = IndexMerger.mergeIndexed(
-        indexes.stream().map(IndexableAdapter::getMetricNames).collect(Collectors.toList())
-    );
-
-    final AggregatorFactory[] sortedMetricAggs = new AggregatorFactory[mergedMetrics.size()];
-    for (AggregatorFactory metricAgg : metricAggs) {
-      int metricIndex = mergedMetrics.indexOf(metricAgg.getName());
-      /*
-        If metricIndex is negative, one of the metricAggs was not present in the union of metrics from the indices
-        we are merging
-       */
-      if (metricIndex > -1) {
-        sortedMetricAggs[metricIndex] = metricAgg;
-      }
-    }
+    final List<DimensionDesc> mergedDimensions = IndexMerger.mergeDimensions(indexes);
+    final List<MetricDesc> mergedMetrics = IndexMerger.mergeMetrics(indexes, metricAggs);
 
-    /*
-      If there is nothing at sortedMetricAggs[i], then we did not have a metricAgg whose name matched the name
-      of the ith element of mergedMetrics. I.e. There was a metric in the indices to merge that we did not ask for.
-     */
-    for (int i = 0; i < sortedMetricAggs.length; i++) {
-      if (sortedMetricAggs[i] == null) {
-        throw new IAE("Indices to merge contained metric[%s], but requested metrics did not", mergedMetrics.get(i));
-      }
-    }
-
-    for (int i = 0; i < mergedMetrics.size(); i++) {
-      if (!sortedMetricAggs[i].getName().equals(mergedMetrics.get(i))) {
-        throw new IAE(
-            "Metric mismatch, index[%d] [%s] != [%s]",
-            i,
-            sortedMetricAggs[i].getName(),
-            mergedMetrics.get(i)
-        );
-      }
-    }
-
-    Function<List<TransformableRowIterator>, TimeAndDimsIterator> rowMergerFn;
+    final Function<List<TransformableRowIterator>, TimeAndDimsIterator> rowMergerFn;
     if (rollup) {
-      rowMergerFn = rowIterators -> new RowCombiningTimeAndDimsIterator(rowIterators, sortedMetricAggs, mergedMetrics);
+      rowMergerFn = rowIterators -> new RowCombiningTimeAndDimsIterator(rowIterators, mergedMetrics);
     } else {
       rowMergerFn = MergingRowIterator::new;
     }
 
-    return makeIndexFiles(
-        indexes,
-        sortedMetricAggs,
-        outDir,
-        progress,
-        mergedDimensions,
-        mergedMetrics,
-        rowMergerFn,
-        true,
-        indexSpec,
-        segmentWriteOutMediumFactory
+    return new MergedIndexMetadata(
+        makeIndexFiles(
+            indexes,
+            outDir,
+            progress,
+            mergedDimensions,
+            mergedMetrics,
+            rowMergerFn,
+            true,
+            indexSpec,
+            segmentWriteOutMediumFactory
+        ),
+        mergedDimensions.stream().map(DimensionDesc::getName).collect(Collectors.toList())
     );
   }
 
@@ -941,14 +892,13 @@ public File convert(
   ) throws IOException
   {
     try (QueryableIndex index = indexIO.loadIndex(inDir)) {
-      final IndexableAdapter adapter = new QueryableIndexIndexableAdapter(index);
+      final IndexableAdapter adapter = new QueryableIndexAdapter(index);
       return makeIndexFiles(
           ImmutableList.of(adapter),
-          null,
           outDir,
           progress,
-          Lists.newArrayList(adapter.getDimensionNames()),
-          Lists.newArrayList(adapter.getMetricNames()),
+          IndexMerger.mergeDimensions(Collections.singletonList(adapter)),
+          IndexMerger.mergeMetrics(Collections.singletonList(adapter), null),
           Iterables::getOnlyElement,
           false,
           indexSpec,
@@ -969,15 +919,11 @@ public File append(
     FileUtils.deleteDirectory(outDir);
     FileUtils.forceMkdir(outDir);
 
-    final List<String> mergedDimensions = IndexMerger.getMergedDimensions(indexes);
-
-    final List<String> mergedMetrics = IndexMerger.mergeIndexed(
-        indexes.stream().map(IndexableAdapter::getMetricNames).collect(Collectors.toList())
-    );
+    final List<DimensionDesc> mergedDimensions = IndexMerger.mergeDimensions(indexes);
+    final List<MetricDesc> mergedMetrics = IndexMerger.mergeMetrics(indexes, aggregators);
 
     return makeIndexFiles(
         indexes,
-        aggregators,
         outDir,
         new BaseProgressIndicator(),
         mergedDimensions,
@@ -989,38 +935,34 @@ public File append(
     );
   }
 
-  private Map<String, DimensionHandler> makeDimensionHandlers(
-      final List<String> mergedDimensions,
-      final List<ColumnCapabilitiesImpl> dimCapabilities
-  )
-  {
-    Map<String, DimensionHandler> handlers = new LinkedHashMap<>();
-    for (int i = 0; i < mergedDimensions.size(); i++) {
-      ColumnCapabilities capabilities = dimCapabilities.get(i);
-      String dimName = mergedDimensions.get(i);
-      DimensionHandler handler = DimensionHandlerUtils.getHandlerFromCapabilities(dimName, capabilities, null);
-      handlers.put(dimName, handler);
-    }
-    return handlers;
-  }
-
   private TimeAndDimsIterator makeMergedTimeAndDimsIterator(
       final List<IndexableAdapter> indexes,
-      final List<String> mergedDimensions,
-      final List<String> mergedMetrics,
-      final Function<List<TransformableRowIterator>, TimeAndDimsIterator> rowMergerFn,
-      final Map<String, DimensionHandler> handlers,
-      final List<DimensionMerger> mergers
+      final List<DimensionDesc> mergedDimensions,
+      final List<MetricDesc> mergedMetrics,
+      final Function<List<TransformableRowIterator>, TimeAndDimsIterator> rowMergerFn
   )
   {
-    List<TransformableRowIterator> perIndexRowIterators = Lists.newArrayListWithCapacity(indexes.size());
+    final List<TransformableRowIterator> perIndexRowIterators = Lists.newArrayListWithCapacity(indexes.size());
+    final List<String> mergedDimensionNames = mergedDimensions.stream()
+                                                              .map(DimensionDesc::getName)
+                                                              .collect(Collectors.toList());
+    final Map<String, DimensionHandler> handlers = mergedDimensions
+        .stream()
+        .collect(Collectors.toMap(DimensionDesc::getName, DimensionDesc::getHandler));
+    final List<DimensionMerger> mergers = mergedDimensions.stream()
+                                                          .map(DimensionDesc::getNonNullMerger)
+                                                          .collect(Collectors.toList());
+    final List<String> mergedMetricNames = mergedMetrics.stream()
+                                                        .map(MetricDesc::getName)
+                                                        .collect(Collectors.toList());
     for (int i = 0; i < indexes.size(); ++i) {
       final IndexableAdapter adapter = indexes.get(i);
       TransformableRowIterator target = adapter.getRows();
-      if (!mergedDimensions.equals(adapter.getDimensionNames()) || !mergedMetrics.equals(adapter.getMetricNames())) {
+      if (!mergedDimensionNames.equals(adapter.getDimensionNames())
+          || !mergedMetricNames.equals(adapter.getMetricNames())) {
         target = makeRowIteratorWithReorderedColumns(
-            mergedDimensions,
-            mergedMetrics,
+            mergedDimensionNames,
+            mergedMetricNames,
             handlers,
             adapter,
             target
diff --git a/processing/src/main/java/org/apache/druid/segment/IndexableAdapter.java b/processing/src/main/java/org/apache/druid/segment/IndexableAdapter.java
index 9cb4ec3cdc5..379731b0b7a 100644
--- a/processing/src/main/java/org/apache/druid/segment/IndexableAdapter.java
+++ b/processing/src/main/java/org/apache/druid/segment/IndexableAdapter.java
@@ -25,12 +25,13 @@
 import org.joda.time.Interval;
 
 import javax.annotation.Nullable;
+import java.io.Closeable;
 import java.util.List;
 
 /**
  * An adapter to an index
  */
-public interface IndexableAdapter
+public interface IndexableAdapter extends Closeable
 {
   Interval getDataInterval();
 
diff --git a/processing/src/main/java/org/apache/druid/segment/LongDimensionIndexer.java b/processing/src/main/java/org/apache/druid/segment/LongDimensionIndexer.java
index 20f192d7598..59a1d190e99 100644
--- a/processing/src/main/java/org/apache/druid/segment/LongDimensionIndexer.java
+++ b/processing/src/main/java/org/apache/druid/segment/LongDimensionIndexer.java
@@ -26,7 +26,6 @@
 import org.apache.druid.query.dimension.DimensionSpec;
 import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector;
 import org.apache.druid.segment.data.Indexed;
-import org.apache.druid.segment.incremental.IncrementalIndex;
 import org.apache.druid.segment.incremental.IncrementalIndexRowHolder;
 
 import javax.annotation.Nullable;
@@ -88,7 +87,7 @@ public int getCardinality()
   public DimensionSelector makeDimensionSelector(
       DimensionSpec spec,
       IncrementalIndexRowHolder currEntry,
-      IncrementalIndex.DimensionDesc desc
+      DimensionDesc desc
   )
   {
     return new LongWrappingDimensionSelector(makeColumnValueSelector(currEntry, desc), spec.getExtractionFn());
@@ -97,7 +96,7 @@ public DimensionSelector makeDimensionSelector(
   @Override
   public ColumnValueSelector<?> makeColumnValueSelector(
       IncrementalIndexRowHolder currEntry,
-      IncrementalIndex.DimensionDesc desc
+      DimensionDesc desc
   )
   {
     final int dimIndex = desc.getIndex();
diff --git a/processing/src/main/java/org/apache/druid/segment/MergedIndexMetadata.java b/processing/src/main/java/org/apache/druid/segment/MergedIndexMetadata.java
new file mode 100644
index 00000000000..31c555b0450
--- /dev/null
+++ b/processing/src/main/java/org/apache/druid/segment/MergedIndexMetadata.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.druid.segment;
+
+import java.io.File;
+import java.util.List;
+
+public class MergedIndexMetadata
+{
+  private final File file;
+  private final List<String> dimensions;
+
+  public MergedIndexMetadata(File file, List<String> dimensions)
+  {
+    this.file = file;
+    this.dimensions = dimensions;
+  }
+
+  public File getFile()
+  {
+    return file;
+  }
+
+  public List<String> getDimensions()
+  {
+    return dimensions;
+  }
+
+  @Override
+  public String toString()
+  {
+    return "MergedIndexMetadata{" +
+           "file=" + file +
+           ", dimensions=" + dimensions +
+           '}';
+  }
+}
diff --git a/processing/src/main/java/org/apache/druid/segment/MetricDesc.java b/processing/src/main/java/org/apache/druid/segment/MetricDesc.java
new file mode 100644
index 00000000000..48ac57193ab
--- /dev/null
+++ b/processing/src/main/java/org/apache/druid/segment/MetricDesc.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.druid.segment;
+
+import org.apache.druid.query.aggregation.AggregatorFactory;
+import org.apache.druid.segment.column.ColumnCapabilitiesImpl;
+import org.apache.druid.segment.column.ValueType;
+
+import javax.annotation.Nullable;
+
+/**
+ * Metric descriptor. Some APIs can return nulls only because {@link IndexMergerV9#convert} doesn't take
+ * {@link AggregatorFactory}s. They shouldn't return nulls in any other cases.
+ */
+public interface MetricDesc
+{
+  int getIndex();
+
+  String getName();
+
+  @Nullable
+  AggregatorFactory getAggregatorFactory();
+
+  String getType();
+
+  ValueType getValueType();
+
+  ColumnCapabilitiesImpl getCapabilities();
+}
diff --git a/processing/src/main/java/org/apache/druid/segment/MetricDescImpl.java b/processing/src/main/java/org/apache/druid/segment/MetricDescImpl.java
new file mode 100644
index 00000000000..e0c0103b82a
--- /dev/null
+++ b/processing/src/main/java/org/apache/druid/segment/MetricDescImpl.java
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.druid.segment;
+
+import org.apache.druid.query.aggregation.AggregatorFactory;
+import org.apache.druid.segment.column.ColumnCapabilitiesImpl;
+import org.apache.druid.segment.column.ValueType;
+import org.apache.druid.segment.serde.ComplexMetrics;
+
+public class MetricDescImpl implements MetricDesc
+{
+  private final int index;
+  private final String name;
+  private final AggregatorFactory aggregatorFactory;
+  private final String type;
+  private final ColumnCapabilitiesImpl capabilities;
+
+  public MetricDescImpl(int index, AggregatorFactory factory)
+  {
+    this.index = index;
+    this.name = factory.getName();
+    this.aggregatorFactory = factory;
+
+    final String typeInfo = factory.getTypeName();
+    this.capabilities = new ColumnCapabilitiesImpl();
+    if ("float".equalsIgnoreCase(typeInfo)) {
+      capabilities.setType(ValueType.FLOAT);
+      this.type = typeInfo;
+    } else if ("long".equalsIgnoreCase(typeInfo)) {
+      capabilities.setType(ValueType.LONG);
+      this.type = typeInfo;
+    } else if ("double".equalsIgnoreCase(typeInfo)) {
+      capabilities.setType(ValueType.DOUBLE);
+      this.type = typeInfo;
+    } else {
+      capabilities.setType(ValueType.COMPLEX);
+      this.type = ComplexMetrics.getSerdeForType(typeInfo).getTypeName();
+    }
+  }
+
+  @Override
+  public int getIndex()
+  {
+    return index;
+  }
+
+  @Override
+  public String getName()
+  {
+    return name;
+  }
+
+  @Override
+  public AggregatorFactory getAggregatorFactory()
+  {
+    return aggregatorFactory;
+  }
+
+  @Override
+  public String getType()
+  {
+    return type;
+  }
+
+  @Override
+  public ValueType getValueType()
+  {
+    return capabilities.getType();
+  }
+
+  @Override
+  public ColumnCapabilitiesImpl getCapabilities()
+  {
+    return capabilities;
+  }
+}
diff --git a/processing/src/main/java/org/apache/druid/segment/QueryableIndex.java b/processing/src/main/java/org/apache/druid/segment/QueryableIndex.java
index b3c7a0c21cb..f2d4546a01d 100644
--- a/processing/src/main/java/org/apache/druid/segment/QueryableIndex.java
+++ b/processing/src/main/java/org/apache/druid/segment/QueryableIndex.java
@@ -33,7 +33,7 @@
  * using {@link StorageAdapter}.
  *
  * @see QueryableIndexStorageAdapter for query path adapter
- * @see QueryableIndexIndexableAdapter for indexing path adapter
+ * @see QueryableIndexAdapter for indexing path adapter
  */
 public interface QueryableIndex extends ColumnSelector, Closeable
 {
diff --git a/processing/src/main/java/org/apache/druid/segment/QueryableIndexIndexableAdapter.java b/processing/src/main/java/org/apache/druid/segment/QueryableIndexAdapter.java
similarity index 97%
rename from processing/src/main/java/org/apache/druid/segment/QueryableIndexIndexableAdapter.java
rename to processing/src/main/java/org/apache/druid/segment/QueryableIndexAdapter.java
index 429b34695d7..215d2c19c83 100644
--- a/processing/src/main/java/org/apache/druid/segment/QueryableIndexIndexableAdapter.java
+++ b/processing/src/main/java/org/apache/druid/segment/QueryableIndexAdapter.java
@@ -43,6 +43,7 @@
 import org.joda.time.Interval;
 
 import javax.annotation.Nullable;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -53,16 +54,16 @@
 
 /**
  */
-public class QueryableIndexIndexableAdapter implements IndexableAdapter
+public class QueryableIndexAdapter implements IndexableAdapter
 {
-  private static final Logger log = new Logger(QueryableIndexIndexableAdapter.class);
+  private static final Logger log = new Logger(QueryableIndexAdapter.class);
 
   private final int numRows;
   private final QueryableIndex input;
   private final ImmutableList<String> availableDimensions;
   private final Metadata metadata;
 
-  public QueryableIndexIndexableAdapter(QueryableIndex input)
+  public QueryableIndexAdapter(QueryableIndex input)
   {
     this.input = input;
     numRows = input.getNumRows();
@@ -176,6 +177,84 @@ public RowIteratorImpl getRows()
     return new RowIteratorImpl();
   }
 
+  @Override
+  public String getMetricType(String metric)
+  {
+    final Column column = input.getColumn(metric);
+
+    final ValueType type = column.getCapabilities().getType();
+    switch (type) {
+      case FLOAT:
+        return "float";
+      case LONG:
+        return "long";
+      case DOUBLE:
+        return "double";
+      case COMPLEX: {
+        try (ComplexColumn complexColumn = column.getComplexColumn()) {
+          return complexColumn.getTypeName();
+        }
+      }
+      default:
+        throw new ISE("Unknown type[%s]", type);
+    }
+  }
+
+  @Override
+  public ColumnCapabilities getCapabilities(String column)
+  {
+    return input.getColumn(column).getCapabilities();
+  }
+
+  @Override
+  public BitmapValues getBitmapValues(String dimension, int dictId)
+  {
+    final Column column = input.getColumn(dimension);
+    if (column == null) {
+      return BitmapValues.EMPTY;
+    }
+
+    final BitmapIndex bitmaps = column.getBitmapIndex();
+    if (bitmaps == null) {
+      return BitmapValues.EMPTY;
+    }
+
+    if (dictId >= 0) {
+      return new ImmutableBitmapValues(bitmaps.getBitmap(dictId));
+    } else {
+      return BitmapValues.EMPTY;
+    }
+  }
+
+  @VisibleForTesting
+  BitmapValues getBitmapIndex(String dimension, String value)
+  {
+    final Column column = input.getColumn(dimension);
+
+    if (column == null) {
+      return BitmapValues.EMPTY;
+    }
+
+    final BitmapIndex bitmaps = column.getBitmapIndex();
+    if (bitmaps == null) {
+      return BitmapValues.EMPTY;
+    }
+
+    return new ImmutableBitmapValues(bitmaps.getBitmap(bitmaps.getIndex(value)));
+  }
+
+  @Override
+  public Metadata getMetadata()
+  {
+    return metadata;
+  }
+
+  @Override
+  public void close() throws IOException
+  {
+    input.close();
+  }
+
   /**
    * On {@link #moveToNext()} and {@link #mark()}, this class copies all column values into a set of {@link
    * SettableColumnValueSelector} instances. Alternative approach was to save only offset in column and use the same
@@ -259,7 +338,6 @@ public RowIteratorImpl getRows()
           offset::getOffset
       );
 
-
       markedDimensionValueSelectors = dimensionHandlers
           .stream()
           .map(DimensionHandler::makeNewSettableEncodedValueSelector)
@@ -366,76 +444,4 @@ void resetToMemoizedOffset()
       setRowPointerValues();
     }
   }
-
-  @Override
-  public String getMetricType(String metric)
-  {
-    final Column column = input.getColumn(metric);
-
-    final ValueType type = column.getCapabilities().getType();
-    switch (type) {
-      case FLOAT:
-        return "float";
-      case LONG:
-        return "long";
-      case DOUBLE:
-        return "double";
-      case COMPLEX: {
-        try (ComplexColumn complexColumn = column.getComplexColumn()) {
-          return complexColumn.getTypeName();
-        }
-      }
-      default:
-        throw new ISE("Unknown type[%s]", type);
-    }
-  }
-
-  @Override
-  public ColumnCapabilities getCapabilities(String column)
-  {
-    return input.getColumn(column).getCapabilities();
-  }
-
-  @Override
-  public BitmapValues getBitmapValues(String dimension, int dictId)
-  {
-    final Column column = input.getColumn(dimension);
-    if (column == null) {
-      return BitmapValues.EMPTY;
-    }
-
-    final BitmapIndex bitmaps = column.getBitmapIndex();
-    if (bitmaps == null) {
-      return BitmapValues.EMPTY;
-    }
-
-    if (dictId >= 0) {
-      return new ImmutableBitmapValues(bitmaps.getBitmap(dictId));
-    } else {
-      return BitmapValues.EMPTY;
-    }
-  }
-
-  @VisibleForTesting
-  BitmapValues getBitmapIndex(String dimension, String value)
-  {
-    final Column column = input.getColumn(dimension);
-
-    if (column == null) {
-      return BitmapValues.EMPTY;
-    }
-
-    final BitmapIndex bitmaps = column.getBitmapIndex();
-    if (bitmaps == null) {
-      return BitmapValues.EMPTY;
-    }
-
-    return new ImmutableBitmapValues(bitmaps.getBitmap(bitmaps.getIndex(value)));
-  }
-
-  @Override
-  public Metadata getMetadata()
-  {
-    return metadata;
-  }
 }
diff --git a/processing/src/main/java/org/apache/druid/segment/RowCombiningTimeAndDimsIterator.java b/processing/src/main/java/org/apache/druid/segment/RowCombiningTimeAndDimsIterator.java
index 5120ece6a95..60080b500cb 100644
--- a/processing/src/main/java/org/apache/druid/segment/RowCombiningTimeAndDimsIterator.java
+++ b/processing/src/main/java/org/apache/druid/segment/RowCombiningTimeAndDimsIterator.java
@@ -20,13 +20,13 @@
 package org.apache.druid.segment;
 
 import org.apache.druid.query.aggregation.AggregateCombiner;
-import org.apache.druid.query.aggregation.AggregatorFactory;
 
 import javax.annotation.Nullable;
 import java.util.Arrays;
 import java.util.BitSet;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * RowCombiningTimeAndDimsIterator takes some {@link RowIterator}s, assuming that they are "sorted" (see javadoc of
@@ -98,11 +98,7 @@
   @Nullable
   private RowPointer nextRowPointer;
 
-  RowCombiningTimeAndDimsIterator(
-      List<TransformableRowIterator> originalIterators,
-      AggregatorFactory[] metricAggs,
-      List<String> metricNames
-  )
+  RowCombiningTimeAndDimsIterator(List<TransformableRowIterator> originalIterators, List<MetricDesc> metricDescs)
   {
     int numCombinedIterators = originalIterators.size();
     mergingIterator = new MergingRowIterator(originalIterators);
@@ -116,9 +112,12 @@
         }
     );
 
-    combinedMetricSelectors = new AggregateCombiner[metricAggs.length];
-    Arrays.setAll(combinedMetricSelectors, metricIndex -> metricAggs[metricIndex].makeNullableAggregateCombiner());
-    combinedMetricNames = metricNames;
+    combinedMetricSelectors = new AggregateCombiner[metricDescs.size()];
+    Arrays.setAll(
+        combinedMetricSelectors,
+        metricIndex -> metricDescs.get(metricIndex).getAggregatorFactory().makeNullableAggregateCombiner()
+    );
+    combinedMetricNames = metricDescs.stream().map(MetricDesc::getName).collect(Collectors.toList());
 
     combinedTimeAndDimsPointersByOriginalIteratorIndex = new TimeAndDimsPointer[numCombinedIterators];
     Arrays.setAll(
diff --git a/processing/src/main/java/org/apache/druid/segment/RowFilteringIndexAdapter.java b/processing/src/main/java/org/apache/druid/segment/RowFilteringIndexAdapter.java
index 289d74d61f6..6c3ddec23cd 100644
--- a/processing/src/main/java/org/apache/druid/segment/RowFilteringIndexAdapter.java
+++ b/processing/src/main/java/org/apache/druid/segment/RowFilteringIndexAdapter.java
@@ -24,6 +24,7 @@
 import org.apache.druid.segment.data.Indexed;
 import org.joda.time.Interval;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.function.Predicate;
 
@@ -31,10 +32,10 @@
  */
 public class RowFilteringIndexAdapter implements IndexableAdapter
 {
-  private final QueryableIndexIndexableAdapter baseAdapter;
+  private final QueryableIndexAdapter baseAdapter;
   private final Predicate<RowPointer> filter;
 
-  public RowFilteringIndexAdapter(QueryableIndexIndexableAdapter baseAdapter, Predicate<RowPointer> filter)
+  public RowFilteringIndexAdapter(QueryableIndexAdapter baseAdapter, Predicate<RowPointer> filter)
   {
     this.baseAdapter = baseAdapter;
     this.filter = filter;
@@ -73,7 +74,7 @@ public int getNumRows()
   @Override
   public TransformableRowIterator getRows()
   {
-    QueryableIndexIndexableAdapter.RowIteratorImpl baseRowIterator = baseAdapter.getRows();
+    QueryableIndexAdapter.RowIteratorImpl baseRowIterator = baseAdapter.getRows();
     return new ForwardingRowIterator(baseRowIterator)
     {
       /**
@@ -123,4 +124,10 @@ public Metadata getMetadata()
   {
     return baseAdapter.getMetadata();
   }
+
+  @Override
+  public void close() throws IOException
+  {
+    baseAdapter.close();
+  }
 }
diff --git a/processing/src/main/java/org/apache/druid/segment/StringDimensionIndexer.java b/processing/src/main/java/org/apache/druid/segment/StringDimensionIndexer.java
index 89f025ce1e8..db90416785b 100644
--- a/processing/src/main/java/org/apache/druid/segment/StringDimensionIndexer.java
+++ b/processing/src/main/java/org/apache/druid/segment/StringDimensionIndexer.java
@@ -39,7 +39,6 @@
 import org.apache.druid.segment.data.IndexedInts;
 import org.apache.druid.segment.data.IndexedIterable;
 import org.apache.druid.segment.filter.BooleanValueMatcher;
-import org.apache.druid.segment.incremental.IncrementalIndex;
 import org.apache.druid.segment.incremental.IncrementalIndexRow;
 import org.apache.druid.segment.incremental.IncrementalIndexRowHolder;
 import it.unimi.dsi.fastutil.ints.IntArrays;
@@ -427,7 +426,7 @@ public int getUnsortedEncodedKeyComponentHashCode(int[] key)
   public DimensionSelector makeDimensionSelector(
       final DimensionSpec spec,
       final IncrementalIndexRowHolder currEntry,
-      final IncrementalIndex.DimensionDesc desc
+      final DimensionDesc desc
   )
   {
     final ExtractionFn extractionFn = spec.getExtractionFn();
@@ -658,7 +657,7 @@ public void inspectRuntimeShape(RuntimeShapeInspector inspector)
   @Override
   public ColumnValueSelector<?> makeColumnValueSelector(
       IncrementalIndexRowHolder currEntry,
-      IncrementalIndex.DimensionDesc desc
+      DimensionDesc desc
   )
   {
     return makeDimensionSelector(DefaultDimensionSpec.of(desc.getName()), currEntry, desc);
diff --git a/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndex.java b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndex.java
index c496d023714..bcded3a1951 100644
--- a/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndex.java
+++ b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndex.java
@@ -53,6 +53,7 @@
 import org.apache.druid.segment.AbstractIndex;
 import org.apache.druid.segment.ColumnSelectorFactory;
 import org.apache.druid.segment.ColumnValueSelector;
+import org.apache.druid.segment.DimensionDesc;
 import org.apache.druid.segment.DimensionHandler;
 import org.apache.druid.segment.DimensionHandlerUtils;
 import org.apache.druid.segment.DimensionIndexer;
@@ -61,6 +62,8 @@
 import org.apache.druid.segment.FloatColumnSelector;
 import org.apache.druid.segment.LongColumnSelector;
 import org.apache.druid.segment.Metadata;
+import org.apache.druid.segment.MetricDesc;
+import org.apache.druid.segment.MetricDescImpl;
 import org.apache.druid.segment.NilColumnValueSelector;
 import org.apache.druid.segment.ObjectColumnSelector;
 import org.apache.druid.segment.StorageAdapter;
@@ -289,7 +292,7 @@ protected IncrementalIndex(
 
     this.metricDescs = Maps.newLinkedHashMap();
     for (AggregatorFactory metric : metrics) {
-      MetricDesc metricDesc = new MetricDesc(metricDescs.size(), metric);
+      MetricDesc metricDesc = new MetricDescImpl(metricDescs.size(), metric);
       metricDescs.put(metricDesc.getName(), metricDesc);
       columnCapabilities.put(metricDesc.getName(), metricDesc.getCapabilities());
     }
@@ -667,7 +670,7 @@ IncrementalIndexRowResult toIncrementalIndexRow(InputRow row)
           desc = addNewDimension(dimension, capabilities, handler);
         }
         DimensionHandler handler = desc.getHandler();
-        DimensionIndexer indexer = desc.getIndexer();
+        DimensionIndexer indexer = desc.makeOrGetIndexer();
         Object dimsKey = null;
         try {
           dimsKey = indexer.processRowValsToUnsortedEncodedKeyComponent(
@@ -1005,7 +1008,7 @@ public Metadata getMetadata()
                   theVals.put(dimensionName, null);
                   continue;
                 }
-                final DimensionIndexer indexer = dimensionDesc.getIndexer();
+                final DimensionIndexer indexer = dimensionDesc.makeOrGetIndexer();
                 Object rowVals = indexer.convertUnsortedEncodedKeyComponentToActualArrayOrList(dim, DimensionIndexer.LIST);
                 theVals.put(dimensionName, rowVals);
               }
@@ -1033,99 +1036,6 @@ public DateTime getMaxIngestedEventTime()
     return maxIngestedEventTime;
   }
 
-  public static final class DimensionDesc
-  {
-    private final int index;
-    private final String name;
-    private final ColumnCapabilitiesImpl capabilities;
-    private final DimensionHandler handler;
-    private final DimensionIndexer indexer;
-
-    public DimensionDesc(int index, String name, ColumnCapabilitiesImpl capabilities, DimensionHandler handler)
-    {
-      this.index = index;
-      this.name = name;
-      this.capabilities = capabilities;
-      this.handler = handler;
-      this.indexer = handler.makeIndexer();
-    }
-
-    public int getIndex()
-    {
-      return index;
-    }
-
-    public String getName()
-    {
-      return name;
-    }
-
-    public ColumnCapabilitiesImpl getCapabilities()
-    {
-      return capabilities;
-    }
-
-    public DimensionHandler getHandler()
-    {
-      return handler;
-    }
-
-    public DimensionIndexer getIndexer()
-    {
-      return indexer;
-    }
-  }
-
-  public static final class MetricDesc
-  {
-    private final int index;
-    private final String name;
-    private final String type;
-    private final ColumnCapabilitiesImpl capabilities;
-
-    public MetricDesc(int index, AggregatorFactory factory)
-    {
-      this.index = index;
-      this.name = factory.getName();
-
-      String typeInfo = factory.getTypeName();
-      this.capabilities = new ColumnCapabilitiesImpl();
-      if ("float".equalsIgnoreCase(typeInfo)) {
-        capabilities.setType(ValueType.FLOAT);
-        this.type = typeInfo;
-      } else if ("long".equalsIgnoreCase(typeInfo)) {
-        capabilities.setType(ValueType.LONG);
-        this.type = typeInfo;
-      } else if ("double".equalsIgnoreCase(typeInfo)) {
-        capabilities.setType(ValueType.DOUBLE);
-        this.type = typeInfo;
-      } else {
-        capabilities.setType(ValueType.COMPLEX);
-        this.type = ComplexMetrics.getSerdeForType(typeInfo).getTypeName();
-      }
-    }
-
-    public int getIndex()
-    {
-      return index;
-    }
-
-    public String getName()
-    {
-      return name;
-    }
-
-    public String getType()
-    {
-      return type;
-    }
-
-    public ColumnCapabilitiesImpl getCapabilities()
-    {
-      return capabilities;
-    }
-  }
-
   protected ColumnSelectorFactory makeColumnSelectorFactory(
       final AggregatorFactory agg,
       final Supplier<InputRow> in,
@@ -1173,7 +1083,7 @@ public int compare(IncrementalIndexRow lhs, IncrementalIndexRow rhs)
           return 1;
         }
 
-        final DimensionIndexer indexer = dimensionDescs.get(index).getIndexer();
+        final DimensionIndexer indexer = dimensionDescs.get(index).makeOrGetIndexer();
         retVal = indexer.compareUnsortedEncodedKeyComponents(lhsIdxs, rhsIdxs);
         ++index;
       }
diff --git a/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexAdapter.java b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexAdapter.java
index 4a119d9bfba..a9857894162 100644
--- a/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexAdapter.java
+++ b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexAdapter.java
@@ -21,6 +21,7 @@
 
 import org.apache.druid.collections.bitmap.BitmapFactory;
 import org.apache.druid.collections.bitmap.MutableBitmap;
+import org.apache.druid.segment.DimensionDesc;
 import org.apache.druid.segment.DimensionIndexer;
 import org.apache.druid.segment.IndexableAdapter;
 import org.apache.druid.segment.IntIteratorUtils;
@@ -33,6 +34,7 @@
 import org.joda.time.Interval;
 
 import javax.annotation.Nullable;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -47,14 +49,14 @@
 
   private static class DimensionAccessor
   {
-    private final IncrementalIndex.DimensionDesc dimensionDesc;
+    private final DimensionDesc dimensionDesc;
     private final MutableBitmap[] invertedIndexes;
     private final DimensionIndexer indexer;
 
-    public DimensionAccessor(IncrementalIndex.DimensionDesc dimensionDesc)
+    public DimensionAccessor(DimensionDesc dimensionDesc)
     {
       this.dimensionDesc = dimensionDesc;
-      this.indexer = dimensionDesc.getIndexer();
+      this.indexer = dimensionDesc.makeOrGetIndexer();
       if (dimensionDesc.getCapabilities().hasBitmapIndexes()) {
         this.invertedIndexes = new MutableBitmap[indexer.getCardinality() + 1];
       } else {
@@ -68,10 +70,10 @@ public IncrementalIndexAdapter(Interval dataInterval, IncrementalIndex<?> index,
     this.dataInterval = dataInterval;
     this.index = index;
 
-    final List<IncrementalIndex.DimensionDesc> dimensions = index.getDimensions();
+    final List<DimensionDesc> dimensions = index.getDimensions();
     accessors = dimensions
         .stream()
-        .collect(Collectors.toMap(IncrementalIndex.DimensionDesc::getName, DimensionAccessor::new));
+        .collect(Collectors.toMap(DimensionDesc::getName, DimensionAccessor::new));
 
     processRows(index, bitmapFactory, dimensions);
   }
@@ -89,14 +91,14 @@ public IncrementalIndexAdapter(Interval dataInterval, IncrementalIndex<?> index,
   private void processRows(
       IncrementalIndex<?> index,
       BitmapFactory bitmapFactory,
-      List<IncrementalIndex.DimensionDesc> dimensions
+      List<DimensionDesc> dimensions
   )
   {
     int rowNum = 0;
     for (IncrementalIndexRow row : index.getFacts().persistIterable()) {
       final Object[] dims = row.getDims();
 
-      for (IncrementalIndex.DimensionDesc dimension : dimensions) {
+      for (DimensionDesc dimension : dimensions) {
         final int dimIndex = dimension.getIndex();
         DimensionAccessor accessor = accessors.get(dimension.getName());
 
@@ -150,7 +152,7 @@ public int getNumRows()
       return null;
     }
 
-    final DimensionIndexer indexer = accessor.dimensionDesc.getIndexer();
+    final DimensionIndexer indexer = accessor.dimensionDesc.makeOrGetIndexer();
 
     return indexer.getSortedIndexedValues();
   }
@@ -169,7 +171,7 @@ public BitmapValues getBitmapValues(String dimension, int index)
       return BitmapValues.EMPTY;
     }
     ColumnCapabilities capabilities = accessor.dimensionDesc.getCapabilities();
-    DimensionIndexer indexer = accessor.dimensionDesc.getIndexer();
+    DimensionIndexer indexer = accessor.dimensionDesc.makeOrGetIndexer();
 
     if (!capabilities.hasBitmapIndexes()) {
       return BitmapValues.EMPTY;
@@ -228,4 +230,10 @@ public Metadata getMetadata()
   {
     return index.getMetadata();
   }
+
+  @Override
+  public void close() throws IOException
+  {
+    index.close();
+  }
 }
diff --git a/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexColumnSelectorFactory.java b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexColumnSelectorFactory.java
index bffceb1f17d..f2ee3c489ed 100644
--- a/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexColumnSelectorFactory.java
+++ b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexColumnSelectorFactory.java
@@ -23,6 +23,7 @@
 import org.apache.druid.query.extraction.ExtractionFn;
 import org.apache.druid.segment.ColumnSelectorFactory;
 import org.apache.druid.segment.ColumnValueSelector;
+import org.apache.druid.segment.DimensionDesc;
 import org.apache.druid.segment.DimensionIndexer;
 import org.apache.druid.segment.DimensionSelector;
 import org.apache.druid.segment.DimensionSelectorUtils;
@@ -76,7 +77,7 @@ private DimensionSelector makeDimensionSelectorUndecorated(DimensionSpec dimensi
       return new SingleScanTimeDimSelector(makeColumnValueSelector(dimension), extractionFn, descending);
     }
 
-    final IncrementalIndex.DimensionDesc dimensionDesc = index.getDimension(dimensionSpec.getDimension());
+    final DimensionDesc dimensionDesc = index.getDimension(dimensionSpec.getDimension());
     if (dimensionDesc == null) {
       // not a dimension, column may be a metric
       ColumnCapabilities capabilities = getColumnCapabilities(dimension);
@@ -93,7 +94,7 @@ private DimensionSelector makeDimensionSelectorUndecorated(DimensionSpec dimensi
       // if we can't wrap the base column, just return a column of all nulls
       return DimensionSelectorUtils.constantSelector(null, extractionFn);
     } else {
-      final DimensionIndexer indexer = dimensionDesc.getIndexer();
+      final DimensionIndexer indexer = dimensionDesc.makeOrGetIndexer();
       return indexer.makeDimensionSelector(dimensionSpec, rowHolder, dimensionDesc);
     }
   }
@@ -111,8 +112,8 @@ private DimensionSelector makeDimensionSelectorUndecorated(DimensionSpec dimensi
 
     final Integer dimIndex = index.getDimensionIndex(columnName);
     if (dimIndex != null) {
-      final IncrementalIndex.DimensionDesc dimensionDesc = index.getDimension(columnName);
-      final DimensionIndexer indexer = dimensionDesc.getIndexer();
+      final DimensionDesc dimensionDesc = index.getDimension(columnName);
+      final DimensionIndexer indexer = dimensionDesc.makeOrGetIndexer();
       return indexer.makeColumnValueSelector(rowHolder, dimensionDesc);
     }
 
diff --git a/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRow.java b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRow.java
index 5c4d7b613ec..39bb6fda023 100644
--- a/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRow.java
+++ b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRow.java
@@ -22,6 +22,7 @@
 import com.google.common.base.Function;
 import com.google.common.collect.Lists;
 import org.apache.druid.java.util.common.DateTimes;
+import org.apache.druid.segment.DimensionDesc;
 import org.apache.druid.segment.DimensionIndexer;
 
 import javax.annotation.Nullable;
@@ -36,7 +37,7 @@
 
   final long timestamp;
   final Object[] dims;
-  private final List<IncrementalIndex.DimensionDesc> dimensionDescsList;
+  private final List<DimensionDesc> dimensionDescsList;
 
   /**
    * rowIndex is not checked in {@link #equals} and {@link #hashCode} on purpose. IncrementalIndexRow acts as a Map key
@@ -50,7 +51,7 @@
   IncrementalIndexRow(
       long timestamp,
       Object[] dims,
-      List<IncrementalIndex.DimensionDesc> dimensionDescsList
+      List<DimensionDesc> dimensionDescsList
   )
   {
     this(timestamp, dims, dimensionDescsList, EMPTY_ROW_INDEX);
@@ -59,7 +60,7 @@
   IncrementalIndexRow(
       long timestamp,
       Object[] dims,
-      List<IncrementalIndex.DimensionDesc> dimensionDescsList,
+      List<DimensionDesc> dimensionDescsList,
       int rowIndex
   )
   {
@@ -72,7 +73,7 @@
   private IncrementalIndexRow(
       long timestamp,
       Object[] dims,
-      List<IncrementalIndex.DimensionDesc> dimensionDescsList,
+      List<DimensionDesc> dimensionDescsList,
       long dimsKeySize
   )
   {
@@ -85,7 +86,7 @@ private IncrementalIndexRow(
   static IncrementalIndexRow createTimeAndDimswithDimsKeySize(
       long timestamp,
       Object[] dims,
-      List<IncrementalIndex.DimensionDesc> dimensionDescsList,
+      List<DimensionDesc> dimensionDescsList,
       long dimsKeySize
   )
   {
@@ -170,7 +171,7 @@ public boolean equals(Object o)
       return false;
     }
     for (int i = 0; i < dims.length; i++) {
-      final DimensionIndexer indexer = dimensionDescsList.get(i).getIndexer();
+      final DimensionIndexer indexer = dimensionDescsList.get(i).makeOrGetIndexer();
       if (!indexer.checkUnsortedEncodedKeyComponentsEqual(dims[i], that.dims[i])) {
         return false;
       }
@@ -183,7 +184,7 @@ public int hashCode()
   {
     int hash = (int) timestamp;
     for (int i = 0; i < dims.length; i++) {
-      final DimensionIndexer indexer = dimensionDescsList.get(i).getIndexer();
+      final DimensionIndexer indexer = dimensionDescsList.get(i).makeOrGetIndexer();
       hash = 31 * hash + indexer.getUnsortedEncodedKeyComponentHashCode(dims[i]);
     }
     return hash;
diff --git a/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRowIterator.java b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRowIterator.java
index 627c63f2d8a..cd0b7fa707c 100644
--- a/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRowIterator.java
+++ b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexRowIterator.java
@@ -21,6 +21,7 @@
 
 import org.apache.druid.segment.ColumnSelectorFactory;
 import org.apache.druid.segment.ColumnValueSelector;
+import org.apache.druid.segment.DimensionDesc;
 import org.apache.druid.segment.DimensionHandler;
 import org.apache.druid.segment.IndexableAdapter;
 import org.apache.druid.segment.RowNumCounter;
@@ -70,13 +71,13 @@ private static RowPointer makeRowPointer(
         .stream()
         .map(dim -> {
           ColumnValueSelector selectorWithUnsortedValues = columnSelectorFactory.makeColumnValueSelector(dim.getName());
-          return dim.getIndexer().convertUnsortedValuesToSorted(selectorWithUnsortedValues);
+          return dim.makeOrGetIndexer().convertUnsortedValuesToSorted(selectorWithUnsortedValues);
         })
         .toArray(ColumnValueSelector[]::new);
     List<DimensionHandler> dimensionHandlers = incrementalIndex
         .getDimensions()
         .stream()
-        .map(IncrementalIndex.DimensionDesc::getHandler)
+        .map(DimensionDesc::getHandler)
         .collect(Collectors.toList());
     ColumnValueSelector[] metricSelectors = incrementalIndex
         .getMetricNames()
diff --git a/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexStorageAdapter.java b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexStorageAdapter.java
index 53cba0fcda3..5058739aedf 100644
--- a/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexStorageAdapter.java
+++ b/processing/src/main/java/org/apache/druid/segment/incremental/IncrementalIndexStorageAdapter.java
@@ -32,6 +32,7 @@
 import org.apache.druid.segment.Capabilities;
 import org.apache.druid.segment.ColumnSelectorFactory;
 import org.apache.druid.segment.Cursor;
+import org.apache.druid.segment.DimensionDesc;
 import org.apache.druid.segment.DimensionIndexer;
 import org.apache.druid.segment.Metadata;
 import org.apache.druid.segment.StorageAdapter;
@@ -89,12 +90,12 @@ public int getDimensionCardinality(String dimension)
       return Integer.MAX_VALUE;
     }
 
-    IncrementalIndex.DimensionDesc desc = index.getDimension(dimension);
+    DimensionDesc desc = index.getDimension(dimension);
     if (desc == null) {
       return 0;
     }
 
-    DimensionIndexer indexer = index.getDimension(dimension).getIndexer();
+    DimensionIndexer indexer = index.getDimension(dimension).makeOrGetIndexer();
     return indexer.getCardinality();
   }
 
@@ -120,12 +121,12 @@ public DateTime getMaxTime()
   @Override
   public Comparable getMinValue(String column)
   {
-    IncrementalIndex.DimensionDesc desc = index.getDimension(column);
+    DimensionDesc desc = index.getDimension(column);
     if (desc == null) {
       return null;
     }
 
-    DimensionIndexer indexer = desc.getIndexer();
+    DimensionIndexer indexer = desc.makeOrGetIndexer();
     return indexer.getMinValue();
   }
 
@@ -133,12 +134,12 @@ public Comparable getMinValue(String column)
   @Override
   public Comparable getMaxValue(String column)
   {
-    IncrementalIndex.DimensionDesc desc = index.getDimension(column);
+    DimensionDesc desc = index.getDimension(column);
     if (desc == null) {
       return null;
     }
 
-    DimensionIndexer indexer = desc.getIndexer();
+    DimensionIndexer indexer = desc.makeOrGetIndexer();
     return indexer.getMaxValue();
   }
 
diff --git a/processing/src/main/java/org/apache/druid/segment/selector/settable/SettableColumnValueSelector.java b/processing/src/main/java/org/apache/druid/segment/selector/settable/SettableColumnValueSelector.java
index 1aa2fc46edc..23a98020e5d 100644
--- a/processing/src/main/java/org/apache/druid/segment/selector/settable/SettableColumnValueSelector.java
+++ b/processing/src/main/java/org/apache/druid/segment/selector/settable/SettableColumnValueSelector.java
@@ -22,9 +22,6 @@
 import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector;
 import org.apache.druid.segment.ColumnValueSelector;
 
-/**
- * SettableColumnValueSelectors are used in {@link org.apache.druid.segment.QueryableIndexIndexableAdapter.RowIteratorImpl}.
- */
 public interface SettableColumnValueSelector<T> extends ColumnValueSelector<T>
 {
   void setValueFrom(ColumnValueSelector selector);
diff --git a/processing/src/test/java/org/apache/druid/segment/EmptyIndexTest.java b/processing/src/test/java/org/apache/druid/segment/EmptyIndexTest.java
index 42d8d34d522..17bd5621d2f 100644
--- a/processing/src/test/java/org/apache/druid/segment/EmptyIndexTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/EmptyIndexTest.java
@@ -21,6 +21,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import org.apache.commons.io.FileUtils;
 import org.apache.druid.collections.bitmap.ConciseBitmapFactory;
 import org.apache.druid.java.util.common.Intervals;
 import org.apache.druid.query.aggregation.AggregatorFactory;
@@ -30,7 +31,6 @@
 import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory;
 import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory;
 import org.apache.druid.segment.writeout.TmpFileSegmentWriteOutMediumFactory;
-import org.apache.commons.io.FileUtils;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/processing/src/test/java/org/apache/druid/segment/IndexBuilder.java b/processing/src/test/java/org/apache/druid/segment/IndexBuilder.java
index 26b89a6c3e7..a5775604d87 100644
--- a/processing/src/test/java/org/apache/druid/segment/IndexBuilder.java
+++ b/processing/src/test/java/org/apache/druid/segment/IndexBuilder.java
@@ -158,7 +158,7 @@ public QueryableIndex buildMMappedMergedIndex()
                     @Override
                     public IndexableAdapter apply(QueryableIndex input)
                     {
-                      return new QueryableIndexIndexableAdapter(input);
+                      return new QueryableIndexAdapter(input);
                     }
                   }
               ),
@@ -179,7 +179,7 @@ public AggregatorFactory apply(AggregatorFactory input)
               ),
               new File(tmpDir, StringUtils.format("testIndex-%s", UUID.randomUUID())),
               indexSpec
-          )
+          ).getFile()
       );
       for (QueryableIndex index : persisted) {
         index.close();
diff --git a/processing/src/test/java/org/apache/druid/segment/IndexMergerTestBase.java b/processing/src/test/java/org/apache/druid/segment/IndexMergerTestBase.java
index f6178958205..62da6578c16 100644
--- a/processing/src/test/java/org/apache/druid/segment/IndexMergerTestBase.java
+++ b/processing/src/test/java/org/apache/druid/segment/IndexMergerTestBase.java
@@ -26,6 +26,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
+import it.unimi.dsi.fastutil.ints.IntIterator;
 import org.apache.druid.collections.bitmap.RoaringBitmapFactory;
 import org.apache.druid.common.config.NullHandling;
 import org.apache.druid.data.input.InputRow;
@@ -58,7 +59,6 @@
 import org.apache.druid.segment.incremental.IncrementalIndexAdapter;
 import org.apache.druid.segment.incremental.IncrementalIndexSchema;
 import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory;
-import it.unimi.dsi.fastutil.ints.IntIterator;
 import org.joda.time.Interval;
 import org.junit.Assert;
 import org.junit.Rule;
@@ -215,7 +215,7 @@ public void testPersistWithDifferentDims() throws Exception
     Assert.assertEquals(3, index.getColumnNames().size());
     assertDimCompression(index, indexSpec.getDimensionCompression());
 
-    final QueryableIndexIndexableAdapter adapter = new QueryableIndexIndexableAdapter(index);
+    final QueryableIndexAdapter adapter = new QueryableIndexAdapter(index);
     final List<DebugRow> rowList = RowIteratorHelper.toList(adapter.getRows());
 
     Assert.assertEquals(2, rowList.size());
@@ -324,7 +324,7 @@ public void testPersistMerge() throws Exception
                 mergedDir,
                 indexSpec,
                 null
-            )
+            ).getFile()
         )
     );
 
@@ -389,7 +389,7 @@ public void testPersistEmptyColumn() throws Exception
                 tmpDir3,
                 indexSpec,
                 null
-            )
+            ).getFile()
         )
     );
 
@@ -428,7 +428,7 @@ public void testMergeRetainsValues() throws Exception
     );
 
 
-    final IndexableAdapter queryableAdapter = new QueryableIndexIndexableAdapter(index1);
+    final IndexableAdapter queryableAdapter = new QueryableIndexAdapter(index1);
 
     indexIO.validateTwoSegments(incrementalAdapter, queryableAdapter);
 
@@ -446,7 +446,7 @@ public void testMergeRetainsValues() throws Exception
                 mergedDir,
                 indexSpec,
                 null
-            )
+            ).getFile()
         )
     );
 
@@ -479,7 +479,7 @@ public void testAppendRetainsValues() throws Exception
     QueryableIndex index1 = closer.closeLater(
         indexIO.loadIndex(indexMerger.append(ImmutableList.of(incrementalAdapter), null, tempDir1, indexSpec, null))
     );
-    final IndexableAdapter queryableAdapter = new QueryableIndexIndexableAdapter(index1);
+    final IndexableAdapter queryableAdapter = new QueryableIndexAdapter(index1);
 
     indexIO.validateTwoSegments(incrementalAdapter, queryableAdapter);
 
@@ -502,7 +502,7 @@ public void testAppendRetainsValues() throws Exception
                 mergedDir,
                 indexSpec,
                 null
-            )
+            ).getFile()
         )
     );
 
@@ -542,7 +542,7 @@ public void testMergeSpecChange() throws Exception
     );
 
 
-    final IndexableAdapter queryableAdapter = new QueryableIndexIndexableAdapter(index1);
+    final IndexableAdapter queryableAdapter = new QueryableIndexAdapter(index1);
 
     indexIO.validateTwoSegments(incrementalAdapter, queryableAdapter);
 
@@ -573,7 +573,7 @@ public void testMergeSpecChange() throws Exception
                 mergedDir,
                 newSpec,
                 null
-            )
+            ).getFile()
         )
     );
 
@@ -616,7 +616,7 @@ public void testConvertSame() throws Exception
         indexIO.loadIndex(indexMerger.persist(toPersist1, tempDir1, indexSpec, null))
     );
 
-    final IndexableAdapter queryableAdapter = new QueryableIndexIndexableAdapter(index1);
+    final IndexableAdapter queryableAdapter = new QueryableIndexAdapter(index1);
 
     indexIO.validateTwoSegments(incrementalAdapter, queryableAdapter);
 
@@ -674,7 +674,7 @@ public void testConvertDifferent() throws Exception
     );
 
 
-    final IndexableAdapter queryableAdapter = new QueryableIndexIndexableAdapter(index1);
+    final IndexableAdapter queryableAdapter = new QueryableIndexAdapter(index1);
 
     indexIO.validateTwoSegments(incrementalAdapter, queryableAdapter);
 
@@ -786,11 +786,11 @@ public void testNonLexicographicDimOrderMerge() throws Exception
                 tmpDirMerged,
                 indexSpec,
                 null
-            )
+            ).getFile()
         )
     );
 
-    final QueryableIndexIndexableAdapter adapter = new QueryableIndexIndexableAdapter(merged);
+    final QueryableIndexAdapter adapter = new QueryableIndexAdapter(merged);
     final List<DebugRow> rowList = RowIteratorHelper.toList(adapter.getRows());
 
     Assert.assertEquals(Arrays.asList("d3", "d1", "d2"), ImmutableList.copyOf(adapter.getDimensionNames()));
@@ -879,11 +879,11 @@ public void testMergeWithDimensionsList() throws Exception
                 tmpDirMerged,
                 indexSpec,
                 null
-            )
+            ).getFile()
         )
     );
 
-    final QueryableIndexIndexableAdapter adapter = new QueryableIndexIndexableAdapter(merged);
+    final QueryableIndexAdapter adapter = new QueryableIndexAdapter(merged);
     final List<DebugRow> rowList = RowIteratorHelper.toList(adapter.getRows());
 
     Assert.assertEquals(ImmutableList.of("dimA", "dimC"), ImmutableList.copyOf(adapter.getDimensionNames()));
@@ -951,11 +951,11 @@ public void testDisjointDimMerge() throws Exception
                   tmpDirMerged,
                   indexSpec,
                   null
-              )
+              ).getFile()
           )
       );
 
-      final QueryableIndexIndexableAdapter adapter = new QueryableIndexIndexableAdapter(merged);
+      final QueryableIndexAdapter adapter = new QueryableIndexAdapter(merged);
       final List<DebugRow> rowList = RowIteratorHelper.toList(adapter.getRows());
 
       Assert.assertEquals(ImmutableList.of("dimA", "dimB"), ImmutableList.copyOf(adapter.getDimensionNames()));
@@ -1080,11 +1080,11 @@ public void testJointDimMerge() throws Exception
                   tmpDirMerged,
                   indexSpec,
                   null
-              )
+              ).getFile()
           )
       );
 
-      final QueryableIndexIndexableAdapter adapter = new QueryableIndexIndexableAdapter(merged);
+      final QueryableIndexAdapter adapter = new QueryableIndexAdapter(merged);
       final List<DebugRow> rowList = RowIteratorHelper.toList(adapter.getRows());
 
       if (NullHandling.replaceWithDefault()) {
@@ -1253,11 +1253,11 @@ public void testNoRollupMergeWithDuplicateRow() throws Exception
                 tmpDirMerged,
                 indexSpec,
                 null
-            )
+            ).getFile()
         )
     );
 
-    final QueryableIndexIndexableAdapter adapter = new QueryableIndexIndexableAdapter(merged);
+    final QueryableIndexAdapter adapter = new QueryableIndexAdapter(merged);
     final List<DebugRow> rowList = RowIteratorHelper.toList(adapter.getRows());
 
     if (NullHandling.replaceWithDefault()) {
@@ -1383,7 +1383,7 @@ public void testMergeWithSupersetOrdering() throws Exception
                 tmpDirMerged,
                 indexSpec,
                 null
-            )
+            ).getFile()
         )
     );
 
@@ -1396,17 +1396,17 @@ public void testMergeWithSupersetOrdering() throws Exception
                 tmpDirMerged2,
                 indexSpec,
                 null
-            )
+            ).getFile()
         )
     );
 
-    final QueryableIndexIndexableAdapter adapter = new QueryableIndexIndexableAdapter(merged);
+    final QueryableIndexAdapter adapter = new QueryableIndexAdapter(merged);
     final List<DebugRow> rowList = RowIteratorHelper.toList(adapter.getRows());
 
-    final QueryableIndexIndexableAdapter adapter2 = new QueryableIndexIndexableAdapter(merged2);
+    final QueryableIndexAdapter adapter2 = new QueryableIndexAdapter(merged2);
     final List<DebugRow> rowList2 = RowIteratorHelper.toList(adapter2.getRows());
 
-    Assert.assertEquals(ImmutableList.of("dimB", "dimA"), ImmutableList.copyOf(adapter.getDimensionNames()));
+    Assert.assertEquals(ImmutableSet.of("dimB", "dimA"), ImmutableSet.copyOf(adapter.getDimensionNames()));
     Assert.assertEquals(5, rowList.size());
 
     Assert.assertEquals(Arrays.asList(null, "1"), rowList.get(0).dimensionValues());
@@ -1575,7 +1575,7 @@ public void testAddMetrics() throws IOException
         new AggregatorFactory[]{new LongSumAggregatorFactory("A", "A"), new LongSumAggregatorFactory("C", "C")},
         tmpDirMerged,
         indexSpec
-    );
+    ).getFile();
     final QueryableIndexStorageAdapter adapter = new QueryableIndexStorageAdapter(closer.closeLater(indexIO.loadIndex(
         merged)));
     Assert.assertEquals(ImmutableSet.of("A", "C"), ImmutableSet.copyOf(adapter.getAvailableMetrics()));
@@ -1645,7 +1645,7 @@ public void testAddMetricsBothSidesNull() throws IOException
         },
         tmpDirMerged,
         indexSpec
-    );
+    ).getFile();
     final QueryableIndexStorageAdapter adapter = new QueryableIndexStorageAdapter(closer.closeLater(indexIO.loadIndex(
         merged)));
     Assert.assertEquals(ImmutableSet.of("A", "C"), ImmutableSet.copyOf(adapter.getAvailableMetrics()));
@@ -1708,7 +1708,7 @@ public void testMismatchedMetrics() throws IOException
         },
         tmpDirMerged,
         indexSpec
-    );
+    ).getFile();
 
     // Since D was not present in any of the indices, it is not present in the output
     final QueryableIndexStorageAdapter adapter = new QueryableIndexStorageAdapter(closer.closeLater(indexIO.loadIndex(
@@ -1752,7 +1752,7 @@ public void testMismatchedMetricsVarying() throws IOException
         },
         tmpDirMerged,
         indexSpec
-    );
+    ).getFile();
     final QueryableIndexStorageAdapter adapter = new QueryableIndexStorageAdapter(
         closer.closeLater(indexIO.loadIndex(merged))
     );
@@ -1786,11 +1786,11 @@ public void testMergeNumericDims() throws Exception
                 tmpDirMerged,
                 indexSpec,
                 null
-            )
+            ).getFile()
         )
     );
 
-    final IndexableAdapter adapter = new QueryableIndexIndexableAdapter(merged);
+    final IndexableAdapter adapter = new QueryableIndexAdapter(merged);
     final List<DebugRow> rowList = RowIteratorHelper.toList(adapter.getRows());
 
     Assert.assertEquals(ImmutableList.of("dimA", "dimB", "dimC"), ImmutableList.copyOf(adapter.getDimensionNames()));
@@ -2062,13 +2062,13 @@ public void testMultiValueHandling() throws Exception
 
     List<DimensionSchema> schema;
     QueryableIndex index;
-    QueryableIndexIndexableAdapter adapter;
+    QueryableIndexAdapter adapter;
     List<DebugRow> rowList;
 
     // xaab-axbx + abx-xab --> aabx-abxx + abx-abx --> abx-abx + aabx-abxx
     schema = makeDimensionSchemas(Arrays.asList("dim1", "dim2"), MultiValueHandling.SORTED_ARRAY);
     index = persistAndLoad(schema, rows);
-    adapter = new QueryableIndexIndexableAdapter(index);
+    adapter = new QueryableIndexAdapter(index);
     rowList = RowIteratorHelper.toList(adapter.getRows());
 
     Assert.assertEquals(2, index.getColumn(Column.TIME_COLUMN_NAME).getLength());
@@ -2107,7 +2107,7 @@ public void testMultiValueHandling() throws Exception
     Assert.assertEquals(Arrays.asList("dim1", "dim2"), Lists.newArrayList(index.getAvailableDimensions()));
     Assert.assertEquals(3, index.getColumnNames().size());
 
-    adapter = new QueryableIndexIndexableAdapter(index);
+    adapter = new QueryableIndexAdapter(index);
     rowList = RowIteratorHelper.toList(adapter.getRows());
 
     Assert.assertEquals(1, rowList.size());
@@ -2138,7 +2138,7 @@ public void testMultiValueHandling() throws Exception
     Assert.assertEquals(Arrays.asList("dim1", "dim2"), Lists.newArrayList(index.getAvailableDimensions()));
     Assert.assertEquals(3, index.getColumnNames().size());
 
-    adapter = new QueryableIndexIndexableAdapter(index);
+    adapter = new QueryableIndexAdapter(index);
     rowList = RowIteratorHelper.toList(adapter.getRows());
 
     Assert.assertEquals(2, rowList.size());
diff --git a/processing/src/test/java/org/apache/druid/segment/IndexMergerV9CompatibilityTest.java b/processing/src/test/java/org/apache/druid/segment/IndexMergerV9CompatibilityTest.java
index 75e5de2fada..3b53e2c283e 100644
--- a/processing/src/test/java/org/apache/druid/segment/IndexMergerV9CompatibilityTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/IndexMergerV9CompatibilityTest.java
@@ -195,7 +195,7 @@ public void testPersistWithSegmentMetadata() throws IOException
   @Test
   public void testSimpleReprocess() throws IOException
   {
-    final IndexableAdapter adapter = new QueryableIndexIndexableAdapter(
+    final IndexableAdapter adapter = new QueryableIndexAdapter(
         closer.closeLater(
             indexIO.loadIndex(
                 persistTmpDir
@@ -220,7 +220,7 @@ private File reprocessAndValidate(File inDir, File tmpDir) throws IOException
   @Test
   public void testIdempotentReprocess() throws IOException
   {
-    final IndexableAdapter adapter = new QueryableIndexIndexableAdapter(
+    final IndexableAdapter adapter = new QueryableIndexAdapter(
         closer.closeLater(
             indexIO.loadIndex(
                 persistTmpDir
@@ -232,12 +232,12 @@ public void testIdempotentReprocess() throws IOException
     reprocessAndValidate(persistTmpDir, tmpDir1);
 
     final File tmpDir2 = new File(tmpDir, "reprocessed2");
-    final IndexableAdapter adapter2 = new QueryableIndexIndexableAdapter(closer.closeLater(indexIO.loadIndex(tmpDir1)));
+    final IndexableAdapter adapter2 = new QueryableIndexAdapter(closer.closeLater(indexIO.loadIndex(tmpDir1)));
     Assert.assertEquals(events.size(), adapter2.getNumRows());
     reprocessAndValidate(tmpDir1, tmpDir2);
 
     final File tmpDir3 = new File(tmpDir, "reprocessed3");
-    final IndexableAdapter adapter3 = new QueryableIndexIndexableAdapter(closer.closeLater(indexIO.loadIndex(tmpDir2)));
+    final IndexableAdapter adapter3 = new QueryableIndexAdapter(closer.closeLater(indexIO.loadIndex(tmpDir2)));
     Assert.assertEquals(events.size(), adapter3.getNumRows());
     reprocessAndValidate(tmpDir2, tmpDir3);
   }
diff --git a/processing/src/test/java/org/apache/druid/segment/IndexMergerV9WithSpatialIndexTest.java b/processing/src/test/java/org/apache/druid/segment/IndexMergerV9WithSpatialIndexTest.java
index bd5d144735e..40851c371db 100644
--- a/processing/src/test/java/org/apache/druid/segment/IndexMergerV9WithSpatialIndexTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/IndexMergerV9WithSpatialIndexTest.java
@@ -23,6 +23,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import org.apache.commons.io.FileUtils;
 import org.apache.druid.collections.spatial.search.RadiusBound;
 import org.apache.druid.collections.spatial.search.RectangularBound;
 import org.apache.druid.data.input.MapBasedInputRow;
@@ -31,7 +32,6 @@
 import org.apache.druid.java.util.common.DateTimes;
 import org.apache.druid.java.util.common.Intervals;
 import org.apache.druid.java.util.common.granularity.Granularities;
-import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory;
 import org.apache.druid.query.Druids;
 import org.apache.druid.query.FinalizeResultsQueryRunner;
 import org.apache.druid.query.QueryPlus;
@@ -49,7 +49,7 @@
 import org.apache.druid.query.timeseries.TimeseriesResultValue;
 import org.apache.druid.segment.incremental.IncrementalIndex;
 import org.apache.druid.segment.incremental.IncrementalIndexSchema;
-import org.apache.commons.io.FileUtils;
+import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory;
 import org.joda.time.Interval;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -514,7 +514,7 @@ private static QueryableIndex makeMergedQueryableIndex(
                 mergedFile,
                 indexSpec,
                 null
-            )
+            ).getFile()
         );
         return mergedRealtime;
 
diff --git a/processing/src/test/java/org/apache/druid/segment/QueryableIndexIndexableAdapterTest.java b/processing/src/test/java/org/apache/druid/segment/QueryableIndexAdapterTest.java
similarity index 94%
rename from processing/src/test/java/org/apache/druid/segment/QueryableIndexIndexableAdapterTest.java
rename to processing/src/test/java/org/apache/druid/segment/QueryableIndexAdapterTest.java
index f333d39809d..91c1e86a942 100644
--- a/processing/src/test/java/org/apache/druid/segment/QueryableIndexIndexableAdapterTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/QueryableIndexAdapterTest.java
@@ -40,7 +40,7 @@
 import java.util.Collection;
 
 @RunWith(Parameterized.class)
-public class QueryableIndexIndexableAdapterTest
+public class QueryableIndexAdapterTest
 {
   private static final IndexSpec INDEX_SPEC = IndexMergerTestBase.makeIndexSpec(
       new ConciseBitmapSerdeFactory(),
@@ -67,7 +67,7 @@
   private final IndexMerger indexMerger;
   private final IndexIO indexIO;
 
-  public QueryableIndexIndexableAdapterTest(SegmentWriteOutMediumFactory segmentWriteOutMediumFactory)
+  public QueryableIndexAdapterTest(SegmentWriteOutMediumFactory segmentWriteOutMediumFactory)
   {
     indexMerger = TestHelper.getTestIndexMergerV9(segmentWriteOutMediumFactory);
     indexIO = TestHelper.getTestIndexIO(segmentWriteOutMediumFactory);
@@ -92,7 +92,7 @@ public void testGetBitmapIndex() throws Exception
         )
     );
 
-    IndexableAdapter adapter = new QueryableIndexIndexableAdapter(index);
+    IndexableAdapter adapter = new QueryableIndexAdapter(index);
     String dimension = "dim1";
     @SuppressWarnings("UnusedAssignment") //null is added to all dimensions with value
     BitmapValues bitmapValues = adapter.getBitmapValues(dimension, 0);
diff --git a/processing/src/test/java/org/apache/druid/segment/SchemalessIndexTest.java b/processing/src/test/java/org/apache/druid/segment/SchemalessIndexTest.java
index 48920262393..f91bc73ad19 100644
--- a/processing/src/test/java/org/apache/druid/segment/SchemalessIndexTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/SchemalessIndexTest.java
@@ -221,7 +221,7 @@ public QueryableIndex getMergedIncrementalIndex()
                 mergedFile,
                 indexSpec,
                 null
-            )
+            ).getFile()
         );
 
         return mergedIndex;
@@ -268,7 +268,7 @@ public QueryableIndex getMergedIncrementalIndex(int index1, int index2)
                 mergedFile,
                 indexSpec,
                 null
-            )
+            ).getFile()
         );
 
         entry.put(index2, index);
@@ -303,7 +303,7 @@ public QueryableIndex getMergedIncrementalIndex(int[] indexes)
         }
 
         return indexIO.loadIndex(
-            indexMerger.mergeQueryableIndex(indexesToMerge, true, METRIC_AGGS, mergedFile, indexSpec, null)
+            indexMerger.mergeQueryableIndex(indexesToMerge, true, METRIC_AGGS, mergedFile, indexSpec, null).getFile()
         );
       }
       catch (IOException e) {
@@ -506,7 +506,7 @@ public IndexableAdapter apply(PartitionChunk<File> chunk)
                             {
                               try {
                                 return new RowFilteringIndexAdapter(
-                                    new QueryableIndexIndexableAdapter(indexIO.loadIndex(chunk.getObject())),
+                                    new QueryableIndexAdapter(indexIO.loadIndex(chunk.getObject())),
                                     rowPointer -> timelineObjectHolder.getInterval().contains(rowPointer.getTimestamp())
                                 );
                               }
@@ -565,7 +565,7 @@ public QueryableIndex apply(@Nullable File input)
               mergedFile,
               indexSpec,
               null
-          )
+          ).getFile()
       );
     }
     catch (IOException e) {
diff --git a/processing/src/test/java/org/apache/druid/segment/TestIndex.java b/processing/src/test/java/org/apache/druid/segment/TestIndex.java
index 201354a430b..7f7abc6ed26 100644
--- a/processing/src/test/java/org/apache/druid/segment/TestIndex.java
+++ b/processing/src/test/java/org/apache/druid/segment/TestIndex.java
@@ -238,7 +238,7 @@ public static QueryableIndex mergedRealtimeIndex()
                 mergedFile,
                 indexSpec,
                 null
-            )
+            ).getFile()
         );
 
         return mergedRealtime;
diff --git a/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterBonusTest.java b/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterBonusTest.java
index 88840a4494b..e36a17d9e51 100644
--- a/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterBonusTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterBonusTest.java
@@ -32,7 +32,6 @@
 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;
-import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory;
 import org.apache.druid.query.Druids;
 import org.apache.druid.query.FinalizeResultsQueryRunner;
 import org.apache.druid.query.QueryPlus;
@@ -59,6 +58,7 @@
 import org.apache.druid.segment.TestHelper;
 import org.apache.druid.segment.incremental.IncrementalIndex;
 import org.apache.druid.segment.incremental.IncrementalIndexSchema;
+import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory;
 import org.joda.time.Interval;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -463,7 +463,7 @@ private static QueryableIndex makeMergedQueryableIndex(
               mergedFile,
               indexSpec,
               null
-          )
+          ).getFile()
       );
 
       return mergedRealtime;
diff --git a/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterTest.java b/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterTest.java
index 14bbe8974cb..f51aa8f5613 100644
--- a/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterTest.java
+++ b/processing/src/test/java/org/apache/druid/segment/filter/SpatialFilterTest.java
@@ -31,7 +31,6 @@
 import org.apache.druid.java.util.common.DateTimes;
 import org.apache.druid.java.util.common.Intervals;
 import org.apache.druid.java.util.common.granularity.Granularities;
-import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory;
 import org.apache.druid.query.Druids;
 import org.apache.druid.query.FinalizeResultsQueryRunner;
 import org.apache.druid.query.QueryPlus;
@@ -57,6 +56,7 @@
 import org.apache.druid.segment.TestHelper;
 import org.apache.druid.segment.incremental.IncrementalIndex;
 import org.apache.druid.segment.incremental.IncrementalIndexSchema;
+import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory;
 import org.joda.time.Interval;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -512,7 +512,7 @@ private static QueryableIndex makeMergedQueryableIndex(IndexSpec indexSpec)
               mergedFile,
               indexSpec,
               null
-          )
+          ).getFile()
       );
 
       return mergedRealtime;
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 42c8af9065e..246b1da3101 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
@@ -42,7 +42,6 @@
  */
 public class RealtimeTuningConfig implements TuningConfig, AppenderatorConfig
 {
-  private static final int defaultMaxRowsInMemory = TuningConfig.DEFAULT_MAX_ROWS_IN_MEMORY;
   private static final Period defaultIntermediatePersistPeriod = new Period("PT10M");
   private static final Period defaultWindowPeriod = new Period("PT10M");
   private static final VersioningPolicy defaultVersioningPolicy = new IntervalStartVersioningPolicy();
@@ -72,7 +71,7 @@ private static File createNewBasePersistDirectory()
   public static RealtimeTuningConfig makeDefaultTuningConfig(final @Nullable File basePersistDirectory)
   {
     return new RealtimeTuningConfig(
-        defaultMaxRowsInMemory,
+        TuningConfig.DEFAULT_MAX_ROWS_IN_MEMORY,
         0L,
         defaultIntermediatePersistPeriod,
         defaultWindowPeriod,
@@ -136,7 +135,7 @@ public RealtimeTuningConfig(
       @JsonProperty("dedupColumn") @Nullable String dedupColumn
   )
   {
-    this.maxRowsInMemory = maxRowsInMemory == null ? defaultMaxRowsInMemory : maxRowsInMemory;
+    this.maxRowsInMemory = maxRowsInMemory == null ? TuningConfig.DEFAULT_MAX_ROWS_IN_MEMORY : maxRowsInMemory;
     // initializing this to 0, it will be lazily initialized to a value
     // @see server.src.main.java.org.apache.druid.segment.indexing.TuningConfigs#getMaxBytesInMemoryOrDefault(long)
     this.maxBytesInMemory = maxBytesInMemory == null ? 0 : maxBytesInMemory;
@@ -336,4 +335,151 @@ public RealtimeTuningConfig withBasePersistDirectory(File dir)
         dedupColumn
     );
   }
+
+  public static class Builder
+  {
+    private Integer maxRowsInMemory;
+    private Long maxBytesInMemory;
+    private Period intermediatePersistPeriod;
+    private Period windowPeriod;
+    private File basePersistDirectory;
+    private VersioningPolicy versioningPolicy;
+    private RejectionPolicyFactory rejectionPolicyFactory;
+    private Integer maxPendingPersists;
+    private ShardSpec shardSpec;
+    private IndexSpec indexSpec;
+    private int persistThreadPriority;
+    private int mergeThreadPriority;
+    private Boolean reportParseExceptions;
+    private Long handoffConditionTimeout;
+    private Long alertTimeout;
+    private SegmentWriteOutMediumFactory segmentWriteOutMediumFactory;
+    private String dedupColumn;
+
+    public Builder setMaxRowsInMemory(int maxRowsInMemory)
+    {
+      this.maxRowsInMemory = maxRowsInMemory;
+      return this;
+    }
+
+    public Builder setMaxBytesInMemory(long maxBytesInMemory)
+    {
+      this.maxBytesInMemory = maxBytesInMemory;
+      return this;
+    }
+
+    public Builder setIntermediatePersistePeriod(Period intermediatePersistePeriod)
+    {
+      this.intermediatePersistPeriod = intermediatePersistePeriod;
+      return this;
+    }
+
+    public Builder setWindowPeriod(Period windowPeriod)
+    {
+      this.windowPeriod = windowPeriod;
+      return this;
+    }
+
+    public Builder setBasePersistDirectory(File basePersistDirectory)
+    {
+      this.basePersistDirectory = basePersistDirectory;
+      return this;
+    }
+
+    public Builder setVersioningPolicy(VersioningPolicy versioningPolicy)
+    {
+      this.versioningPolicy = versioningPolicy;
+      return this;
+    }
+
+    public Builder setRejectionPolicyFactory(RejectionPolicyFactory rejectionPolicyFactory)
+    {
+      this.rejectionPolicyFactory = rejectionPolicyFactory;
+      return this;
+    }
+
+    public Builder setMaxPendingPersists(int maxPendingPersists)
+    {
+      this.maxPendingPersists = maxPendingPersists;
+      return this;
+    }
+
+    public Builder setShardSpec(ShardSpec shardSpec)
+    {
+      this.shardSpec = shardSpec;
+      return this;
+    }
+
+    public Builder setIndexSpec(IndexSpec indexSpec)
+    {
+      this.indexSpec = indexSpec;
+      return this;
+    }
+
+    public Builder setPersistThreadPriority(int persistThreadPriority)
+    {
+      this.persistThreadPriority = persistThreadPriority;
+      return this;
+    }
+
+    public Builder setMergeThreadPriority(int mergeThreadPriority)
+    {
+      this.mergeThreadPriority = mergeThreadPriority;
+      return this;
+    }
+
+    public Builder setReportParseExceptions(boolean reportParseExceptions)
+    {
+      this.reportParseExceptions = reportParseExceptions;
+      return this;
+    }
+
+    public Builder setHandoffConditionTimeout(long handoffConditionTimeout)
+    {
+      this.handoffConditionTimeout = handoffConditionTimeout;
+      return this;
+    }
+
+    public Builder setAlertTimeout(long alertTimeout)
+    {
+      this.alertTimeout = alertTimeout;
+      return this;
+    }
+
+    public Builder setSegmentWriteOutMediumFactory(SegmentWriteOutMediumFactory factory)
+    {
+      this.segmentWriteOutMediumFactory = factory;
+      return this;
+    }
+
+    public Builder setDedupColumn(String dedupColumn)
+    {
+      this.dedupColumn = dedupColumn;
+      return this;
+    }
+
+    public RealtimeTuningConfig build()
+    {
+      return new RealtimeTuningConfig(
+          maxRowsInMemory,
+          maxBytesInMemory,
+          intermediatePersistPeriod,
+          windowPeriod,
+          basePersistDirectory,
+          versioningPolicy,
+          rejectionPolicyFactory,
+          maxPendingPersists,
+          shardSpec,
+          indexSpec,
+          true,
+          persistThreadPriority,
+          mergeThreadPriority,
+          reportParseExceptions,
+          handoffConditionTimeout,
+          alertTimeout,
+          segmentWriteOutMediumFactory,
+          dedupColumn
+      );
+    }
+  }
 }
diff --git a/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorConfig.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorConfig.java
index f09726ab60e..cefc421bc38 100644
--- a/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorConfig.java
+++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorConfig.java
@@ -19,8 +19,8 @@
 
 package org.apache.druid.segment.realtime.appenderator;
 
-import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory;
 import org.apache.druid.segment.IndexSpec;
+import org.apache.druid.segment.writeout.SegmentWriteOutMediumFactory;
 import org.joda.time.Period;
 
 import javax.annotation.Nullable;
diff --git a/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorImpl.java b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorImpl.java
index 808c8ff1dfb..2a3b951ef77 100644
--- a/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorImpl.java
+++ b/server/src/main/java/org/apache/druid/segment/realtime/appenderator/AppenderatorImpl.java
@@ -38,6 +38,7 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
+import org.apache.commons.io.FileUtils;
 import org.apache.druid.client.cache.Cache;
 import org.apache.druid.client.cache.CacheConfig;
 import org.apache.druid.client.cache.CachePopulatorStats;
@@ -63,6 +64,7 @@
 import org.apache.druid.segment.IndexIO;
 import org.apache.druid.segment.IndexMerger;
 import org.apache.druid.segment.IndexSpec;
+import org.apache.druid.segment.MergedIndexMetadata;
 import org.apache.druid.segment.QueryableIndex;
 import org.apache.druid.segment.QueryableIndexSegment;
 import org.apache.druid.segment.Segment;
@@ -77,7 +79,6 @@
 import org.apache.druid.server.coordination.DataSegmentAnnouncer;
 import org.apache.druid.timeline.DataSegment;
 import org.apache.druid.timeline.VersionedIntervalTimeline;
-import org.apache.commons.io.FileUtils;
 import org.joda.time.Interval;
 
 import javax.annotation.Nullable;
@@ -704,7 +705,7 @@ private DataSegment mergeAndPush(final SegmentIdentifier identifier, final Sink
         throw new ISE("Merged target[%s] exists after removing?!", mergedTarget);
       }
 
-      final File mergedFile;
+      final MergedIndexMetadata mergedIndexMetadata;
       List<QueryableIndex> indexes = Lists.newArrayList();
       Closer closer = Closer.create();
       try {
@@ -716,7 +717,7 @@ private DataSegment mergeAndPush(final SegmentIdentifier identifier, final Sink
           closer.register(segmentAndCloseable.rhs);
         }
 
-        mergedFile = indexMerger.mergeQueryableIndex(
+        mergedIndexMetadata = indexMerger.mergeQueryableIndex(
             indexes,
             schema.getGranularitySpec().isRollup(),
             schema.getAggregators(),
@@ -738,8 +739,8 @@ private DataSegment mergeAndPush(final SegmentIdentifier identifier, final Sink
           // Kafka indexing task, pushers must use unique file paths in deep storage in order to maintain exactly-once
           // semantics.
           () -> dataSegmentPusher.push(
-              mergedFile,
-              sink.getSegment().withDimensions(IndexMerger.getMergedDimensionsFromQueryableIndexes(indexes)),
+              mergedIndexMetadata.getFile(),
+              sink.getSegment().withDimensions(mergedIndexMetadata.getDimensions()),
               useUniquePath
           ),
           exception -> exception instanceof Exception,
diff --git a/server/src/main/java/org/apache/druid/segment/realtime/plumber/RealtimePlumber.java b/server/src/main/java/org/apache/druid/segment/realtime/plumber/RealtimePlumber.java
index 5d9e6222e20..f047bc62aee 100644
--- a/server/src/main/java/org/apache/druid/segment/realtime/plumber/RealtimePlumber.java
+++ b/server/src/main/java/org/apache/druid/segment/realtime/plumber/RealtimePlumber.java
@@ -30,6 +30,7 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.primitives.Ints;
+import org.apache.commons.io.FileUtils;
 import org.apache.druid.client.cache.Cache;
 import org.apache.druid.client.cache.CacheConfig;
 import org.apache.druid.client.cache.CachePopulatorStats;
@@ -58,6 +59,7 @@
 import org.apache.druid.segment.IndexIO;
 import org.apache.druid.segment.IndexMerger;
 import org.apache.druid.segment.IndexSpec;
+import org.apache.druid.segment.MergedIndexMetadata;
 import org.apache.druid.segment.Metadata;
 import org.apache.druid.segment.QueryableIndex;
 import org.apache.druid.segment.QueryableIndexSegment;
@@ -76,7 +78,6 @@
 import org.apache.druid.timeline.DataSegment;
 import org.apache.druid.timeline.VersionedIntervalTimeline;
 import org.apache.druid.timeline.partition.SingleElementPartitionChunk;
-import org.apache.commons.io.FileUtils;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
 import org.joda.time.Interval;
@@ -420,7 +421,7 @@ public void doRun()
               final long mergeThreadCpuTime = VMUtils.safeGetThreadCpuTime();
               mergeStopwatch = Stopwatch.createStarted();
 
-              final File mergedFile;
+              final MergedIndexMetadata mergedIndexMetadata;
               List<QueryableIndex> indexes = Lists.newArrayList();
               Closer closer = Closer.create();
               try {
@@ -432,7 +433,7 @@ public void doRun()
                   closer.register(segmentAndCloseable.rhs);
                 }
 
-                mergedFile = indexMerger.mergeQueryableIndex(
+                mergedIndexMetadata = indexMerger.mergeQueryableIndex(
                     indexes,
                     schema.getGranularitySpec().isRollup(),
                     schema.getAggregators(),
@@ -455,8 +456,8 @@ public void doRun()
               log.info("Pushing [%s] to deep storage", sink.getSegment().getIdentifier());
 
               DataSegment segment = dataSegmentPusher.push(
-                  mergedFile,
-                  sink.getSegment().withDimensions(IndexMerger.getMergedDimensionsFromQueryableIndexes(indexes)),
+                  mergedIndexMetadata.getFile(),
+                  sink.getSegment().withDimensions(mergedIndexMetadata.getDimensions()),
                   false
               );
               log.info("Inserting [%s] to the metadata store", sink.getSegment().getIdentifier());
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 e25b9113ed5..9d315264883 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
@@ -166,27 +166,16 @@ public Plumber findPlumber(
                 },
                 null
             ),
-
-            new RealtimeTuningConfig(
-                1,
-                null,
-                new Period("PT10M"),
-                null,
-                null,
-                null,
-                null,
-                1,
-                NoneShardSpec.instance(),
-                new IndexSpec(),
-                null,
-                0,
-                0,
-                true,
-                null,
-                null,
-                null,
-                null
-            )
+            new RealtimeTuningConfig.Builder()
+                .setMaxRowsInMemory(1)
+                .setIntermediatePersistePeriod(new Period("PT10M"))
+                .setMaxPendingPersists(1)
+                .setShardSpec(NoneShardSpec.instance())
+                .setIndexSpec(new IndexSpec())
+                .setPersistThreadPriority(0)
+                .setMergeThreadPriority(0)
+                .setReportParseExceptions(true)
+                .build()
         ),
         null
     );


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org