Fix rebase errors

Author: yonigottesman

benchmarks/src/main/java/org/apache/druid/benchmark/query/OakTopNBenchmark.java

@@ -141,7 +141,6 @@ public class OakTopNBenchmark
     JSON_MAPPER = new DefaultObjectMapper();
     INDEX_IO = new IndexIO(
         JSON_MAPPER,
-        OffHeapMemorySegmentWriteOutMediumFactory.instance(),
         new ColumnConfig()
         {
           @Override

processing/src/main/java/org/apache/druid/segment/incremental/ExternalDataIncrementalIndex.java

@@ -165,7 +165,7 @@ public Iterator<Row> iterator()
                 continue;
               }
               final DimensionIndexer indexer = dimensionDesc.getIndexer();
-              Object rowVals = indexer.convertUnsortedEncodedKeyComponentToActualArrayOrList(dim, DimensionIndexer.LIST);
+              Object rowVals = indexer.convertUnsortedEncodedKeyComponentToActualList(dim);
               theVals.put(dimensionName, rowVals);
             }
 

processing/src/main/java/org/apache/druid/segment/incremental/OakIncrementalIndex.java

@@ -160,7 +160,7 @@ public Row apply(Map.Entry<ByteBuffer, ByteBuffer> entry)
             continue;
           }
           final DimensionIndexer indexer = dimensionDesc.getIndexer();
-          Object rowVals = indexer.convertUnsortedEncodedKeyComponentToActualArrayOrList(dim, DimensionIndexer.LIST);
+          Object rowVals = indexer.convertUnsortedEncodedKeyComponentToActualList(dim);
           theVals.put(dimensionName, rowVals);
         }
 

processing/src/main/java/org/apache/druid/segment/incremental/OffheapAggsManager.java

@@ -83,7 +83,7 @@ protected BufferAggregator[] initAggs(
 
       selectors.put(
               agg.getName(),
-              new OnheapIncrementalIndex.ObjectCachingColumnSelectorFactory(columnSelectorFactory, concurrentEventAdd)
+              new OnheapIncrementalIndex.CachingColumnSelectorFactory(columnSelectorFactory, concurrentEventAdd)
       );
 
       if (i == 0) {

processing/src/main/java/org/apache/druid/segment/incremental/OnheapAggsManager.java

@@ -123,7 +123,7 @@ public Aggregator[] initAggs(
     for (AggregatorFactory agg : metrics) {
       selectors.put(
               agg.getName(),
-              new OnheapIncrementalIndex.ObjectCachingColumnSelectorFactory(
+              new OnheapIncrementalIndex.CachingColumnSelectorFactory(
                       makeColumnSelectorFactory(agg, rowSupplier, deserializeComplexMetrics),
                       concurrentEventAdd
               )