diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/FilteredAggregatorBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/FilteredAggregatorBenchmark.java index fab083118130..9c42bca4e44d 100644 --- a/benchmarks/src/test/java/org/apache/druid/benchmark/FilteredAggregatorBenchmark.java +++ b/benchmarks/src/test/java/org/apache/druid/benchmark/FilteredAggregatorBenchmark.java @@ -207,7 +207,7 @@ public static class IncrementalIndexState @Param({"onheap", "offheap"}) private String indexType; - IncrementalIndex incIndex; + IncrementalIndex incIndex; @Setup public void setup(FilteredAggregatorBenchmark global) throws JsonProcessingException @@ -237,7 +237,7 @@ public static class IncrementalIndexIngestState @Param({"onheap", "offheap"}) private String indexType; - IncrementalIndex incIndex; + IncrementalIndex incIndex; List inputRows; @Setup(Level.Invocation) @@ -273,7 +273,7 @@ public void setup(FilteredAggregatorBenchmark global) throws IOException { global.appendableIndexSpec = new OnheapIncrementalIndex.Spec(); - IncrementalIndex incIndex = global.makeIncIndex(global.schemaInfo.getAggsArray()); + IncrementalIndex incIndex = global.makeIncIndex(global.schemaInfo.getAggsArray()); global.generator.addToIndex(incIndex, global.rowsPerSegment); qIndexesDir = FileUtils.createTempDir(); @@ -302,7 +302,7 @@ public void tearDown() } } - private IncrementalIndex makeIncIndex(AggregatorFactory[] metrics) + private IncrementalIndex makeIncIndex(AggregatorFactory[] metrics) { return appendableIndexSpec.builder() .setSimpleTestingIndexSchema(metrics) diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/IncrementalIndexRowTypeBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/IncrementalIndexRowTypeBenchmark.java index 572d0cbb6e7c..9687a888d91c 100644 --- a/benchmarks/src/test/java/org/apache/druid/benchmark/IncrementalIndexRowTypeBenchmark.java +++ b/benchmarks/src/test/java/org/apache/druid/benchmark/IncrementalIndexRowTypeBenchmark.java @@ -63,7 +63,7 @@ public class IncrementalIndexRowTypeBenchmark private String indexType; private AppendableIndexSpec appendableIndexSpec; - IncrementalIndex incIndex; + IncrementalIndex incIndex; private static AggregatorFactory[] aggs; static final int DIMENSION_COUNT = 8; @@ -131,7 +131,7 @@ private MapBasedInputRow getStringRow(long timestamp, int dimensionCount) return new MapBasedInputRow(timestamp, dimensionList, builder.build()); } - private IncrementalIndex makeIncIndex() + private IncrementalIndex makeIncIndex() { return appendableIndexSpec.builder() .setSimpleTestingIndexSchema(aggs) diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/IncrementalIndexReadBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/IncrementalIndexReadBenchmark.java index c07c34f10d7e..bfc3c2975260 100644 --- a/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/IncrementalIndexReadBenchmark.java +++ b/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/IncrementalIndexReadBenchmark.java @@ -95,7 +95,7 @@ public class IncrementalIndexReadBenchmark } private AppendableIndexSpec appendableIndexSpec; - private IncrementalIndex incIndex; + private IncrementalIndex incIndex; private GeneratorSchemaInfo schemaInfo; @Setup @@ -130,7 +130,7 @@ public void tearDown() } } - private IncrementalIndex makeIncIndex() + private IncrementalIndex makeIncIndex() { return appendableIndexSpec.builder() .setIndexSchema( diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/IndexIngestionBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/IndexIngestionBenchmark.java index 33819ef4ad51..310f155432d7 100644 --- a/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/IndexIngestionBenchmark.java +++ b/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/IndexIngestionBenchmark.java @@ -79,7 +79,7 @@ public class IndexIngestionBenchmark } private AppendableIndexSpec appendableIndexSpec; - private IncrementalIndex incIndex; + private IncrementalIndex incIndex; private List rows; private GeneratorSchemaInfo schemaInfo; @@ -119,7 +119,7 @@ public void tearDown() } } - private IncrementalIndex makeIncIndex() + private IncrementalIndex makeIncIndex() { return appendableIndexSpec.builder() .setIndexSchema( diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/IndexMergeBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/IndexMergeBenchmark.java index 44be3cc386af..4bf9c12e4409 100644 --- a/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/IndexMergeBenchmark.java +++ b/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/IndexMergeBenchmark.java @@ -131,7 +131,7 @@ public void setup() throws IOException rowsPerSegment ); - IncrementalIndex incIndex = makeIncIndex(); + IncrementalIndex incIndex = makeIncIndex(); gen.addToIndex(incIndex, rowsPerSegment); diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/IndexPersistBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/IndexPersistBenchmark.java index 3679adaac7bd..9b91a70293e5 100644 --- a/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/IndexPersistBenchmark.java +++ b/benchmarks/src/test/java/org/apache/druid/benchmark/indexing/IndexPersistBenchmark.java @@ -97,7 +97,7 @@ public class IndexPersistBenchmark private String indexType; private AppendableIndexSpec appendableIndexSpec; - private IncrementalIndex incIndex; + private IncrementalIndex incIndex; private List rows; private GeneratorSchemaInfo schemaInfo; private File tmpDir; @@ -168,7 +168,7 @@ public void teardownTemp() throws IOException FileUtils.deleteDirectory(tmpDir); } - private IncrementalIndex makeIncIndex() + private IncrementalIndex makeIncIndex() { return appendableIndexSpec.builder() .setIndexSchema( diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/query/GroupByBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/query/GroupByBenchmark.java index 481bc4515997..6310dd499dbd 100644 --- a/benchmarks/src/test/java/org/apache/druid/benchmark/query/GroupByBenchmark.java +++ b/benchmarks/src/test/java/org/apache/druid/benchmark/query/GroupByBenchmark.java @@ -535,7 +535,7 @@ public static class IncrementalIndexState @Param({"onheap", "offheap"}) private String indexType; - IncrementalIndex incIndex; + IncrementalIndex incIndex; @Setup(Level.Trial) public void setup(GroupByBenchmark global) throws JsonProcessingException @@ -584,7 +584,7 @@ public void setup(GroupByBenchmark global) throws IOException for (int i = 0; i < numSegments; i++) { log.info("Generating rows for segment %d/%d", i + 1, numSegments); - final IncrementalIndex incIndex = global.makeIncIndex(global.schemaInfo.isWithRollup()); + final IncrementalIndex incIndex = global.makeIncIndex(global.schemaInfo.isWithRollup()); global.generator.reset(RNG_SEED + i).addToIndex(incIndex, global.rowsPerSegment); log.info( @@ -621,7 +621,7 @@ public void tearDown() } } - private IncrementalIndex makeIncIndex(boolean withRollup) + private IncrementalIndex makeIncIndex(boolean withRollup) { return appendableIndexSpec.builder() .setIndexSchema( diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/query/ScanBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/query/ScanBenchmark.java index 10c31b5cbe4b..b9ae2a40f662 100644 --- a/benchmarks/src/test/java/org/apache/druid/benchmark/query/ScanBenchmark.java +++ b/benchmarks/src/test/java/org/apache/druid/benchmark/query/ScanBenchmark.java @@ -284,7 +284,7 @@ public static class IncrementalIndexState @Param({"onheap", "offheap"}) private String indexType; - IncrementalIndex incIndex; + IncrementalIndex incIndex; @Setup public void setup(ScanBenchmark global) throws JsonProcessingException @@ -334,7 +334,7 @@ public void setup(ScanBenchmark global) throws IOException for (int i = 0; i < numSegments; i++) { log.info("Generating rows for segment " + i); - IncrementalIndex incIndex = global.makeIncIndex(); + IncrementalIndex incIndex = global.makeIncIndex(); global.generator.reset(RNG_SEED + i).addToIndex(incIndex, global.rowsPerSegment); File indexFile = INDEX_MERGER_V9.persist( @@ -363,7 +363,7 @@ public void tearDown() } } - private IncrementalIndex makeIncIndex() + private IncrementalIndex makeIncIndex() { return appendableIndexSpec.builder() .setSimpleTestingIndexSchema(schemaInfo.getAggsArray()) diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/query/SearchBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/query/SearchBenchmark.java index 2060591be6f7..a3de820c0682 100644 --- a/benchmarks/src/test/java/org/apache/druid/benchmark/query/SearchBenchmark.java +++ b/benchmarks/src/test/java/org/apache/druid/benchmark/query/SearchBenchmark.java @@ -354,7 +354,7 @@ public static class IncrementalIndexState @Param({"onheap", "offheap"}) private String indexType; - IncrementalIndex incIndex; + IncrementalIndex incIndex; @Setup public void setup(SearchBenchmark global) throws JsonProcessingException @@ -401,7 +401,7 @@ public void setup(SearchBenchmark global) throws IOException for (int i = 0; i < numSegments; i++) { log.info("Generating rows for segment " + i); - IncrementalIndex incIndex = global.makeIncIndex(); + IncrementalIndex incIndex = global.makeIncIndex(); global.generator.reset(RNG_SEED + i).addToIndex(incIndex, global.rowsPerSegment); File indexFile = INDEX_MERGER_V9.persist( @@ -430,7 +430,7 @@ public void tearDown() } } - private IncrementalIndex makeIncIndex() + private IncrementalIndex makeIncIndex() { return appendableIndexSpec.builder() .setSimpleTestingIndexSchema(schemaInfo.getAggsArray()) diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/query/TimeseriesBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/query/TimeseriesBenchmark.java index 98b3dd51fc9d..1f271e22274c 100644 --- a/benchmarks/src/test/java/org/apache/druid/benchmark/query/TimeseriesBenchmark.java +++ b/benchmarks/src/test/java/org/apache/druid/benchmark/query/TimeseriesBenchmark.java @@ -279,7 +279,7 @@ public static class IncrementalIndexState @Param({"onheap", "offheap"}) private String indexType; - IncrementalIndex incIndex; + IncrementalIndex incIndex; @Setup public void setup(TimeseriesBenchmark global) throws JsonProcessingException @@ -326,7 +326,7 @@ public void setup(TimeseriesBenchmark global) throws IOException for (int i = 0; i < numSegments; i++) { log.info("Generating rows for segment " + i); - IncrementalIndex incIndex = global.makeIncIndex(); + IncrementalIndex incIndex = global.makeIncIndex(); global.generator.reset(RNG_SEED + i).addToIndex(incIndex, global.rowsPerSegment); File indexFile = INDEX_MERGER_V9.persist( @@ -355,7 +355,7 @@ public void tearDown() } } - private IncrementalIndex makeIncIndex() + private IncrementalIndex makeIncIndex() { return appendableIndexSpec.builder() .setSimpleTestingIndexSchema(schemaInfo.getAggsArray()) diff --git a/benchmarks/src/test/java/org/apache/druid/benchmark/query/TopNBenchmark.java b/benchmarks/src/test/java/org/apache/druid/benchmark/query/TopNBenchmark.java index 6587024583f1..3eaf7dc85f48 100644 --- a/benchmarks/src/test/java/org/apache/druid/benchmark/query/TopNBenchmark.java +++ b/benchmarks/src/test/java/org/apache/druid/benchmark/query/TopNBenchmark.java @@ -257,7 +257,7 @@ public static class IncrementalIndexState @Param({"onheap", "offheap"}) private String indexType; - IncrementalIndex incIndex; + IncrementalIndex incIndex; @Setup public void setup(TopNBenchmark global) throws JsonProcessingException @@ -302,7 +302,7 @@ public void setup(TopNBenchmark global) throws IOException for (int i = 0; i < numSegments; i++) { log.info("Generating rows for segment " + i); - IncrementalIndex incIndex = global.makeIncIndex(); + IncrementalIndex incIndex = global.makeIncIndex(); global.generator.reset(RNG_SEED + i).addToIndex(incIndex, global.rowsPerSegment); File indexFile = INDEX_MERGER_V9.persist( @@ -331,7 +331,7 @@ public void tearDown() } } - private IncrementalIndex makeIncIndex() + private IncrementalIndex makeIncIndex() { return appendableIndexSpec.builder() .setSimpleTestingIndexSchema(schemaInfo.getAggsArray()) diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/sampler/InputSourceSampler.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/sampler/InputSourceSampler.java index 8ff872d50309..21685c4d7455 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/sampler/InputSourceSampler.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/sampler/InputSourceSampler.java @@ -39,7 +39,6 @@ import org.apache.druid.java.util.common.io.Closer; import org.apache.druid.java.util.common.parsers.CloseableIterator; import org.apache.druid.java.util.common.parsers.ParseException; -import org.apache.druid.query.aggregation.Aggregator; import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.query.aggregation.LongMinAggregatorFactory; import org.apache.druid.segment.column.ColumnHolder; @@ -114,7 +113,7 @@ public SamplerResponse sample( tempDir ); try (final CloseableIterator iterator = reader.sample(); - final IncrementalIndex index = buildIncrementalIndex(nonNullSamplerConfig, nonNullDataSchema); + final IncrementalIndex index = buildIncrementalIndex(nonNullSamplerConfig, nonNullDataSchema); final Closer closer1 = closer) { List responseRows = new ArrayList<>(nonNullSamplerConfig.getNumRows()); int numRowsIndexed = 0; @@ -226,7 +225,7 @@ private InputSourceReader buildReader( return dataSchema.getTransformSpec().decorate(reader); } - private IncrementalIndex buildIncrementalIndex(SamplerConfig samplerConfig, DataSchema dataSchema) + private IncrementalIndex buildIncrementalIndex(SamplerConfig samplerConfig, DataSchema dataSchema) { final IncrementalIndexSchema schema = new IncrementalIndexSchema.Builder() .withTimestampSpec(dataSchema.getTimestampSpec()) diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/input/DruidSegmentReaderTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/input/DruidSegmentReaderTest.java index 4e3e8b2bd378..a69890357987 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/input/DruidSegmentReaderTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/input/DruidSegmentReaderTest.java @@ -80,7 +80,7 @@ public class DruidSegmentReaderTest extends NullHandlingTest public void setUp() throws IOException { // Write a segment with two rows in it, with columns: s (string), d (double), cnt (long), met_s (complex). - final IncrementalIndex incrementalIndex = + final IncrementalIndex incrementalIndex = IndexBuilder.create() .schema( new IncrementalIndexSchema.Builder() diff --git a/processing/src/main/java/org/apache/druid/query/GroupByMergedQueryRunner.java b/processing/src/main/java/org/apache/druid/query/GroupByMergedQueryRunner.java index d79aad99ef67..26eca1340a69 100644 --- a/processing/src/main/java/org/apache/druid/query/GroupByMergedQueryRunner.java +++ b/processing/src/main/java/org/apache/druid/query/GroupByMergedQueryRunner.java @@ -167,7 +167,7 @@ public T apply(Row input) private void waitForFutureCompletion( GroupByQuery query, List> futures, - IncrementalIndex closeOnFailure + IncrementalIndex closeOnFailure ) { ListenableFuture> future = Futures.allAsList(futures); diff --git a/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryHelper.java b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryHelper.java index 8a7b05096c35..74380ee3daee 100644 --- a/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryHelper.java +++ b/processing/src/main/java/org/apache/druid/query/groupby/GroupByQueryHelper.java @@ -205,7 +205,7 @@ public static IncrementalIndex makeIncrementalIndex( } // Used by GroupByStrategyV1 - public static Sequence postAggregate(final GroupByQuery query, IncrementalIndex index) + public static Sequence postAggregate(final GroupByQuery query, IncrementalIndex index) { return Sequences.map( Sequences.simple(index.iterableWithPostAggregations(query.getPostAggregatorSpecs(), query.isDescending())), diff --git a/processing/src/main/java/org/apache/druid/segment/generator/DataGenerator.java b/processing/src/main/java/org/apache/druid/segment/generator/DataGenerator.java index f9aae18258c1..a78d8bbd7167 100644 --- a/processing/src/main/java/org/apache/druid/segment/generator/DataGenerator.java +++ b/processing/src/main/java/org/apache/druid/segment/generator/DataGenerator.java @@ -189,7 +189,7 @@ public InputRow get() * @param stream the stream of rows to add * @param index the index to add rows to */ - public static void addStreamToIndex(Stream stream, IncrementalIndex index) + public static void addStreamToIndex(Stream stream, IncrementalIndex index) { stream.forEachOrdered(row -> { try { @@ -207,7 +207,7 @@ public static void addStreamToIndex(Stream stream, IncrementalIndex * @param index the index to add rows to * @param numOfRows the number of rows to add */ - public void addToIndex(IncrementalIndex index, int numOfRows) + public void addToIndex(IncrementalIndex index, int numOfRows) { addStreamToIndex(generator(numOfRows), index); } 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 00677b1b10cf..0cfadf3ef718 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 @@ -33,7 +33,6 @@ import com.google.errorprone.annotations.concurrent.GuardedBy; import org.apache.druid.common.config.NullHandling; import org.apache.druid.data.input.InputRow; -import org.apache.druid.data.input.MapBasedRow; import org.apache.druid.data.input.Row; import org.apache.druid.data.input.impl.DimensionSchema; import org.apache.druid.data.input.impl.DimensionsSpec; @@ -98,7 +97,7 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.stream.Stream; -public abstract class IncrementalIndex extends AbstractIndex implements Iterable, Closeable +public abstract class IncrementalIndex extends AbstractIndex implements Iterable, Closeable { /** * Column selector used at ingestion time for inputs to aggregators. @@ -219,7 +218,6 @@ public ColumnCapabilities getColumnCapabilities(String columnName) private final List> rowTransformers; private final VirtualColumns virtualColumns; private final AggregatorFactory[] metrics; - private final AggregatorType[] aggs; private final boolean deserializeComplexMetrics; private final Metadata metadata; @@ -274,7 +272,7 @@ protected IncrementalIndex( this.rollup ); - this.aggs = initAggs(metrics, rowSupplier, deserializeComplexMetrics, concurrentEventAdd); + initAggs(metrics, rowSupplier, deserializeComplexMetrics, concurrentEventAdd); this.metricDescs = Maps.newLinkedHashMap(); for (AggregatorFactory metric : metrics) { @@ -328,7 +326,7 @@ protected IncrementalIndex( public abstract String getOutOfRowsReason(); - protected abstract AggregatorType[] initAggs( + protected abstract void initAggs( AggregatorFactory[] metrics, Supplier rowSupplier, boolean deserializeComplexMetrics, @@ -346,20 +344,6 @@ protected abstract AddToFactsResult addToFacts( public abstract int getLastRowIndex(); - protected abstract AggregatorType[] getAggsForRow(int rowOffset); - - /** - * Return the current aggregated value for a particular aggregator, row number, and aggregator number. - * - * Note: rowOffset and aggPosition are unused today, but may be used in the future by - * https://github.com/apache/druid/pull/10001. - */ - protected abstract Object getAggVal( - AggregatorType agg, - @SuppressWarnings("unused") int rowOffset, - @SuppressWarnings("unused") int aggPosition - ); - protected abstract float getMetricFloatValue(int rowOffset, int aggOffset); protected abstract long getMetricLongValue(int rowOffset, int aggOffset); @@ -701,12 +685,6 @@ private long getMaxTimeMillis() return getFacts().getMaxTimeMillis(); } - @SuppressWarnings("unused") // Unused today, but may be used in the future by https://github.com/apache/druid/pull/10001 - public AggregatorType[] getAggs() - { - return aggs; - } - public AggregatorFactory[] getMetricAggs() { return metrics; @@ -897,55 +875,10 @@ public Iterator iterator() return iterableWithPostAggregations(null, false).iterator(); } - public Iterable iterableWithPostAggregations( - @Nullable final List postAggs, - final boolean descending - ) - { - return () -> { - final List dimensions = getDimensions(); - - return Iterators.transform( - getFacts().iterator(descending), - incrementalIndexRow -> { - final int rowOffset = incrementalIndexRow.getRowIndex(); - - Object[] theDims = incrementalIndexRow.getDims(); - - Map theVals = Maps.newLinkedHashMap(); - for (int i = 0; i < theDims.length; ++i) { - Object dim = theDims[i]; - DimensionDesc dimensionDesc = dimensions.get(i); - if (dimensionDesc == null) { - continue; - } - String dimensionName = dimensionDesc.getName(); - DimensionHandler handler = dimensionDesc.getHandler(); - if (dim == null || handler.getLengthOfEncodedKeyComponent(dim) == 0) { - theVals.put(dimensionName, null); - continue; - } - final DimensionIndexer indexer = dimensionDesc.getIndexer(); - Object rowVals = indexer.convertUnsortedEncodedKeyComponentToActualList(dim); - theVals.put(dimensionName, rowVals); - } - - AggregatorType[] aggs = getAggsForRow(rowOffset); - for (int i = 0; i < aggs.length; ++i) { - theVals.put(metrics[i].getName(), getAggVal(aggs[i], rowOffset, i)); - } - - if (postAggs != null) { - for (PostAggregator postAgg : postAggs) { - theVals.put(postAgg.getName(), postAgg.compute(theVals)); - } - } - - return new MapBasedRow(incrementalIndexRow.getTimestamp(), theVals); - } - ); - }; - } + public abstract Iterable iterableWithPostAggregations( + @Nullable List postAggs, + boolean descending + ); public DateTime getMaxIngestedEventTime() { 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 b896c9ec9272..1c5a42da990f 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 @@ -42,7 +42,7 @@ public class IncrementalIndexAdapter implements IndexableAdapter { private final Interval dataInterval; - private final IncrementalIndex index; + private final IncrementalIndex index; private final Map accessors; private static class DimensionAccessor @@ -64,7 +64,7 @@ public DimensionAccessor(IncrementalIndex.DimensionDesc dimensionDesc) } } - public IncrementalIndexAdapter(Interval dataInterval, IncrementalIndex index, BitmapFactory bitmapFactory) + public IncrementalIndexAdapter(Interval dataInterval, IncrementalIndex index, BitmapFactory bitmapFactory) { this.dataInterval = dataInterval; this.index = index; @@ -88,7 +88,7 @@ public IncrementalIndexAdapter(Interval dataInterval, IncrementalIndex index, * a null value. */ private void processRows( - IncrementalIndex index, + IncrementalIndex index, BitmapFactory bitmapFactory, List dimensions ) 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 7f0b1dc0e9bc..7cab1e314edb 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 @@ -40,7 +40,7 @@ class IncrementalIndexColumnSelectorFactory implements ColumnSelectorFactory { private final IncrementalIndexStorageAdapter adapter; - private final IncrementalIndex index; + private final IncrementalIndex index; private final VirtualColumns virtualColumns; private final boolean descending; private final IncrementalIndexRowHolder rowHolder; 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 639b6abe1750..98ad5c75109f 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 @@ -48,7 +48,7 @@ class IncrementalIndexRowIterator implements TransformableRowIterator private final RowPointer currentRowPointer; private final TimeAndDimsPointer markedRowPointer; - IncrementalIndexRowIterator(IncrementalIndex incrementalIndex) + IncrementalIndexRowIterator(IncrementalIndex incrementalIndex) { this.timeAndDimsIterator = incrementalIndex.getFacts().persistIterable().iterator(); this.currentRowPointer = makeRowPointer(incrementalIndex, currentRowHolder, currentRowNumCounter); @@ -58,7 +58,7 @@ class IncrementalIndexRowIterator implements TransformableRowIterator } private static RowPointer makeRowPointer( - IncrementalIndex incrementalIndex, + IncrementalIndex incrementalIndex, IncrementalIndexRowHolder rowHolder, RowNumCounter rowNumCounter ) 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 0b8047eb19c7..864514722097 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 @@ -120,9 +120,9 @@ public boolean hasNulls() } }; - final IncrementalIndex index; + final IncrementalIndex index; - public IncrementalIndexStorageAdapter(IncrementalIndex index) + public IncrementalIndexStorageAdapter(IncrementalIndex index) { this.index = index; } diff --git a/processing/src/main/java/org/apache/druid/segment/incremental/OnheapIncrementalIndex.java b/processing/src/main/java/org/apache/druid/segment/incremental/OnheapIncrementalIndex.java index a72124a21533..8ebbeaf9a676 100644 --- a/processing/src/main/java/org/apache/druid/segment/incremental/OnheapIncrementalIndex.java +++ b/processing/src/main/java/org/apache/druid/segment/incremental/OnheapIncrementalIndex.java @@ -20,16 +20,23 @@ package org.apache.druid.segment.incremental; import com.google.common.base.Supplier; +import com.google.common.collect.Iterators; +import com.google.common.collect.Maps; import org.apache.druid.data.input.InputRow; +import org.apache.druid.data.input.MapBasedRow; +import org.apache.druid.data.input.Row; import org.apache.druid.java.util.common.StringUtils; import org.apache.druid.java.util.common.io.Closer; import org.apache.druid.java.util.common.logger.Logger; import org.apache.druid.java.util.common.parsers.ParseException; import org.apache.druid.query.aggregation.Aggregator; import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.query.aggregation.PostAggregator; import org.apache.druid.query.dimension.DimensionSpec; import org.apache.druid.segment.ColumnSelectorFactory; import org.apache.druid.segment.ColumnValueSelector; +import org.apache.druid.segment.DimensionHandler; +import org.apache.druid.segment.DimensionIndexer; import org.apache.druid.segment.DimensionSelector; import org.apache.druid.segment.column.ColumnCapabilities; import org.apache.druid.utils.JvmUtils; @@ -49,7 +56,7 @@ /** * */ -public class OnheapIncrementalIndex extends IncrementalIndex +public class OnheapIncrementalIndex extends IncrementalIndex { private static final Logger log = new Logger(OnheapIncrementalIndex.class); /** @@ -121,7 +128,7 @@ public FactsHolder getFacts() } @Override - protected Aggregator[] initAggs( + protected void initAggs( final AggregatorFactory[] metrics, final Supplier rowSupplier, final boolean deserializeComplexMetrics, @@ -138,8 +145,6 @@ protected Aggregator[] initAggs( ) ); } - - return new Aggregator[metrics.length]; } @Override @@ -327,18 +332,11 @@ public String getOutOfRowsReason() return outOfRowsReason; } - @Override protected Aggregator[] getAggsForRow(int rowOffset) { return concurrentGet(rowOffset); } - @Override - protected Object getAggVal(Aggregator agg, int rowOffset, int aggPosition) - { - return agg.get(); - } - @Override public float getMetricFloatValue(int rowOffset, int aggOffset) { @@ -369,6 +367,61 @@ public boolean isNull(int rowOffset, int aggOffset) return concurrentGet(rowOffset)[aggOffset].isNull(); } + @Override + public Iterable iterableWithPostAggregations( + @Nullable final List postAggs, + final boolean descending + ) + { + final AggregatorFactory[] metrics = getMetricAggs(); + + { + return () -> { + final List dimensions = getDimensions(); + + return Iterators.transform( + getFacts().iterator(descending), + incrementalIndexRow -> { + final int rowOffset = incrementalIndexRow.getRowIndex(); + + Object[] theDims = incrementalIndexRow.getDims(); + + Map theVals = Maps.newLinkedHashMap(); + for (int i = 0; i < theDims.length; ++i) { + Object dim = theDims[i]; + DimensionDesc dimensionDesc = dimensions.get(i); + if (dimensionDesc == null) { + continue; + } + String dimensionName = dimensionDesc.getName(); + DimensionHandler handler = dimensionDesc.getHandler(); + if (dim == null || handler.getLengthOfEncodedKeyComponent(dim) == 0) { + theVals.put(dimensionName, null); + continue; + } + final DimensionIndexer indexer = dimensionDesc.getIndexer(); + Object rowVals = indexer.convertUnsortedEncodedKeyComponentToActualList(dim); + theVals.put(dimensionName, rowVals); + } + + Aggregator[] aggs = getAggsForRow(rowOffset); + for (int i = 0; i < aggs.length; ++i) { + theVals.put(metrics[i].getName(), aggs[i].get()); + } + + if (postAggs != null) { + for (PostAggregator postAgg : postAggs) { + theVals.put(postAgg.getName(), postAgg.compute(theVals)); + } + } + + return new MapBasedRow(incrementalIndexRow.getTimestamp(), theVals); + } + ); + }; + } + } + /** * Clear out maps to allow GC * NOTE: This is NOT thread-safe with add... so make sure all the adding is DONE before closing diff --git a/processing/src/test/java/org/apache/druid/query/search/SearchQueryRunnerTest.java b/processing/src/test/java/org/apache/druid/query/search/SearchQueryRunnerTest.java index 6656d8caa399..f204a8fe2bca 100644 --- a/processing/src/test/java/org/apache/druid/query/search/SearchQueryRunnerTest.java +++ b/processing/src/test/java/org/apache/druid/query/search/SearchQueryRunnerTest.java @@ -36,7 +36,6 @@ import org.apache.druid.query.QueryRunnerFactory; import org.apache.druid.query.QueryRunnerTestHelper; import org.apache.druid.query.Result; -import org.apache.druid.query.aggregation.Aggregator; import org.apache.druid.query.context.ResponseContext; import org.apache.druid.query.dimension.DefaultDimensionSpec; import org.apache.druid.query.dimension.ExtractionDimensionSpec; @@ -720,7 +719,7 @@ public void testSearchOnFloatColumnWithExFn() @Test public void testSearchWithNullValueInDimension() throws Exception { - IncrementalIndex index = new OnheapIncrementalIndex.Builder() + IncrementalIndex index = new OnheapIncrementalIndex.Builder() .setIndexSchema( new IncrementalIndexSchema.Builder() .withMinTimestamp(DateTimes.of("2011-01-12T00:00:00.000Z").getMillis()) diff --git a/processing/src/test/java/org/apache/druid/segment/IndexIOTest.java b/processing/src/test/java/org/apache/druid/segment/IndexIOTest.java index 1911aa6bc5b2..c0b9f2d1e7d9 100644 --- a/processing/src/test/java/org/apache/druid/segment/IndexIOTest.java +++ b/processing/src/test/java/org/apache/druid/segment/IndexIOTest.java @@ -33,7 +33,6 @@ import org.apache.druid.jackson.DefaultObjectMapper; import org.apache.druid.java.util.common.Intervals; import org.apache.druid.java.util.common.UOE; -import org.apache.druid.query.aggregation.Aggregator; import org.apache.druid.query.aggregation.CountAggregatorFactory; import org.apache.druid.segment.data.CompressionFactory; import org.apache.druid.segment.data.CompressionStrategy; @@ -257,7 +256,7 @@ public IndexIOTest( this.exception = exception; } - final IncrementalIndex incrementalIndex1 = new OnheapIncrementalIndex.Builder() + final IncrementalIndex incrementalIndex1 = new OnheapIncrementalIndex.Builder() .setIndexSchema( new IncrementalIndexSchema.Builder() .withMinTimestamp(DEFAULT_INTERVAL.getStart().getMillis()) @@ -274,7 +273,7 @@ public IndexIOTest( .setMaxRowCount(1000000) .build(); - final IncrementalIndex incrementalIndex2 = new OnheapIncrementalIndex.Builder() + final IncrementalIndex incrementalIndex2 = new OnheapIncrementalIndex.Builder() .setIndexSchema( new IncrementalIndexSchema.Builder() .withMinTimestamp(DEFAULT_INTERVAL.getStart().getMillis()) diff --git a/processing/src/test/java/org/apache/druid/segment/data/IncrementalIndexTest.java b/processing/src/test/java/org/apache/druid/segment/data/IncrementalIndexTest.java index 9b5d2f3b1202..4a903d34255e 100644 --- a/processing/src/test/java/org/apache/druid/segment/data/IncrementalIndexTest.java +++ b/processing/src/test/java/org/apache/druid/segment/data/IncrementalIndexTest.java @@ -217,7 +217,7 @@ private static MapBasedInputRow getLongRow(long timestamp, int dimensionCount) public void testCaseSensitivity() throws Exception { long timestamp = System.currentTimeMillis(); - IncrementalIndex index = indexCreator.createIndex((Object) DEFAULT_AGGREGATOR_FACTORIES); + IncrementalIndex index = indexCreator.createIndex((Object) DEFAULT_AGGREGATOR_FACTORIES); populateIndex(timestamp, index); Assert.assertEquals(Arrays.asList("dim1", "dim2"), index.getDimensionNames()); @@ -239,7 +239,7 @@ public void testCaseSensitivity() throws Exception public void testFilteredAggregators() throws Exception { long timestamp = System.currentTimeMillis(); - IncrementalIndex index = indexCreator.createIndex((Object) new AggregatorFactory[]{ + IncrementalIndex index = indexCreator.createIndex((Object) new AggregatorFactory[]{ new CountAggregatorFactory("count"), new FilteredAggregatorFactory( new CountAggregatorFactory("count_selector_filtered"), @@ -333,7 +333,7 @@ public void testSingleThreadedIndexingAndQuery() throws Exception ); } - final IncrementalIndex index = indexCreator.createIndex( + final IncrementalIndex index = indexCreator.createIndex( (Object) ingestAggregatorFactories.toArray( new AggregatorFactory[0] ) @@ -446,7 +446,7 @@ public void testConcurrentAddRead() throws InterruptedException, ExecutionExcept } - final IncrementalIndex index = indexCreator.createIndex( + final IncrementalIndex index = indexCreator.createIndex( (Object) ingestAggregatorFactories.toArray(new AggregatorFactory[0]) ); final int concurrentThreads = 2; @@ -624,7 +624,7 @@ public Double[] accumulate(Double[] accumulated, Result i @Test public void testConcurrentAdd() throws Exception { - final IncrementalIndex index = indexCreator.createIndex((Object) DEFAULT_AGGREGATOR_FACTORIES); + final IncrementalIndex index = indexCreator.createIndex((Object) DEFAULT_AGGREGATOR_FACTORIES); final int threadCount = 10; final int elementsPerThread = 200; final int dimensionCount = 5; @@ -670,7 +670,7 @@ public void run() @Test public void testgetDimensions() { - final IncrementalIndex incrementalIndex = indexCreator.createIndex( + final IncrementalIndex incrementalIndex = indexCreator.createIndex( (builder, args) -> builder .setIndexSchema( new IncrementalIndexSchema.Builder() @@ -694,7 +694,7 @@ public void testgetDimensions() @Test public void testDynamicSchemaRollup() throws IndexSizeExceededException { - final IncrementalIndex index = indexCreator.createIndex( + final IncrementalIndex index = indexCreator.createIndex( (builder, args) -> builder .setSimpleTestingIndexSchema(/* empty */) .setMaxRowCount(10) diff --git a/processing/src/test/java/org/apache/druid/segment/generator/DataGeneratorTest.java b/processing/src/test/java/org/apache/druid/segment/generator/DataGeneratorTest.java index 0da7d87d8c7c..64bb672c01f5 100644 --- a/processing/src/test/java/org/apache/druid/segment/generator/DataGeneratorTest.java +++ b/processing/src/test/java/org/apache/druid/segment/generator/DataGeneratorTest.java @@ -658,7 +658,7 @@ public void testToIndex() .withRollup(false) .build(); - IncrementalIndex index = new OnheapIncrementalIndex.Builder() + IncrementalIndex index = new OnheapIncrementalIndex.Builder() .setIndexSchema(schema) .setSortFacts(false) .setMaxRowCount(1_000_000) diff --git a/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexAdapterTest.java b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexAdapterTest.java index e9c6139e3311..5200ada8ef31 100644 --- a/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexAdapterTest.java +++ b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexAdapterTest.java @@ -78,7 +78,7 @@ public static Collection constructorFeeder() public void testGetBitmapIndex() throws Exception { final long timestamp = System.currentTimeMillis(); - IncrementalIndex incrementalIndex = indexCreator.createIndex("rollup"); + IncrementalIndex incrementalIndex = indexCreator.createIndex("rollup"); IncrementalIndexTest.populateIndex(timestamp, incrementalIndex); IndexableAdapter adapter = new IncrementalIndexAdapter( incrementalIndex.getInterval(), @@ -98,7 +98,7 @@ public void testGetBitmapIndex() throws Exception public void testGetRowsIterable() throws Exception { final long timestamp = System.currentTimeMillis(); - IncrementalIndex toPersist1 = indexCreator.createIndex("rollup"); + IncrementalIndex toPersist1 = indexCreator.createIndex("rollup"); IncrementalIndexTest.populateIndex(timestamp, toPersist1); final IndexableAdapter incrementalAdapter = new IncrementalIndexAdapter( @@ -122,7 +122,7 @@ public void testGetRowsIterable() throws Exception public void testGetRowsIterableNoRollup() throws Exception { final long timestamp = System.currentTimeMillis(); - IncrementalIndex toPersist1 = indexCreator.createIndex("plain"); + IncrementalIndex toPersist1 = indexCreator.createIndex("plain"); IncrementalIndexTest.populateIndex(timestamp, toPersist1); IncrementalIndexTest.populateIndex(timestamp, toPersist1); IncrementalIndexTest.populateIndex(timestamp, toPersist1); diff --git a/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexCreator.java b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexCreator.java index d59794854aa1..4f7eb9b8317d 100644 --- a/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexCreator.java +++ b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexCreator.java @@ -94,7 +94,7 @@ public interface IndexCreator * @param args a list of arguments that are used to configure the builder * @return a new instance of an incremental-index */ - IncrementalIndex createIndex(AppendableIndexBuilder builder, Object... args); + IncrementalIndex createIndex(AppendableIndexBuilder builder, Object... args); } private final Closer closer = Closer.create(); @@ -147,7 +147,7 @@ public static AppendableIndexSpec parseIndexType(String indexType) throws JsonPr * @param args The arguments for the index-generator * @return An incremental-index instance */ - public final IncrementalIndex createIndex(Object... args) + public final IncrementalIndex createIndex(Object... args) { return createIndex(indexCreator, args); } @@ -158,7 +158,7 @@ public final IncrementalIndex createIndex(Object... args) * @param args The arguments for the index-generator * @return An incremental-index instance */ - public final IncrementalIndex createIndex(IndexCreator indexCreator, Object... args) + public final IncrementalIndex createIndex(IndexCreator indexCreator, Object... args) { return closer.register(indexCreator.createIndex(appendableIndexSpec.builder(), args)); } diff --git a/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexIngestionTest.java b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexIngestionTest.java index 5886f7ca4006..121f093b1a67 100644 --- a/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexIngestionTest.java +++ b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexIngestionTest.java @@ -74,7 +74,7 @@ public static Collection constructorFeeder() @Test public void testMultithreadAddFacts() throws Exception { - final IncrementalIndex index = indexCreator.createIndex(new IncrementalIndexSchema.Builder() + final IncrementalIndex index = indexCreator.createIndex(new IncrementalIndexSchema.Builder() .withQueryGranularity(Granularities.MINUTE) .withMetrics(new LongMaxAggregatorFactory("max", "max")) .build() @@ -134,7 +134,7 @@ public void run() @Test public void testMultithreadAddFactsUsingExpressionAndJavaScript() throws Exception { - final IncrementalIndex indexExpr = indexCreator.createIndex( + final IncrementalIndex indexExpr = indexCreator.createIndex( new IncrementalIndexSchema.Builder() .withQueryGranularity(Granularities.MINUTE) .withMetrics(new LongSumAggregatorFactory( @@ -147,7 +147,7 @@ public void testMultithreadAddFactsUsingExpressionAndJavaScript() throws Excepti .build() ); - final IncrementalIndex indexJs = indexCreator.createIndex( + final IncrementalIndex indexJs = indexCreator.createIndex( new IncrementalIndexSchema.Builder() .withQueryGranularity(Granularities.MINUTE) .withMetrics(new JavaScriptAggregatorFactory( @@ -222,7 +222,7 @@ public void testOnHeapIncrementalIndexClose() throws Exception mockedAggregator.close(); EasyMock.expectLastCall().times(1); - final IncrementalIndex genericIndex = indexCreator.createIndex( + final IncrementalIndex genericIndex = indexCreator.createIndex( new IncrementalIndexSchema.Builder() .withQueryGranularity(Granularities.MINUTE) .withMetrics(new LongMaxAggregatorFactory("max", "max")) diff --git a/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexMultiValueSpecTest.java b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexMultiValueSpecTest.java index 24aae3a67f63..a479aa465fb3 100644 --- a/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexMultiValueSpecTest.java +++ b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexMultiValueSpecTest.java @@ -105,7 +105,7 @@ public Object get(Object key) return null; } }; - IncrementalIndex index = indexCreator.createIndex(schema); + IncrementalIndex index = indexCreator.createIndex(schema); index.add( new MapBasedInputRow( 0, diff --git a/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexRowCompTest.java b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexRowCompTest.java index 166b332830ab..55191fd192b3 100644 --- a/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexRowCompTest.java +++ b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexRowCompTest.java @@ -66,7 +66,7 @@ public static Collection constructorFeeder() @Test public void testBasic() { - IncrementalIndex index = indexCreator.createIndex(); + IncrementalIndex index = indexCreator.createIndex(); long time = System.currentTimeMillis(); IncrementalIndexRow ir1 = index.toIncrementalIndexRow(toMapRow(time, "billy", "A", "joe", "B")).getIncrementalIndexRow(); diff --git a/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexRowSizeTest.java b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexRowSizeTest.java index cfd2e1a2bff6..ea448fdf8edf 100644 --- a/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexRowSizeTest.java +++ b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexRowSizeTest.java @@ -67,7 +67,7 @@ public static Collection constructorFeeder() @Test public void testIncrementalIndexRowSizeBasic() { - IncrementalIndex index = indexCreator.createIndex(); + IncrementalIndex index = indexCreator.createIndex(); long time = System.currentTimeMillis(); IncrementalIndex.IncrementalIndexRowResult tndResult = index.toIncrementalIndexRow(toMapRow( time, @@ -84,7 +84,7 @@ public void testIncrementalIndexRowSizeBasic() @Test public void testIncrementalIndexRowSizeArr() { - IncrementalIndex index = indexCreator.createIndex(); + IncrementalIndex index = indexCreator.createIndex(); long time = System.currentTimeMillis(); IncrementalIndex.IncrementalIndexRowResult tndResult = index.toIncrementalIndexRow(toMapRow( time + 1, @@ -101,7 +101,7 @@ public void testIncrementalIndexRowSizeArr() @Test public void testIncrementalIndexRowSizeComplex() { - IncrementalIndex index = indexCreator.createIndex(); + IncrementalIndex index = indexCreator.createIndex(); long time = System.currentTimeMillis(); IncrementalIndex.IncrementalIndexRowResult tndResult = index.toIncrementalIndexRow(toMapRow( time + 1, @@ -118,7 +118,7 @@ public void testIncrementalIndexRowSizeComplex() @Test public void testIncrementalIndexRowSizeEmptyString() { - IncrementalIndex index = indexCreator.createIndex(); + IncrementalIndex index = indexCreator.createIndex(); long time = System.currentTimeMillis(); IncrementalIndex.IncrementalIndexRowResult tndResult = index.toIncrementalIndexRow(toMapRow( time + 1, diff --git a/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexStorageAdapterTest.java b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexStorageAdapterTest.java index 6168719a5da2..20812e7b8884 100644 --- a/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexStorageAdapterTest.java +++ b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexStorageAdapterTest.java @@ -112,7 +112,7 @@ public static Collection constructorFeeder() @Test public void testSanity() throws Exception { - IncrementalIndex index = indexCreator.createIndex(); + IncrementalIndex index = indexCreator.createIndex(); index.add( new MapBasedInputRow( System.currentTimeMillis() - 1, @@ -176,7 +176,7 @@ public int getMaxIntermediateRows() @Test public void testObjectColumnSelectorOnVaryingColumnSchema() throws Exception { - IncrementalIndex index = indexCreator.createIndex(); + IncrementalIndex index = indexCreator.createIndex(); index.add( new MapBasedInputRow( DateTimes.of("2014-09-01T00:00:00"), @@ -258,7 +258,7 @@ public int getMaxIntermediateRows() public void testResetSanity() throws IOException { - IncrementalIndex index = indexCreator.createIndex(); + IncrementalIndex index = indexCreator.createIndex(); DateTime t = DateTimes.nowUtc(); Interval interval = new Interval(t.minusMinutes(1), t.plusMinutes(1)); @@ -318,7 +318,7 @@ public void testResetSanity() throws IOException @Test public void testSingleValueTopN() throws IOException { - IncrementalIndex index = indexCreator.createIndex(); + IncrementalIndex index = indexCreator.createIndex(); DateTime t = DateTimes.nowUtc(); index.add( new MapBasedInputRow( @@ -360,7 +360,7 @@ public void testSingleValueTopN() throws IOException @Test public void testFilterByNull() throws Exception { - IncrementalIndex index = indexCreator.createIndex(); + IncrementalIndex index = indexCreator.createIndex(); index.add( new MapBasedInputRow( System.currentTimeMillis() - 1, @@ -421,7 +421,7 @@ public int getMaxIntermediateRows() @Test public void testCursoringAndIndexUpdationInterleaving() throws Exception { - final IncrementalIndex index = indexCreator.createIndex(); + final IncrementalIndex index = indexCreator.createIndex(); final long timestamp = System.currentTimeMillis(); for (int i = 0; i < 2; i++) { @@ -485,7 +485,7 @@ public void testCursorDictionaryRaceConditionFix() throws Exception { // Tests the dictionary ID race condition bug described at https://github.com/apache/druid/pull/6340 - final IncrementalIndex index = indexCreator.createIndex(); + final IncrementalIndex index = indexCreator.createIndex(); final long timestamp = System.currentTimeMillis(); for (int i = 0; i < 5; i++) { @@ -536,7 +536,7 @@ public void testCursorDictionaryRaceConditionFix() throws Exception @Test public void testCursoringAndSnapshot() throws Exception { - final IncrementalIndex index = indexCreator.createIndex(); + final IncrementalIndex index = indexCreator.createIndex(); final long timestamp = System.currentTimeMillis(); for (int i = 0; i < 2; i++) { diff --git a/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexTest.java b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexTest.java index 4a6b38bf3033..e7b9886a5dd7 100644 --- a/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexTest.java +++ b/processing/src/test/java/org/apache/druid/segment/incremental/IncrementalIndexTest.java @@ -102,7 +102,7 @@ public static Collection constructorFeeder() @Test(expected = ISE.class) public void testDuplicateDimensions() throws IndexSizeExceededException { - IncrementalIndex index = indexCreator.createIndex(); + IncrementalIndex index = indexCreator.createIndex(); index.add( new MapBasedInputRow( System.currentTimeMillis() - 1, @@ -122,7 +122,7 @@ public void testDuplicateDimensions() throws IndexSizeExceededException @Test(expected = ISE.class) public void testDuplicateDimensionsFirstOccurrence() throws IndexSizeExceededException { - IncrementalIndex index = indexCreator.createIndex(); + IncrementalIndex index = indexCreator.createIndex(); index.add( new MapBasedInputRow( System.currentTimeMillis() - 1, @@ -135,7 +135,7 @@ public void testDuplicateDimensionsFirstOccurrence() throws IndexSizeExceededExc @Test public void controlTest() throws IndexSizeExceededException { - IncrementalIndex index = indexCreator.createIndex(); + IncrementalIndex index = indexCreator.createIndex(); index.add( new MapBasedInputRow( System.currentTimeMillis() - 1, @@ -162,7 +162,7 @@ public void controlTest() throws IndexSizeExceededException @Test public void testUnparseableNumerics() throws IndexSizeExceededException { - IncrementalIndex index = indexCreator.createIndex(); + IncrementalIndex index = indexCreator.createIndex(); IncrementalIndexAddResult result; result = index.add( @@ -228,7 +228,7 @@ public void sameRow() throws IndexSizeExceededException Lists.newArrayList("billy", "joe"), ImmutableMap.of("billy", "A", "joe", "B") ); - IncrementalIndex index = indexCreator.createIndex(); + IncrementalIndex index = indexCreator.createIndex(); index.add(row); index.add(row); index.add(row);