From 3b0e7becc86c33231c1bb27fe41505831fe0ccc0 Mon Sep 17 00:00:00 2001 From: Clint Wylie Date: Wed, 30 Aug 2023 22:49:58 -0700 Subject: [PATCH 1/5] refactor CompactionState since core and processing have been merged so now can refer to real types --- ...SegmentGeneratorFrameProcessorFactory.java | 2 + .../common/task/AbstractBatchIndexTask.java | 14 +-- .../task/CompactionTaskParallelRunTest.java | 85 +++++----------- .../common/task/CompactionTaskRunTest.java | 45 ++++----- .../druid/timeline/CompactionState.java | 29 +++--- .../druid/timeline/DataSegmentTest.java | 24 +++-- .../coordinator/compact/CompactionStatus.java | 10 +- .../compact/NewestSegmentFirstPolicyTest.java | 96 +++++++------------ .../coordinator/duty/CompactSegmentsTest.java | 39 ++------ .../sql/calcite/schema/SystemSchemaTest.java | 3 +- 10 files changed, 130 insertions(+), 217 deletions(-) diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/SegmentGeneratorFrameProcessorFactory.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/SegmentGeneratorFrameProcessorFactory.java index 998e04295579..59e6289e1857 100644 --- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/SegmentGeneratorFrameProcessorFactory.java +++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/processor/SegmentGeneratorFrameProcessorFactory.java @@ -49,6 +49,7 @@ import org.apache.druid.msq.kernel.StageDefinition; import org.apache.druid.msq.kernel.StagePartition; import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.column.StringEncodingStrategy; import org.apache.druid.segment.data.CompressionFactory; import org.apache.druid.segment.data.CompressionStrategy; import org.apache.druid.segment.incremental.AppendableIndexSpec; @@ -307,6 +308,7 @@ public IndexSpec getIndexSpecForIntermediatePersists() return IndexSpec.builder() // Dimensions don't support NONE, so use UNCOMPRESSED .withDimensionCompression(CompressionStrategy.UNCOMPRESSED) + .withStringDictionaryEncoding(new StringEncodingStrategy.Utf8()) // NONE is more efficient than UNCOMPRESSED .withMetricCompression(CompressionStrategy.NONE) .withLongEncoding(CompressionFactory.LongEncodingStrategy.LONGS) diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java index 11bcfb6de785..dadaab6f10c9 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java @@ -19,12 +19,10 @@ package org.apache.druid.indexing.common.task; -import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.errorprone.annotations.concurrent.GuardedBy; -import org.apache.druid.client.indexing.ClientCompactionTaskTransformSpec; import org.apache.druid.data.input.InputFormat; import org.apache.druid.data.input.InputRow; import org.apache.druid.data.input.InputSource; @@ -82,6 +80,7 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; @@ -524,19 +523,16 @@ public static Function, Set> compactionStateAnnota ? null : new DimensionsSpec(ingestionSpec.getDataSchema().getDimensionsSpec().getDimensions()); // We only need to store filter since that is the only field auto compaction support - Map transformSpec = ingestionSpec.getDataSchema().getTransformSpec() == null || TransformSpec.NONE.equals(ingestionSpec.getDataSchema().getTransformSpec()) + TransformSpec transformSpec = ingestionSpec.getDataSchema().getTransformSpec() == null || TransformSpec.NONE.equals(ingestionSpec.getDataSchema().getTransformSpec()) ? null - : new ClientCompactionTaskTransformSpec(ingestionSpec.getDataSchema().getTransformSpec().getFilter()).asMap(toolbox.getJsonMapper()); - List metricsSpec = ingestionSpec.getDataSchema().getAggregators() == null - ? null - : toolbox.getJsonMapper().convertValue(ingestionSpec.getDataSchema().getAggregators(), new TypeReference>() {}); + : ingestionSpec.getDataSchema().getTransformSpec(); final CompactionState compactionState = new CompactionState( tuningConfig.getPartitionsSpec(), dimensionsSpec, - metricsSpec, + Arrays.asList(ingestionSpec.getDataSchema().getAggregators()), transformSpec, - tuningConfig.getIndexSpec().asMap(toolbox.getJsonMapper()), + tuningConfig.getIndexSpec(), granularitySpec.asMap(toolbox.getJsonMapper()) ); return segments -> segments diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskParallelRunTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskParallelRunTest.java index b49a223e7189..91001aedadac 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskParallelRunTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskParallelRunTest.java @@ -62,6 +62,7 @@ import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; import org.apache.druid.segment.loading.NoopSegmentCacheManager; +import org.apache.druid.segment.transform.TransformSpec; import org.apache.druid.server.security.Action; import org.apache.druid.server.security.Resource; import org.apache.druid.server.security.ResourceAction; @@ -92,7 +93,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -172,17 +172,12 @@ public void testRunParallelWithDynamicPartitioningMatchCompactionState() throws lockGranularity == LockGranularity.TIME_CHUNK ? NumberedShardSpec.class : NumberedOverwriteShardSpec.class, segment.getShardSpec().getClass() ); - // Expect compaction state to exist as store compaction state by default - Map expectedLongSumMetric = new HashMap<>(); - expectedLongSumMetric.put("type", "longSum"); - expectedLongSumMetric.put("name", "val"); - expectedLongSumMetric.put("fieldName", "val"); CompactionState expectedState = new CompactionState( new DynamicPartitionsSpec(null, Long.MAX_VALUE), new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("ts", "dim"))), - ImmutableList.of(expectedLongSumMetric), + ImmutableList.of(new LongSumAggregatorFactory("val", "val")), null, - compactionTask.getTuningConfig().getIndexSpec().asMap(getObjectMapper()), + compactionTask.getTuningConfig().getIndexSpec(), getObjectMapper().readValue( getObjectMapper().writeValueAsString( new UniformGranularitySpec( @@ -221,17 +216,13 @@ public void testRunParallelWithHashPartitioningMatchCompactionState() throws Exc final Set compactedSegments = runTask(compactionTask); for (DataSegment segment : compactedSegments) { // Expect compaction state to exist as store compaction state by default - Map expectedLongSumMetric = new HashMap<>(); - expectedLongSumMetric.put("type", "longSum"); - expectedLongSumMetric.put("name", "val"); - expectedLongSumMetric.put("fieldName", "val"); Assert.assertSame(HashBasedNumberedShardSpec.class, segment.getShardSpec().getClass()); CompactionState expectedState = new CompactionState( new HashedPartitionsSpec(null, 3, null), new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("ts", "dim"))), - ImmutableList.of(expectedLongSumMetric), + ImmutableList.of(new LongSumAggregatorFactory("val", "val")), null, - compactionTask.getTuningConfig().getIndexSpec().asMap(getObjectMapper()), + compactionTask.getTuningConfig().getIndexSpec(), getObjectMapper().readValue( getObjectMapper().writeValueAsString( new UniformGranularitySpec( @@ -270,17 +261,13 @@ public void testRunParallelWithRangePartitioning() throws Exception final Set compactedSegments = runTask(compactionTask); for (DataSegment segment : compactedSegments) { // Expect compaction state to exist as store compaction state by default - Map expectedLongSumMetric = new HashMap<>(); - expectedLongSumMetric.put("type", "longSum"); - expectedLongSumMetric.put("name", "val"); - expectedLongSumMetric.put("fieldName", "val"); Assert.assertSame(SingleDimensionShardSpec.class, segment.getShardSpec().getClass()); CompactionState expectedState = new CompactionState( new SingleDimensionPartitionsSpec(7, null, "dim", false), new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("ts", "dim"))), - ImmutableList.of(expectedLongSumMetric), + ImmutableList.of(new LongSumAggregatorFactory("val", "val")), null, - compactionTask.getTuningConfig().getIndexSpec().asMap(getObjectMapper()), + compactionTask.getTuningConfig().getIndexSpec(), getObjectMapper().readValue( getObjectMapper().writeValueAsString( new UniformGranularitySpec( @@ -329,17 +316,13 @@ public void testRunParallelWithRangePartitioningAndNoUpfrontSegmentFetching() th final Set compactedSegments = runTask(compactionTask); for (DataSegment segment : compactedSegments) { // Expect compaction state to exist as store compaction state by default - Map expectedLongSumMetric = new HashMap<>(); - expectedLongSumMetric.put("type", "longSum"); - expectedLongSumMetric.put("name", "val"); - expectedLongSumMetric.put("fieldName", "val"); Assert.assertSame(SingleDimensionShardSpec.class, segment.getShardSpec().getClass()); CompactionState expectedState = new CompactionState( new SingleDimensionPartitionsSpec(7, null, "dim", false), new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("ts", "dim"))), - ImmutableList.of(expectedLongSumMetric), + ImmutableList.of(new LongSumAggregatorFactory("val", "val")), null, - compactionTask.getTuningConfig().getIndexSpec().asMap(getObjectMapper()), + compactionTask.getTuningConfig().getIndexSpec(), getObjectMapper().readValue( getObjectMapper().writeValueAsString( new UniformGranularitySpec( @@ -383,17 +366,13 @@ public void testRunParallelWithMultiDimensionRangePartitioning() throws Exceptio final Set compactedSegments = runTask(compactionTask); for (DataSegment segment : compactedSegments) { // Expect compaction state to exist as store compaction state by default - Map expectedLongSumMetric = new HashMap<>(); - expectedLongSumMetric.put("type", "longSum"); - expectedLongSumMetric.put("name", "val"); - expectedLongSumMetric.put("fieldName", "val"); Assert.assertSame(DimensionRangeShardSpec.class, segment.getShardSpec().getClass()); CompactionState expectedState = new CompactionState( new DimensionRangePartitionsSpec(7, null, Arrays.asList("dim1", "dim2"), false), new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("ts", "dim"))), - ImmutableList.of(expectedLongSumMetric), + ImmutableList.of(new LongSumAggregatorFactory("val", "val")), null, - compactionTask.getTuningConfig().getIndexSpec().asMap(getObjectMapper()), + compactionTask.getTuningConfig().getIndexSpec(), getObjectMapper().readValue( getObjectMapper().writeValueAsString( new UniformGranularitySpec( @@ -432,17 +411,13 @@ public void testRunParallelWithRangePartitioningWithSingleTask() throws Exceptio final Set compactedSegments = runTask(compactionTask); for (DataSegment segment : compactedSegments) { // Expect compaction state to exist as store compaction state by default - Map expectedLongSumMetric = new HashMap<>(); - expectedLongSumMetric.put("type", "longSum"); - expectedLongSumMetric.put("name", "val"); - expectedLongSumMetric.put("fieldName", "val"); Assert.assertSame(SingleDimensionShardSpec.class, segment.getShardSpec().getClass()); CompactionState expectedState = new CompactionState( new SingleDimensionPartitionsSpec(7, null, "dim", false), new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("ts", "dim"))), - ImmutableList.of(expectedLongSumMetric), + ImmutableList.of(new LongSumAggregatorFactory("val", "val")), null, - compactionTask.getTuningConfig().getIndexSpec().asMap(getObjectMapper()), + compactionTask.getTuningConfig().getIndexSpec(), getObjectMapper().readValue( getObjectMapper().writeValueAsString( new UniformGranularitySpec( @@ -484,17 +459,13 @@ public void testRunParallelWithMultiDimensionRangePartitioningWithSingleTask() t final Set compactedSegments = runTask(compactionTask); for (DataSegment segment : compactedSegments) { // Expect compaction state to exist as store compaction state by default - Map expectedLongSumMetric = new HashMap<>(); - expectedLongSumMetric.put("type", "longSum"); - expectedLongSumMetric.put("name", "val"); - expectedLongSumMetric.put("fieldName", "val"); Assert.assertSame(DimensionRangeShardSpec.class, segment.getShardSpec().getClass()); CompactionState expectedState = new CompactionState( new DimensionRangePartitionsSpec(7, null, Arrays.asList("dim1", "dim2"), false), new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("ts", "dim"))), - ImmutableList.of(expectedLongSumMetric), + ImmutableList.of(new LongSumAggregatorFactory("val", "val")), null, - compactionTask.getTuningConfig().getIndexSpec().asMap(getObjectMapper()), + compactionTask.getTuningConfig().getIndexSpec(), getObjectMapper().readValue( getObjectMapper().writeValueAsString( new UniformGranularitySpec( @@ -566,19 +537,15 @@ public void testRunCompactionWithFilterShouldStoreInState() throws Exception lockGranularity == LockGranularity.TIME_CHUNK ? NumberedShardSpec.class : NumberedOverwriteShardSpec.class, segment.getShardSpec().getClass() ); - Map expectedLongSumMetric = new HashMap<>(); - expectedLongSumMetric.put("type", "longSum"); - expectedLongSumMetric.put("name", "val"); - expectedLongSumMetric.put("fieldName", "val"); CompactionState expectedState = new CompactionState( new DynamicPartitionsSpec(null, Long.MAX_VALUE), new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("ts", "dim"))), - ImmutableList.of(expectedLongSumMetric), + ImmutableList.of(new LongSumAggregatorFactory("val", "val")), getObjectMapper().readValue( getObjectMapper().writeValueAsString(compactionTask.getTransformSpec()), - Map.class + TransformSpec.class ), - compactionTask.getTuningConfig().getIndexSpec().asMap(getObjectMapper()), + compactionTask.getTuningConfig().getIndexSpec(), getObjectMapper().readValue( getObjectMapper().writeValueAsString( new UniformGranularitySpec( @@ -624,22 +591,18 @@ public void testRunCompactionWithNewMetricsShouldStoreInState() throws Exception lockGranularity == LockGranularity.TIME_CHUNK ? NumberedShardSpec.class : NumberedOverwriteShardSpec.class, segment.getShardSpec().getClass() ); - Map expectedCountMetric = new HashMap<>(); - expectedCountMetric.put("type", "count"); - expectedCountMetric.put("name", "cnt"); - Map expectedLongSumMetric = new HashMap<>(); - expectedLongSumMetric.put("type", "longSum"); - expectedLongSumMetric.put("name", "val"); - expectedLongSumMetric.put("fieldName", "val"); CompactionState expectedState = new CompactionState( new DynamicPartitionsSpec(null, Long.MAX_VALUE), new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("ts", "dim"))), - ImmutableList.of(expectedCountMetric, expectedLongSumMetric), + ImmutableList.of( + new CountAggregatorFactory("cnt"), + new LongSumAggregatorFactory("val", "val") + ), getObjectMapper().readValue( getObjectMapper().writeValueAsString(compactionTask.getTransformSpec()), - Map.class + TransformSpec.class ), - compactionTask.getTuningConfig().getIndexSpec().asMap(getObjectMapper()), + compactionTask.getTuningConfig().getIndexSpec(), getObjectMapper().readValue( getObjectMapper().writeValueAsString( new UniformGranularitySpec( diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskRunTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskRunTest.java index 275e76706612..bbd425aa7d40 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskRunTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskRunTest.java @@ -86,6 +86,7 @@ import org.apache.druid.segment.loading.TombstoneLoadSpec; import org.apache.druid.segment.realtime.firehose.NoopChatHandlerProvider; import org.apache.druid.segment.realtime.firehose.WindowedStorageAdapter; +import org.apache.druid.segment.transform.TransformSpec; import org.apache.druid.server.security.AuthTestUtils; import org.apache.druid.timeline.CompactionState; import org.apache.druid.timeline.DataSegment; @@ -207,16 +208,12 @@ public static CompactionState getDefaultCompactionState( { ObjectMapper mapper = new DefaultObjectMapper(); // Expected compaction state to exist after compaction as we store compaction state by default - Map expectedLongSumMetric = new HashMap<>(); - expectedLongSumMetric.put("type", "longSum"); - expectedLongSumMetric.put("name", "val"); - expectedLongSumMetric.put("fieldName", "val"); return new CompactionState( new DynamicPartitionsSpec(5000000, Long.MAX_VALUE), new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("ts", "dim"))), - ImmutableList.of(expectedLongSumMetric), + ImmutableList.of(new LongSumAggregatorFactory("val", "val")), null, - IndexSpec.DEFAULT.asMap(mapper), + IndexSpec.DEFAULT, mapper.readValue( mapper.writeValueAsString( new UniformGranularitySpec( @@ -373,9 +370,9 @@ public void testRunWithHashPartitioning() throws Exception CompactionState expectedState = new CompactionState( new HashedPartitionsSpec(null, 3, null), new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("ts", "dim"))), - ImmutableList.of(expectedLongSumMetric), + ImmutableList.of(new LongSumAggregatorFactory("val", "val")), null, - compactionTask.getTuningConfig().getIndexSpec().asMap(getObjectMapper()), + compactionTask.getTuningConfig().getIndexSpec(), getObjectMapper().readValue( getObjectMapper().writeValueAsString( new UniformGranularitySpec( @@ -770,16 +767,15 @@ public void testCompactionWithFilterInTransformSpec() throws Exception Assert.assertEquals(new NumberedShardSpec(0, 1), segments.get(0).getShardSpec()); ObjectMapper mapper = new DefaultObjectMapper(); - Map expectedLongSumMetric = new HashMap<>(); - expectedLongSumMetric.put("type", "longSum"); - expectedLongSumMetric.put("name", "val"); - expectedLongSumMetric.put("fieldName", "val"); CompactionState expectedCompactionState = new CompactionState( new DynamicPartitionsSpec(5000000, Long.MAX_VALUE), new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("ts", "dim"))), - ImmutableList.of(expectedLongSumMetric), - getObjectMapper().readValue(getObjectMapper().writeValueAsString(compactionTask.getTransformSpec()), Map.class), - IndexSpec.DEFAULT.asMap(mapper), + ImmutableList.of(new LongSumAggregatorFactory("val", "val")), + getObjectMapper().readValue( + getObjectMapper().writeValueAsString(compactionTask.getTransformSpec()), + TransformSpec.class + ), + IndexSpec.DEFAULT, mapper.readValue( mapper.writeValueAsString( new UniformGranularitySpec( @@ -831,19 +827,18 @@ public void testCompactionWithNewMetricInMetricsSpec() throws Exception Assert.assertEquals(new NumberedShardSpec(0, 1), segments.get(0).getShardSpec()); ObjectMapper mapper = new DefaultObjectMapper(); - Map expectedCountMetric = new HashMap<>(); - expectedCountMetric.put("type", "count"); - expectedCountMetric.put("name", "cnt"); - Map expectedLongSumMetric = new HashMap<>(); - expectedLongSumMetric.put("type", "longSum"); - expectedLongSumMetric.put("name", "val"); - expectedLongSumMetric.put("fieldName", "val"); CompactionState expectedCompactionState = new CompactionState( new DynamicPartitionsSpec(5000000, Long.MAX_VALUE), new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("ts", "dim"))), - ImmutableList.of(expectedCountMetric, expectedLongSumMetric), - getObjectMapper().readValue(getObjectMapper().writeValueAsString(compactionTask.getTransformSpec()), Map.class), - IndexSpec.DEFAULT.asMap(mapper), + ImmutableList.of( + new CountAggregatorFactory("cnt"), + new LongSumAggregatorFactory("val", "val") + ), + getObjectMapper().readValue( + getObjectMapper().writeValueAsString(compactionTask.getTransformSpec()), + TransformSpec.class + ), + IndexSpec.DEFAULT, mapper.readValue( mapper.writeValueAsString( new UniformGranularitySpec( diff --git a/processing/src/main/java/org/apache/druid/timeline/CompactionState.java b/processing/src/main/java/org/apache/druid/timeline/CompactionState.java index cb9ddf1a93b5..0b8acf09df88 100644 --- a/processing/src/main/java/org/apache/druid/timeline/CompactionState.java +++ b/processing/src/main/java/org/apache/druid/timeline/CompactionState.java @@ -23,6 +23,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.druid.data.input.impl.DimensionsSpec; import org.apache.druid.indexer.partitions.PartitionsSpec; +import org.apache.druid.query.aggregation.AggregatorFactory; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.transform.TransformSpec; import java.util.List; import java.util.Map; @@ -43,26 +46,20 @@ public class CompactionState { private final PartitionsSpec partitionsSpec; private final DimensionsSpec dimensionsSpec; - // org.apache.druid.segment.transform.TransformSpec cannot be used here because it's in the 'processing' module which - // has a dependency on the 'core' module where this class is. - private final Map transformSpec; - // org.apache.druid.segment.IndexSpec cannot be used here because it's in the 'processing' module which - // has a dependency on the 'core' module where this class is. - private final Map indexSpec; + private final TransformSpec transformSpec; + private final IndexSpec indexSpec; // org.apache.druid.segment.indexing.granularity.GranularitySpec cannot be used here because it's in the - // 'server' module which has a dependency on the 'core' module where this class is. + // 'server' module which has a dependency on the 'processing' module where this class is. private final Map granularitySpec; - // org.apache.druid.query.aggregation.AggregatorFactory cannot be used here because it's in the 'processing' module which - // has a dependency on the 'core' module where this class is. - private final List metricsSpec; + private final List metricsSpec; @JsonCreator public CompactionState( @JsonProperty("partitionsSpec") PartitionsSpec partitionsSpec, @JsonProperty("dimensionsSpec") DimensionsSpec dimensionsSpec, - @JsonProperty("metricsSpec") List metricsSpec, - @JsonProperty("transformSpec") Map transformSpec, - @JsonProperty("indexSpec") Map indexSpec, + @JsonProperty("metricsSpec") List metricsSpec, + @JsonProperty("transformSpec") TransformSpec transformSpec, + @JsonProperty("indexSpec") IndexSpec indexSpec, @JsonProperty("granularitySpec") Map granularitySpec ) { @@ -87,19 +84,19 @@ public DimensionsSpec getDimensionsSpec() } @JsonProperty - public List getMetricsSpec() + public List getMetricsSpec() { return metricsSpec; } @JsonProperty - public Map getTransformSpec() + public TransformSpec getTransformSpec() { return transformSpec; } @JsonProperty - public Map getIndexSpec() + public IndexSpec getIndexSpec() { return indexSpec; } diff --git a/processing/src/test/java/org/apache/druid/timeline/DataSegmentTest.java b/processing/src/test/java/org/apache/druid/timeline/DataSegmentTest.java index 87ec7b17869b..c5a0ea8f60b6 100644 --- a/processing/src/test/java/org/apache/druid/timeline/DataSegmentTest.java +++ b/processing/src/test/java/org/apache/druid/timeline/DataSegmentTest.java @@ -28,9 +28,15 @@ import org.apache.druid.data.input.impl.DimensionsSpec; import org.apache.druid.indexer.partitions.DynamicPartitionsSpec; import org.apache.druid.indexer.partitions.HashedPartitionsSpec; +import org.apache.druid.jackson.AggregatorsModule; import org.apache.druid.java.util.common.DateTimes; import org.apache.druid.java.util.common.Intervals; import org.apache.druid.java.util.common.jackson.JacksonUtils; +import org.apache.druid.query.aggregation.CountAggregatorFactory; +import org.apache.druid.query.filter.SelectorDimFilter; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.transform.TransformSpec; +import org.apache.druid.testing.InitializedNullHandlingTest; import org.apache.druid.timeline.DataSegment.PruneSpecsHolder; import org.apache.druid.timeline.partition.NoneShardSpec; import org.apache.druid.timeline.partition.NumberedShardSpec; @@ -50,9 +56,9 @@ /** */ -public class DataSegmentTest +public class DataSegmentTest extends InitializedNullHandlingTest { - private static final ObjectMapper MAPPER = new TestObjectMapper(); + private static final ObjectMapper MAPPER = new TestObjectMapper().registerModules(new AggregatorsModule()); private static final int TEST_VERSION = 0x9; private static ShardSpec getShardSpec(final int partitionNum) @@ -126,9 +132,9 @@ public void testV1Serialization() throws Exception new DimensionsSpec( DimensionsSpec.getDefaultSchemas(ImmutableList.of("dim1", "bar", "foo")) ), - ImmutableList.of(ImmutableMap.of("type", "count", "name", "count")), - ImmutableMap.of("filter", ImmutableMap.of("type", "selector", "dimension", "dim1", "value", "foo")), - ImmutableMap.of(), + ImmutableList.of(new CountAggregatorFactory("count")), + new TransformSpec(new SelectorDimFilter("dim1", "foo", null, null), Collections.emptyList()), + IndexSpec.DEFAULT, ImmutableMap.of() ), TEST_VERSION, @@ -193,7 +199,7 @@ public void testDeserializationDataSegmentLastCompactionStateWithNullSpecs() thr null, null, null, - ImmutableMap.of(), + null, ImmutableMap.of() ), TEST_VERSION, @@ -342,9 +348,9 @@ public void testWithLastCompactionState() final CompactionState compactionState = new CompactionState( new DynamicPartitionsSpec(null, null), new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("bar", "foo"))), - ImmutableList.of(ImmutableMap.of("type", "count", "name", "count")), - ImmutableMap.of("filter", ImmutableMap.of("type", "selector", "dimension", "dim1", "value", "foo")), - Collections.singletonMap("test", "map"), + ImmutableList.of(new CountAggregatorFactory("count")), + new TransformSpec(new SelectorDimFilter("dim1", "foo", null, null), Collections.emptyList()), + IndexSpec.DEFAULT, Collections.singletonMap("test2", "map2") ); final DataSegment segment1 = DataSegment.builder() diff --git a/server/src/main/java/org/apache/druid/server/coordinator/compact/CompactionStatus.java b/server/src/main/java/org/apache/druid/server/coordinator/compact/CompactionStatus.java index 862f2e7c5b4c..cd210a738cf8 100644 --- a/server/src/main/java/org/apache/druid/server/coordinator/compact/CompactionStatus.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/compact/CompactionStatus.java @@ -36,7 +36,6 @@ import org.apache.druid.server.coordinator.DataSourceCompactionConfig; import org.apache.druid.server.coordinator.UserCompactionTaskGranularityConfig; import org.apache.druid.timeline.CompactionState; -import org.apache.druid.utils.CollectionUtils; import javax.annotation.Nullable; import java.util.Arrays; @@ -306,16 +305,13 @@ private CompactionStatus metricsSpecIsUpToDate() return COMPLETE; } - final List metricSpecList = lastCompactionState.getMetricsSpec(); - final AggregatorFactory[] existingMetricsSpec - = CollectionUtils.isNullOrEmpty(metricSpecList) - ? null : objectMapper.convertValue(metricSpecList, AggregatorFactory[].class); + final List metricSpecList = lastCompactionState.getMetricsSpec(); - if (existingMetricsSpec == null || !Arrays.deepEquals(configuredMetricsSpec, existingMetricsSpec)) { + if (metricSpecList == null || !Arrays.deepEquals(configuredMetricsSpec, metricSpecList.toArray())) { return CompactionStatus.configChanged( "metricsSpec", Arrays.toString(configuredMetricsSpec), - Arrays.toString(existingMetricsSpec) + String.valueOf(metricSpecList) ); } else { return COMPLETE; diff --git a/server/src/test/java/org/apache/druid/server/coordinator/compact/NewestSegmentFirstPolicyTest.java b/server/src/test/java/org/apache/druid/server/coordinator/compact/NewestSegmentFirstPolicyTest.java index 04f8f8993de6..d4742e954bef 100644 --- a/server/src/test/java/org/apache/druid/server/coordinator/compact/NewestSegmentFirstPolicyTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/compact/NewestSegmentFirstPolicyTest.java @@ -19,7 +19,6 @@ package org.apache.druid.server.coordinator.compact; -import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; @@ -70,7 +69,6 @@ import java.util.Comparator; import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Set; import java.util.TimeZone; import java.util.stream.Collectors; @@ -718,7 +716,6 @@ public void testIteratorReturnsAllMixedVersionSegmentsInConfiguredSegmentGranula public void testIteratorReturnsNothingAsSegmentsWasCompactedAndHaveSameSegmentGranularityAndSameTimezone() { // Same indexSpec as what is set in the auto compaction config - Map indexSpec = IndexSpec.DEFAULT.asMap(mapper); // Same partitionsSpec as what is set in the auto compaction config PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from(null, null, null)); @@ -728,13 +725,13 @@ public void testIteratorReturnsNothingAsSegmentsWasCompactedAndHaveSameSegmentGr Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, indexSpec, null) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, null) ), new SegmentGenerateSpec( Intervals.of("2017-10-02T00:00:00/2017-10-03T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, indexSpec, null) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, null) ) ); @@ -750,8 +747,6 @@ public void testIteratorReturnsNothingAsSegmentsWasCompactedAndHaveSameSegmentGr @Test public void testIteratorReturnsNothingAsSegmentsWasCompactedAndHaveSameSegmentGranularityInLastCompactionState() { - // Same indexSpec as what is set in the auto compaction config - Map indexSpec = IndexSpec.DEFAULT.asMap(mapper); // Same partitionsSpec as what is set in the auto compaction config PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from(null, null, null)); @@ -761,13 +756,13 @@ public void testIteratorReturnsNothingAsSegmentsWasCompactedAndHaveSameSegmentGr Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, indexSpec, ImmutableMap.of("segmentGranularity", "day")) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, ImmutableMap.of("segmentGranularity", "day")) ), new SegmentGenerateSpec( Intervals.of("2017-10-02T00:00:00/2017-10-03T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, indexSpec, ImmutableMap.of("segmentGranularity", "day")) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, ImmutableMap.of("segmentGranularity", "day")) ) ); @@ -783,8 +778,6 @@ public void testIteratorReturnsNothingAsSegmentsWasCompactedAndHaveSameSegmentGr @Test public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentSegmentGranularity() { - // Same indexSpec as what is set in the auto compaction config - Map indexSpec = IndexSpec.DEFAULT.asMap(mapper); // Same partitionsSpec as what is set in the auto compaction config PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from(null, null, null)); @@ -794,13 +787,13 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentSeg Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, indexSpec, null) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, null) ), new SegmentGenerateSpec( Intervals.of("2017-10-02T00:00:00/2017-10-03T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, indexSpec, null) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, null) ) ); @@ -826,8 +819,6 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentSeg @Test public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentSegmentGranularityInLastCompactionState() { - // Same indexSpec as what is set in the auto compaction config - Map indexSpec = IndexSpec.DEFAULT.asMap(mapper); // Same partitionsSpec as what is set in the auto compaction config PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from(null, null, null)); @@ -837,13 +828,13 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentSeg Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, indexSpec, ImmutableMap.of("segmentGranularity", "day")) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, ImmutableMap.of("segmentGranularity", "day")) ), new SegmentGenerateSpec( Intervals.of("2017-10-02T00:00:00/2017-10-03T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, indexSpec, ImmutableMap.of("segmentGranularity", "day")) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, ImmutableMap.of("segmentGranularity", "day")) ) ); @@ -869,8 +860,6 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentSeg @Test public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentTimezone() { - // Same indexSpec as what is set in the auto compaction config - Map indexSpec = IndexSpec.DEFAULT.asMap(mapper); // Same partitionsSpec as what is set in the auto compaction config PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from(null, null, null)); @@ -880,7 +869,7 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentTim Intervals.of("2017-10-02T00:00:00/2017-10-03T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, indexSpec, null) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, null) ) ); @@ -921,8 +910,6 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentTim @Test public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentOrigin() { - // Same indexSpec as what is set in the auto compaction config - Map indexSpec = IndexSpec.DEFAULT.asMap(mapper); // Same partitionsSpec as what is set in the auto compaction config PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from(null, null, null)); @@ -932,7 +919,7 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentOri Intervals.of("2017-10-02T00:00:00/2017-10-03T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, indexSpec, null) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, null) ) ); @@ -972,8 +959,6 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentOri @Test public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentRollup() { - // Same indexSpec as what is set in the auto compaction config - Map indexSpec = IndexSpec.DEFAULT.asMap(mapper); // Same partitionsSpec as what is set in the auto compaction config PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from(null, null, null)); @@ -986,19 +971,19 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentRol Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, indexSpec, ImmutableMap.of("rollup", "false")) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, ImmutableMap.of("rollup", "false")) ), new SegmentGenerateSpec( Intervals.of("2017-10-02T00:00:00/2017-10-03T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, indexSpec, ImmutableMap.of("rollup", "true")) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, ImmutableMap.of("rollup", "true")) ), new SegmentGenerateSpec( Intervals.of("2017-10-03T00:00:00/2017-10-04T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, indexSpec, ImmutableMap.of()) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, ImmutableMap.of()) ) ); @@ -1032,8 +1017,6 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentRol @Test public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentQueryGranularity() { - // Same indexSpec as what is set in the auto compaction config - Map indexSpec = IndexSpec.DEFAULT.asMap(mapper); // Same partitionsSpec as what is set in the auto compaction config PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from(null, null, null)); @@ -1046,19 +1029,19 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentQue Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, indexSpec, ImmutableMap.of("queryGranularity", "day")) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, ImmutableMap.of("queryGranularity", "day")) ), new SegmentGenerateSpec( Intervals.of("2017-10-02T00:00:00/2017-10-03T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, indexSpec, ImmutableMap.of("queryGranularity", "minute")) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, ImmutableMap.of("queryGranularity", "minute")) ), new SegmentGenerateSpec( Intervals.of("2017-10-03T00:00:00/2017-10-04T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, indexSpec, ImmutableMap.of()) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, ImmutableMap.of()) ) ); @@ -1092,8 +1075,6 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentQue @Test public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentDimensions() { - // Same indexSpec as what is set in the auto compaction config - Map indexSpec = IndexSpec.DEFAULT.asMap(mapper); // Same partitionsSpec as what is set in the auto compaction config PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from(null, null, null)); @@ -1107,25 +1088,25 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentDim Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("bar", "foo"))), null, null, indexSpec, null) + new CompactionState(partitionsSpec, new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("bar", "foo"))), null, null, IndexSpec.DEFAULT, null) ), new SegmentGenerateSpec( Intervals.of("2017-10-02T00:00:00/2017-10-03T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("foo"))), null, null, indexSpec, null) + new CompactionState(partitionsSpec, new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("foo"))), null, null, IndexSpec.DEFAULT, null) ), new SegmentGenerateSpec( Intervals.of("2017-10-03T00:00:00/2017-10-04T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, DimensionsSpec.EMPTY, null, null, indexSpec, null) + new CompactionState(partitionsSpec, DimensionsSpec.EMPTY, null, null, IndexSpec.DEFAULT, null) ), new SegmentGenerateSpec( Intervals.of("2017-10-04T00:00:00/2017-10-05T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, indexSpec, null) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, null) ) ); @@ -1191,8 +1172,6 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentDim public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentFilter() throws Exception { NullHandling.initializeForTests(); - // Same indexSpec as what is set in the auto compaction config - Map indexSpec = IndexSpec.DEFAULT.asMap(mapper); // Same partitionsSpec as what is set in the auto compaction config PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from(null, null, null)); @@ -1210,8 +1189,8 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentFil partitionsSpec, null, null, - mapper.readValue(mapper.writeValueAsString(new TransformSpec(new SelectorDimFilter("dim1", "foo", null), null)), new TypeReference>() {}), - indexSpec, + new TransformSpec(new SelectorDimFilter("dim1", "foo", null), null), + IndexSpec.DEFAULT, null ) ), @@ -1223,8 +1202,8 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentFil partitionsSpec, null, null, - mapper.readValue(mapper.writeValueAsString(new TransformSpec(new SelectorDimFilter("dim1", "bar", null), null)), new TypeReference>() {}), - indexSpec, + new TransformSpec(new SelectorDimFilter("dim1", "bar", null), null), + IndexSpec.DEFAULT, null ) ), @@ -1236,8 +1215,8 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentFil partitionsSpec, null, null, - mapper.readValue(mapper.writeValueAsString(new TransformSpec(null, null)), new TypeReference>() {}), - indexSpec, + new TransformSpec(null, null), + IndexSpec.DEFAULT, null ) ), @@ -1245,7 +1224,7 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentFil Intervals.of("2017-10-04T00:00:00/2017-10-05T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, indexSpec, null) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, null) ) ); @@ -1315,8 +1294,6 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentMet new InjectableValues.Std() .addValue(ExprMacroTable.class.getName(), TestExprMacroTable.INSTANCE) ); - // Same indexSpec as what is set in the auto compaction config - Map indexSpec = IndexSpec.DEFAULT.asMap(mapper); // Same partitionsSpec as what is set in the auto compaction config PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from(null, null, null)); @@ -1333,9 +1310,9 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentMet new CompactionState( partitionsSpec, null, - mapper.convertValue(new AggregatorFactory[] {new CountAggregatorFactory("cnt")}, new TypeReference>() {}), + Collections.singletonList(new CountAggregatorFactory("cnt")), null, - indexSpec, + IndexSpec.DEFAULT, null ) ), @@ -1346,9 +1323,9 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentMet new CompactionState( partitionsSpec, null, - mapper.convertValue(new AggregatorFactory[] {new CountAggregatorFactory("cnt"), new LongSumAggregatorFactory("val", "val")}, new TypeReference>() {}), + Arrays.asList(new CountAggregatorFactory("cnt"), new LongSumAggregatorFactory("val", "val")), null, - indexSpec, + IndexSpec.DEFAULT, null ) ), @@ -1359,9 +1336,9 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentMet new CompactionState( partitionsSpec, null, - mapper.convertValue(new AggregatorFactory[] {}, new TypeReference>() {}), + Collections.emptyList(), null, - indexSpec, + IndexSpec.DEFAULT, null ) ), @@ -1369,7 +1346,7 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentMet Intervals.of("2017-10-04T00:00:00/2017-10-05T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, indexSpec, null) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, null) ) ); @@ -1466,7 +1443,6 @@ public void testIteratorReturnsSegmentsAsCompactionStateChangedWithCompactedStat { // Different indexSpec as what is set in the auto compaction config IndexSpec newIndexSpec = IndexSpec.builder().withBitmapSerdeFactory(new ConciseBitmapSerdeFactory()).build(); - Map newIndexSpecMap = mapper.convertValue(newIndexSpec, new TypeReference>() {}); PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from(null, null, null)); // Create segments that were compacted (CompactionState != null) and have segmentGranularity=DAY @@ -1475,7 +1451,7 @@ public void testIteratorReturnsSegmentsAsCompactionStateChangedWithCompactedStat Intervals.of("2017-10-02T00:00:00/2017-10-03T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, newIndexSpecMap, null) + new CompactionState(partitionsSpec, null, null, null, newIndexSpec, null) ) ); @@ -1527,7 +1503,7 @@ public void testIteratorDoesNotReturnSegmentWithChangingAppendableIndexSpec() null, null, null, - IndexSpec.DEFAULT.asMap(mapper), + IndexSpec.DEFAULT, null ) ) diff --git a/server/src/test/java/org/apache/druid/server/coordinator/duty/CompactSegmentsTest.java b/server/src/test/java/org/apache/druid/server/coordinator/duty/CompactSegmentsTest.java index 2926dbd6d70b..39d0f3504c04 100644 --- a/server/src/test/java/org/apache/druid/server/coordinator/duty/CompactSegmentsTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/duty/CompactSegmentsTest.java @@ -19,7 +19,6 @@ package org.apache.druid.server.coordinator.duty; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.ObjectMapper; @@ -62,6 +61,7 @@ import org.apache.druid.query.aggregation.CountAggregatorFactory; import org.apache.druid.query.filter.SelectorDimFilter; import org.apache.druid.rpc.indexing.OverlordClient; +import org.apache.druid.segment.IndexSpec; import org.apache.druid.segment.incremental.OnheapIncrementalIndex; import org.apache.druid.segment.indexing.BatchIOConfig; import org.apache.druid.segment.transform.TransformSpec; @@ -105,6 +105,7 @@ import javax.annotation.Nullable; import java.net.URI; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -406,12 +407,12 @@ public void testMakeStatsForDataSourceWithCompactedIntervalBetweenNonCompactedIn DataSegment afterNoon = createSegment(dataSourceName, j, false, k); if (j == 3) { // Make two intervals on this day compacted (two compacted intervals back-to-back) - beforeNoon = beforeNoon.withLastCompactionState(new CompactionState(partitionsSpec, null, null, null, ImmutableMap.of(), ImmutableMap.of())); - afterNoon = afterNoon.withLastCompactionState(new CompactionState(partitionsSpec, null, null, null, ImmutableMap.of(), ImmutableMap.of())); + beforeNoon = beforeNoon.withLastCompactionState(new CompactionState(partitionsSpec, null, null, null, null, ImmutableMap.of())); + afterNoon = afterNoon.withLastCompactionState(new CompactionState(partitionsSpec, null, null, null, null, ImmutableMap.of())); } if (j == 1) { // Make one interval on this day compacted - afterNoon = afterNoon.withLastCompactionState(new CompactionState(partitionsSpec, null, null, null, ImmutableMap.of(), ImmutableMap.of())); + afterNoon = afterNoon.withLastCompactionState(new CompactionState(partitionsSpec, null, null, null, null, ImmutableMap.of())); } segments.add(beforeNoon); segments.add(afterNoon); @@ -2052,20 +2053,9 @@ private void compactSegments( compactionPartitionsSpec = clientCompactionTaskQuery.getTuningConfig().getPartitionsSpec(); } - Map transformSpec = null; - try { - if (clientCompactionTaskQuery.getTransformSpec() != null) { - transformSpec = jsonMapper.readValue( - jsonMapper.writeValueAsString(new TransformSpec(clientCompactionTaskQuery.getTransformSpec() - .getFilter(), null)), - new TypeReference>() - { - } - ); - } - } - catch (JsonProcessingException e) { - throw new IAE("Invalid Json payload"); + TransformSpec transformSpec = null; + if (clientCompactionTaskQuery.getTransformSpec() != null) { + transformSpec = new TransformSpec(clientCompactionTaskQuery.getTransformSpec().getFilter(), null); } List metricsSpec = null; @@ -2087,18 +2077,9 @@ private void compactSegments( clientCompactionTaskQuery.getDimensionsSpec() == null ? null : new DimensionsSpec( clientCompactionTaskQuery.getDimensionsSpec().getDimensions() ), - metricsSpec, + Arrays.asList(clientCompactionTaskQuery.getMetricsSpec()), transformSpec, - ImmutableMap.of( - "bitmap", - ImmutableMap.of("type", "roaring"), - "dimensionCompression", - "lz4", - "metricCompression", - "lz4", - "longEncoding", - "longs" - ), + IndexSpec.DEFAULT, ImmutableMap.of() ), 1, diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/schema/SystemSchemaTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/schema/SystemSchemaTest.java index 82eae68c3321..f0f2c1d75f11 100644 --- a/sql/src/test/java/org/apache/druid/sql/calcite/schema/SystemSchemaTest.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/schema/SystemSchemaTest.java @@ -71,6 +71,7 @@ import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; import org.apache.druid.rpc.indexing.OverlordClient; import org.apache.druid.segment.IndexBuilder; +import org.apache.druid.segment.IndexSpec; import org.apache.druid.segment.QueryableIndex; import org.apache.druid.segment.TestHelper; import org.apache.druid.segment.column.ColumnType; @@ -285,7 +286,7 @@ public void setUp() throws Exception null, null, null, - Collections.singletonMap("test", "map"), + IndexSpec.DEFAULT, Collections.singletonMap("test2", "map2") ); From d37e8466c941e35705f1a005ef061ead2f324809 Mon Sep 17 00:00:00 2001 From: Clint Wylie Date: Thu, 31 Aug 2023 02:58:16 -0700 Subject: [PATCH 2/5] move GranularitySpec to druid-processing --- .../k8s/overlord/common/K8sTestUtils.java | 2 +- .../MaterializedViewSupervisorSpec.java | 2 +- .../indexing/kafka/KafkaIndexTaskTest.java | 2 +- .../indexing/kafka/KafkaSamplerSpecTest.java | 2 +- .../kafka/supervisor/KafkaSupervisorTest.java | 2 +- .../kinesis/KinesisSamplerSpecTest.java | 2 +- .../supervisor/KinesisSupervisorTest.java | 2 +- .../apache/druid/msq/exec/ControllerImpl.java | 4 +- .../indexer/DetermineHashedPartitionsJob.java | 2 +- .../indexer/HadoopDruidIndexerConfig.java | 2 +- .../indexer/HadoopDruidIndexerMapper.java | 2 +- .../path/GranularUnprocessedPathSpec.java | 2 +- .../indexer/BatchDeltaIngestionTest.java | 2 +- .../DetermineHashedPartitionsJobTest.java | 2 +- .../indexer/DeterminePartitionsJobTest.java | 2 +- .../DetermineRangePartitionsJobTest.java | 2 +- .../indexer/HadoopDruidIndexerConfigTest.java | 2 +- .../indexer/HadoopDruidIndexerMapperTest.java | 2 +- .../indexer/HadoopIngestionSpecTest.java | 2 +- ...cUpdateDatasourcePathSpecSegmentsTest.java | 2 +- .../indexer/IndexGeneratorCombinerTest.java | 2 +- .../druid/indexer/IndexGeneratorJobTest.java | 2 +- .../apache/druid/indexer/JobHelperTest.java | 2 +- .../indexer/path/DatasourcePathSpecTest.java | 2 +- .../indexer/path/GranularityPathSpecTest.java | 2 +- .../common/task/AbstractBatchIndexTask.java | 4 +- .../task/CachingLocalSegmentAllocator.java | 2 +- .../indexing/common/task/CompactionTask.java | 4 +- .../indexing/common/task/HadoopIndexTask.java | 4 +- .../druid/indexing/common/task/IndexTask.java | 4 +- .../common/task/InputSourceProcessor.java | 2 +- .../common/task/LocalSegmentAllocator.java | 2 +- .../OverlordCoordinatingSegmentAllocator.java | 2 +- .../common/task/SegmentAllocators.java | 2 +- .../parallel/ParallelIndexSupervisorTask.java | 4 +- .../PartialDimensionCardinalityTask.java | 2 +- .../PartialDimensionDistributionTask.java | 2 +- .../PartialHashSegmentGenerateTask.java | 2 +- .../parallel/PerfectRollupWorkerTask.java | 4 +- .../batch/parallel/SinglePhaseSubTask.java | 4 +- .../task/batch/parallel/TombstoneHelper.java | 2 +- ...faultIndexTaskInputRowIteratorBuilder.java | 2 +- .../IndexTaskInputRowIteratorBuilder.java | 2 +- ...itionIndexTaskInputRowIteratorBuilder.java | 2 +- .../overlord/sampler/SamplerConfig.java | 3 +- ...penderatorDriverRealtimeIndexTaskTest.java | 2 +- .../common/task/AppenderatorsTest.java | 2 +- .../common/task/BatchAppenderatorsTest.java | 2 +- .../task/CompactionTaskParallelRunTest.java | 141 ++++++------------ .../common/task/CompactionTaskRunTest.java | 62 +++----- .../common/task/CompactionTaskTest.java | 2 +- .../common/task/HadoopIndexTaskTest.java | 2 +- .../common/task/IndexIngestionSpecTest.java | 2 +- .../indexing/common/task/IndexTaskTest.java | 6 +- ...itionCachingLocalSegmentAllocatorTest.java | 2 +- .../common/task/RealtimeIndexTaskTest.java | 2 +- .../indexing/common/task/TaskSerdeTest.java | 2 +- ...bstractMultiPhaseParallelIndexingTest.java | 4 +- ...itionCachingLocalSegmentAllocatorTest.java | 2 +- .../parallel/HashPartitionTaskKillTest.java | 4 +- ...aseParallelIndexingWithNullColumnTest.java | 2 +- .../ParallelIndexSupervisorTaskKillTest.java | 2 +- ...rallelIndexSupervisorTaskResourceTest.java | 2 +- .../ParallelIndexSupervisorTaskSerdeTest.java | 2 +- .../parallel/ParallelIndexTestingFactory.java | 4 +- .../PartialDimensionCardinalityTaskTest.java | 2 +- .../PartialHashSegmentGenerateTaskTest.java | 2 +- .../parallel/PerfectRollupWorkerTaskTest.java | 2 +- .../parallel/PushedSegmentsReportTest.java | 11 +- .../parallel/RangePartitionTaskKillTest.java | 4 +- .../SinglePhaseParallelIndexingTest.java | 2 +- .../batch/parallel/TombstoneHelperTest.java | 4 +- ...tIndexTaskInputRowIteratorBuilderTest.java | 2 +- ...InputRowIteratorBuilderTestingFactory.java | 2 +- ...nIndexTaskInputRowIteratorBuilderTest.java | 2 +- .../indexing/input/InputRowSchemasTest.java | 2 +- .../indexing/overlord/TaskLifecycleTest.java | 2 +- .../sampler/InputSourceSamplerTest.java | 4 +- ...SeekableStreamIndexTaskRunnerAuthTest.java | 2 +- .../SeekableStreamIndexTaskTestBase.java | 2 +- .../SeekableStreamSamplerSpecTest.java | 2 +- .../SeekableStreamSupervisorSpecTest.java | 2 +- .../SeekableStreamSupervisorStateTest.java | 2 +- .../duty/ITAutoCompactionTest.java | 2 +- .../granularity/ArbitraryGranularitySpec.java | 2 +- .../granularity/BaseGranularitySpec.java | 16 +- .../indexer}/granularity/GranularitySpec.java | 6 +- .../granularity/UniformGranularitySpec.java | 3 +- .../org/apache/druid/segment/IndexSpec.java | 13 -- .../druid/timeline/CompactionState.java | 8 +- .../granularity/ArbitraryGranularityTest.java | 29 +--- .../granularity/UniformGranularityTest.java | 31 +--- .../apache/druid/segment/IndexSpecTest.java | 27 ---- .../druid/timeline/DataSegmentTest.java | 9 +- .../ClientCompactionTaskGranularitySpec.java | 2 +- .../druid/segment/indexing/DataSchema.java | 4 +- .../UserCompactionTaskGranularityConfig.java | 2 +- .../segment/indexing/DataSchemaTest.java | 4 +- .../indexing/TestModifiedDataSchema.java | 2 +- .../segment/realtime/FireDepartmentTest.java | 2 +- ...edSegmensSinksBatchAppenderatorTester.java | 2 +- ...DefaultOfflineAppenderatorFactoryTest.java | 2 +- ...enAndClosedSegmentsAppenderatorTester.java | 2 +- .../StreamAppenderatorTester.java | 2 +- ...nifiedIndexerAppenderatorsManagerTest.java | 2 +- .../plumber/RealtimePlumberSchoolTest.java | 2 +- .../segment/realtime/plumber/SinkTest.java | 2 +- .../compact/NewestSegmentFirstPolicyTest.java | 22 +-- .../coordinator/duty/CompactSegmentsTest.java | 16 +- .../cli/validate/DruidJsonValidatorTest.java | 2 +- .../sql/calcite/schema/SystemSchemaTest.java | 6 +- 111 files changed, 235 insertions(+), 394 deletions(-) rename {server/src/main/java/org/apache/druid/segment/indexing => processing/src/main/java/org/apache/druid/indexer}/granularity/ArbitraryGranularitySpec.java (98%) rename {server/src/main/java/org/apache/druid/segment/indexing => processing/src/main/java/org/apache/druid/indexer}/granularity/BaseGranularitySpec.java (92%) rename {server/src/main/java/org/apache/druid/segment/indexing => processing/src/main/java/org/apache/druid/indexer}/granularity/GranularitySpec.java (93%) rename {server/src/main/java/org/apache/druid/segment/indexing => processing/src/main/java/org/apache/druid/indexer}/granularity/UniformGranularitySpec.java (96%) rename {server/src/test/java/org/apache/druid/segment/indexing => processing/src/test/java/org/apache/druid/indexer}/granularity/ArbitraryGranularityTest.java (87%) rename {server/src/test/java/org/apache/druid/segment/indexing => processing/src/test/java/org/apache/druid/indexer}/granularity/UniformGranularityTest.java (91%) diff --git a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/K8sTestUtils.java b/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/K8sTestUtils.java index c0affe9573c3..f492d3a15a1f 100644 --- a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/K8sTestUtils.java +++ b/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/K8sTestUtils.java @@ -36,7 +36,7 @@ import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; import org.apache.druid.segment.IndexSpec; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import java.io.File; 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 eec08ff133df..1b3748ca7eca 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 @@ -46,7 +46,7 @@ import org.apache.druid.metadata.SqlSegmentsMetadataManager; import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.ArbitraryGranularitySpec; +import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; import org.apache.druid.segment.realtime.firehose.ChatHandlerProvider; import org.apache.druid.segment.transform.TransformSpec; import org.apache.druid.server.security.AuthorizerMapper; 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 f1001174266b..e8efa5342274 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 @@ -109,7 +109,7 @@ import org.apache.druid.segment.incremental.RowIngestionMetersTotals; import org.apache.druid.segment.incremental.RowMeters; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.transform.ExpressionTransform; import org.apache.druid.segment.transform.TransformSpec; import org.apache.druid.server.security.Action; diff --git a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaSamplerSpecTest.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaSamplerSpecTest.java index 0a0b64396a66..4c9eb24c686d 100644 --- a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaSamplerSpecTest.java +++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaSamplerSpecTest.java @@ -51,7 +51,7 @@ import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; import org.apache.druid.segment.TestHelper; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.server.security.Action; import org.apache.druid.server.security.Resource; import org.apache.druid.server.security.ResourceAction; 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 2ff8c5bf91e8..a9a1bad09fea 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 @@ -88,7 +88,7 @@ import org.apache.druid.segment.incremental.RowIngestionMetersFactory; import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.RealtimeIOConfig; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.realtime.FireDepartment; import org.apache.druid.server.metrics.ExceptionCapturingServiceEmitter; import org.apache.druid.server.metrics.NoopServiceEmitter; diff --git a/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisSamplerSpecTest.java b/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisSamplerSpecTest.java index b0ba730a3502..8cc56c5f5912 100644 --- a/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisSamplerSpecTest.java +++ b/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisSamplerSpecTest.java @@ -52,7 +52,7 @@ import org.apache.druid.query.aggregation.CountAggregatorFactory; import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.server.security.Action; import org.apache.druid.server.security.Resource; import org.apache.druid.server.security.ResourceAction; diff --git a/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisorTest.java b/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisorTest.java index 39d943dbebef..5b71dc6a9491 100644 --- a/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisorTest.java +++ b/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisorTest.java @@ -84,7 +84,7 @@ import org.apache.druid.segment.incremental.RowIngestionMetersFactory; import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.RealtimeIOConfig; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.realtime.FireDepartment; import org.apache.druid.server.metrics.ExceptionCapturingServiceEmitter; import org.apache.druid.server.metrics.NoopServiceEmitter; diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerImpl.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerImpl.java index d883a587e9b5..dada0bda4761 100644 --- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerImpl.java +++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerImpl.java @@ -180,8 +180,8 @@ import org.apache.druid.segment.column.RowSignature; import org.apache.druid.segment.column.ValueType; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.ArbitraryGranularitySpec; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.realtime.appenderator.SegmentIdWithShardSpec; import org.apache.druid.segment.transform.TransformSpec; import org.apache.druid.server.DruidNode; diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/DetermineHashedPartitionsJob.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/DetermineHashedPartitionsJob.java index 1d0c3c4b14fc..79c1d9f309ad 100644 --- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/DetermineHashedPartitionsJob.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/DetermineHashedPartitionsJob.java @@ -37,7 +37,7 @@ import org.apache.druid.java.util.common.StringUtils; import org.apache.druid.java.util.common.granularity.Granularity; import org.apache.druid.java.util.common.logger.Logger; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.timeline.partition.HashBasedNumberedShardSpec; import org.apache.druid.timeline.partition.HashPartitionFunction; import org.apache.hadoop.conf.Configurable; diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java index 246a068e4609..6c2e23c7a048 100644 --- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java @@ -51,7 +51,7 @@ import org.apache.druid.segment.IndexMerger; import org.apache.druid.segment.IndexMergerV9; import org.apache.druid.segment.IndexSpec; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.loading.DataSegmentPusher; import org.apache.druid.server.DruidNode; import org.apache.druid.timeline.DataSegment; diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerMapper.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerMapper.java index 788b41d7e779..3dde4715746f 100644 --- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerMapper.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerMapper.java @@ -30,7 +30,7 @@ import org.apache.druid.java.util.common.collect.Utils; import org.apache.druid.java.util.common.logger.Logger; import org.apache.druid.java.util.common.parsers.ParseException; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.Counter; import org.apache.hadoop.mapreduce.Mapper; diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/path/GranularUnprocessedPathSpec.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/path/GranularUnprocessedPathSpec.java index 3891851d9ed7..49ddd2b973e6 100644 --- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/path/GranularUnprocessedPathSpec.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/path/GranularUnprocessedPathSpec.java @@ -29,7 +29,7 @@ import org.apache.druid.java.util.common.StringUtils; import org.apache.druid.java.util.common.granularity.Granularity; import org.apache.druid.java.util.common.guava.Comparators; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; 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 ce725230b963..af3fdcf4e48a 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 @@ -47,7 +47,7 @@ import org.apache.druid.segment.QueryableIndexStorageAdapter; import org.apache.druid.segment.StorageAdapter; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.loading.LocalDataSegmentPuller; import org.apache.druid.segment.realtime.firehose.IngestSegmentFirehose; import org.apache.druid.segment.realtime.firehose.WindowedStorageAdapter; 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 fb1ff1520a28..07da0b075887 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 @@ -35,7 +35,7 @@ import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.timeline.partition.HashBasedNumberedShardSpec; import org.apache.druid.timeline.partition.HashPartitionFunction; import org.joda.time.Interval; 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 5f338936a409..3ccd98034f6d 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 @@ -32,7 +32,7 @@ import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.query.aggregation.LongSumAggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.timeline.partition.SingleDimensionShardSpec; import org.junit.After; import org.junit.Assert; diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/DetermineRangePartitionsJobTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/DetermineRangePartitionsJobTest.java index f10a898d1260..0ecadaf79fda 100644 --- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/DetermineRangePartitionsJobTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/DetermineRangePartitionsJobTest.java @@ -32,7 +32,7 @@ import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.query.aggregation.LongSumAggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.timeline.partition.DimensionRangeShardSpec; import org.junit.After; import org.junit.Assert; 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 f69ad04915c5..3dde4de1be32 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 @@ -39,7 +39,7 @@ import org.apache.druid.java.util.common.granularity.Granularities; import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.timeline.partition.HashBasedNumberedShardSpec; import org.apache.druid.timeline.partition.HashPartitionFunction; import org.apache.druid.timeline.partition.NoneShardSpec; diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopDruidIndexerMapperTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopDruidIndexerMapperTest.java index db20ed8a1847..287630e2f4d9 100644 --- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopDruidIndexerMapperTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopDruidIndexerMapperTest.java @@ -36,7 +36,7 @@ import org.apache.druid.query.filter.SelectorDimFilter; import org.apache.druid.segment.TestHelper; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.transform.ExpressionTransform; import org.apache.druid.segment.transform.TransformSpec; import org.apache.hadoop.conf.Configuration; diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopIngestionSpecTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopIngestionSpecTest.java index f2775184311f..e5b8d364ea29 100644 --- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopIngestionSpecTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopIngestionSpecTest.java @@ -33,7 +33,7 @@ import org.apache.druid.java.util.common.granularity.Granularities; import org.apache.druid.java.util.common.granularity.PeriodGranularity; import org.apache.druid.metadata.MetadataStorageConnectorConfig; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.joda.time.Period; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopIngestionSpecUpdateDatasourcePathSpecSegmentsTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopIngestionSpecUpdateDatasourcePathSpecSegmentsTest.java index 6402721e73c6..616580fe7238 100644 --- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopIngestionSpecUpdateDatasourcePathSpecSegmentsTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopIngestionSpecUpdateDatasourcePathSpecSegmentsTest.java @@ -36,7 +36,7 @@ import org.apache.druid.java.util.common.granularity.Granularities; import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.timeline.DataSegment; import org.apache.druid.timeline.DataSegment.PruneSpecsHolder; import org.apache.druid.timeline.partition.NoneShardSpec; diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorCombinerTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorCombinerTest.java index 385c28ff0fb0..9f8187daab85 100644 --- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorCombinerTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorCombinerTest.java @@ -37,7 +37,7 @@ import org.apache.druid.query.aggregation.LongSumAggregatorFactory; import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.BytesWritable; import org.apache.hadoop.mapreduce.Reducer; 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 2b8fc6749e31..e2dd7c54c0a1 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 @@ -40,7 +40,7 @@ import org.apache.druid.query.aggregation.LongSumAggregatorFactory; import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.timeline.DataSegment; import org.apache.druid.timeline.partition.HashBasedNumberedShardSpec; import org.apache.druid.timeline.partition.HashPartitionFunction; 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 3c1b80166c51..851f622953ec 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 @@ -39,7 +39,7 @@ import org.apache.druid.query.aggregation.LongSumAggregatorFactory; import org.apache.druid.segment.TestHelper; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.timeline.DataSegment; import org.apache.druid.timeline.partition.NoneShardSpec; import org.apache.hadoop.conf.Configuration; diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/path/DatasourcePathSpecTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/path/DatasourcePathSpecTest.java index e8caea0256e0..02fe640d98d4 100644 --- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/path/DatasourcePathSpecTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/path/DatasourcePathSpecTest.java @@ -47,7 +47,7 @@ import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.query.aggregation.LongSumAggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.server.DruidNode; import org.apache.druid.timeline.DataSegment; import org.apache.druid.timeline.partition.NoneShardSpec; 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 d1aee3d66992..88051d8ba9a7 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 @@ -36,7 +36,7 @@ import org.apache.druid.java.util.common.granularity.PeriodGranularity; import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.lib.input.TextInputFormat; import org.apache.hadoop.security.UserGroupInformation; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java index dadaab6f10c9..35b30048b492 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java @@ -63,7 +63,7 @@ import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.IngestionSpec; import org.apache.druid.segment.indexing.TuningConfig; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.realtime.appenderator.SegmentIdWithShardSpec; import org.apache.druid.segment.transform.TransformSpec; import org.apache.druid.timeline.CompactionState; @@ -533,7 +533,7 @@ public static Function, Set> compactionStateAnnota Arrays.asList(ingestionSpec.getDataSchema().getAggregators()), transformSpec, tuningConfig.getIndexSpec(), - granularitySpec.asMap(toolbox.getJsonMapper()) + granularitySpec ); return segments -> segments .stream() diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/CachingLocalSegmentAllocator.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/CachingLocalSegmentAllocator.java index 8d722848e2d0..75ebdd320753 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/CachingLocalSegmentAllocator.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/CachingLocalSegmentAllocator.java @@ -32,7 +32,7 @@ import org.apache.druid.indexing.common.task.batch.partition.CompletePartitionAnalysis; import org.apache.druid.java.util.common.ISE; import org.apache.druid.java.util.common.Pair; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.realtime.appenderator.SegmentIdWithShardSpec; import org.apache.druid.timeline.partition.BucketNumberedShardSpec; import org.apache.druid.timeline.partition.ShardSpec; 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 c068aa1433fb..2b9244681dcf 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 @@ -85,8 +85,8 @@ import org.apache.druid.segment.incremental.AppendableIndexSpec; import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.TuningConfig; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.loading.SegmentCacheManager; import org.apache.druid.segment.realtime.appenderator.AppenderatorsManager; import org.apache.druid.segment.transform.TransformSpec; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopIndexTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopIndexTask.java index 37bbf647e74f..32714e0633f5 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopIndexTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopIndexTask.java @@ -60,8 +60,8 @@ import org.apache.druid.java.util.common.granularity.Granularity; import org.apache.druid.java.util.common.logger.Logger; import org.apache.druid.segment.incremental.RowIngestionMeters; -import org.apache.druid.segment.indexing.granularity.ArbitraryGranularitySpec; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.realtime.firehose.ChatHandler; import org.apache.druid.segment.realtime.firehose.ChatHandlerProvider; import org.apache.druid.server.security.Action; 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 4642b4391d96..f6dfd56854aa 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 @@ -85,8 +85,8 @@ 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.ArbitraryGranularitySpec; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.realtime.FireDepartment; import org.apache.druid.segment.realtime.FireDepartmentMetrics; import org.apache.druid.segment.realtime.appenderator.Appenderator; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/InputSourceProcessor.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/InputSourceProcessor.java index e91f5d5fb0d1..a327b173faf1 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/InputSourceProcessor.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/InputSourceProcessor.java @@ -34,7 +34,7 @@ import org.apache.druid.segment.incremental.ParseExceptionHandler; import org.apache.druid.segment.incremental.RowIngestionMeters; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.realtime.appenderator.AppenderatorDriverAddResult; import org.apache.druid.segment.realtime.appenderator.BatchAppenderatorDriver; import org.apache.druid.segment.realtime.appenderator.SegmentsAndCommitMetadata; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/LocalSegmentAllocator.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/LocalSegmentAllocator.java index c2488e6244ba..ffa5ed76ff67 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/LocalSegmentAllocator.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/LocalSegmentAllocator.java @@ -27,7 +27,7 @@ import org.apache.druid.indexing.common.TaskToolbox; import org.apache.druid.indexing.common.actions.LockListAction; import org.apache.druid.java.util.common.ISE; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.realtime.appenderator.SegmentAllocator; import org.apache.druid.segment.realtime.appenderator.SegmentIdWithShardSpec; import org.apache.druid.timeline.partition.BuildingNumberedShardSpec; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/OverlordCoordinatingSegmentAllocator.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/OverlordCoordinatingSegmentAllocator.java index bd9c3c8b4502..3bf4449e4c75 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/OverlordCoordinatingSegmentAllocator.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/OverlordCoordinatingSegmentAllocator.java @@ -31,7 +31,7 @@ import org.apache.druid.indexing.common.task.batch.parallel.SupervisorTaskAccess; import org.apache.druid.java.util.common.ISE; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.realtime.appenderator.SegmentIdWithShardSpec; import org.apache.druid.timeline.partition.NumberedOverwritePartialShardSpec; import org.apache.druid.timeline.partition.NumberedPartialShardSpec; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/SegmentAllocators.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/SegmentAllocators.java index 1e0216d81059..fe46ea1da3c0 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/SegmentAllocators.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/SegmentAllocators.java @@ -25,7 +25,7 @@ import org.apache.druid.indexing.common.task.batch.parallel.SupervisorTaskAccess; import org.apache.druid.indexing.common.task.batch.partition.CompletePartitionAnalysis; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.realtime.appenderator.SegmentAllocator; import javax.annotation.Nullable; 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 f5653c1c86bb..f384d515b182 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 @@ -70,8 +70,8 @@ import org.apache.druid.segment.incremental.RowIngestionMetersTotals; import org.apache.druid.segment.incremental.SimpleRowIngestionMeters; import org.apache.druid.segment.indexing.TuningConfig; -import org.apache.druid.segment.indexing.granularity.ArbitraryGranularitySpec; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.realtime.appenderator.SegmentIdWithShardSpec; import org.apache.druid.segment.realtime.appenderator.TransactionalSegmentPublisher; import org.apache.druid.segment.realtime.firehose.ChatHandler; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityTask.java index 625b20517836..bda7a260d7cc 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityTask.java @@ -44,7 +44,7 @@ import org.apache.druid.segment.incremental.ParseExceptionHandler; import org.apache.druid.segment.incremental.RowIngestionMeters; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.server.security.Action; import org.apache.druid.server.security.Resource; import org.apache.druid.server.security.ResourceAction; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionDistributionTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionDistributionTask.java index b2ecd3dc2695..e8e00a389aa7 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionDistributionTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionDistributionTask.java @@ -50,7 +50,7 @@ import org.apache.druid.segment.incremental.ParseExceptionHandler; import org.apache.druid.segment.incremental.RowIngestionMeters; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.server.security.Action; import org.apache.druid.server.security.Resource; import org.apache.druid.server.security.ResourceAction; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialHashSegmentGenerateTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialHashSegmentGenerateTask.java index b91a6ce3a821..d45db7721bc1 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialHashSegmentGenerateTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialHashSegmentGenerateTask.java @@ -34,7 +34,7 @@ import org.apache.druid.indexing.common.task.batch.parallel.iterator.DefaultIndexTaskInputRowIteratorBuilder; import org.apache.druid.indexing.common.task.batch.partition.HashPartitionAnalysis; import org.apache.druid.indexing.worker.shuffle.ShuffleDataSegmentPusher; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.server.security.Action; import org.apache.druid.server.security.Resource; import org.apache.druid.server.security.ResourceAction; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PerfectRollupWorkerTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PerfectRollupWorkerTask.java index 4259922b43ad..8c62cec1265e 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PerfectRollupWorkerTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PerfectRollupWorkerTask.java @@ -25,8 +25,8 @@ import org.apache.druid.indexing.common.task.TaskResource; import org.apache.druid.java.util.common.granularity.Granularity; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.ArbitraryGranularitySpec; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; 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/SinglePhaseSubTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseSubTask.java index 349e9974fb7c..2ffc60d61a43 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseSubTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseSubTask.java @@ -59,8 +59,8 @@ import org.apache.druid.segment.incremental.RowIngestionMeters; import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.RealtimeIOConfig; -import org.apache.druid.segment.indexing.granularity.ArbitraryGranularitySpec; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.realtime.FireDepartment; import org.apache.druid.segment.realtime.FireDepartmentMetrics; import org.apache.druid.segment.realtime.RealtimeMetricsMonitor; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/TombstoneHelper.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/TombstoneHelper.java index 61766cab77b1..18d2ce87a816 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/TombstoneHelper.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/TombstoneHelper.java @@ -30,7 +30,7 @@ import org.apache.druid.java.util.common.JodaUtils; import org.apache.druid.java.util.common.granularity.Granularity; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.realtime.appenderator.SegmentIdWithShardSpec; import org.apache.druid.timeline.DataSegment; import org.apache.druid.timeline.partition.ShardSpec; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/DefaultIndexTaskInputRowIteratorBuilder.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/DefaultIndexTaskInputRowIteratorBuilder.java index aa74f1199e6b..947be4945c62 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/DefaultIndexTaskInputRowIteratorBuilder.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/DefaultIndexTaskInputRowIteratorBuilder.java @@ -25,7 +25,7 @@ import org.apache.druid.data.input.InputRow; import org.apache.druid.indexing.common.task.IndexTask; import org.apache.druid.java.util.common.parsers.CloseableIterator; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import java.util.ArrayList; import java.util.List; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/IndexTaskInputRowIteratorBuilder.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/IndexTaskInputRowIteratorBuilder.java index 89afdbb64d05..d8fd4190e402 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/IndexTaskInputRowIteratorBuilder.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/IndexTaskInputRowIteratorBuilder.java @@ -23,7 +23,7 @@ import org.apache.druid.data.input.HandlingInputRowIterator; import org.apache.druid.data.input.InputRow; import org.apache.druid.java.util.common.parsers.CloseableIterator; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; public interface IndexTaskInputRowIteratorBuilder { diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/RangePartitionIndexTaskInputRowIteratorBuilder.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/RangePartitionIndexTaskInputRowIteratorBuilder.java index c377d371c9af..fe54658de546 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/RangePartitionIndexTaskInputRowIteratorBuilder.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/RangePartitionIndexTaskInputRowIteratorBuilder.java @@ -24,7 +24,7 @@ import org.apache.druid.indexing.common.task.IndexTask; import org.apache.druid.java.util.common.IAE; import org.apache.druid.java.util.common.parsers.CloseableIterator; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import java.util.List; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/sampler/SamplerConfig.java b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/sampler/SamplerConfig.java index b81d6964e42d..8eb738bf9d0e 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/sampler/SamplerConfig.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/sampler/SamplerConfig.java @@ -22,6 +22,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.java.util.common.HumanReadableBytes; import javax.annotation.Nullable; @@ -57,7 +58,7 @@ public SamplerConfig( * The maximum number of rows to return in a response. The actual number of returned rows may be less if: * - The sampled source contains fewer rows * - {@link SamplerConfig#timeoutMs} elapses before this value is reached - * - {@link org.apache.druid.segment.indexing.granularity.GranularitySpec#isRollup()} is true and input rows get + * - {@link GranularitySpec#isRollup()} is true and input rows get * rolled-up into fewer indexed rows. * - The incremental index performing the sampling reaches {@link SamplerConfig#getMaxBytesInMemory()} before this * value is reached 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 f403eeee415a..c92237cd5680 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 @@ -118,7 +118,7 @@ import org.apache.druid.segment.incremental.RowIngestionMeters; import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.RealtimeIOConfig; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.join.NoopJoinableFactory; import org.apache.druid.segment.realtime.firehose.NoopChatHandlerProvider; import org.apache.druid.segment.transform.ExpressionTransform; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/AppenderatorsTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/AppenderatorsTest.java index c0489c61b425..6569751d5e52 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/AppenderatorsTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/AppenderatorsTest.java @@ -45,7 +45,7 @@ import org.apache.druid.segment.incremental.SimpleRowIngestionMeters; import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.TuningConfig; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.loading.DataSegmentPusher; import org.apache.druid.segment.realtime.FireDepartmentMetrics; import org.apache.druid.segment.realtime.appenderator.Appenderator; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/BatchAppenderatorsTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/BatchAppenderatorsTest.java index f81007722350..b45cdeba8f60 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/BatchAppenderatorsTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/BatchAppenderatorsTest.java @@ -48,7 +48,7 @@ import org.apache.druid.segment.incremental.SimpleRowIngestionMeters; import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.TuningConfig; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.join.NoopJoinableFactory; import org.apache.druid.segment.loading.DataSegmentPusher; import org.apache.druid.segment.realtime.FireDepartmentMetrics; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskParallelRunTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskParallelRunTest.java index 91001aedadac..3c8314e1aabe 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskParallelRunTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskParallelRunTest.java @@ -60,7 +60,7 @@ import org.apache.druid.query.filter.SelectorDimFilter; import org.apache.druid.segment.SegmentUtils; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.loading.NoopSegmentCacheManager; import org.apache.druid.segment.transform.TransformSpec; import org.apache.druid.server.security.Action; @@ -178,16 +178,11 @@ public void testRunParallelWithDynamicPartitioningMatchCompactionState() throws ImmutableList.of(new LongSumAggregatorFactory("val", "val")), null, compactionTask.getTuningConfig().getIndexSpec(), - getObjectMapper().readValue( - getObjectMapper().writeValueAsString( - new UniformGranularitySpec( - Granularities.HOUR, - Granularities.MINUTE, - true, - ImmutableList.of(segment.getInterval()) - ) - ), - Map.class + new UniformGranularitySpec( + Granularities.HOUR, + Granularities.MINUTE, + true, + ImmutableList.of(segment.getInterval()) ) ); Assert.assertEquals("Compaction state for " + segment.getId(), expectedState, segment.getLastCompactionState()); @@ -223,16 +218,11 @@ public void testRunParallelWithHashPartitioningMatchCompactionState() throws Exc ImmutableList.of(new LongSumAggregatorFactory("val", "val")), null, compactionTask.getTuningConfig().getIndexSpec(), - getObjectMapper().readValue( - getObjectMapper().writeValueAsString( - new UniformGranularitySpec( - Granularities.HOUR, - Granularities.MINUTE, - true, - ImmutableList.of(segment.getInterval()) - ) - ), - Map.class + new UniformGranularitySpec( + Granularities.HOUR, + Granularities.MINUTE, + true, + ImmutableList.of(segment.getInterval()) ) ); Assert.assertEquals("Compaction state for " + segment.getId(), expectedState, segment.getLastCompactionState()); @@ -268,16 +258,11 @@ public void testRunParallelWithRangePartitioning() throws Exception ImmutableList.of(new LongSumAggregatorFactory("val", "val")), null, compactionTask.getTuningConfig().getIndexSpec(), - getObjectMapper().readValue( - getObjectMapper().writeValueAsString( - new UniformGranularitySpec( - Granularities.HOUR, - Granularities.MINUTE, - true, - ImmutableList.of(segment.getInterval()) - ) - ), - Map.class + new UniformGranularitySpec( + Granularities.HOUR, + Granularities.MINUTE, + true, + ImmutableList.of(segment.getInterval()) ) ); Assert.assertEquals("Compaction state for " + segment.getId(), expectedState, segment.getLastCompactionState()); @@ -323,18 +308,13 @@ public void testRunParallelWithRangePartitioningAndNoUpfrontSegmentFetching() th ImmutableList.of(new LongSumAggregatorFactory("val", "val")), null, compactionTask.getTuningConfig().getIndexSpec(), - getObjectMapper().readValue( - getObjectMapper().writeValueAsString( - new UniformGranularitySpec( - Granularities.HOUR, - Granularities.MINUTE, - true, - - // Umbrella interval for all segments, since CompactionTasks generated a single granularitySpec. - ImmutableList.of(Intervals.of("2014-01-01/2014-01-01T03:00:00")) - ) - ), - Map.class + new UniformGranularitySpec( + Granularities.HOUR, + Granularities.MINUTE, + true, + + // Umbrella interval for all segments, since CompactionTasks generated a single granularitySpec. + ImmutableList.of(Intervals.of("2014-01-01/2014-01-01T03:00:00")) ) ); Assert.assertEquals("Compaction state for " + segment.getId(), expectedState, segment.getLastCompactionState()); @@ -373,16 +353,11 @@ public void testRunParallelWithMultiDimensionRangePartitioning() throws Exceptio ImmutableList.of(new LongSumAggregatorFactory("val", "val")), null, compactionTask.getTuningConfig().getIndexSpec(), - getObjectMapper().readValue( - getObjectMapper().writeValueAsString( - new UniformGranularitySpec( - Granularities.HOUR, - Granularities.MINUTE, - true, - ImmutableList.of(segment.getInterval()) - ) - ), - Map.class + new UniformGranularitySpec( + Granularities.HOUR, + Granularities.MINUTE, + true, + ImmutableList.of(segment.getInterval()) ) ); Assert.assertEquals("Compaction state for " + segment.getId(), expectedState, segment.getLastCompactionState()); @@ -418,16 +393,11 @@ public void testRunParallelWithRangePartitioningWithSingleTask() throws Exceptio ImmutableList.of(new LongSumAggregatorFactory("val", "val")), null, compactionTask.getTuningConfig().getIndexSpec(), - getObjectMapper().readValue( - getObjectMapper().writeValueAsString( - new UniformGranularitySpec( - Granularities.HOUR, - Granularities.MINUTE, - true, - ImmutableList.of(segment.getInterval()) - ) - ), - Map.class + new UniformGranularitySpec( + Granularities.HOUR, + Granularities.MINUTE, + true, + ImmutableList.of(segment.getInterval()) ) ); Assert.assertEquals("Compaction state for " + segment.getId(), expectedState, segment.getLastCompactionState()); @@ -466,16 +436,11 @@ public void testRunParallelWithMultiDimensionRangePartitioningWithSingleTask() t ImmutableList.of(new LongSumAggregatorFactory("val", "val")), null, compactionTask.getTuningConfig().getIndexSpec(), - getObjectMapper().readValue( - getObjectMapper().writeValueAsString( - new UniformGranularitySpec( - Granularities.HOUR, - Granularities.MINUTE, - true, - ImmutableList.of(segment.getInterval()) - ) - ), - Map.class + new UniformGranularitySpec( + Granularities.HOUR, + Granularities.MINUTE, + true, + ImmutableList.of(segment.getInterval()) ) ); Assert.assertEquals("Compaction state for " + segment.getId(), expectedState, segment.getLastCompactionState()); @@ -546,16 +511,11 @@ public void testRunCompactionWithFilterShouldStoreInState() throws Exception TransformSpec.class ), compactionTask.getTuningConfig().getIndexSpec(), - getObjectMapper().readValue( - getObjectMapper().writeValueAsString( - new UniformGranularitySpec( - Granularities.HOUR, - Granularities.MINUTE, - true, - ImmutableList.of(segment.getInterval()) - ) - ), - Map.class + new UniformGranularitySpec( + Granularities.HOUR, + Granularities.MINUTE, + true, + ImmutableList.of(segment.getInterval()) ) ); Assert.assertEquals("Compaction state for " + segment.getId(), expectedState, segment.getLastCompactionState()); @@ -603,16 +563,11 @@ public void testRunCompactionWithNewMetricsShouldStoreInState() throws Exception TransformSpec.class ), compactionTask.getTuningConfig().getIndexSpec(), - getObjectMapper().readValue( - getObjectMapper().writeValueAsString( - new UniformGranularitySpec( - Granularities.HOUR, - Granularities.MINUTE, - true, - ImmutableList.of(segment.getInterval()) - ) - ), - Map.class + new UniformGranularitySpec( + Granularities.HOUR, + Granularities.MINUTE, + true, + ImmutableList.of(segment.getInterval()) ) ); Assert.assertEquals("Compaction state for " + segment.getId(), expectedState, segment.getLastCompactionState()); diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskRunTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskRunTest.java index bbd425aa7d40..7039649d590f 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskRunTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskRunTest.java @@ -72,7 +72,7 @@ import org.apache.druid.segment.IndexSpec; import org.apache.druid.segment.QueryableIndexStorageAdapter; import org.apache.druid.segment.VirtualColumns; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.join.NoopJoinableFactory; import org.apache.druid.segment.loading.LocalDataSegmentPuller; import org.apache.druid.segment.loading.LocalDataSegmentPusher; @@ -214,16 +214,11 @@ public static CompactionState getDefaultCompactionState( ImmutableList.of(new LongSumAggregatorFactory("val", "val")), null, IndexSpec.DEFAULT, - mapper.readValue( - mapper.writeValueAsString( - new UniformGranularitySpec( - segmentGranularity, - queryGranularity, - true, - intervals - ) - ), - Map.class + new UniformGranularitySpec( + segmentGranularity, + queryGranularity, + true, + intervals ) ); } @@ -373,16 +368,11 @@ public void testRunWithHashPartitioning() throws Exception ImmutableList.of(new LongSumAggregatorFactory("val", "val")), null, compactionTask.getTuningConfig().getIndexSpec(), - getObjectMapper().readValue( - getObjectMapper().writeValueAsString( - new UniformGranularitySpec( - Granularities.HOUR, - Granularities.MINUTE, - true, - ImmutableList.of(Intervals.of("2014-01-01T0%d:00:00/2014-01-01T0%d:00:00", i, i + 1)) - ) - ), - Map.class + new UniformGranularitySpec( + Granularities.HOUR, + Granularities.MINUTE, + true, + ImmutableList.of(Intervals.of("2014-01-01T0%d:00:00/2014-01-01T0%d:00:00", i, i + 1)) ) ); Assert.assertEquals(expectedState, segments.get(segmentIdx).getLastCompactionState()); @@ -776,16 +766,11 @@ public void testCompactionWithFilterInTransformSpec() throws Exception TransformSpec.class ), IndexSpec.DEFAULT, - mapper.readValue( - mapper.writeValueAsString( - new UniformGranularitySpec( - Granularities.DAY, - Granularities.MINUTE, - true, - ImmutableList.of(Intervals.of("2014-01-01T00:00:00/2014-01-01T03:00:00")) - ) - ), - Map.class + new UniformGranularitySpec( + Granularities.DAY, + Granularities.MINUTE, + true, + ImmutableList.of(Intervals.of("2014-01-01T00:00:00/2014-01-01T03:00:00")) ) ); Assert.assertEquals( @@ -839,16 +824,11 @@ public void testCompactionWithNewMetricInMetricsSpec() throws Exception TransformSpec.class ), IndexSpec.DEFAULT, - mapper.readValue( - mapper.writeValueAsString( - new UniformGranularitySpec( - Granularities.DAY, - Granularities.MINUTE, - true, - ImmutableList.of(Intervals.of("2014-01-01T00:00:00/2014-01-01T03:00:00")) - ) - ), - Map.class + new UniformGranularitySpec( + Granularities.DAY, + Granularities.MINUTE, + true, + ImmutableList.of(Intervals.of("2014-01-01T00:00:00/2014-01-01T03:00:00")) ) ); Assert.assertEquals( 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 c7f6168d85da..c469309eca0b 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 @@ -123,7 +123,7 @@ import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.RealtimeTuningConfig; import org.apache.druid.segment.indexing.TuningConfig; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.join.NoopJoinableFactory; import org.apache.druid.segment.loading.NoopSegmentCacheManager; import org.apache.druid.segment.loading.SegmentCacheManager; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/HadoopIndexTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/HadoopIndexTaskTest.java index ff828f16789d..794d7ef1e65e 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/HadoopIndexTaskTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/HadoopIndexTaskTest.java @@ -29,7 +29,7 @@ import org.apache.druid.java.util.common.granularity.Granularities; import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.server.security.Action; import org.apache.druid.server.security.AuthTestUtils; import org.apache.druid.server.security.Resource; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IndexIngestionSpecTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IndexIngestionSpecTest.java index 7555c6b1e378..48d893b1c49b 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IndexIngestionSpecTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IndexIngestionSpecTest.java @@ -27,7 +27,7 @@ import org.apache.druid.java.util.common.granularity.Granularities; import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.ArbitraryGranularitySpec; +import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; 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 459c29db37ac..a9284f241561 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 @@ -79,9 +79,9 @@ import org.apache.druid.segment.incremental.RowIngestionMeters; import org.apache.druid.segment.incremental.RowIngestionMetersFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.ArbitraryGranularitySpec; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.loading.SegmentCacheManager; import org.apache.druid.segment.loading.SegmentLoaderConfig; import org.apache.druid.segment.loading.SegmentLocalCacheManager; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/RangePartitionCachingLocalSegmentAllocatorTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/RangePartitionCachingLocalSegmentAllocatorTest.java index dc3911f0bb07..2450cc775c38 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/RangePartitionCachingLocalSegmentAllocatorTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/RangePartitionCachingLocalSegmentAllocatorTest.java @@ -33,7 +33,7 @@ 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.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.realtime.appenderator.SegmentAllocator; import org.apache.druid.segment.realtime.appenderator.SegmentIdWithShardSpec; import org.apache.druid.timeline.SegmentId; 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 9881561d61f1..2f4ec04c4bc9 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 @@ -106,7 +106,7 @@ import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.RealtimeIOConfig; import org.apache.druid.segment.indexing.RealtimeTuningConfig; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.join.NoopJoinableFactory; import org.apache.druid.segment.realtime.FireDepartment; import org.apache.druid.segment.realtime.firehose.NoopChatHandlerProvider; 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 d3deefc9ae78..3b7364bc5ae8 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 @@ -49,7 +49,7 @@ import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.RealtimeIOConfig; import org.apache.druid.segment.indexing.RealtimeTuningConfig; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.realtime.FireDepartment; import org.apache.druid.server.security.AuthTestUtils; import org.apache.druid.timeline.partition.NoneShardSpec; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/AbstractMultiPhaseParallelIndexingTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/AbstractMultiPhaseParallelIndexingTest.java index ef62971e9a22..24b43f019462 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/AbstractMultiPhaseParallelIndexingTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/AbstractMultiPhaseParallelIndexingTest.java @@ -51,8 +51,8 @@ import org.apache.druid.segment.Segment; import org.apache.druid.segment.SegmentLazyLoadFailCallback; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.loading.SegmentCacheManager; import org.apache.druid.segment.loading.SegmentLoader; import org.apache.druid.segment.loading.SegmentLoadingException; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/HashPartitionCachingLocalSegmentAllocatorTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/HashPartitionCachingLocalSegmentAllocatorTest.java index ef8f09562311..339a8bb081f4 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/HashPartitionCachingLocalSegmentAllocatorTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/HashPartitionCachingLocalSegmentAllocatorTest.java @@ -37,7 +37,7 @@ 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.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.realtime.appenderator.SegmentAllocator; import org.apache.druid.segment.realtime.appenderator.SegmentIdWithShardSpec; import org.apache.druid.timeline.SegmentId; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/HashPartitionTaskKillTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/HashPartitionTaskKillTest.java index 39eaa4af62a1..8858507d0c54 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/HashPartitionTaskKillTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/HashPartitionTaskKillTest.java @@ -44,8 +44,8 @@ import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.query.aggregation.LongSumAggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Before; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/MultiPhaseParallelIndexingWithNullColumnTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/MultiPhaseParallelIndexingWithNullColumnTest.java index 22a006bd6c29..6b7160ab8da4 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/MultiPhaseParallelIndexingWithNullColumnTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/MultiPhaseParallelIndexingWithNullColumnTest.java @@ -52,7 +52,7 @@ import org.apache.druid.java.util.common.parsers.JSONPathFieldType; import org.apache.druid.java.util.common.parsers.JSONPathSpec; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import org.junit.Assert; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskKillTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskKillTest.java index 7bf894fff4d7..a78f212fdc2f 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskKillTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskKillTest.java @@ -38,7 +38,7 @@ import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.query.aggregation.LongSumAggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.hamcrest.CoreMatchers; import org.joda.time.Interval; import org.junit.After; 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 b11d939f760f..d7f2b0c4a085 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 @@ -47,7 +47,7 @@ import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.query.aggregation.LongSumAggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.realtime.appenderator.SegmentAllocator; import org.apache.druid.segment.realtime.appenderator.SegmentIdWithShardSpec; import org.apache.druid.server.security.AuthConfig; 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 6c83c225fa9f..f02b207fda38 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 @@ -36,7 +36,7 @@ import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.query.aggregation.LongSumAggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.hamcrest.CoreMatchers; import org.joda.time.Interval; import org.junit.Assert; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexTestingFactory.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexTestingFactory.java index 7f315ab33043..3e0df2e3c58b 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexTestingFactory.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexTestingFactory.java @@ -38,8 +38,8 @@ import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.segment.IndexIO; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.ArbitraryGranularitySpec; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.realtime.appenderator.AppenderatorsManager; import org.apache.druid.segment.transform.TransformSpec; import org.apache.druid.timeline.partition.BuildingHashBasedNumberedShardSpec; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityTaskTest.java index d1a143d056c9..82f8c10f3ef6 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityTaskTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityTaskTest.java @@ -43,7 +43,7 @@ import org.apache.druid.segment.TestHelper; import org.apache.druid.segment.incremental.ParseExceptionHandler; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.server.security.Action; import org.apache.druid.server.security.Resource; import org.apache.druid.server.security.ResourceAction; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PartialHashSegmentGenerateTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PartialHashSegmentGenerateTaskTest.java index c2760209c010..a73c376e3ef4 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PartialHashSegmentGenerateTaskTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PartialHashSegmentGenerateTaskTest.java @@ -29,7 +29,7 @@ import org.apache.druid.java.util.common.Intervals; import org.apache.druid.java.util.common.granularity.Granularities; import org.apache.druid.segment.TestHelper; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.server.security.Action; import org.apache.druid.server.security.Resource; import org.apache.druid.server.security.ResourceAction; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PerfectRollupWorkerTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PerfectRollupWorkerTaskTest.java index 71b474e77359..a8318dc6869f 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PerfectRollupWorkerTaskTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PerfectRollupWorkerTaskTest.java @@ -27,7 +27,7 @@ import org.apache.druid.indexing.common.task.TaskResource; import org.apache.druid.java.util.common.Intervals; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.easymock.EasyMock; import org.joda.time.Interval; import org.junit.Rule; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PushedSegmentsReportTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PushedSegmentsReportTest.java index 05d0a1fe9de3..2508db1436e3 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PushedSegmentsReportTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PushedSegmentsReportTest.java @@ -20,6 +20,8 @@ package org.apache.druid.indexing.common.task.batch.parallel; import nl.jqno.equalsverifier.EqualsVerifier; +import org.apache.druid.segment.IndexSpec; +import org.apache.druid.segment.data.CompressionFactory; import org.junit.Test; public class PushedSegmentsReportTest @@ -27,6 +29,13 @@ public class PushedSegmentsReportTest @Test public void testEquals() { - EqualsVerifier.forClass(PushedSegmentsReport.class).usingGetClass().verify(); + EqualsVerifier.forClass(PushedSegmentsReport.class) + .withPrefabValues( + IndexSpec.class, + IndexSpec.DEFAULT, + IndexSpec.builder().withLongEncoding(CompressionFactory.LongEncodingStrategy.AUTO).build() + ) + .usingGetClass() + .verify(); } } diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/RangePartitionTaskKillTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/RangePartitionTaskKillTest.java index ce112aafce8a..b30bc9509c38 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/RangePartitionTaskKillTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/RangePartitionTaskKillTest.java @@ -42,8 +42,8 @@ import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.query.aggregation.LongSumAggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.timeline.partition.PartitionBoundaries; import org.joda.time.Interval; import org.junit.Assert; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseParallelIndexingTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseParallelIndexingTest.java index d22769c1f791..307f0ca2a545 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseParallelIndexingTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseParallelIndexingTest.java @@ -45,7 +45,7 @@ import org.apache.druid.segment.incremental.ParseExceptionReport; import org.apache.druid.segment.incremental.RowIngestionMetersTotals; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.server.security.Action; import org.apache.druid.server.security.Resource; import org.apache.druid.server.security.ResourceAction; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/TombstoneHelperTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/TombstoneHelperTest.java index 0ba6ad9fd118..51e6ffd56e76 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/TombstoneHelperTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/TombstoneHelperTest.java @@ -31,8 +31,8 @@ import org.apache.druid.java.util.common.granularity.Granularities; import org.apache.druid.java.util.common.granularity.Granularity; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.realtime.appenderator.SegmentIdWithShardSpec; import org.apache.druid.timeline.DataSegment; import org.apache.druid.timeline.partition.TombstoneShardSpec; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/DefaultIndexTaskInputRowIteratorBuilderTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/DefaultIndexTaskInputRowIteratorBuilderTest.java index ddf0fbd5a887..dfc2963ca6f2 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/DefaultIndexTaskInputRowIteratorBuilderTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/DefaultIndexTaskInputRowIteratorBuilderTest.java @@ -23,7 +23,7 @@ import org.apache.druid.data.input.InputRow; import org.apache.druid.java.util.common.DateTimes; import org.apache.druid.java.util.common.parsers.CloseableIterator; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.easymock.EasyMock; import org.joda.time.DateTime; import org.junit.Assert; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/IndexTaskInputRowIteratorBuilderTestingFactory.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/IndexTaskInputRowIteratorBuilderTestingFactory.java index a1821318ba56..660cd254e634 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/IndexTaskInputRowIteratorBuilderTestingFactory.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/IndexTaskInputRowIteratorBuilderTestingFactory.java @@ -26,7 +26,7 @@ import org.apache.druid.java.util.common.DateTimes; import org.apache.druid.java.util.common.Intervals; import org.apache.druid.java.util.common.parsers.CloseableIterator; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.easymock.EasyMock; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/RangePartitionIndexTaskInputRowIteratorBuilderTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/RangePartitionIndexTaskInputRowIteratorBuilderTest.java index 20065b597fa8..e24b65c51dbd 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/RangePartitionIndexTaskInputRowIteratorBuilderTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/RangePartitionIndexTaskInputRowIteratorBuilderTest.java @@ -21,7 +21,7 @@ import org.apache.druid.data.input.InputRow; import org.apache.druid.java.util.common.parsers.CloseableIterator; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.hamcrest.Matchers; import org.joda.time.DateTime; import org.junit.Assert; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/input/InputRowSchemasTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/input/InputRowSchemasTest.java index 44850ad0558f..6b853a43e696 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/input/InputRowSchemasTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/input/InputRowSchemasTest.java @@ -36,7 +36,7 @@ import org.apache.druid.query.aggregation.LongSumAggregatorFactory; import org.apache.druid.query.filter.SelectorDimFilter; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.transform.ExpressionTransform; import org.apache.druid.segment.transform.TransformSpec; import org.apache.druid.testing.InitializedNullHandlingTest; 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 31ec645b3fdd..17a1b7e20834 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 @@ -126,7 +126,7 @@ import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.RealtimeIOConfig; import org.apache.druid.segment.indexing.RealtimeTuningConfig; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.join.JoinableFactoryWrapperTest; import org.apache.druid.segment.join.NoopJoinableFactory; import org.apache.druid.segment.loading.DataSegmentArchiver; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/sampler/InputSourceSamplerTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/sampler/InputSourceSamplerTest.java index 5f6375e62974..82a46ac2b67d 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/sampler/InputSourceSamplerTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/sampler/InputSourceSamplerTest.java @@ -58,8 +58,8 @@ import org.apache.druid.query.expression.TestExprMacroTable; import org.apache.druid.query.filter.SelectorDimFilter; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.transform.ExpressionTransform; import org.apache.druid.segment.transform.TransformSpec; import org.apache.druid.testing.InitializedNullHandlingTest; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskRunnerAuthTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskRunnerAuthTest.java index 0f280059e0a5..c982b0a032f1 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskRunnerAuthTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskRunnerAuthTest.java @@ -35,7 +35,7 @@ import org.apache.druid.java.util.common.granularity.AllGranularity; import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.ArbitraryGranularitySpec; +import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; import org.apache.druid.segment.transform.TransformSpec; import org.apache.druid.server.security.Access; import org.apache.druid.server.security.Action; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskTestBase.java b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskTestBase.java index 6be23407a418..91be5c00a260 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskTestBase.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskTestBase.java @@ -111,7 +111,7 @@ import org.apache.druid.segment.handoff.SegmentHandoffNotifierFactory; import org.apache.druid.segment.incremental.RowIngestionMetersTotals; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.join.NoopJoinableFactory; import org.apache.druid.segment.loading.DataSegmentPusher; import org.apache.druid.segment.loading.LocalDataSegmentPusher; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSamplerSpecTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSamplerSpecTest.java index 87cd196c268f..13f83c5fdc1d 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSamplerSpecTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSamplerSpecTest.java @@ -52,7 +52,7 @@ import org.apache.druid.query.aggregation.CountAggregatorFactory; import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.easymock.EasyMock; import org.easymock.EasyMockSupport; import org.joda.time.DateTime; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSupervisorSpecTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSupervisorSpecTest.java index 9215f24a3858..1d977b8d82c6 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSupervisorSpecTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSupervisorSpecTest.java @@ -62,7 +62,7 @@ import org.apache.druid.segment.TestHelper; import org.apache.druid.segment.incremental.RowIngestionMetersFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.easymock.EasyMock; import org.easymock.EasyMockSupport; import org.joda.time.DateTime; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java index 7e8afdf6bc5d..821b255c7e93 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java @@ -80,7 +80,7 @@ import org.apache.druid.segment.TestHelper; import org.apache.druid.segment.incremental.RowIngestionMetersFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.server.metrics.NoopServiceEmitter; import org.easymock.EasyMock; import org.easymock.EasyMockSupport; diff --git a/integration-tests/src/test/java/org/apache/druid/tests/coordinator/duty/ITAutoCompactionTest.java b/integration-tests/src/test/java/org/apache/druid/tests/coordinator/duty/ITAutoCompactionTest.java index 26df03e0d81f..43cd02c37669 100644 --- a/integration-tests/src/test/java/org/apache/druid/tests/coordinator/duty/ITAutoCompactionTest.java +++ b/integration-tests/src/test/java/org/apache/druid/tests/coordinator/duty/ITAutoCompactionTest.java @@ -51,7 +51,7 @@ import org.apache.druid.query.aggregation.datasketches.quantiles.DoublesSketchAggregatorFactory; import org.apache.druid.query.aggregation.datasketches.theta.SketchMergeAggregatorFactory; import org.apache.druid.query.filter.SelectorDimFilter; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.server.coordinator.AutoCompactionSnapshot; import org.apache.druid.server.coordinator.CoordinatorCompactionConfig; import org.apache.druid.server.coordinator.DataSourceCompactionConfig; diff --git a/server/src/main/java/org/apache/druid/segment/indexing/granularity/ArbitraryGranularitySpec.java b/processing/src/main/java/org/apache/druid/indexer/granularity/ArbitraryGranularitySpec.java similarity index 98% rename from server/src/main/java/org/apache/druid/segment/indexing/granularity/ArbitraryGranularitySpec.java rename to processing/src/main/java/org/apache/druid/indexer/granularity/ArbitraryGranularitySpec.java index 8bf6396bf3ea..ef78c2c798e0 100644 --- a/server/src/main/java/org/apache/druid/segment/indexing/granularity/ArbitraryGranularitySpec.java +++ b/processing/src/main/java/org/apache/druid/indexer/granularity/ArbitraryGranularitySpec.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.druid.segment.indexing.granularity; +package org.apache.druid.indexer.granularity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/server/src/main/java/org/apache/druid/segment/indexing/granularity/BaseGranularitySpec.java b/processing/src/main/java/org/apache/druid/indexer/granularity/BaseGranularitySpec.java similarity index 92% rename from server/src/main/java/org/apache/druid/segment/indexing/granularity/BaseGranularitySpec.java rename to processing/src/main/java/org/apache/druid/indexer/granularity/BaseGranularitySpec.java index ac9fdcae7e16..5e2b612cdae7 100644 --- a/server/src/main/java/org/apache/druid/segment/indexing/granularity/BaseGranularitySpec.java +++ b/processing/src/main/java/org/apache/druid/indexer/granularity/BaseGranularitySpec.java @@ -17,11 +17,10 @@ * under the License. */ -package org.apache.druid.segment.indexing.granularity; +package org.apache.druid.indexer.granularity; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Optional; import com.google.common.collect.Iterators; import org.apache.druid.java.util.common.DateTimes; @@ -34,7 +33,6 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.TreeSet; public abstract class BaseGranularitySpec implements GranularitySpec @@ -61,6 +59,7 @@ public List inputIntervals() @Override @JsonProperty("rollup") + @JsonInclude(JsonInclude.Include.NON_DEFAULT) public boolean isRollup() { return rollup; @@ -80,15 +79,6 @@ public TreeSet materializedBucketIntervals() protected abstract LookupIntervalBuckets getLookupTableBuckets(); - @Override - public Map asMap(ObjectMapper objectMapper) - { - return objectMapper.convertValue( - this, - new TypeReference>() {} - ); - } - /** * This is a helper class to facilitate sharing the code for sortedBucketIntervals among * the various GranularitySpec implementations. In particular, the UniformGranularitySpec diff --git a/server/src/main/java/org/apache/druid/segment/indexing/granularity/GranularitySpec.java b/processing/src/main/java/org/apache/druid/indexer/granularity/GranularitySpec.java similarity index 93% rename from server/src/main/java/org/apache/druid/segment/indexing/granularity/GranularitySpec.java rename to processing/src/main/java/org/apache/druid/indexer/granularity/GranularitySpec.java index 75e9ac12ab1b..f79557bc4dee 100644 --- a/server/src/main/java/org/apache/druid/segment/indexing/granularity/GranularitySpec.java +++ b/processing/src/main/java/org/apache/druid/indexer/granularity/GranularitySpec.java @@ -17,18 +17,16 @@ * under the License. */ -package org.apache.druid.segment.indexing.granularity; +package org.apache.druid.indexer.granularity; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Optional; import org.apache.druid.java.util.common.granularity.Granularity; import org.joda.time.DateTime; import org.joda.time.Interval; import java.util.List; -import java.util.Map; import java.util.TreeSet; /** @@ -79,6 +77,4 @@ public interface GranularitySpec Granularity getQueryGranularity(); GranularitySpec withIntervals(List inputIntervals); - - Map asMap(ObjectMapper objectMapper); } diff --git a/server/src/main/java/org/apache/druid/segment/indexing/granularity/UniformGranularitySpec.java b/processing/src/main/java/org/apache/druid/indexer/granularity/UniformGranularitySpec.java similarity index 96% rename from server/src/main/java/org/apache/druid/segment/indexing/granularity/UniformGranularitySpec.java rename to processing/src/main/java/org/apache/druid/indexer/granularity/UniformGranularitySpec.java index a68d51725f37..584c40e01801 100644 --- a/server/src/main/java/org/apache/druid/segment/indexing/granularity/UniformGranularitySpec.java +++ b/processing/src/main/java/org/apache/druid/indexer/granularity/UniformGranularitySpec.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.druid.segment.indexing.granularity; +package org.apache.druid.indexer.granularity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -29,6 +29,7 @@ public class UniformGranularitySpec extends BaseGranularitySpec { + public static UniformGranularitySpec DEFAULT_SPEC = new UniformGranularitySpec(null, null, null, null); private final Granularity segmentGranularity; private final Granularity queryGranularity; private final IntervalsByGranularity intervalsByGranularity; diff --git a/processing/src/main/java/org/apache/druid/segment/IndexSpec.java b/processing/src/main/java/org/apache/druid/segment/IndexSpec.java index 1c8b097d5238..c51a25014e83 100644 --- a/processing/src/main/java/org/apache/druid/segment/IndexSpec.java +++ b/processing/src/main/java/org/apache/druid/segment/IndexSpec.java @@ -22,8 +22,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.druid.segment.column.StringEncodingStrategy; import org.apache.druid.segment.data.BitmapSerde; import org.apache.druid.segment.data.BitmapSerdeFactory; @@ -32,7 +30,6 @@ import org.apache.druid.segment.loading.SegmentizerFactory; import javax.annotation.Nullable; -import java.util.Map; import java.util.Objects; /** @@ -154,16 +151,6 @@ public CompressionStrategy getJsonCompression() return jsonCompression; } - public Map asMap(ObjectMapper objectMapper) - { - return objectMapper.convertValue( - this, - new TypeReference>() - { - } - ); - } - @Override public boolean equals(Object o) { diff --git a/processing/src/main/java/org/apache/druid/timeline/CompactionState.java b/processing/src/main/java/org/apache/druid/timeline/CompactionState.java index 0b8acf09df88..b14cea05fc9e 100644 --- a/processing/src/main/java/org/apache/druid/timeline/CompactionState.java +++ b/processing/src/main/java/org/apache/druid/timeline/CompactionState.java @@ -22,13 +22,13 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.indexer.partitions.PartitionsSpec; import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.segment.IndexSpec; import org.apache.druid.segment.transform.TransformSpec; import java.util.List; -import java.util.Map; import java.util.Objects; /** @@ -50,7 +50,7 @@ public class CompactionState private final IndexSpec indexSpec; // org.apache.druid.segment.indexing.granularity.GranularitySpec cannot be used here because it's in the // 'server' module which has a dependency on the 'processing' module where this class is. - private final Map granularitySpec; + private final GranularitySpec granularitySpec; private final List metricsSpec; @JsonCreator @@ -60,7 +60,7 @@ public CompactionState( @JsonProperty("metricsSpec") List metricsSpec, @JsonProperty("transformSpec") TransformSpec transformSpec, @JsonProperty("indexSpec") IndexSpec indexSpec, - @JsonProperty("granularitySpec") Map granularitySpec + @JsonProperty("granularitySpec") GranularitySpec granularitySpec ) { this.partitionsSpec = partitionsSpec; @@ -102,7 +102,7 @@ public IndexSpec getIndexSpec() } @JsonProperty - public Map getGranularitySpec() + public GranularitySpec getGranularitySpec() { return granularitySpec; } diff --git a/server/src/test/java/org/apache/druid/segment/indexing/granularity/ArbitraryGranularityTest.java b/processing/src/test/java/org/apache/druid/indexer/granularity/ArbitraryGranularityTest.java similarity index 87% rename from server/src/test/java/org/apache/druid/segment/indexing/granularity/ArbitraryGranularityTest.java rename to processing/src/test/java/org/apache/druid/indexer/granularity/ArbitraryGranularityTest.java index 25bf848d8b1c..470ecb6a5408 100644 --- a/server/src/test/java/org/apache/druid/segment/indexing/granularity/ArbitraryGranularityTest.java +++ b/processing/src/test/java/org/apache/druid/indexer/granularity/ArbitraryGranularityTest.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.druid.segment.indexing.granularity; +package org.apache.druid.indexer.granularity; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Optional; @@ -32,7 +32,6 @@ import org.junit.Test; import java.util.List; -import java.util.Map; public class ArbitraryGranularityTest { @@ -218,32 +217,6 @@ public void testJson() } } - @Test - public void testAsMap() - { - final GranularitySpec spec = new ArbitraryGranularitySpec(Granularities.NONE, Lists.newArrayList( - Intervals.of("2012-01-08T00Z/2012-01-11T00Z"), - Intervals.of("2012-02-01T00Z/2012-03-01T00Z"), - Intervals.of("2012-01-07T00Z/2012-01-08T00Z"), - Intervals.of("2012-01-03T00Z/2012-01-04T00Z"), - Intervals.of("2012-01-01T00Z/2012-01-03T00Z") - )); - - Map map = spec.asMap(JSON_MAPPER); - final GranularitySpec rtSpec = JSON_MAPPER.convertValue(map, GranularitySpec.class); - Assert.assertEquals( - "Round-trip", - ImmutableList.copyOf(spec.sortedBucketIntervals()), - ImmutableList.copyOf(rtSpec.sortedBucketIntervals()) - ); - Assert.assertEquals( - "Round-trip", - ImmutableList.copyOf(spec.inputIntervals()), - ImmutableList.copyOf(rtSpec.inputIntervals()) - ); - Assert.assertEquals(spec, rtSpec); - } - @Test public void testNullInputIntervals() { diff --git a/server/src/test/java/org/apache/druid/segment/indexing/granularity/UniformGranularityTest.java b/processing/src/test/java/org/apache/druid/indexer/granularity/UniformGranularityTest.java similarity index 91% rename from server/src/test/java/org/apache/druid/segment/indexing/granularity/UniformGranularityTest.java rename to processing/src/test/java/org/apache/druid/indexer/granularity/UniformGranularityTest.java index 5ec957747295..e74751773f27 100644 --- a/server/src/test/java/org/apache/druid/segment/indexing/granularity/UniformGranularityTest.java +++ b/processing/src/test/java/org/apache/druid/indexer/granularity/UniformGranularityTest.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.druid.segment.indexing.granularity; +package org.apache.druid.indexer.granularity; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Optional; @@ -39,7 +39,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Map; public class UniformGranularityTest { @@ -180,34 +179,6 @@ public void testJson() } } - @Test - public void testAsMap() - { - final GranularitySpec spec = new UniformGranularitySpec( - Granularities.DAY, - null, - Lists.newArrayList( - Intervals.of("2012-01-08T00Z/2012-01-11T00Z"), - Intervals.of("2012-01-07T00Z/2012-01-08T00Z"), - Intervals.of("2012-01-03T00Z/2012-01-04T00Z"), - Intervals.of("2012-01-01T00Z/2012-01-03T00Z") - ) - ); - Map map = spec.asMap(JSON_MAPPER); - final GranularitySpec rtSpec = JSON_MAPPER.convertValue(map, GranularitySpec.class); - Assert.assertEquals( - "Round-trip sortedBucketIntervals", - ImmutableList.copyOf(spec.sortedBucketIntervals()), - ImmutableList.copyOf(rtSpec.sortedBucketIntervals().iterator()) - ); - Assert.assertEquals( - "Round-trip granularity", - spec.getSegmentGranularity(), - rtSpec.getSegmentGranularity() - ); - Assert.assertEquals(spec, rtSpec); - } - @Test public void testEquals() { diff --git a/processing/src/test/java/org/apache/druid/segment/IndexSpecTest.java b/processing/src/test/java/org/apache/druid/segment/IndexSpecTest.java index 261281cec0b1..960f7fb96d54 100644 --- a/processing/src/test/java/org/apache/druid/segment/IndexSpecTest.java +++ b/processing/src/test/java/org/apache/druid/segment/IndexSpecTest.java @@ -22,7 +22,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import nl.jqno.equalsverifier.EqualsVerifier; import org.apache.druid.jackson.DefaultObjectMapper; -import org.apache.druid.segment.data.BitmapSerdeFactory; import org.apache.druid.segment.data.CompressionFactory; import org.apache.druid.segment.data.CompressionFactory.LongEncodingStrategy; import org.apache.druid.segment.data.CompressionStrategy; @@ -30,8 +29,6 @@ import org.junit.Assert; import org.junit.Test; -import java.util.Map; - public class IndexSpecTest { @Test @@ -72,30 +69,6 @@ public void testDefaults() Assert.assertEquals(LongEncodingStrategy.LONGS, spec.getLongEncoding()); } - @Test - public void testAsMap() - { - final ObjectMapper objectMapper = new DefaultObjectMapper(); - final IndexSpec spec = IndexSpec.DEFAULT; - final Map map = spec.asMap(objectMapper); - Assert.assertEquals( - spec.getBitmapSerdeFactory(), - objectMapper.convertValue(map.get("bitmap"), BitmapSerdeFactory.class) - ); - Assert.assertEquals( - spec.getDimensionCompression(), - objectMapper.convertValue(map.get("dimensionCompression"), CompressionStrategy.class) - ); - Assert.assertEquals( - spec.getMetricCompression(), - objectMapper.convertValue(map.get("metricCompression"), CompressionStrategy.class) - ); - Assert.assertEquals( - spec.getLongEncoding(), - objectMapper.convertValue(map.get("longEncoding"), LongEncodingStrategy.class) - ); - } - @Test public void testEquals() { diff --git a/processing/src/test/java/org/apache/druid/timeline/DataSegmentTest.java b/processing/src/test/java/org/apache/druid/timeline/DataSegmentTest.java index c5a0ea8f60b6..3e2c8a6438d4 100644 --- a/processing/src/test/java/org/apache/druid/timeline/DataSegmentTest.java +++ b/processing/src/test/java/org/apache/druid/timeline/DataSegmentTest.java @@ -26,6 +26,7 @@ import com.google.common.collect.RangeSet; import org.apache.druid.TestObjectMapper; import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.DynamicPartitionsSpec; import org.apache.druid.indexer.partitions.HashedPartitionsSpec; import org.apache.druid.jackson.AggregatorsModule; @@ -135,7 +136,7 @@ public void testV1Serialization() throws Exception ImmutableList.of(new CountAggregatorFactory("count")), new TransformSpec(new SelectorDimFilter("dim1", "foo", null, null), Collections.emptyList()), IndexSpec.DEFAULT, - ImmutableMap.of() + null ), TEST_VERSION, 1 @@ -199,8 +200,8 @@ public void testDeserializationDataSegmentLastCompactionStateWithNullSpecs() thr null, null, null, - null, - ImmutableMap.of() + IndexSpec.DEFAULT, + UniformGranularitySpec.DEFAULT_SPEC ), TEST_VERSION, 1 @@ -351,7 +352,7 @@ public void testWithLastCompactionState() ImmutableList.of(new CountAggregatorFactory("count")), new TransformSpec(new SelectorDimFilter("dim1", "foo", null, null), Collections.emptyList()), IndexSpec.DEFAULT, - Collections.singletonMap("test2", "map2") + null ); final DataSegment segment1 = DataSegment.builder() .dataSource("foo") diff --git a/server/src/main/java/org/apache/druid/client/indexing/ClientCompactionTaskGranularitySpec.java b/server/src/main/java/org/apache/druid/client/indexing/ClientCompactionTaskGranularitySpec.java index 3ba732cfbf74..7b3722e25b1e 100644 --- a/server/src/main/java/org/apache/druid/client/indexing/ClientCompactionTaskGranularitySpec.java +++ b/server/src/main/java/org/apache/druid/client/indexing/ClientCompactionTaskGranularitySpec.java @@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.druid.java.util.common.granularity.Granularity; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import java.util.Objects; diff --git a/server/src/main/java/org/apache/druid/segment/indexing/DataSchema.java b/server/src/main/java/org/apache/druid/segment/indexing/DataSchema.java index 1e717f5d17b6..bc025baa934b 100644 --- a/server/src/main/java/org/apache/druid/segment/indexing/DataSchema.java +++ b/server/src/main/java/org/apache/druid/segment/indexing/DataSchema.java @@ -40,8 +40,8 @@ import org.apache.druid.java.util.common.logger.Logger; import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.segment.column.ColumnHolder; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.transform.TransformSpec; import javax.annotation.Nullable; diff --git a/server/src/main/java/org/apache/druid/server/coordinator/UserCompactionTaskGranularityConfig.java b/server/src/main/java/org/apache/druid/server/coordinator/UserCompactionTaskGranularityConfig.java index d6b320a24838..d901cf78bd5c 100644 --- a/server/src/main/java/org/apache/druid/server/coordinator/UserCompactionTaskGranularityConfig.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/UserCompactionTaskGranularityConfig.java @@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.druid.java.util.common.granularity.Granularity; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import java.util.Objects; diff --git a/server/src/test/java/org/apache/druid/segment/indexing/DataSchemaTest.java b/server/src/test/java/org/apache/druid/segment/indexing/DataSchemaTest.java index 78294fca0c4b..8512afad1cf9 100644 --- a/server/src/test/java/org/apache/druid/segment/indexing/DataSchemaTest.java +++ b/server/src/test/java/org/apache/druid/segment/indexing/DataSchemaTest.java @@ -44,8 +44,8 @@ import org.apache.druid.query.expression.TestExprMacroTable; import org.apache.druid.query.filter.SelectorDimFilter; import org.apache.druid.segment.TestHelper; -import org.apache.druid.segment.indexing.granularity.ArbitraryGranularitySpec; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.transform.ExpressionTransform; import org.apache.druid.segment.transform.TransformSpec; import org.apache.druid.testing.InitializedNullHandlingTest; diff --git a/server/src/test/java/org/apache/druid/segment/indexing/TestModifiedDataSchema.java b/server/src/test/java/org/apache/druid/segment/indexing/TestModifiedDataSchema.java index b10509036243..81110e49d1c8 100644 --- a/server/src/test/java/org/apache/druid/segment/indexing/TestModifiedDataSchema.java +++ b/server/src/test/java/org/apache/druid/segment/indexing/TestModifiedDataSchema.java @@ -26,7 +26,7 @@ import org.apache.druid.data.input.impl.DimensionsSpec; import org.apache.druid.data.input.impl.TimestampSpec; import org.apache.druid.query.aggregation.AggregatorFactory; -import org.apache.druid.segment.indexing.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.transform.TransformSpec; import javax.annotation.Nullable; diff --git a/server/src/test/java/org/apache/druid/segment/realtime/FireDepartmentTest.java b/server/src/test/java/org/apache/druid/segment/realtime/FireDepartmentTest.java index 9c37fe7a37c6..bdc645025de8 100644 --- a/server/src/test/java/org/apache/druid/segment/realtime/FireDepartmentTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/FireDepartmentTest.java @@ -36,7 +36,7 @@ import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.RealtimeIOConfig; import org.apache.druid.segment.indexing.RealtimeTuningConfig; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.join.NoopJoinableFactory; import org.apache.druid.segment.realtime.plumber.RealtimePlumberSchool; import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; diff --git a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/ClosedSegmensSinksBatchAppenderatorTester.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/ClosedSegmensSinksBatchAppenderatorTester.java index c1d2bf7a3a5d..2850620b5269 100644 --- a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/ClosedSegmensSinksBatchAppenderatorTester.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/ClosedSegmensSinksBatchAppenderatorTester.java @@ -45,7 +45,7 @@ import org.apache.druid.segment.incremental.SimpleRowIngestionMeters; import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.TuningConfig; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.loading.DataSegmentPusher; import org.apache.druid.segment.realtime.FireDepartmentMetrics; import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; diff --git a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/DefaultOfflineAppenderatorFactoryTest.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/DefaultOfflineAppenderatorFactoryTest.java index c6c2069b681c..2c9f268e041d 100644 --- a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/DefaultOfflineAppenderatorFactoryTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/DefaultOfflineAppenderatorFactoryTest.java @@ -40,7 +40,7 @@ import org.apache.druid.segment.column.ColumnConfig; import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.RealtimeTuningConfig; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.realtime.FireDepartmentMetrics; import org.apache.druid.timeline.partition.LinearShardSpec; import org.junit.Assert; diff --git a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/OpenAndClosedSegmentsAppenderatorTester.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/OpenAndClosedSegmentsAppenderatorTester.java index 552dc893baf8..6ec851a445d5 100644 --- a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/OpenAndClosedSegmentsAppenderatorTester.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/OpenAndClosedSegmentsAppenderatorTester.java @@ -43,7 +43,7 @@ import org.apache.druid.segment.incremental.SimpleRowIngestionMeters; import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.TuningConfig; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.loading.DataSegmentPusher; import org.apache.druid.segment.realtime.FireDepartmentMetrics; import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; diff --git a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorTester.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorTester.java index 217c90116c3f..57fdce29034a 100644 --- a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorTester.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorTester.java @@ -60,7 +60,7 @@ import org.apache.druid.segment.incremental.SimpleRowIngestionMeters; import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.RealtimeTuningConfig; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.join.NoopJoinableFactory; import org.apache.druid.segment.loading.DataSegmentPusher; import org.apache.druid.segment.realtime.FireDepartmentMetrics; diff --git a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/UnifiedIndexerAppenderatorsManagerTest.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/UnifiedIndexerAppenderatorsManagerTest.java index c0a0913314a3..31e3dbdb549a 100644 --- a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/UnifiedIndexerAppenderatorsManagerTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/UnifiedIndexerAppenderatorsManagerTest.java @@ -45,7 +45,7 @@ import org.apache.druid.segment.incremental.NoopRowIngestionMeters; import org.apache.druid.segment.incremental.ParseExceptionHandler; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.join.JoinableFactoryWrapperTest; import org.apache.druid.segment.loading.NoopDataSegmentPusher; import org.apache.druid.segment.realtime.FireDepartmentMetrics; diff --git a/server/src/test/java/org/apache/druid/segment/realtime/plumber/RealtimePlumberSchoolTest.java b/server/src/test/java/org/apache/druid/segment/realtime/plumber/RealtimePlumberSchoolTest.java index eeea2a930e53..12ef42e4e2d6 100644 --- a/server/src/test/java/org/apache/druid/segment/realtime/plumber/RealtimePlumberSchoolTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/plumber/RealtimePlumberSchoolTest.java @@ -50,7 +50,7 @@ import org.apache.druid.segment.handoff.SegmentHandoffNotifierFactory; import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.RealtimeTuningConfig; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.join.NoopJoinableFactory; import org.apache.druid.segment.loading.DataSegmentPusher; import org.apache.druid.segment.realtime.FireDepartmentMetrics; diff --git a/server/src/test/java/org/apache/druid/segment/realtime/plumber/SinkTest.java b/server/src/test/java/org/apache/druid/segment/realtime/plumber/SinkTest.java index 2d3bdc4ae7ee..f352e96608da 100644 --- a/server/src/test/java/org/apache/druid/segment/realtime/plumber/SinkTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/plumber/SinkTest.java @@ -34,7 +34,7 @@ import org.apache.druid.query.aggregation.CountAggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.RealtimeTuningConfig; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.realtime.FireHydrant; import org.apache.druid.testing.InitializedNullHandlingTest; import org.joda.time.DateTime; diff --git a/server/src/test/java/org/apache/druid/server/coordinator/compact/NewestSegmentFirstPolicyTest.java b/server/src/test/java/org/apache/druid/server/coordinator/compact/NewestSegmentFirstPolicyTest.java index d4742e954bef..60feabc65709 100644 --- a/server/src/test/java/org/apache/druid/server/coordinator/compact/NewestSegmentFirstPolicyTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/compact/NewestSegmentFirstPolicyTest.java @@ -28,6 +28,7 @@ import org.apache.druid.client.indexing.ClientCompactionTaskQueryTuningConfig; import org.apache.druid.common.config.NullHandling; import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.PartitionsSpec; import org.apache.druid.jackson.DefaultObjectMapper; import org.apache.druid.java.util.common.DateTimes; @@ -78,6 +79,7 @@ public class NewestSegmentFirstPolicyTest private static final String DATA_SOURCE = "dataSource"; private static final long DEFAULT_SEGMENT_SIZE = 1000; private static final int DEFAULT_NUM_SEGMENTS_PER_SHARD = 4; + private static UniformGranularitySpec DAY = new UniformGranularitySpec(Granularities.DAY, null, null, null); private final ObjectMapper mapper = new DefaultObjectMapper(); private final NewestSegmentFirstPolicy policy = new NewestSegmentFirstPolicy(mapper); @@ -756,13 +758,13 @@ public void testIteratorReturnsNothingAsSegmentsWasCompactedAndHaveSameSegmentGr Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, ImmutableMap.of("segmentGranularity", "day")) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, DAY) ), new SegmentGenerateSpec( Intervals.of("2017-10-02T00:00:00/2017-10-03T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, ImmutableMap.of("segmentGranularity", "day")) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, DAY) ) ); @@ -828,13 +830,13 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentSeg Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, ImmutableMap.of("segmentGranularity", "day")) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, DAY) ), new SegmentGenerateSpec( Intervals.of("2017-10-02T00:00:00/2017-10-03T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, ImmutableMap.of("segmentGranularity", "day")) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, DAY) ) ); @@ -971,19 +973,19 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentRol Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, ImmutableMap.of("rollup", "false")) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, new UniformGranularitySpec(null, null, false, null)) ), new SegmentGenerateSpec( Intervals.of("2017-10-02T00:00:00/2017-10-03T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, ImmutableMap.of("rollup", "true")) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, UniformGranularitySpec.DEFAULT_SPEC) ), new SegmentGenerateSpec( Intervals.of("2017-10-03T00:00:00/2017-10-04T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, ImmutableMap.of()) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, new UniformGranularitySpec(null, null, false, null)) ) ); @@ -1029,19 +1031,19 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentQue Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, ImmutableMap.of("queryGranularity", "day")) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, new UniformGranularitySpec(null , Granularities.DAY, null, null)) ), new SegmentGenerateSpec( Intervals.of("2017-10-02T00:00:00/2017-10-03T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, ImmutableMap.of("queryGranularity", "minute")) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, new UniformGranularitySpec(null, Granularities.MINUTE, null)) ), new SegmentGenerateSpec( Intervals.of("2017-10-03T00:00:00/2017-10-04T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, ImmutableMap.of()) + new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, UniformGranularitySpec.DEFAULT_SPEC) ) ); diff --git a/server/src/test/java/org/apache/druid/server/coordinator/duty/CompactSegmentsTest.java b/server/src/test/java/org/apache/druid/server/coordinator/duty/CompactSegmentsTest.java index 39d0f3504c04..df46f6a2454c 100644 --- a/server/src/test/java/org/apache/druid/server/coordinator/duty/CompactSegmentsTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/duty/CompactSegmentsTest.java @@ -45,6 +45,7 @@ import org.apache.druid.indexer.TaskLocation; import org.apache.druid.indexer.TaskState; import org.apache.druid.indexer.TaskStatusPlus; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.DynamicPartitionsSpec; import org.apache.druid.indexer.partitions.HashedPartitionsSpec; import org.apache.druid.indexer.partitions.PartitionsSpec; @@ -105,7 +106,6 @@ import javax.annotation.Nullable; import java.net.URI; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -407,12 +407,12 @@ public void testMakeStatsForDataSourceWithCompactedIntervalBetweenNonCompactedIn DataSegment afterNoon = createSegment(dataSourceName, j, false, k); if (j == 3) { // Make two intervals on this day compacted (two compacted intervals back-to-back) - beforeNoon = beforeNoon.withLastCompactionState(new CompactionState(partitionsSpec, null, null, null, null, ImmutableMap.of())); - afterNoon = afterNoon.withLastCompactionState(new CompactionState(partitionsSpec, null, null, null, null, ImmutableMap.of())); + beforeNoon = beforeNoon.withLastCompactionState(new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, UniformGranularitySpec.DEFAULT_SPEC)); + afterNoon = afterNoon.withLastCompactionState(new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, UniformGranularitySpec.DEFAULT_SPEC)); } if (j == 1) { // Make one interval on this day compacted - afterNoon = afterNoon.withLastCompactionState(new CompactionState(partitionsSpec, null, null, null, null, ImmutableMap.of())); + afterNoon = afterNoon.withLastCompactionState(new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, UniformGranularitySpec.DEFAULT_SPEC)); } segments.add(beforeNoon); segments.add(afterNoon); @@ -2058,9 +2058,9 @@ private void compactSegments( transformSpec = new TransformSpec(clientCompactionTaskQuery.getTransformSpec().getFilter(), null); } - List metricsSpec = null; + List metricsSpec = null; if (clientCompactionTaskQuery.getMetricsSpec() != null) { - metricsSpec = jsonMapper.convertValue(clientCompactionTaskQuery.getMetricsSpec(), new TypeReference>() {}); + metricsSpec = jsonMapper.convertValue(clientCompactionTaskQuery.getMetricsSpec(), new TypeReference>() {}); } for (int i = 0; i < 2; i++) { @@ -2077,10 +2077,10 @@ private void compactSegments( clientCompactionTaskQuery.getDimensionsSpec() == null ? null : new DimensionsSpec( clientCompactionTaskQuery.getDimensionsSpec().getDimensions() ), - Arrays.asList(clientCompactionTaskQuery.getMetricsSpec()), + metricsSpec, transformSpec, IndexSpec.DEFAULT, - ImmutableMap.of() + UniformGranularitySpec.DEFAULT_SPEC ), 1, segmentSize 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 232c87eb8801..d5f232274ba4 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 @@ -33,7 +33,7 @@ import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.segment.IndexSpec; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.segment.indexing.granularity.UniformGranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/schema/SystemSchemaTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/schema/SystemSchemaTest.java index f0f2c1d75f11..bef118f308d4 100644 --- a/sql/src/test/java/org/apache/druid/sql/calcite/schema/SystemSchemaTest.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/schema/SystemSchemaTest.java @@ -51,8 +51,10 @@ import org.apache.druid.discovery.DruidNodeDiscoveryProvider; import org.apache.druid.discovery.NodeRole; import org.apache.druid.indexer.TaskStatusPlus; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.DynamicPartitionsSpec; import org.apache.druid.indexing.overlord.supervisor.SupervisorStatus; +import org.apache.druid.jackson.DefaultObjectMapper; import org.apache.druid.java.util.common.CloseableIterators; import org.apache.druid.java.util.common.DateTimes; import org.apache.druid.java.util.common.IAE; @@ -287,7 +289,7 @@ public void setUp() throws Exception null, null, IndexSpec.DEFAULT, - Collections.singletonMap("test2", "map2") + UniformGranularitySpec.DEFAULT_SPEC ); private final DataSegment publishedCompactedSegment1 = new DataSegment( @@ -566,7 +568,7 @@ public void testGetTableMap() @Test public void testSegmentsTable() throws Exception { - final SegmentsTable segmentsTable = new SegmentsTable(druidSchema, metadataView, new ObjectMapper(), authMapper); + final SegmentsTable segmentsTable = new SegmentsTable(druidSchema, metadataView, new DefaultObjectMapper(), authMapper); final Set publishedSegments = new HashSet<>(Arrays.asList( new SegmentStatusInCluster(publishedCompactedSegment1, true, 2), new SegmentStatusInCluster(publishedCompactedSegment2, false, 0), From e6f7c52b865316917fc34b5d756f0e3fa3e01a7c Mon Sep 17 00:00:00 2001 From: Clint Wylie Date: Thu, 31 Aug 2023 04:32:41 -0700 Subject: [PATCH 3/5] fix --- .../k8s/overlord/common/K8sTestUtils.java | 2 +- .../MaterializedViewSupervisorSpec.java | 2 +- .../indexing/kafka/KafkaIndexTaskTest.java | 2 +- .../indexing/kafka/KafkaSamplerSpecTest.java | 2 +- .../kafka/supervisor/KafkaSupervisorTest.java | 2 +- .../kinesis/KinesisSamplerSpecTest.java | 2 +- .../supervisor/KinesisSupervisorTest.java | 2 +- .../apache/druid/msq/exec/ControllerImpl.java | 4 ++-- .../indexer/DetermineHashedPartitionsJob.java | 2 +- .../indexer/HadoopDruidIndexerConfig.java | 2 +- .../indexer/HadoopDruidIndexerMapper.java | 2 +- .../path/GranularUnprocessedPathSpec.java | 2 +- .../druid/indexer/BatchDeltaIngestionTest.java | 2 +- .../DetermineHashedPartitionsJobTest.java | 2 +- .../indexer/DeterminePartitionsJobTest.java | 2 +- .../DetermineRangePartitionsJobTest.java | 2 +- .../indexer/HadoopDruidIndexerConfigTest.java | 2 +- .../indexer/HadoopDruidIndexerMapperTest.java | 2 +- .../druid/indexer/HadoopIngestionSpecTest.java | 2 +- ...ecUpdateDatasourcePathSpecSegmentsTest.java | 2 +- .../indexer/IndexGeneratorCombinerTest.java | 2 +- .../druid/indexer/IndexGeneratorJobTest.java | 2 +- .../apache/druid/indexer/JobHelperTest.java | 2 +- .../indexer/path/DatasourcePathSpecTest.java | 2 +- .../indexer/path/GranularityPathSpecTest.java | 2 +- .../common/task/AbstractBatchIndexTask.java | 18 +++++++++++------- .../task/CachingLocalSegmentAllocator.java | 2 +- .../indexing/common/task/CompactionTask.java | 4 ++-- .../indexing/common/task/HadoopIndexTask.java | 4 ++-- .../druid/indexing/common/task/IndexTask.java | 4 ++-- .../common/task/InputSourceProcessor.java | 2 +- .../common/task/LocalSegmentAllocator.java | 2 +- .../OverlordCoordinatingSegmentAllocator.java | 2 +- .../common/task/SegmentAllocators.java | 2 +- .../parallel/ParallelIndexSupervisorTask.java | 4 ++-- .../PartialDimensionCardinalityTask.java | 2 +- .../PartialDimensionDistributionTask.java | 2 +- .../PartialHashSegmentGenerateTask.java | 2 +- .../parallel/PerfectRollupWorkerTask.java | 4 ++-- .../batch/parallel/SinglePhaseSubTask.java | 4 ++-- .../task/batch/parallel/TombstoneHelper.java | 2 +- ...efaultIndexTaskInputRowIteratorBuilder.java | 2 +- .../IndexTaskInputRowIteratorBuilder.java | 2 +- ...titionIndexTaskInputRowIteratorBuilder.java | 2 +- ...ppenderatorDriverRealtimeIndexTaskTest.java | 2 +- .../common/task/AppenderatorsTest.java | 2 +- .../common/task/BatchAppenderatorsTest.java | 2 +- .../task/CompactionTaskParallelRunTest.java | 14 +++++++------- .../common/task/CompactionTaskRunTest.java | 11 ++--------- .../common/task/CompactionTaskTest.java | 2 +- .../common/task/HadoopIndexTaskTest.java | 2 +- .../common/task/IndexIngestionSpecTest.java | 2 +- .../indexing/common/task/IndexTaskTest.java | 6 +++--- ...titionCachingLocalSegmentAllocatorTest.java | 2 +- .../common/task/RealtimeIndexTaskTest.java | 2 +- .../indexing/common/task/TaskSerdeTest.java | 2 +- ...AbstractMultiPhaseParallelIndexingTest.java | 4 ++-- ...titionCachingLocalSegmentAllocatorTest.java | 2 +- .../parallel/HashPartitionTaskKillTest.java | 4 ++-- ...haseParallelIndexingWithNullColumnTest.java | 2 +- .../ParallelIndexSupervisorTaskKillTest.java | 2 +- ...arallelIndexSupervisorTaskResourceTest.java | 2 +- .../ParallelIndexSupervisorTaskSerdeTest.java | 2 +- .../parallel/ParallelIndexTestingFactory.java | 4 ++-- .../PartialDimensionCardinalityTaskTest.java | 2 +- .../PartialHashSegmentGenerateTaskTest.java | 2 +- .../parallel/PerfectRollupWorkerTaskTest.java | 2 +- .../parallel/RangePartitionTaskKillTest.java | 4 ++-- .../SinglePhaseParallelIndexingTest.java | 2 +- .../batch/parallel/TombstoneHelperTest.java | 4 ++-- ...ltIndexTaskInputRowIteratorBuilderTest.java | 2 +- ...kInputRowIteratorBuilderTestingFactory.java | 2 +- ...onIndexTaskInputRowIteratorBuilderTest.java | 2 +- .../indexing/input/InputRowSchemasTest.java | 2 +- .../indexing/overlord/TaskLifecycleTest.java | 2 +- .../sampler/InputSourceSamplerTest.java | 4 ++-- .../SeekableStreamIndexTaskRunnerAuthTest.java | 2 +- .../SeekableStreamIndexTaskTestBase.java | 2 +- .../SeekableStreamSamplerSpecTest.java | 2 +- .../SeekableStreamSupervisorSpecTest.java | 2 +- .../SeekableStreamSupervisorStateTest.java | 2 +- .../coordinator/duty/ITAutoCompactionTest.java | 2 +- .../ClientCompactionTaskGranularitySpec.java | 2 +- .../druid/segment/indexing/DataSchema.java | 4 ++-- .../UserCompactionTaskGranularityConfig.java | 2 +- .../druid/segment/indexing/DataSchemaTest.java | 4 ++-- .../indexing/TestModifiedDataSchema.java | 2 +- .../segment/realtime/FireDepartmentTest.java | 2 +- ...sedSegmensSinksBatchAppenderatorTester.java | 2 +- .../DefaultOfflineAppenderatorFactoryTest.java | 2 +- ...penAndClosedSegmentsAppenderatorTester.java | 2 +- .../appenderator/StreamAppenderatorTester.java | 2 +- ...UnifiedIndexerAppenderatorsManagerTest.java | 2 +- .../plumber/RealtimePlumberSchoolTest.java | 2 +- .../segment/realtime/plumber/SinkTest.java | 2 +- .../compact/NewestSegmentFirstPolicyTest.java | 2 +- .../cli/validate/DruidJsonValidatorTest.java | 2 +- 97 files changed, 131 insertions(+), 134 deletions(-) diff --git a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/K8sTestUtils.java b/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/K8sTestUtils.java index f492d3a15a1f..d083b66f4b13 100644 --- a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/K8sTestUtils.java +++ b/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/K8sTestUtils.java @@ -27,6 +27,7 @@ import org.apache.druid.data.input.impl.LocalInputSource; import org.apache.druid.data.input.impl.NoopInputFormat; import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.DynamicPartitionsSpec; import org.apache.druid.indexing.common.task.IndexTask; import org.apache.druid.indexing.common.task.Task; @@ -36,7 +37,6 @@ import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; import org.apache.druid.segment.IndexSpec; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import java.io.File; 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 1b3748ca7eca..84b6bc049ed7 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 @@ -31,6 +31,7 @@ import org.apache.druid.indexer.HadoopIOConfig; import org.apache.druid.indexer.HadoopIngestionSpec; import org.apache.druid.indexer.HadoopTuningConfig; +import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; import org.apache.druid.indexer.hadoop.DatasourceIngestionSpec; import org.apache.druid.indexing.common.task.HadoopIndexTask; import org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator; @@ -46,7 +47,6 @@ import org.apache.druid.metadata.SqlSegmentsMetadataManager; import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; import org.apache.druid.segment.realtime.firehose.ChatHandlerProvider; import org.apache.druid.segment.transform.TransformSpec; import org.apache.druid.server.security.AuthorizerMapper; 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 e8efa5342274..5e7d5e120a58 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 @@ -54,6 +54,7 @@ import org.apache.druid.data.input.kafkainput.KafkaStringHeaderFormat; import org.apache.druid.indexer.TaskState; import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexing.common.IngestionStatsAndErrorsTaskReportData; import org.apache.druid.indexing.common.LockGranularity; import org.apache.druid.indexing.common.TestUtils; @@ -109,7 +110,6 @@ import org.apache.druid.segment.incremental.RowIngestionMetersTotals; import org.apache.druid.segment.incremental.RowMeters; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.transform.ExpressionTransform; import org.apache.druid.segment.transform.TransformSpec; import org.apache.druid.server.security.Action; diff --git a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaSamplerSpecTest.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaSamplerSpecTest.java index 4c9eb24c686d..b3357a039ea9 100644 --- a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaSamplerSpecTest.java +++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaSamplerSpecTest.java @@ -35,6 +35,7 @@ import org.apache.druid.data.input.impl.StringInputRowParser; import org.apache.druid.data.input.impl.TimestampSpec; import org.apache.druid.data.input.kafkainput.KafkaInputFormat; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexing.kafka.supervisor.KafkaSupervisorIOConfig; import org.apache.druid.indexing.kafka.supervisor.KafkaSupervisorSpec; import org.apache.druid.indexing.kafka.test.TestBroker; @@ -51,7 +52,6 @@ import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; import org.apache.druid.segment.TestHelper; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.server.security.Action; import org.apache.druid.server.security.Resource; import org.apache.druid.server.security.ResourceAction; 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 a9a1bad09fea..d0bc33db2b67 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 @@ -38,6 +38,7 @@ import org.apache.druid.data.input.kafka.KafkaTopicPartition; import org.apache.druid.indexer.TaskLocation; import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexing.common.TaskInfoProvider; import org.apache.druid.indexing.common.TestUtils; import org.apache.druid.indexing.common.task.RealtimeIndexTask; @@ -88,7 +89,6 @@ import org.apache.druid.segment.incremental.RowIngestionMetersFactory; import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.RealtimeIOConfig; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.realtime.FireDepartment; import org.apache.druid.server.metrics.ExceptionCapturingServiceEmitter; import org.apache.druid.server.metrics.NoopServiceEmitter; diff --git a/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisSamplerSpecTest.java b/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisSamplerSpecTest.java index 8cc56c5f5912..8c4e8316d405 100644 --- a/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisSamplerSpecTest.java +++ b/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisSamplerSpecTest.java @@ -37,6 +37,7 @@ import org.apache.druid.data.input.impl.StringDimensionSchema; import org.apache.druid.data.input.impl.StringInputRowParser; import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexing.kinesis.supervisor.KinesisSupervisorIOConfig; import org.apache.druid.indexing.kinesis.supervisor.KinesisSupervisorSpec; import org.apache.druid.indexing.overlord.sampler.InputSourceSampler; @@ -52,7 +53,6 @@ import org.apache.druid.query.aggregation.CountAggregatorFactory; import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.server.security.Action; import org.apache.druid.server.security.Resource; import org.apache.druid.server.security.ResourceAction; diff --git a/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisorTest.java b/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisorTest.java index 5b71dc6a9491..c130c21ee70d 100644 --- a/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisorTest.java +++ b/extensions-core/kinesis-indexing-service/src/test/java/org/apache/druid/indexing/kinesis/supervisor/KinesisSupervisorTest.java @@ -35,6 +35,7 @@ import org.apache.druid.data.input.impl.TimestampSpec; import org.apache.druid.indexer.TaskLocation; import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexing.common.TaskInfoProvider; import org.apache.druid.indexing.common.TestUtils; import org.apache.druid.indexing.common.task.RealtimeIndexTask; @@ -84,7 +85,6 @@ import org.apache.druid.segment.incremental.RowIngestionMetersFactory; import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.RealtimeIOConfig; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.realtime.FireDepartment; import org.apache.druid.server.metrics.ExceptionCapturingServiceEmitter; import org.apache.druid.server.metrics.NoopServiceEmitter; diff --git a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerImpl.java b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerImpl.java index dada0bda4761..b5c869e0c581 100644 --- a/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerImpl.java +++ b/extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerImpl.java @@ -58,6 +58,8 @@ import org.apache.druid.frame.write.InvalidNullByteException; import org.apache.druid.indexer.TaskState; import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.indexing.common.LockGranularity; import org.apache.druid.indexing.common.TaskLock; import org.apache.druid.indexing.common.TaskLockType; @@ -180,8 +182,6 @@ import org.apache.druid.segment.column.RowSignature; import org.apache.druid.segment.column.ValueType; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; -import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.realtime.appenderator.SegmentIdWithShardSpec; import org.apache.druid.segment.transform.TransformSpec; import org.apache.druid.server.DruidNode; diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/DetermineHashedPartitionsJob.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/DetermineHashedPartitionsJob.java index 79c1d9f309ad..79be643fe0ba 100644 --- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/DetermineHashedPartitionsJob.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/DetermineHashedPartitionsJob.java @@ -30,6 +30,7 @@ import org.apache.druid.data.input.InputRow; import org.apache.druid.data.input.Rows; import org.apache.druid.hll.HyperLogLogCollector; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.HashedPartitionsSpec; import org.apache.druid.indexer.partitions.PartitionsSpec; import org.apache.druid.java.util.common.DateTimes; @@ -37,7 +38,6 @@ import org.apache.druid.java.util.common.StringUtils; import org.apache.druid.java.util.common.granularity.Granularity; import org.apache.druid.java.util.common.logger.Logger; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.timeline.partition.HashBasedNumberedShardSpec; import org.apache.druid.timeline.partition.HashPartitionFunction; import org.apache.hadoop.conf.Configurable; diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java index 6c2e23c7a048..4a652e6f01db 100644 --- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerConfig.java @@ -38,6 +38,7 @@ import org.apache.druid.guice.GuiceInjectors; import org.apache.druid.guice.JsonConfigProvider; import org.apache.druid.guice.annotations.Self; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.indexer.partitions.DimensionBasedPartitionsSpec; import org.apache.druid.indexer.path.PathSpec; import org.apache.druid.initialization.Initialization; @@ -51,7 +52,6 @@ import org.apache.druid.segment.IndexMerger; import org.apache.druid.segment.IndexMergerV9; import org.apache.druid.segment.IndexSpec; -import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.loading.DataSegmentPusher; import org.apache.druid.server.DruidNode; import org.apache.druid.timeline.DataSegment; diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerMapper.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerMapper.java index 3dde4715746f..4f8e7c8b1383 100644 --- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerMapper.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/HadoopDruidIndexerMapper.java @@ -23,6 +23,7 @@ import org.apache.druid.data.input.InputRow; import org.apache.druid.data.input.impl.InputRowParser; import org.apache.druid.data.input.impl.StringInputRowParser; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.java.util.common.DateTimes; import org.apache.druid.java.util.common.Intervals; import org.apache.druid.java.util.common.RE; @@ -30,7 +31,6 @@ import org.apache.druid.java.util.common.collect.Utils; import org.apache.druid.java.util.common.logger.Logger; import org.apache.druid.java.util.common.parsers.ParseException; -import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.Counter; import org.apache.hadoop.mapreduce.Mapper; diff --git a/indexing-hadoop/src/main/java/org/apache/druid/indexer/path/GranularUnprocessedPathSpec.java b/indexing-hadoop/src/main/java/org/apache/druid/indexer/path/GranularUnprocessedPathSpec.java index 49ddd2b973e6..f462c486ddfd 100644 --- a/indexing-hadoop/src/main/java/org/apache/druid/indexer/path/GranularUnprocessedPathSpec.java +++ b/indexing-hadoop/src/main/java/org/apache/druid/indexer/path/GranularUnprocessedPathSpec.java @@ -24,12 +24,12 @@ import com.google.common.collect.Lists; import com.google.common.collect.Ordering; import org.apache.druid.indexer.HadoopDruidIndexerConfig; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.hadoop.FSSpideringIterator; import org.apache.druid.java.util.common.DateTimes; import org.apache.druid.java.util.common.StringUtils; import org.apache.druid.java.util.common.granularity.Granularity; import org.apache.druid.java.util.common.guava.Comparators; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; 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 af3fdcf4e48a..fc060c7fb0b3 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 @@ -33,6 +33,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.granularity.UniformGranularitySpec; import org.apache.druid.indexer.hadoop.WindowedDataSegment; import org.apache.druid.jackson.DefaultObjectMapper; import org.apache.druid.java.util.common.DateTimes; @@ -47,7 +48,6 @@ import org.apache.druid.segment.QueryableIndexStorageAdapter; import org.apache.druid.segment.StorageAdapter; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.loading.LocalDataSegmentPuller; import org.apache.druid.segment.realtime.firehose.IngestSegmentFirehose; import org.apache.druid.segment.realtime.firehose.WindowedStorageAdapter; 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 07da0b075887..df272d7d02e5 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 @@ -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.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.HashedPartitionsSpec; import org.apache.druid.java.util.common.DateTimes; import org.apache.druid.java.util.common.FileUtils; @@ -35,7 +36,6 @@ import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.timeline.partition.HashBasedNumberedShardSpec; import org.apache.druid.timeline.partition.HashPartitionFunction; import org.joda.time.Interval; 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 3ccd98034f6d..46a0ca7346e7 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 @@ -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.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.SingleDimensionPartitionsSpec; import org.apache.druid.java.util.common.FileUtils; import org.apache.druid.java.util.common.Intervals; @@ -32,7 +33,6 @@ import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.query.aggregation.LongSumAggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.timeline.partition.SingleDimensionShardSpec; import org.junit.After; import org.junit.Assert; diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/DetermineRangePartitionsJobTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/DetermineRangePartitionsJobTest.java index 0ecadaf79fda..b0fef8a59a26 100644 --- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/DetermineRangePartitionsJobTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/DetermineRangePartitionsJobTest.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.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.DimensionRangePartitionsSpec; import org.apache.druid.java.util.common.FileUtils; import org.apache.druid.java.util.common.Intervals; @@ -32,7 +33,6 @@ import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.query.aggregation.LongSumAggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.timeline.partition.DimensionRangeShardSpec; import org.junit.After; import org.junit.Assert; 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 3dde4de1be32..3ffc5a8f76c9 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 @@ -28,6 +28,7 @@ import org.apache.druid.data.input.MapBasedInputRow; import org.apache.druid.discovery.NodeRole; import org.apache.druid.guice.annotations.Self; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.DimensionBasedPartitionsSpec; import org.apache.druid.indexer.partitions.HashedPartitionsSpec; import org.apache.druid.indexer.partitions.PartitionsSpec; @@ -39,7 +40,6 @@ import org.apache.druid.java.util.common.granularity.Granularities; import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.timeline.partition.HashBasedNumberedShardSpec; import org.apache.druid.timeline.partition.HashPartitionFunction; import org.apache.druid.timeline.partition.NoneShardSpec; diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopDruidIndexerMapperTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopDruidIndexerMapperTest.java index 287630e2f4d9..0a8d610ff7ca 100644 --- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopDruidIndexerMapperTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopDruidIndexerMapperTest.java @@ -26,6 +26,7 @@ import org.apache.druid.data.input.impl.DimensionsSpec; import org.apache.druid.data.input.impl.JSONParseSpec; import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.path.StaticPathSpec; import org.apache.druid.java.util.common.granularity.Granularities; import org.apache.druid.java.util.common.jackson.JacksonUtils; @@ -36,7 +37,6 @@ import org.apache.druid.query.filter.SelectorDimFilter; import org.apache.druid.segment.TestHelper; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.transform.ExpressionTransform; import org.apache.druid.segment.transform.TransformSpec; import org.apache.hadoop.conf.Configuration; diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopIngestionSpecTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopIngestionSpecTest.java index e5b8d364ea29..693990da0873 100644 --- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopIngestionSpecTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopIngestionSpecTest.java @@ -23,6 +23,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.HashedPartitionsSpec; import org.apache.druid.indexer.partitions.PartitionsSpec; import org.apache.druid.indexer.partitions.SingleDimensionPartitionsSpec; @@ -33,7 +34,6 @@ import org.apache.druid.java.util.common.granularity.Granularities; import org.apache.druid.java.util.common.granularity.PeriodGranularity; import org.apache.druid.metadata.MetadataStorageConnectorConfig; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.joda.time.Period; import org.junit.Assert; import org.junit.Test; diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopIngestionSpecUpdateDatasourcePathSpecSegmentsTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopIngestionSpecUpdateDatasourcePathSpecSegmentsTest.java index 616580fe7238..101f8f912005 100644 --- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopIngestionSpecUpdateDatasourcePathSpecSegmentsTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/HadoopIngestionSpecUpdateDatasourcePathSpecSegmentsTest.java @@ -23,6 +23,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.hadoop.DatasourceIngestionSpec; import org.apache.druid.indexer.hadoop.WindowedDataSegment; import org.apache.druid.indexer.path.DatasourcePathSpec; @@ -36,7 +37,6 @@ import org.apache.druid.java.util.common.granularity.Granularities; import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.timeline.DataSegment; import org.apache.druid.timeline.DataSegment.PruneSpecsHolder; import org.apache.druid.timeline.partition.NoneShardSpec; diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorCombinerTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorCombinerTest.java index 9f8187daab85..e22eaa517925 100644 --- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorCombinerTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/IndexGeneratorCombinerTest.java @@ -29,6 +29,7 @@ import org.apache.druid.data.input.impl.StringInputRowParser; import org.apache.druid.data.input.impl.TimeAndDimsParseSpec; import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.java.util.common.DateTimes; import org.apache.druid.java.util.common.Intervals; import org.apache.druid.java.util.common.StringUtils; @@ -37,7 +38,6 @@ import org.apache.druid.query.aggregation.LongSumAggregatorFactory; import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.BytesWritable; import org.apache.hadoop.mapreduce.Reducer; 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 e2dd7c54c0a1..8329b6bcb02d 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 @@ -31,6 +31,7 @@ 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.granularity.UniformGranularitySpec; import org.apache.druid.java.util.common.Intervals; import org.apache.druid.java.util.common.RE; import org.apache.druid.java.util.common.StringUtils; @@ -40,7 +41,6 @@ import org.apache.druid.query.aggregation.LongSumAggregatorFactory; import org.apache.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.timeline.DataSegment; import org.apache.druid.timeline.partition.HashBasedNumberedShardSpec; import org.apache.druid.timeline.partition.HashPartitionFunction; 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 851f622953ec..7e1b7f413c2d 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 @@ -27,6 +27,7 @@ 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.granularity.UniformGranularitySpec; import org.apache.druid.indexer.path.StaticPathSpec; import org.apache.druid.java.util.common.CompressionUtilsTest; import org.apache.druid.java.util.common.ISE; @@ -39,7 +40,6 @@ import org.apache.druid.query.aggregation.LongSumAggregatorFactory; import org.apache.druid.segment.TestHelper; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.timeline.DataSegment; import org.apache.druid.timeline.partition.NoneShardSpec; import org.apache.hadoop.conf.Configuration; diff --git a/indexing-hadoop/src/test/java/org/apache/druid/indexer/path/DatasourcePathSpecTest.java b/indexing-hadoop/src/test/java/org/apache/druid/indexer/path/DatasourcePathSpecTest.java index 02fe640d98d4..8d0eaf4084ef 100644 --- a/indexing-hadoop/src/test/java/org/apache/druid/indexer/path/DatasourcePathSpecTest.java +++ b/indexing-hadoop/src/test/java/org/apache/druid/indexer/path/DatasourcePathSpecTest.java @@ -37,6 +37,7 @@ import org.apache.druid.indexer.HadoopIOConfig; import org.apache.druid.indexer.HadoopIngestionSpec; import org.apache.druid.indexer.HadoopTuningConfig; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.hadoop.DatasourceIngestionSpec; import org.apache.druid.indexer.hadoop.DatasourceInputFormat; import org.apache.druid.indexer.hadoop.WindowedDataSegment; @@ -47,7 +48,6 @@ import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.query.aggregation.LongSumAggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.server.DruidNode; import org.apache.druid.timeline.DataSegment; import org.apache.druid.timeline.partition.NoneShardSpec; 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 88051d8ba9a7..bd523773e911 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.granularity.UniformGranularitySpec; import org.apache.druid.jackson.DefaultObjectMapper; import org.apache.druid.java.util.common.Intervals; import org.apache.druid.java.util.common.StringUtils; @@ -36,7 +37,6 @@ import org.apache.druid.java.util.common.granularity.PeriodGranularity; import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.lib.input.TextInputFormat; import org.apache.hadoop.security.UserGroupInformation; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java index 35b30048b492..1c42a02f5a45 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java @@ -28,6 +28,7 @@ import org.apache.druid.data.input.InputSource; import org.apache.druid.data.input.InputSourceReader; import org.apache.druid.data.input.impl.DimensionsSpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.indexing.common.LockGranularity; import org.apache.druid.indexing.common.TaskLock; import org.apache.druid.indexing.common.TaskLockType; @@ -63,7 +64,6 @@ import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.IngestionSpec; import org.apache.druid.segment.indexing.TuningConfig; -import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.realtime.appenderator.SegmentIdWithShardSpec; import org.apache.druid.segment.transform.TransformSpec; import org.apache.druid.timeline.CompactionState; @@ -519,13 +519,17 @@ public static Function, Set> compactionStateAnnota TuningConfig tuningConfig = ingestionSpec.getTuningConfig(); GranularitySpec granularitySpec = ingestionSpec.getDataSchema().getGranularitySpec(); // We do not need to store dimensionExclusions and spatialDimensions since auto compaction does not support them - DimensionsSpec dimensionsSpec = ingestionSpec.getDataSchema().getDimensionsSpec() == null - ? null - : new DimensionsSpec(ingestionSpec.getDataSchema().getDimensionsSpec().getDimensions()); + DimensionsSpec dimensionsSpec = ingestionSpec.getDataSchema().getDimensionsSpec(); + if (dimensionsSpec != null) { + dimensionsSpec = new DimensionsSpec(ingestionSpec.getDataSchema().getDimensionsSpec().getDimensions()); + } // We only need to store filter since that is the only field auto compaction support - TransformSpec transformSpec = ingestionSpec.getDataSchema().getTransformSpec() == null || TransformSpec.NONE.equals(ingestionSpec.getDataSchema().getTransformSpec()) - ? null - : ingestionSpec.getDataSchema().getTransformSpec(); + TransformSpec transformSpec = ingestionSpec.getDataSchema().getTransformSpec(); + if (TransformSpec.NONE.equals(transformSpec)) { + transformSpec = null; + } else { + transformSpec = new TransformSpec(transformSpec.getFilter(), Collections.emptyList()); + } final CompactionState compactionState = new CompactionState( tuningConfig.getPartitionsSpec(), diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/CachingLocalSegmentAllocator.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/CachingLocalSegmentAllocator.java index 75ebdd320753..2e618e5d85cb 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/CachingLocalSegmentAllocator.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/CachingLocalSegmentAllocator.java @@ -23,6 +23,7 @@ import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import org.apache.druid.data.input.InputRow; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.indexing.common.TaskLock; import org.apache.druid.indexing.common.TaskToolbox; import org.apache.druid.indexing.common.actions.LockListAction; @@ -32,7 +33,6 @@ import org.apache.druid.indexing.common.task.batch.partition.CompletePartitionAnalysis; import org.apache.druid.java.util.common.ISE; import org.apache.druid.java.util.common.Pair; -import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.realtime.appenderator.SegmentIdWithShardSpec; import org.apache.druid.timeline.partition.BucketNumberedShardSpec; import org.apache.druid.timeline.partition.ShardSpec; 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 2b9244681dcf..4cdaf703cb89 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,6 +46,8 @@ import org.apache.druid.indexer.Checks; import org.apache.druid.indexer.Property; import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.DynamicPartitionsSpec; import org.apache.druid.indexer.partitions.PartitionsSpec; import org.apache.druid.indexing.common.LockGranularity; @@ -85,8 +87,6 @@ import org.apache.druid.segment.incremental.AppendableIndexSpec; import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.TuningConfig; -import org.apache.druid.indexer.granularity.GranularitySpec; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.loading.SegmentCacheManager; import org.apache.druid.segment.realtime.appenderator.AppenderatorsManager; import org.apache.druid.segment.transform.TransformSpec; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopIndexTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopIndexTask.java index 32714e0633f5..e52b624fcfdb 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopIndexTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/HadoopIndexTask.java @@ -43,6 +43,8 @@ import org.apache.druid.indexer.TaskMetricsGetter; import org.apache.druid.indexer.TaskMetricsUtils; import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.indexing.common.IngestionStatsAndErrorsTaskReport; import org.apache.druid.indexing.common.IngestionStatsAndErrorsTaskReportData; import org.apache.druid.indexing.common.TaskLock; @@ -60,8 +62,6 @@ import org.apache.druid.java.util.common.granularity.Granularity; import org.apache.druid.java.util.common.logger.Logger; import org.apache.druid.segment.incremental.RowIngestionMeters; -import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; -import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.realtime.firehose.ChatHandler; import org.apache.druid.segment.realtime.firehose.ChatHandlerProvider; import org.apache.druid.server.security.Action; 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 f6dfd56854aa..56a41ecece3b 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 @@ -44,6 +44,8 @@ import org.apache.druid.indexer.IngestionState; import org.apache.druid.indexer.Property; import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.indexer.partitions.DynamicPartitionsSpec; import org.apache.druid.indexer.partitions.HashedPartitionsSpec; import org.apache.druid.indexer.partitions.PartitionsSpec; @@ -85,8 +87,6 @@ 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.indexer.granularity.ArbitraryGranularitySpec; -import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.realtime.FireDepartment; import org.apache.druid.segment.realtime.FireDepartmentMetrics; import org.apache.druid.segment.realtime.appenderator.Appenderator; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/InputSourceProcessor.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/InputSourceProcessor.java index a327b173faf1..02542b94753c 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/InputSourceProcessor.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/InputSourceProcessor.java @@ -25,6 +25,7 @@ import org.apache.druid.data.input.InputRow; import org.apache.druid.data.input.InputSource; import org.apache.druid.data.input.InputSourceReader; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.indexer.partitions.DynamicPartitionsSpec; import org.apache.druid.indexer.partitions.PartitionsSpec; import org.apache.druid.indexing.common.task.batch.parallel.iterator.IndexTaskInputRowIteratorBuilder; @@ -34,7 +35,6 @@ import org.apache.druid.segment.incremental.ParseExceptionHandler; import org.apache.druid.segment.incremental.RowIngestionMeters; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.realtime.appenderator.AppenderatorDriverAddResult; import org.apache.druid.segment.realtime.appenderator.BatchAppenderatorDriver; import org.apache.druid.segment.realtime.appenderator.SegmentsAndCommitMetadata; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/LocalSegmentAllocator.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/LocalSegmentAllocator.java index ffa5ed76ff67..911856d88d84 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/LocalSegmentAllocator.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/LocalSegmentAllocator.java @@ -23,11 +23,11 @@ import com.google.common.collect.Maps; import org.apache.commons.lang3.mutable.MutableInt; import org.apache.druid.data.input.InputRow; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.indexing.common.TaskLock; import org.apache.druid.indexing.common.TaskToolbox; import org.apache.druid.indexing.common.actions.LockListAction; import org.apache.druid.java.util.common.ISE; -import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.realtime.appenderator.SegmentAllocator; import org.apache.druid.segment.realtime.appenderator.SegmentIdWithShardSpec; import org.apache.druid.timeline.partition.BuildingNumberedShardSpec; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/OverlordCoordinatingSegmentAllocator.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/OverlordCoordinatingSegmentAllocator.java index 3bf4449e4c75..fd1092fc80a7 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/OverlordCoordinatingSegmentAllocator.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/OverlordCoordinatingSegmentAllocator.java @@ -20,6 +20,7 @@ package org.apache.druid.indexing.common.task; import org.apache.druid.data.input.InputRow; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.indexer.partitions.PartitionsSpec; import org.apache.druid.indexer.partitions.SecondaryPartitionType; import org.apache.druid.indexing.appenderator.ActionBasedSegmentAllocator; @@ -31,7 +32,6 @@ import org.apache.druid.indexing.common.task.batch.parallel.SupervisorTaskAccess; import org.apache.druid.java.util.common.ISE; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.realtime.appenderator.SegmentIdWithShardSpec; import org.apache.druid.timeline.partition.NumberedOverwritePartialShardSpec; import org.apache.druid.timeline.partition.NumberedPartialShardSpec; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/SegmentAllocators.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/SegmentAllocators.java index fe46ea1da3c0..bc360546042c 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/SegmentAllocators.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/SegmentAllocators.java @@ -20,12 +20,12 @@ package org.apache.druid.indexing.common.task; import com.google.common.base.Preconditions; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.indexer.partitions.PartitionsSpec; import org.apache.druid.indexing.common.TaskToolbox; import org.apache.druid.indexing.common.task.batch.parallel.SupervisorTaskAccess; import org.apache.druid.indexing.common.task.batch.partition.CompletePartitionAnalysis; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.realtime.appenderator.SegmentAllocator; import javax.annotation.Nullable; 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 f384d515b182..470c3aa0f2ee 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 @@ -37,6 +37,8 @@ import org.apache.druid.indexer.IngestionState; import org.apache.druid.indexer.TaskState; import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.indexer.partitions.DimensionRangePartitionsSpec; import org.apache.druid.indexer.partitions.HashedPartitionsSpec; import org.apache.druid.indexer.partitions.PartitionsSpec; @@ -70,8 +72,6 @@ import org.apache.druid.segment.incremental.RowIngestionMetersTotals; import org.apache.druid.segment.incremental.SimpleRowIngestionMeters; import org.apache.druid.segment.indexing.TuningConfig; -import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; -import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.realtime.appenderator.SegmentIdWithShardSpec; import org.apache.druid.segment.realtime.appenderator.TransactionalSegmentPublisher; import org.apache.druid.segment.realtime.firehose.ChatHandler; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityTask.java index bda7a260d7cc..485263115536 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityTask.java @@ -33,6 +33,7 @@ import org.apache.druid.data.input.InputRow; import org.apache.druid.data.input.InputSource; import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.indexer.partitions.HashedPartitionsSpec; import org.apache.druid.indexing.common.TaskToolbox; import org.apache.druid.indexing.common.actions.SurrogateTaskActionClient; @@ -44,7 +45,6 @@ import org.apache.druid.segment.incremental.ParseExceptionHandler; import org.apache.druid.segment.incremental.RowIngestionMeters; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.server.security.Action; import org.apache.druid.server.security.Resource; import org.apache.druid.server.security.ResourceAction; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionDistributionTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionDistributionTask.java index e8e00a389aa7..32811d314a96 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionDistributionTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionDistributionTask.java @@ -36,6 +36,7 @@ import org.apache.druid.data.input.Rows; import org.apache.druid.data.input.StringTuple; import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.indexer.partitions.DimensionRangePartitionsSpec; import org.apache.druid.indexing.common.TaskToolbox; import org.apache.druid.indexing.common.actions.SurrogateTaskActionClient; @@ -50,7 +51,6 @@ import org.apache.druid.segment.incremental.ParseExceptionHandler; import org.apache.druid.segment.incremental.RowIngestionMeters; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.server.security.Action; import org.apache.druid.server.security.Resource; import org.apache.druid.server.security.ResourceAction; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialHashSegmentGenerateTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialHashSegmentGenerateTask.java index d45db7721bc1..2df8cfd1651c 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialHashSegmentGenerateTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PartialHashSegmentGenerateTask.java @@ -23,6 +23,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableSet; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.indexer.partitions.HashedPartitionsSpec; import org.apache.druid.indexing.common.TaskReport; import org.apache.druid.indexing.common.TaskToolbox; @@ -34,7 +35,6 @@ import org.apache.druid.indexing.common.task.batch.parallel.iterator.DefaultIndexTaskInputRowIteratorBuilder; import org.apache.druid.indexing.common.task.batch.partition.HashPartitionAnalysis; import org.apache.druid.indexing.worker.shuffle.ShuffleDataSegmentPusher; -import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.server.security.Action; import org.apache.druid.server.security.Resource; import org.apache.druid.server.security.ResourceAction; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PerfectRollupWorkerTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PerfectRollupWorkerTask.java index 8c62cec1265e..633b2b52e159 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PerfectRollupWorkerTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/PerfectRollupWorkerTask.java @@ -20,13 +20,13 @@ package org.apache.druid.indexing.common.task.batch.parallel; import com.google.common.base.Preconditions; +import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.indexer.partitions.PartitionsSpec; import org.apache.druid.indexing.common.actions.TaskActionClient; import org.apache.druid.indexing.common.task.TaskResource; import org.apache.druid.java.util.common.granularity.Granularity; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; -import org.apache.druid.indexer.granularity.GranularitySpec; 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/SinglePhaseSubTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseSubTask.java index 2ffc60d61a43..2e2e15a63b83 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseSubTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseSubTask.java @@ -33,6 +33,8 @@ import org.apache.druid.data.input.InputSource; import org.apache.druid.indexer.IngestionState; import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.indexer.partitions.DynamicPartitionsSpec; import org.apache.druid.indexing.common.IngestionStatsAndErrorsTaskReport; import org.apache.druid.indexing.common.IngestionStatsAndErrorsTaskReportData; @@ -59,8 +61,6 @@ import org.apache.druid.segment.incremental.RowIngestionMeters; import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.RealtimeIOConfig; -import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; -import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.realtime.FireDepartment; import org.apache.druid.segment.realtime.FireDepartmentMetrics; import org.apache.druid.segment.realtime.RealtimeMetricsMonitor; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/TombstoneHelper.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/TombstoneHelper.java index 18d2ce87a816..63d965f2b9fc 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/TombstoneHelper.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/TombstoneHelper.java @@ -20,6 +20,7 @@ package org.apache.druid.indexing.common.task.batch.parallel; import com.google.common.base.Preconditions; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.indexing.common.TaskLock; import org.apache.druid.indexing.common.actions.LockListAction; import org.apache.druid.indexing.common.actions.RetrieveUsedSegmentsAction; @@ -30,7 +31,6 @@ import org.apache.druid.java.util.common.JodaUtils; import org.apache.druid.java.util.common.granularity.Granularity; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.realtime.appenderator.SegmentIdWithShardSpec; import org.apache.druid.timeline.DataSegment; import org.apache.druid.timeline.partition.ShardSpec; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/DefaultIndexTaskInputRowIteratorBuilder.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/DefaultIndexTaskInputRowIteratorBuilder.java index 947be4945c62..c081118976c6 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/DefaultIndexTaskInputRowIteratorBuilder.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/DefaultIndexTaskInputRowIteratorBuilder.java @@ -23,9 +23,9 @@ import com.google.common.collect.ImmutableList; import org.apache.druid.data.input.HandlingInputRowIterator; import org.apache.druid.data.input.InputRow; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.indexing.common.task.IndexTask; import org.apache.druid.java.util.common.parsers.CloseableIterator; -import org.apache.druid.indexer.granularity.GranularitySpec; import java.util.ArrayList; import java.util.List; diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/IndexTaskInputRowIteratorBuilder.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/IndexTaskInputRowIteratorBuilder.java index d8fd4190e402..78201c5081bc 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/IndexTaskInputRowIteratorBuilder.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/IndexTaskInputRowIteratorBuilder.java @@ -22,8 +22,8 @@ import org.apache.druid.data.input.Firehose; import org.apache.druid.data.input.HandlingInputRowIterator; import org.apache.druid.data.input.InputRow; -import org.apache.druid.java.util.common.parsers.CloseableIterator; import org.apache.druid.indexer.granularity.GranularitySpec; +import org.apache.druid.java.util.common.parsers.CloseableIterator; public interface IndexTaskInputRowIteratorBuilder { diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/RangePartitionIndexTaskInputRowIteratorBuilder.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/RangePartitionIndexTaskInputRowIteratorBuilder.java index fe54658de546..c8c7ad101c16 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/RangePartitionIndexTaskInputRowIteratorBuilder.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/RangePartitionIndexTaskInputRowIteratorBuilder.java @@ -21,10 +21,10 @@ import org.apache.druid.data.input.HandlingInputRowIterator; import org.apache.druid.data.input.InputRow; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.indexing.common.task.IndexTask; import org.apache.druid.java.util.common.IAE; import org.apache.druid.java.util.common.parsers.CloseableIterator; -import org.apache.druid.indexer.granularity.GranularitySpec; import java.util.List; 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 c92237cd5680..f379163fb525 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 @@ -51,6 +51,7 @@ import org.apache.druid.indexer.IngestionState; import org.apache.druid.indexer.TaskState; import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexing.common.IngestionStatsAndErrorsTaskReportData; import org.apache.druid.indexing.common.SegmentCacheManagerFactory; import org.apache.druid.indexing.common.SingleFileTaskReportFileWriter; @@ -118,7 +119,6 @@ import org.apache.druid.segment.incremental.RowIngestionMeters; import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.RealtimeIOConfig; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.join.NoopJoinableFactory; import org.apache.druid.segment.realtime.firehose.NoopChatHandlerProvider; import org.apache.druid.segment.transform.ExpressionTransform; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/AppenderatorsTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/AppenderatorsTest.java index 6569751d5e52..33211a6d6bbe 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/AppenderatorsTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/AppenderatorsTest.java @@ -24,6 +24,7 @@ import org.apache.druid.data.input.impl.JSONParseSpec; import org.apache.druid.data.input.impl.MapInputRowParser; import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.PartitionsSpec; import org.apache.druid.jackson.DefaultObjectMapper; import org.apache.druid.java.util.common.FileUtils; @@ -45,7 +46,6 @@ import org.apache.druid.segment.incremental.SimpleRowIngestionMeters; import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.TuningConfig; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.loading.DataSegmentPusher; import org.apache.druid.segment.realtime.FireDepartmentMetrics; import org.apache.druid.segment.realtime.appenderator.Appenderator; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/BatchAppenderatorsTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/BatchAppenderatorsTest.java index b45cdeba8f60..46b724bc5d6a 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/BatchAppenderatorsTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/BatchAppenderatorsTest.java @@ -24,6 +24,7 @@ import org.apache.druid.data.input.impl.JSONParseSpec; import org.apache.druid.data.input.impl.MapInputRowParser; import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.PartitionsSpec; import org.apache.druid.indexing.common.TaskToolbox; import org.apache.druid.indexing.common.config.TaskConfig; @@ -48,7 +49,6 @@ import org.apache.druid.segment.incremental.SimpleRowIngestionMeters; import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.TuningConfig; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.join.NoopJoinableFactory; import org.apache.druid.segment.loading.DataSegmentPusher; import org.apache.druid.segment.realtime.FireDepartmentMetrics; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskParallelRunTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskParallelRunTest.java index 3c8314e1aabe..907df8687aac 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskParallelRunTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskParallelRunTest.java @@ -34,6 +34,7 @@ import org.apache.druid.data.input.impl.TimestampSpec; import org.apache.druid.indexer.TaskState; import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.DimensionRangePartitionsSpec; import org.apache.druid.indexer.partitions.DynamicPartitionsSpec; import org.apache.druid.indexer.partitions.HashedPartitionsSpec; @@ -60,7 +61,6 @@ import org.apache.druid.query.filter.SelectorDimFilter; import org.apache.druid.segment.SegmentUtils; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.loading.NoopSegmentCacheManager; import org.apache.druid.segment.transform.TransformSpec; import org.apache.druid.server.security.Action; @@ -190,7 +190,7 @@ public void testRunParallelWithDynamicPartitioningMatchCompactionState() throws } @Test - public void testRunParallelWithHashPartitioningMatchCompactionState() throws Exception + public void testRunParallelWithHashPartitioningMatchCompactionState() { allowSegmentFetchesByCompactionTask = true; @@ -230,7 +230,7 @@ public void testRunParallelWithHashPartitioningMatchCompactionState() throws Exc } @Test - public void testRunParallelWithRangePartitioning() throws Exception + public void testRunParallelWithRangePartitioning() { allowSegmentFetchesByCompactionTask = true; @@ -270,7 +270,7 @@ public void testRunParallelWithRangePartitioning() throws Exception } @Test - public void testRunParallelWithRangePartitioningAndNoUpfrontSegmentFetching() throws Exception + public void testRunParallelWithRangePartitioningAndNoUpfrontSegmentFetching() { allowSegmentFetchesByCompactionTask = false; @@ -322,7 +322,7 @@ public void testRunParallelWithRangePartitioningAndNoUpfrontSegmentFetching() th } @Test - public void testRunParallelWithMultiDimensionRangePartitioning() throws Exception + public void testRunParallelWithMultiDimensionRangePartitioning() { allowSegmentFetchesByCompactionTask = true; @@ -365,7 +365,7 @@ public void testRunParallelWithMultiDimensionRangePartitioning() throws Exceptio } @Test - public void testRunParallelWithRangePartitioningWithSingleTask() throws Exception + public void testRunParallelWithRangePartitioningWithSingleTask() { allowSegmentFetchesByCompactionTask = true; @@ -405,7 +405,7 @@ public void testRunParallelWithRangePartitioningWithSingleTask() throws Exceptio } @Test - public void testRunParallelWithMultiDimensionRangePartitioningWithSingleTask() throws Exception + public void testRunParallelWithMultiDimensionRangePartitioningWithSingleTask() { allowSegmentFetchesByCompactionTask = true; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskRunTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskRunTest.java index 7039649d590f..6cd157a7a0fa 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskRunTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskRunTest.java @@ -19,7 +19,6 @@ package org.apache.druid.indexing.common.task; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.jsontype.NamedType; import com.google.common.collect.ImmutableList; @@ -38,6 +37,7 @@ import org.apache.druid.data.input.impl.TimestampSpec; import org.apache.druid.indexer.TaskState; import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.DynamicPartitionsSpec; import org.apache.druid.indexer.partitions.HashedPartitionsSpec; import org.apache.druid.indexing.common.LockGranularity; @@ -72,7 +72,6 @@ import org.apache.druid.segment.IndexSpec; import org.apache.druid.segment.QueryableIndexStorageAdapter; import org.apache.druid.segment.VirtualColumns; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.join.NoopJoinableFactory; import org.apache.druid.segment.loading.LocalDataSegmentPuller; import org.apache.druid.segment.loading.LocalDataSegmentPusher; @@ -116,10 +115,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; @@ -204,7 +201,7 @@ public static CompactionState getDefaultCompactionState( Granularity segmentGranularity, Granularity queryGranularity, List intervals - ) throws JsonProcessingException + ) { ObjectMapper mapper = new DefaultObjectMapper(); // Expected compaction state to exist after compaction as we store compaction state by default @@ -358,10 +355,6 @@ public void testRunWithHashPartitioning() throws Exception interval, segments.get(segmentIdx).getInterval() ); - Map expectedLongSumMetric = new HashMap<>(); - expectedLongSumMetric.put("type", "longSum"); - expectedLongSumMetric.put("name", "val"); - expectedLongSumMetric.put("fieldName", "val"); CompactionState expectedState = new CompactionState( new HashedPartitionsSpec(null, 3, null), new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("ts", "dim"))), 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 c469309eca0b..6f1079e2718d 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 @@ -56,6 +56,7 @@ import org.apache.druid.guice.GuiceInjectors; import org.apache.druid.guice.IndexingServiceTuningConfigModule; import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.HashedPartitionsSpec; import org.apache.druid.indexing.common.LockGranularity; import org.apache.druid.indexing.common.RetryPolicyConfig; @@ -123,7 +124,6 @@ import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.RealtimeTuningConfig; import org.apache.druid.segment.indexing.TuningConfig; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.join.NoopJoinableFactory; import org.apache.druid.segment.loading.NoopSegmentCacheManager; import org.apache.druid.segment.loading.SegmentCacheManager; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/HadoopIndexTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/HadoopIndexTaskTest.java index 794d7ef1e65e..dc4938ffd43a 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/HadoopIndexTaskTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/HadoopIndexTaskTest.java @@ -24,12 +24,12 @@ import com.google.common.collect.ImmutableMap; import org.apache.druid.indexer.HadoopIOConfig; import org.apache.druid.indexer.HadoopIngestionSpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.jackson.DefaultObjectMapper; import org.apache.druid.java.util.common.Intervals; import org.apache.druid.java.util.common.granularity.Granularities; import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.server.security.Action; import org.apache.druid.server.security.AuthTestUtils; import org.apache.druid.server.security.Resource; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IndexIngestionSpecTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IndexIngestionSpecTest.java index 48d893b1c49b..8a56409f819c 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IndexIngestionSpecTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/IndexIngestionSpecTest.java @@ -22,12 +22,12 @@ import com.google.common.collect.ImmutableMap; import org.apache.druid.data.input.impl.NoopInputFormat; import org.apache.druid.data.input.impl.NoopInputSource; +import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; import org.apache.druid.indexing.common.task.IndexTask.IndexIOConfig; import org.apache.druid.indexing.common.task.IndexTask.IndexIngestionSpec; import org.apache.druid.java.util.common.granularity.Granularities; import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; 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 a9284f241561..c6d7fdf991e0 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 @@ -41,6 +41,9 @@ import org.apache.druid.data.input.impl.TimestampSpec; import org.apache.druid.indexer.TaskState; import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.DynamicPartitionsSpec; import org.apache.druid.indexer.partitions.HashedPartitionsSpec; import org.apache.druid.indexer.partitions.PartitionsSpec; @@ -79,9 +82,6 @@ import org.apache.druid.segment.incremental.RowIngestionMeters; import org.apache.druid.segment.incremental.RowIngestionMetersFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; -import org.apache.druid.indexer.granularity.GranularitySpec; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.loading.SegmentCacheManager; import org.apache.druid.segment.loading.SegmentLoaderConfig; import org.apache.druid.segment.loading.SegmentLocalCacheManager; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/RangePartitionCachingLocalSegmentAllocatorTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/RangePartitionCachingLocalSegmentAllocatorTest.java index 2450cc775c38..8b5fe58a04c2 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/RangePartitionCachingLocalSegmentAllocatorTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/RangePartitionCachingLocalSegmentAllocatorTest.java @@ -23,6 +23,7 @@ import com.google.common.collect.ImmutableMap; import org.apache.druid.data.input.InputRow; import org.apache.druid.data.input.StringTuple; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.DimensionRangePartitionsSpec; import org.apache.druid.indexing.common.TaskLock; import org.apache.druid.indexing.common.TaskToolbox; @@ -33,7 +34,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.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.realtime.appenderator.SegmentAllocator; import org.apache.druid.segment.realtime.appenderator.SegmentIdWithShardSpec; import org.apache.druid.timeline.SegmentId; 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 2f4ec04c4bc9..89892905184f 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 @@ -43,6 +43,7 @@ import org.apache.druid.discovery.LookupNodeService; import org.apache.druid.indexer.TaskState; import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexing.common.SegmentCacheManagerFactory; import org.apache.druid.indexing.common.TaskToolbox; import org.apache.druid.indexing.common.TaskToolboxFactory; @@ -106,7 +107,6 @@ import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.RealtimeIOConfig; import org.apache.druid.segment.indexing.RealtimeTuningConfig; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.join.NoopJoinableFactory; import org.apache.druid.segment.realtime.FireDepartment; import org.apache.druid.segment.realtime.firehose.NoopChatHandlerProvider; 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 3b7364bc5ae8..9ea10dc5bbb8 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 @@ -34,6 +34,7 @@ import org.apache.druid.guice.FirehoseModule; import org.apache.druid.indexer.HadoopIOConfig; import org.apache.druid.indexer.HadoopIngestionSpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.DynamicPartitionsSpec; import org.apache.druid.indexer.partitions.PartitionsSpec; import org.apache.druid.indexing.common.TestUtils; @@ -49,7 +50,6 @@ import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.RealtimeIOConfig; import org.apache.druid.segment.indexing.RealtimeTuningConfig; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.realtime.FireDepartment; import org.apache.druid.server.security.AuthTestUtils; import org.apache.druid.timeline.partition.NoneShardSpec; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/AbstractMultiPhaseParallelIndexingTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/AbstractMultiPhaseParallelIndexingTest.java index 24b43f019462..5b4aa1da400d 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/AbstractMultiPhaseParallelIndexingTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/AbstractMultiPhaseParallelIndexingTest.java @@ -28,6 +28,8 @@ import org.apache.druid.data.input.impl.TimestampSpec; import org.apache.druid.indexer.TaskState; import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.PartitionsSpec; import org.apache.druid.indexing.common.LockGranularity; import org.apache.druid.indexing.common.SegmentCacheManagerFactory; @@ -51,8 +53,6 @@ import org.apache.druid.segment.Segment; import org.apache.druid.segment.SegmentLazyLoadFailCallback; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.GranularitySpec; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.loading.SegmentCacheManager; import org.apache.druid.segment.loading.SegmentLoader; import org.apache.druid.segment.loading.SegmentLoadingException; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/HashPartitionCachingLocalSegmentAllocatorTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/HashPartitionCachingLocalSegmentAllocatorTest.java index 339a8bb081f4..c0d1561287a3 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/HashPartitionCachingLocalSegmentAllocatorTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/HashPartitionCachingLocalSegmentAllocatorTest.java @@ -24,6 +24,7 @@ import com.google.common.collect.ImmutableMap; import org.apache.druid.data.input.InputRow; import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.HashedPartitionsSpec; import org.apache.druid.indexing.common.TaskLock; import org.apache.druid.indexing.common.TaskToolbox; @@ -37,7 +38,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.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.realtime.appenderator.SegmentAllocator; import org.apache.druid.segment.realtime.appenderator.SegmentIdWithShardSpec; import org.apache.druid.timeline.SegmentId; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/HashPartitionTaskKillTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/HashPartitionTaskKillTest.java index 8858507d0c54..a77666918f76 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/HashPartitionTaskKillTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/HashPartitionTaskKillTest.java @@ -29,6 +29,8 @@ import org.apache.druid.data.input.impl.TimestampSpec; import org.apache.druid.indexer.TaskState; import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.HashedPartitionsSpec; import org.apache.druid.indexer.partitions.PartitionsSpec; import org.apache.druid.indexing.common.LockGranularity; @@ -44,8 +46,6 @@ import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.query.aggregation.LongSumAggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.GranularitySpec; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.joda.time.Interval; import org.junit.Assert; import org.junit.Before; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/MultiPhaseParallelIndexingWithNullColumnTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/MultiPhaseParallelIndexingWithNullColumnTest.java index 6b7160ab8da4..44ebbb4ccb28 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/MultiPhaseParallelIndexingWithNullColumnTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/MultiPhaseParallelIndexingWithNullColumnTest.java @@ -40,6 +40,7 @@ import org.apache.druid.data.input.impl.SplittableInputSource; import org.apache.druid.data.input.impl.TimestampSpec; import org.apache.druid.indexer.TaskState; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.DimensionRangePartitionsSpec; import org.apache.druid.indexer.partitions.HashedPartitionsSpec; import org.apache.druid.indexer.partitions.PartitionsSpec; @@ -52,7 +53,6 @@ import org.apache.druid.java.util.common.parsers.JSONPathFieldType; import org.apache.druid.java.util.common.parsers.JSONPathSpec; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.timeline.DataSegment; import org.joda.time.Interval; import org.junit.Assert; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskKillTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskKillTest.java index a78f212fdc2f..a0a9e4a2d2e9 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskKillTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskKillTest.java @@ -29,6 +29,7 @@ import org.apache.druid.indexer.TaskState; import org.apache.druid.indexer.TaskStatus; import org.apache.druid.indexer.TaskStatusPlus; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexing.common.TaskToolbox; import org.apache.druid.indexing.common.actions.TaskActionClient; import org.apache.druid.indexing.common.task.TaskResource; @@ -38,7 +39,6 @@ import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.query.aggregation.LongSumAggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.hamcrest.CoreMatchers; import org.joda.time.Interval; import org.junit.After; 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 d7f2b0c4a085..794dbde88fd4 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 @@ -34,6 +34,7 @@ import org.apache.druid.indexer.TaskState; import org.apache.druid.indexer.TaskStatus; import org.apache.druid.indexer.TaskStatusPlus; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.DynamicPartitionsSpec; import org.apache.druid.indexing.common.TaskToolbox; import org.apache.druid.indexing.common.task.AbstractTask; @@ -47,7 +48,6 @@ import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.query.aggregation.LongSumAggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.realtime.appenderator.SegmentAllocator; import org.apache.druid.segment.realtime.appenderator.SegmentIdWithShardSpec; import org.apache.druid.server.security.AuthConfig; 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 f02b207fda38..c0801b1c28b1 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 @@ -25,6 +25,7 @@ import org.apache.druid.data.input.impl.DimensionsSpec; import org.apache.druid.data.input.impl.LocalInputSource; import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.HashedPartitionsSpec; import org.apache.druid.indexer.partitions.PartitionsSpec; import org.apache.druid.indexer.partitions.SingleDimensionPartitionsSpec; @@ -36,7 +37,6 @@ import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.query.aggregation.LongSumAggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.hamcrest.CoreMatchers; import org.joda.time.Interval; import org.junit.Assert; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexTestingFactory.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexTestingFactory.java index 3e0df2e3c58b..03777d2e19f8 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexTestingFactory.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexTestingFactory.java @@ -28,6 +28,8 @@ import org.apache.druid.data.input.impl.DimensionsSpec; import org.apache.druid.data.input.impl.JsonInputFormat; import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.indexer.partitions.HashedPartitionsSpec; import org.apache.druid.indexer.partitions.PartitionsSpec; import org.apache.druid.indexer.partitions.SingleDimensionPartitionsSpec; @@ -38,8 +40,6 @@ import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.segment.IndexIO; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; -import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.realtime.appenderator.AppenderatorsManager; import org.apache.druid.segment.transform.TransformSpec; import org.apache.druid.timeline.partition.BuildingHashBasedNumberedShardSpec; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityTaskTest.java index 82f8c10f3ef6..c3c66555c1bc 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityTaskTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PartialDimensionCardinalityTaskTest.java @@ -31,6 +31,7 @@ import org.apache.druid.data.input.impl.InlineInputSource; import org.apache.druid.indexer.TaskState; import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.DynamicPartitionsSpec; import org.apache.druid.indexer.partitions.HashedPartitionsSpec; import org.apache.druid.indexer.partitions.PartitionsSpec; @@ -43,7 +44,6 @@ import org.apache.druid.segment.TestHelper; import org.apache.druid.segment.incremental.ParseExceptionHandler; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.server.security.Action; import org.apache.druid.server.security.Resource; import org.apache.druid.server.security.ResourceAction; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PartialHashSegmentGenerateTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PartialHashSegmentGenerateTaskTest.java index a73c376e3ef4..7e39170d6551 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PartialHashSegmentGenerateTaskTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PartialHashSegmentGenerateTaskTest.java @@ -24,12 +24,12 @@ import com.google.common.collect.ImmutableMap; import org.apache.druid.data.input.impl.JsonInputFormat; import org.apache.druid.data.input.impl.LocalInputSource; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.HashedPartitionsSpec; import org.apache.druid.indexing.common.task.batch.partition.HashPartitionAnalysis; import org.apache.druid.java.util.common.Intervals; import org.apache.druid.java.util.common.granularity.Granularities; import org.apache.druid.segment.TestHelper; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.server.security.Action; import org.apache.druid.server.security.Resource; import org.apache.druid.server.security.ResourceAction; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PerfectRollupWorkerTaskTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PerfectRollupWorkerTaskTest.java index a8318dc6869f..dfc562f0b50e 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PerfectRollupWorkerTaskTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PerfectRollupWorkerTaskTest.java @@ -20,6 +20,7 @@ package org.apache.druid.indexing.common.task.batch.parallel; import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.indexer.partitions.HashedPartitionsSpec; import org.apache.druid.indexer.partitions.PartitionsSpec; import org.apache.druid.indexing.common.TaskToolbox; @@ -27,7 +28,6 @@ import org.apache.druid.indexing.common.task.TaskResource; import org.apache.druid.java.util.common.Intervals; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.GranularitySpec; import org.easymock.EasyMock; import org.joda.time.Interval; import org.junit.Rule; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/RangePartitionTaskKillTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/RangePartitionTaskKillTest.java index b30bc9509c38..7df38d8abe4d 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/RangePartitionTaskKillTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/RangePartitionTaskKillTest.java @@ -29,6 +29,8 @@ import org.apache.druid.data.input.impl.TimestampSpec; import org.apache.druid.indexer.TaskState; import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.PartitionsSpec; import org.apache.druid.indexer.partitions.SingleDimensionPartitionsSpec; import org.apache.druid.indexing.common.LockGranularity; @@ -42,8 +44,6 @@ import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.query.aggregation.LongSumAggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.GranularitySpec; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.timeline.partition.PartitionBoundaries; import org.joda.time.Interval; import org.junit.Assert; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseParallelIndexingTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseParallelIndexingTest.java index 307f0ca2a545..9447318c25e9 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseParallelIndexingTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/SinglePhaseParallelIndexingTest.java @@ -28,6 +28,7 @@ import org.apache.druid.data.input.impl.JsonInputFormat; import org.apache.druid.data.input.impl.LocalInputSource; import org.apache.druid.indexer.TaskState; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexing.common.LockGranularity; import org.apache.druid.indexing.common.TaskToolbox; import org.apache.druid.indexing.common.actions.TaskActionClient; @@ -45,7 +46,6 @@ import org.apache.druid.segment.incremental.ParseExceptionReport; import org.apache.druid.segment.incremental.RowIngestionMetersTotals; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.server.security.Action; import org.apache.druid.server.security.Resource; import org.apache.druid.server.security.ResourceAction; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/TombstoneHelperTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/TombstoneHelperTest.java index 51e6ffd56e76..a32a5fb3fd33 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/TombstoneHelperTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/TombstoneHelperTest.java @@ -21,6 +21,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import org.apache.druid.indexer.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexing.common.actions.LockListAction; import org.apache.druid.indexing.common.actions.RetrieveUsedSegmentsAction; import org.apache.druid.indexing.common.actions.TaskAction; @@ -31,8 +33,6 @@ import org.apache.druid.java.util.common.granularity.Granularities; import org.apache.druid.java.util.common.granularity.Granularity; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.GranularitySpec; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.realtime.appenderator.SegmentIdWithShardSpec; import org.apache.druid.timeline.DataSegment; import org.apache.druid.timeline.partition.TombstoneShardSpec; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/DefaultIndexTaskInputRowIteratorBuilderTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/DefaultIndexTaskInputRowIteratorBuilderTest.java index dfc2963ca6f2..c30c7ed87b94 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/DefaultIndexTaskInputRowIteratorBuilderTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/DefaultIndexTaskInputRowIteratorBuilderTest.java @@ -21,9 +21,9 @@ import org.apache.druid.data.input.HandlingInputRowIterator; import org.apache.druid.data.input.InputRow; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.java.util.common.DateTimes; import org.apache.druid.java.util.common.parsers.CloseableIterator; -import org.apache.druid.indexer.granularity.GranularitySpec; import org.easymock.EasyMock; import org.joda.time.DateTime; import org.junit.Assert; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/IndexTaskInputRowIteratorBuilderTestingFactory.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/IndexTaskInputRowIteratorBuilderTestingFactory.java index 660cd254e634..d6de11fb0f14 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/IndexTaskInputRowIteratorBuilderTestingFactory.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/IndexTaskInputRowIteratorBuilderTestingFactory.java @@ -23,10 +23,10 @@ import org.apache.druid.data.input.HandlingInputRowIterator; import org.apache.druid.data.input.InputRow; import org.apache.druid.data.input.MapBasedInputRow; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.java.util.common.DateTimes; import org.apache.druid.java.util.common.Intervals; import org.apache.druid.java.util.common.parsers.CloseableIterator; -import org.apache.druid.indexer.granularity.GranularitySpec; import org.easymock.EasyMock; import org.joda.time.DateTime; import org.joda.time.Interval; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/RangePartitionIndexTaskInputRowIteratorBuilderTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/RangePartitionIndexTaskInputRowIteratorBuilderTest.java index e24b65c51dbd..f933f5b3c383 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/RangePartitionIndexTaskInputRowIteratorBuilderTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/iterator/RangePartitionIndexTaskInputRowIteratorBuilderTest.java @@ -20,8 +20,8 @@ package org.apache.druid.indexing.common.task.batch.parallel.iterator; import org.apache.druid.data.input.InputRow; -import org.apache.druid.java.util.common.parsers.CloseableIterator; import org.apache.druid.indexer.granularity.GranularitySpec; +import org.apache.druid.java.util.common.parsers.CloseableIterator; import org.hamcrest.Matchers; import org.joda.time.DateTime; import org.junit.Assert; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/input/InputRowSchemasTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/input/InputRowSchemasTest.java index 6b853a43e696..f1cc7da03455 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/input/InputRowSchemasTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/input/InputRowSchemasTest.java @@ -29,6 +29,7 @@ import org.apache.druid.data.input.impl.LongDimensionSchema; import org.apache.druid.data.input.impl.StringDimensionSchema; import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.java.util.common.granularity.Granularities; import org.apache.druid.math.expr.ExprMacroTable; import org.apache.druid.query.aggregation.AggregatorFactory; @@ -36,7 +37,6 @@ import org.apache.druid.query.aggregation.LongSumAggregatorFactory; import org.apache.druid.query.filter.SelectorDimFilter; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.transform.ExpressionTransform; import org.apache.druid.segment.transform.TransformSpec; import org.apache.druid.testing.InitializedNullHandlingTest; 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 17a1b7e20834..582afb865bf8 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 @@ -57,6 +57,7 @@ import org.apache.druid.indexer.TaskLocation; import org.apache.druid.indexer.TaskState; import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexing.common.SegmentCacheManagerFactory; import org.apache.druid.indexing.common.TaskLock; import org.apache.druid.indexing.common.TaskLockType; @@ -126,7 +127,6 @@ import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.RealtimeIOConfig; import org.apache.druid.segment.indexing.RealtimeTuningConfig; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.join.JoinableFactoryWrapperTest; import org.apache.druid.segment.join.NoopJoinableFactory; import org.apache.druid.segment.loading.DataSegmentArchiver; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/sampler/InputSourceSamplerTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/sampler/InputSourceSamplerTest.java index 82a46ac2b67d..21905fd233a4 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/overlord/sampler/InputSourceSamplerTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/overlord/sampler/InputSourceSamplerTest.java @@ -41,6 +41,8 @@ import org.apache.druid.data.input.impl.StringDimensionSchema; import org.apache.druid.data.input.impl.StringInputRowParser; import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexer.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexing.seekablestream.RecordSupplierInputSource; import org.apache.druid.indexing.seekablestream.common.OrderedPartitionableRecord; import org.apache.druid.indexing.seekablestream.common.OrderedSequenceNumber; @@ -58,8 +60,6 @@ import org.apache.druid.query.expression.TestExprMacroTable; import org.apache.druid.query.filter.SelectorDimFilter; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.GranularitySpec; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.transform.ExpressionTransform; import org.apache.druid.segment.transform.TransformSpec; import org.apache.druid.testing.InitializedNullHandlingTest; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskRunnerAuthTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskRunnerAuthTest.java index c982b0a032f1..2c277581335e 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskRunnerAuthTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskRunnerAuthTest.java @@ -25,6 +25,7 @@ import org.apache.druid.data.input.impl.CsvInputFormat; import org.apache.druid.data.input.impl.DimensionsSpec; import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; import org.apache.druid.indexing.common.LockGranularity; import org.apache.druid.indexing.common.TaskToolbox; import org.apache.druid.indexing.seekablestream.common.OrderedPartitionableRecord; @@ -35,7 +36,6 @@ import org.apache.druid.java.util.common.granularity.AllGranularity; import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; import org.apache.druid.segment.transform.TransformSpec; import org.apache.druid.server.security.Access; import org.apache.druid.server.security.Action; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskTestBase.java b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskTestBase.java index 91be5c00a260..28be4cb2834a 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskTestBase.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskTestBase.java @@ -51,6 +51,7 @@ import org.apache.druid.discovery.DruidNodeAnnouncer; import org.apache.druid.discovery.LookupNodeService; import org.apache.druid.indexer.TaskStatus; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexing.common.IngestionStatsAndErrorsTaskReportData; import org.apache.druid.indexing.common.LockGranularity; import org.apache.druid.indexing.common.SegmentCacheManagerFactory; @@ -111,7 +112,6 @@ import org.apache.druid.segment.handoff.SegmentHandoffNotifierFactory; import org.apache.druid.segment.incremental.RowIngestionMetersTotals; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.join.NoopJoinableFactory; import org.apache.druid.segment.loading.DataSegmentPusher; import org.apache.druid.segment.loading.LocalDataSegmentPusher; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSamplerSpecTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSamplerSpecTest.java index 13f83c5fdc1d..adca9f166c83 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSamplerSpecTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSamplerSpecTest.java @@ -34,6 +34,7 @@ import org.apache.druid.data.input.impl.StringDimensionSchema; import org.apache.druid.data.input.impl.StringInputRowParser; import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexing.overlord.sampler.InputSourceSampler; import org.apache.druid.indexing.overlord.sampler.SamplerConfig; import org.apache.druid.indexing.overlord.sampler.SamplerTestUtils; @@ -52,7 +53,6 @@ import org.apache.druid.query.aggregation.CountAggregatorFactory; import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.easymock.EasyMock; import org.easymock.EasyMockSupport; import org.joda.time.DateTime; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSupervisorSpecTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSupervisorSpecTest.java index 1d977b8d82c6..66d4ad788d14 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSupervisorSpecTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/SeekableStreamSupervisorSpecTest.java @@ -29,6 +29,7 @@ import org.apache.druid.data.input.impl.JsonInputFormat; import org.apache.druid.data.input.impl.StringDimensionSchema; import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexing.common.task.Task; import org.apache.druid.indexing.overlord.DataSourceMetadata; import org.apache.druid.indexing.overlord.IndexerMetadataStorageCoordinator; @@ -62,7 +63,6 @@ import org.apache.druid.segment.TestHelper; import org.apache.druid.segment.incremental.RowIngestionMetersFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.easymock.EasyMock; import org.easymock.EasyMockSupport; import org.joda.time.DateTime; diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java index 821b255c7e93..a18bad1021fc 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/seekablestream/supervisor/SeekableStreamSupervisorStateTest.java @@ -34,6 +34,7 @@ import org.apache.druid.data.input.impl.TimestampSpec; import org.apache.druid.error.DruidException; import org.apache.druid.error.DruidExceptionMatcher; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexing.common.TaskToolbox; import org.apache.druid.indexing.common.TestUtils; import org.apache.druid.indexing.common.task.Task; @@ -80,7 +81,6 @@ import org.apache.druid.segment.TestHelper; import org.apache.druid.segment.incremental.RowIngestionMetersFactory; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.server.metrics.NoopServiceEmitter; import org.easymock.EasyMock; import org.easymock.EasyMockSupport; diff --git a/integration-tests/src/test/java/org/apache/druid/tests/coordinator/duty/ITAutoCompactionTest.java b/integration-tests/src/test/java/org/apache/druid/tests/coordinator/duty/ITAutoCompactionTest.java index 43cd02c37669..a40241a1bcaf 100644 --- a/integration-tests/src/test/java/org/apache/druid/tests/coordinator/duty/ITAutoCompactionTest.java +++ b/integration-tests/src/test/java/org/apache/druid/tests/coordinator/duty/ITAutoCompactionTest.java @@ -27,6 +27,7 @@ import org.apache.druid.data.input.MaxSizeSplitHintSpec; import org.apache.druid.data.input.impl.DimensionsSpec; import org.apache.druid.indexer.TaskState; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.DynamicPartitionsSpec; import org.apache.druid.indexer.partitions.HashedPartitionsSpec; import org.apache.druid.indexer.partitions.PartitionsSpec; @@ -51,7 +52,6 @@ import org.apache.druid.query.aggregation.datasketches.quantiles.DoublesSketchAggregatorFactory; import org.apache.druid.query.aggregation.datasketches.theta.SketchMergeAggregatorFactory; import org.apache.druid.query.filter.SelectorDimFilter; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.server.coordinator.AutoCompactionSnapshot; import org.apache.druid.server.coordinator.CoordinatorCompactionConfig; import org.apache.druid.server.coordinator.DataSourceCompactionConfig; diff --git a/server/src/main/java/org/apache/druid/client/indexing/ClientCompactionTaskGranularitySpec.java b/server/src/main/java/org/apache/druid/client/indexing/ClientCompactionTaskGranularitySpec.java index 7b3722e25b1e..323c32f2d4db 100644 --- a/server/src/main/java/org/apache/druid/client/indexing/ClientCompactionTaskGranularitySpec.java +++ b/server/src/main/java/org/apache/druid/client/indexing/ClientCompactionTaskGranularitySpec.java @@ -21,8 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import org.apache.druid.java.util.common.granularity.Granularity; import org.apache.druid.indexer.granularity.GranularitySpec; +import org.apache.druid.java.util.common.granularity.Granularity; import java.util.Objects; diff --git a/server/src/main/java/org/apache/druid/segment/indexing/DataSchema.java b/server/src/main/java/org/apache/druid/segment/indexing/DataSchema.java index bc025baa934b..9a94d76d90f2 100644 --- a/server/src/main/java/org/apache/druid/segment/indexing/DataSchema.java +++ b/server/src/main/java/org/apache/druid/segment/indexing/DataSchema.java @@ -35,13 +35,13 @@ import org.apache.druid.data.input.impl.InputRowParser; import org.apache.druid.data.input.impl.ParseSpec; import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexer.granularity.GranularitySpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.java.util.common.IAE; import org.apache.druid.java.util.common.StringUtils; import org.apache.druid.java.util.common.logger.Logger; import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.segment.column.ColumnHolder; -import org.apache.druid.indexer.granularity.GranularitySpec; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.transform.TransformSpec; import javax.annotation.Nullable; diff --git a/server/src/main/java/org/apache/druid/server/coordinator/UserCompactionTaskGranularityConfig.java b/server/src/main/java/org/apache/druid/server/coordinator/UserCompactionTaskGranularityConfig.java index d901cf78bd5c..be3c7e1af965 100644 --- a/server/src/main/java/org/apache/druid/server/coordinator/UserCompactionTaskGranularityConfig.java +++ b/server/src/main/java/org/apache/druid/server/coordinator/UserCompactionTaskGranularityConfig.java @@ -21,8 +21,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import org.apache.druid.java.util.common.granularity.Granularity; import org.apache.druid.indexer.granularity.GranularitySpec; +import org.apache.druid.java.util.common.granularity.Granularity; import java.util.Objects; diff --git a/server/src/test/java/org/apache/druid/segment/indexing/DataSchemaTest.java b/server/src/test/java/org/apache/druid/segment/indexing/DataSchemaTest.java index 8512afad1cf9..19c9f06f87df 100644 --- a/server/src/test/java/org/apache/druid/segment/indexing/DataSchemaTest.java +++ b/server/src/test/java/org/apache/druid/segment/indexing/DataSchemaTest.java @@ -33,6 +33,8 @@ import org.apache.druid.data.input.impl.StringInputRowParser; import org.apache.druid.data.input.impl.TimestampSpec; import org.apache.druid.error.DruidExceptionMatcher; +import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; +import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.java.util.common.DateTimes; import org.apache.druid.java.util.common.Intervals; import org.apache.druid.java.util.common.StringUtils; @@ -44,8 +46,6 @@ import org.apache.druid.query.expression.TestExprMacroTable; import org.apache.druid.query.filter.SelectorDimFilter; import org.apache.druid.segment.TestHelper; -import org.apache.druid.indexer.granularity.ArbitraryGranularitySpec; -import org.apache.druid.indexer.granularity.GranularitySpec; import org.apache.druid.segment.transform.ExpressionTransform; import org.apache.druid.segment.transform.TransformSpec; import org.apache.druid.testing.InitializedNullHandlingTest; diff --git a/server/src/test/java/org/apache/druid/segment/indexing/TestModifiedDataSchema.java b/server/src/test/java/org/apache/druid/segment/indexing/TestModifiedDataSchema.java index 81110e49d1c8..c49261fd9ed3 100644 --- a/server/src/test/java/org/apache/druid/segment/indexing/TestModifiedDataSchema.java +++ b/server/src/test/java/org/apache/druid/segment/indexing/TestModifiedDataSchema.java @@ -25,8 +25,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.druid.data.input.impl.DimensionsSpec; import org.apache.druid.data.input.impl.TimestampSpec; -import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.indexer.granularity.GranularitySpec; +import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.segment.transform.TransformSpec; import javax.annotation.Nullable; diff --git a/server/src/test/java/org/apache/druid/segment/realtime/FireDepartmentTest.java b/server/src/test/java/org/apache/druid/segment/realtime/FireDepartmentTest.java index bdc645025de8..56aa25df6e2b 100644 --- a/server/src/test/java/org/apache/druid/segment/realtime/FireDepartmentTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/FireDepartmentTest.java @@ -28,6 +28,7 @@ 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.granularity.UniformGranularitySpec; import org.apache.druid.jackson.DefaultObjectMapper; import org.apache.druid.java.util.common.granularity.Granularities; import org.apache.druid.query.aggregation.AggregatorFactory; @@ -36,7 +37,6 @@ import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.RealtimeIOConfig; import org.apache.druid.segment.indexing.RealtimeTuningConfig; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.join.NoopJoinableFactory; import org.apache.druid.segment.realtime.plumber.RealtimePlumberSchool; import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; diff --git a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/ClosedSegmensSinksBatchAppenderatorTester.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/ClosedSegmensSinksBatchAppenderatorTester.java index 2850620b5269..55e288dce401 100644 --- a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/ClosedSegmensSinksBatchAppenderatorTester.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/ClosedSegmensSinksBatchAppenderatorTester.java @@ -24,6 +24,7 @@ import org.apache.druid.data.input.impl.JSONParseSpec; import org.apache.druid.data.input.impl.MapInputRowParser; import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.PartitionsSpec; import org.apache.druid.jackson.DefaultObjectMapper; import org.apache.druid.java.util.common.FileUtils; @@ -45,7 +46,6 @@ import org.apache.druid.segment.incremental.SimpleRowIngestionMeters; import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.TuningConfig; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.loading.DataSegmentPusher; import org.apache.druid.segment.realtime.FireDepartmentMetrics; import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; diff --git a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/DefaultOfflineAppenderatorFactoryTest.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/DefaultOfflineAppenderatorFactoryTest.java index 2c9f268e041d..592fd13cdb7d 100644 --- a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/DefaultOfflineAppenderatorFactoryTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/DefaultOfflineAppenderatorFactoryTest.java @@ -30,6 +30,7 @@ import org.apache.druid.data.input.impl.MapInputRowParser; import org.apache.druid.data.input.impl.TimestampSpec; import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.initialization.Initialization; import org.apache.druid.java.util.common.Intervals; import org.apache.druid.java.util.common.granularity.Granularities; @@ -40,7 +41,6 @@ import org.apache.druid.segment.column.ColumnConfig; import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.RealtimeTuningConfig; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.realtime.FireDepartmentMetrics; import org.apache.druid.timeline.partition.LinearShardSpec; import org.junit.Assert; diff --git a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/OpenAndClosedSegmentsAppenderatorTester.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/OpenAndClosedSegmentsAppenderatorTester.java index 6ec851a445d5..5be178d27981 100644 --- a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/OpenAndClosedSegmentsAppenderatorTester.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/OpenAndClosedSegmentsAppenderatorTester.java @@ -24,6 +24,7 @@ import org.apache.druid.data.input.impl.JSONParseSpec; import org.apache.druid.data.input.impl.MapInputRowParser; import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.jackson.DefaultObjectMapper; import org.apache.druid.java.util.common.FileUtils; import org.apache.druid.java.util.common.granularity.Granularities; @@ -43,7 +44,6 @@ import org.apache.druid.segment.incremental.SimpleRowIngestionMeters; import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.TuningConfig; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.loading.DataSegmentPusher; import org.apache.druid.segment.realtime.FireDepartmentMetrics; import org.apache.druid.segment.writeout.OffHeapMemorySegmentWriteOutMediumFactory; diff --git a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorTester.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorTester.java index 57fdce29034a..7f340aa2969e 100644 --- a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorTester.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorTester.java @@ -29,6 +29,7 @@ import org.apache.druid.data.input.impl.JSONParseSpec; import org.apache.druid.data.input.impl.MapInputRowParser; import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.jackson.DefaultObjectMapper; import org.apache.druid.java.util.common.FileUtils; import org.apache.druid.java.util.common.concurrent.Execs; @@ -60,7 +61,6 @@ import org.apache.druid.segment.incremental.SimpleRowIngestionMeters; import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.RealtimeTuningConfig; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.join.NoopJoinableFactory; import org.apache.druid.segment.loading.DataSegmentPusher; import org.apache.druid.segment.realtime.FireDepartmentMetrics; diff --git a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/UnifiedIndexerAppenderatorsManagerTest.java b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/UnifiedIndexerAppenderatorsManagerTest.java index 31e3dbdb549a..e32aefeb7bdb 100644 --- a/server/src/test/java/org/apache/druid/segment/realtime/appenderator/UnifiedIndexerAppenderatorsManagerTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/appenderator/UnifiedIndexerAppenderatorsManagerTest.java @@ -26,6 +26,7 @@ import org.apache.druid.client.cache.MapCache; import org.apache.druid.data.input.impl.DimensionsSpec; import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexing.worker.config.WorkerConfig; import org.apache.druid.java.util.common.Intervals; import org.apache.druid.java.util.common.granularity.Granularities; @@ -45,7 +46,6 @@ import org.apache.druid.segment.incremental.NoopRowIngestionMeters; import org.apache.druid.segment.incremental.ParseExceptionHandler; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.join.JoinableFactoryWrapperTest; import org.apache.druid.segment.loading.NoopDataSegmentPusher; import org.apache.druid.segment.realtime.FireDepartmentMetrics; diff --git a/server/src/test/java/org/apache/druid/segment/realtime/plumber/RealtimePlumberSchoolTest.java b/server/src/test/java/org/apache/druid/segment/realtime/plumber/RealtimePlumberSchoolTest.java index 12ef42e4e2d6..7f925e65734a 100644 --- a/server/src/test/java/org/apache/druid/segment/realtime/plumber/RealtimePlumberSchoolTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/plumber/RealtimePlumberSchoolTest.java @@ -33,6 +33,7 @@ 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.granularity.UniformGranularitySpec; import org.apache.druid.jackson.DefaultObjectMapper; import org.apache.druid.java.util.common.DateTimes; import org.apache.druid.java.util.common.FileUtils; @@ -50,7 +51,6 @@ import org.apache.druid.segment.handoff.SegmentHandoffNotifierFactory; import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.RealtimeTuningConfig; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.join.NoopJoinableFactory; import org.apache.druid.segment.loading.DataSegmentPusher; import org.apache.druid.segment.realtime.FireDepartmentMetrics; diff --git a/server/src/test/java/org/apache/druid/segment/realtime/plumber/SinkTest.java b/server/src/test/java/org/apache/druid/segment/realtime/plumber/SinkTest.java index f352e96608da..e796ae90426e 100644 --- a/server/src/test/java/org/apache/druid/segment/realtime/plumber/SinkTest.java +++ b/server/src/test/java/org/apache/druid/segment/realtime/plumber/SinkTest.java @@ -27,6 +27,7 @@ import org.apache.druid.data.input.Row; import org.apache.druid.data.input.impl.DimensionsSpec; import org.apache.druid.data.input.impl.TimestampSpec; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; 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; @@ -34,7 +35,6 @@ import org.apache.druid.query.aggregation.CountAggregatorFactory; import org.apache.druid.segment.indexing.DataSchema; import org.apache.druid.segment.indexing.RealtimeTuningConfig; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.segment.realtime.FireHydrant; import org.apache.druid.testing.InitializedNullHandlingTest; import org.joda.time.DateTime; diff --git a/server/src/test/java/org/apache/druid/server/coordinator/compact/NewestSegmentFirstPolicyTest.java b/server/src/test/java/org/apache/druid/server/coordinator/compact/NewestSegmentFirstPolicyTest.java index 60feabc65709..90566b028c74 100644 --- a/server/src/test/java/org/apache/druid/server/coordinator/compact/NewestSegmentFirstPolicyTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/compact/NewestSegmentFirstPolicyTest.java @@ -1171,7 +1171,7 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentDim } @Test - public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentFilter() throws Exception + public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentFilter() { NullHandling.initializeForTests(); // Same partitionsSpec as what is set in the auto compaction config 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 d5f232274ba4..03c087612d75 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 @@ -25,6 +25,7 @@ import org.apache.druid.data.input.impl.JsonInputFormat; import org.apache.druid.data.input.impl.LocalInputSource; import org.apache.druid.guice.GuiceInjectors; +import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.apache.druid.indexer.partitions.DynamicPartitionsSpec; import org.apache.druid.indexing.common.task.IndexTask; import org.apache.druid.indexing.common.task.TaskResource; @@ -33,7 +34,6 @@ import org.apache.druid.query.aggregation.AggregatorFactory; import org.apache.druid.segment.IndexSpec; import org.apache.druid.segment.indexing.DataSchema; -import org.apache.druid.indexer.granularity.UniformGranularitySpec; import org.junit.After; import org.junit.Assert; import org.junit.Before; From 57ca94b5c17af09f47c30d8106b5a92919afffae Mon Sep 17 00:00:00 2001 From: Clint Wylie Date: Thu, 31 Aug 2023 04:57:21 -0700 Subject: [PATCH 4/5] style --- .../compact/NewestSegmentFirstPolicyTest.java | 594 ++++++++++++++---- 1 file changed, 463 insertions(+), 131 deletions(-) diff --git a/server/src/test/java/org/apache/druid/server/coordinator/compact/NewestSegmentFirstPolicyTest.java b/server/src/test/java/org/apache/druid/server/coordinator/compact/NewestSegmentFirstPolicyTest.java index 90566b028c74..f0be367145cf 100644 --- a/server/src/test/java/org/apache/druid/server/coordinator/compact/NewestSegmentFirstPolicyTest.java +++ b/server/src/test/java/org/apache/druid/server/coordinator/compact/NewestSegmentFirstPolicyTest.java @@ -412,14 +412,23 @@ public void testIfSegmentsSkipOffsetWithConfiguredSegmentGranularityEqual() ); final CompactionSegmentIterator iterator = policy.reset( - ImmutableMap.of(DATA_SOURCE, createCompactionConfig(40000, new Period("P1D"), new UserCompactionTaskGranularityConfig(Granularities.DAY, null, null))), + ImmutableMap.of( + DATA_SOURCE, + createCompactionConfig(40000, + new Period("P1D"), + new UserCompactionTaskGranularityConfig(Granularities.DAY, null, null) + ) + ), ImmutableMap.of(DATA_SOURCE, timeline), Collections.emptyMap() ); // We should only get segments in Oct final List expectedSegmentsToCompact = new ArrayList<>( - timeline.findNonOvershadowedObjectsInInterval(Intervals.of("2017-10-14T00:00:00/2017-12-02T00:00:00"), Partitions.ONLY_COMPLETE) + timeline.findNonOvershadowedObjectsInInterval( + Intervals.of("2017-10-14T00:00:00/2017-12-02T00:00:00"), + Partitions.ONLY_COMPLETE + ) ); Assert.assertTrue(iterator.hasNext()); @@ -445,14 +454,23 @@ public void testIfSegmentsSkipOffsetWithConfiguredSegmentGranularityLarger() ); final CompactionSegmentIterator iterator = policy.reset( - ImmutableMap.of(DATA_SOURCE, createCompactionConfig(40000, new Period("P1D"), new UserCompactionTaskGranularityConfig(Granularities.MONTH, null, null))), + ImmutableMap.of( + DATA_SOURCE, + createCompactionConfig(40000, + new Period("P1D"), + new UserCompactionTaskGranularityConfig(Granularities.MONTH, null, null) + ) + ), ImmutableMap.of(DATA_SOURCE, timeline), Collections.emptyMap() ); // We should only get segments in Oct final List expectedSegmentsToCompact = new ArrayList<>( - timeline.findNonOvershadowedObjectsInInterval(Intervals.of("2017-10-14T00:00:00/2017-10-15T00:00:00"), Partitions.ONLY_COMPLETE) + timeline.findNonOvershadowedObjectsInInterval( + Intervals.of("2017-10-14T00:00:00/2017-10-15T00:00:00"), + Partitions.ONLY_COMPLETE + ) ); Assert.assertTrue(iterator.hasNext()); @@ -471,14 +489,23 @@ public void testIfSegmentsSkipOffsetWithConfiguredSegmentGranularitySmaller() ); final CompactionSegmentIterator iterator = policy.reset( - ImmutableMap.of(DATA_SOURCE, createCompactionConfig(40000, new Period("P1D"), new UserCompactionTaskGranularityConfig(Granularities.MINUTE, null, null))), + ImmutableMap.of( + DATA_SOURCE, + createCompactionConfig(40000, + new Period("P1D"), + new UserCompactionTaskGranularityConfig(Granularities.MINUTE, null, null) + ) + ), ImmutableMap.of(DATA_SOURCE, timeline), Collections.emptyMap() ); // We should only get segments in Oct final List expectedSegmentsToCompact = new ArrayList<>( - timeline.findNonOvershadowedObjectsInInterval(Intervals.of("2017-10-14T00:00:00/2017-10-15T00:00:00"), Partitions.ONLY_COMPLETE) + timeline.findNonOvershadowedObjectsInInterval( + Intervals.of("2017-10-14T00:00:00/2017-10-15T00:00:00"), + Partitions.ONLY_COMPLETE + ) ); Assert.assertTrue(iterator.hasNext()); @@ -586,7 +613,13 @@ public void testIteratorReturnsSegmentsInConfiguredSegmentGranularity() ); final CompactionSegmentIterator iterator = policy.reset( - ImmutableMap.of(DATA_SOURCE, createCompactionConfig(130000, new Period("P0D"), new UserCompactionTaskGranularityConfig(Granularities.MONTH, null, null))), + ImmutableMap.of( + DATA_SOURCE, + createCompactionConfig(130000, + new Period("P0D"), + new UserCompactionTaskGranularityConfig(Granularities.MONTH, null, null) + ) + ), ImmutableMap.of(DATA_SOURCE, timeline), Collections.emptyMap() ); @@ -597,7 +630,10 @@ public void testIteratorReturnsSegmentsInConfiguredSegmentGranularity() // Month of Dec Assert.assertTrue(iterator.hasNext()); List expectedSegmentsToCompact = new ArrayList<>( - timeline.findNonOvershadowedObjectsInInterval(Intervals.of("2017-12-01T00:00:00/2017-12-31T00:00:00"), Partitions.ONLY_COMPLETE) + timeline.findNonOvershadowedObjectsInInterval( + Intervals.of("2017-12-01T00:00:00/2017-12-31T00:00:00"), + Partitions.ONLY_COMPLETE + ) ); Assert.assertEquals( ImmutableSet.copyOf(expectedSegmentsToCompact), @@ -606,7 +642,10 @@ public void testIteratorReturnsSegmentsInConfiguredSegmentGranularity() // Month of Nov Assert.assertTrue(iterator.hasNext()); expectedSegmentsToCompact = new ArrayList<>( - timeline.findNonOvershadowedObjectsInInterval(Intervals.of("2017-11-01T00:00:00/2017-12-01T00:00:00"), Partitions.ONLY_COMPLETE) + timeline.findNonOvershadowedObjectsInInterval( + Intervals.of("2017-11-01T00:00:00/2017-12-01T00:00:00"), + Partitions.ONLY_COMPLETE + ) ); Assert.assertEquals( ImmutableSet.copyOf(expectedSegmentsToCompact), @@ -615,7 +654,10 @@ public void testIteratorReturnsSegmentsInConfiguredSegmentGranularity() // Month of Oct Assert.assertTrue(iterator.hasNext()); expectedSegmentsToCompact = new ArrayList<>( - timeline.findNonOvershadowedObjectsInInterval(Intervals.of("2017-10-01T00:00:00/2017-11-01T00:00:00"), Partitions.ONLY_COMPLETE) + timeline.findNonOvershadowedObjectsInInterval( + Intervals.of("2017-10-01T00:00:00/2017-11-01T00:00:00"), + Partitions.ONLY_COMPLETE + ) ); Assert.assertEquals( ImmutableSet.copyOf(expectedSegmentsToCompact), @@ -635,7 +677,13 @@ public void testIteratorReturnsSegmentsInMultipleIntervalIfConfiguredSegmentGran ); final CompactionSegmentIterator iterator = policy.reset( - ImmutableMap.of(DATA_SOURCE, createCompactionConfig(130000, new Period("P0D"), new UserCompactionTaskGranularityConfig(Granularities.MONTH, null, null))), + ImmutableMap.of( + DATA_SOURCE, + createCompactionConfig(130000, + new Period("P0D"), + new UserCompactionTaskGranularityConfig(Granularities.MONTH, null, null) + ) + ), ImmutableMap.of(DATA_SOURCE, timeline), Collections.emptyMap() ); @@ -670,13 +718,22 @@ public void testIteratorDoesNotReturnCompactedInterval() ); final CompactionSegmentIterator iterator = policy.reset( - ImmutableMap.of(DATA_SOURCE, createCompactionConfig(40000, new Period("P0D"), new UserCompactionTaskGranularityConfig(Granularities.MINUTE, null, null))), + ImmutableMap.of( + DATA_SOURCE, + createCompactionConfig(40000, + new Period("P0D"), + new UserCompactionTaskGranularityConfig(Granularities.MINUTE, null, null) + ) + ), ImmutableMap.of(DATA_SOURCE, timeline), Collections.emptyMap() ); final List expectedSegmentsToCompact = new ArrayList<>( - timeline.findNonOvershadowedObjectsInInterval(Intervals.of("2017-12-01T00:00:00/2017-12-02T00:00:00"), Partitions.ONLY_COMPLETE) + timeline.findNonOvershadowedObjectsInInterval( + Intervals.of("2017-12-01T00:00:00/2017-12-02T00:00:00"), + Partitions.ONLY_COMPLETE + ) ); Assert.assertTrue(iterator.hasNext()); Assert.assertEquals( @@ -691,12 +748,28 @@ public void testIteratorDoesNotReturnCompactedInterval() public void testIteratorReturnsAllMixedVersionSegmentsInConfiguredSegmentGranularity() { final SegmentTimeline timeline = createTimeline( - new SegmentGenerateSpec(Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), new Period("P1D"), "1994-04-29T00:00:00.000Z", null), - new SegmentGenerateSpec(Intervals.of("2017-10-01T01:00:00/2017-10-01T02:00:00"), new Period("PT1H"), "1994-04-30T00:00:00.000Z", null) + new SegmentGenerateSpec( + Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), + new Period("P1D"), + "1994-04-29T00:00:00.000Z", + null + ), + new SegmentGenerateSpec( + Intervals.of("2017-10-01T01:00:00/2017-10-01T02:00:00"), + new Period("PT1H"), + "1994-04-30T00:00:00.000Z", + null + ) ); final CompactionSegmentIterator iterator = policy.reset( - ImmutableMap.of(DATA_SOURCE, createCompactionConfig(130000, new Period("P0D"), new UserCompactionTaskGranularityConfig(Granularities.MONTH, null, null))), + ImmutableMap.of( + DATA_SOURCE, + createCompactionConfig(130000, + new Period("P0D"), + new UserCompactionTaskGranularityConfig(Granularities.MONTH, null, null) + ) + ), ImmutableMap.of(DATA_SOURCE, timeline), Collections.emptyMap() ); @@ -704,7 +777,10 @@ public void testIteratorReturnsAllMixedVersionSegmentsInConfiguredSegmentGranula // We should get all segments in timeline back since skip offset is P0D. Assert.assertTrue(iterator.hasNext()); List expectedSegmentsToCompact = new ArrayList<>( - timeline.findNonOvershadowedObjectsInInterval(Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), Partitions.ONLY_COMPLETE) + timeline.findNonOvershadowedObjectsInInterval( + Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), + Partitions.ONLY_COMPLETE + ) ); Assert.assertEquals( ImmutableSet.copyOf(expectedSegmentsToCompact), @@ -719,7 +795,11 @@ public void testIteratorReturnsNothingAsSegmentsWasCompactedAndHaveSameSegmentGr { // Same indexSpec as what is set in the auto compaction config // Same partitionsSpec as what is set in the auto compaction config - PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from(null, null, null)); + PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from( + null, + null, + null + )); // Create segments that were compacted (CompactionState != null) and have segmentGranularity=DAY final SegmentTimeline timeline = createTimeline( @@ -739,7 +819,13 @@ public void testIteratorReturnsNothingAsSegmentsWasCompactedAndHaveSameSegmentGr // Auto compaction config sets segmentGranularity=DAY final CompactionSegmentIterator iterator = policy.reset( - ImmutableMap.of(DATA_SOURCE, createCompactionConfig(130000, new Period("P0D"), new UserCompactionTaskGranularityConfig(Granularities.DAY, null, null))), + ImmutableMap.of( + DATA_SOURCE, + createCompactionConfig(130000, + new Period("P0D"), + new UserCompactionTaskGranularityConfig(Granularities.DAY, null, null) + ) + ), ImmutableMap.of(DATA_SOURCE, timeline), Collections.emptyMap() ); @@ -750,7 +836,11 @@ public void testIteratorReturnsNothingAsSegmentsWasCompactedAndHaveSameSegmentGr public void testIteratorReturnsNothingAsSegmentsWasCompactedAndHaveSameSegmentGranularityInLastCompactionState() { // Same partitionsSpec as what is set in the auto compaction config - PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from(null, null, null)); + PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from( + null, + null, + null + )); // Create segments that were compacted (CompactionState != null) and have segmentGranularity=DAY final SegmentTimeline timeline = createTimeline( @@ -770,7 +860,13 @@ public void testIteratorReturnsNothingAsSegmentsWasCompactedAndHaveSameSegmentGr // Auto compaction config sets segmentGranularity=DAY final CompactionSegmentIterator iterator = policy.reset( - ImmutableMap.of(DATA_SOURCE, createCompactionConfig(130000, new Period("P0D"), new UserCompactionTaskGranularityConfig(Granularities.DAY, null, null))), + ImmutableMap.of( + DATA_SOURCE, + createCompactionConfig(130000, + new Period("P0D"), + new UserCompactionTaskGranularityConfig(Granularities.DAY, null, null) + ) + ), ImmutableMap.of(DATA_SOURCE, timeline), Collections.emptyMap() ); @@ -781,7 +877,11 @@ public void testIteratorReturnsNothingAsSegmentsWasCompactedAndHaveSameSegmentGr public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentSegmentGranularity() { // Same partitionsSpec as what is set in the auto compaction config - PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from(null, null, null)); + PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from( + null, + null, + null + )); // Create segments that were compacted (CompactionState != null) and have segmentGranularity=DAY final SegmentTimeline timeline = createTimeline( @@ -801,14 +901,23 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentSeg // Auto compaction config sets segmentGranularity=YEAR final CompactionSegmentIterator iterator = policy.reset( - ImmutableMap.of(DATA_SOURCE, createCompactionConfig(130000, new Period("P0D"), new UserCompactionTaskGranularityConfig(Granularities.YEAR, null, null))), + ImmutableMap.of( + DATA_SOURCE, + createCompactionConfig(130000, + new Period("P0D"), + new UserCompactionTaskGranularityConfig(Granularities.YEAR, null, null) + ) + ), ImmutableMap.of(DATA_SOURCE, timeline), Collections.emptyMap() ); // We should get all segments in timeline back since skip offset is P0D. Assert.assertTrue(iterator.hasNext()); List expectedSegmentsToCompact = new ArrayList<>( - timeline.findNonOvershadowedObjectsInInterval(Intervals.of("2017-10-01T00:00:00/2017-10-03T00:00:00"), Partitions.ONLY_COMPLETE) + timeline.findNonOvershadowedObjectsInInterval( + Intervals.of("2017-10-01T00:00:00/2017-10-03T00:00:00"), + Partitions.ONLY_COMPLETE + ) ); Assert.assertEquals( ImmutableSet.copyOf(expectedSegmentsToCompact), @@ -822,7 +931,11 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentSeg public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentSegmentGranularityInLastCompactionState() { // Same partitionsSpec as what is set in the auto compaction config - PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from(null, null, null)); + PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from( + null, + null, + null + )); // Create segments that were compacted (CompactionState != null) and have segmentGranularity=DAY final SegmentTimeline timeline = createTimeline( @@ -842,14 +955,23 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentSeg // Auto compaction config sets segmentGranularity=YEAR final CompactionSegmentIterator iterator = policy.reset( - ImmutableMap.of(DATA_SOURCE, createCompactionConfig(130000, new Period("P0D"), new UserCompactionTaskGranularityConfig(Granularities.YEAR, null, null))), + ImmutableMap.of( + DATA_SOURCE, + createCompactionConfig(130000, + new Period("P0D"), + new UserCompactionTaskGranularityConfig(Granularities.YEAR, null, null) + ) + ), ImmutableMap.of(DATA_SOURCE, timeline), Collections.emptyMap() ); // We should get all segments in timeline back since skip offset is P0D. Assert.assertTrue(iterator.hasNext()); List expectedSegmentsToCompact = new ArrayList<>( - timeline.findNonOvershadowedObjectsInInterval(Intervals.of("2017-10-01T00:00:00/2017-10-03T00:00:00"), Partitions.ONLY_COMPLETE) + timeline.findNonOvershadowedObjectsInInterval( + Intervals.of("2017-10-01T00:00:00/2017-10-03T00:00:00"), + Partitions.ONLY_COMPLETE + ) ); Assert.assertEquals( ImmutableSet.copyOf(expectedSegmentsToCompact), @@ -863,7 +985,11 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentSeg public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentTimezone() { // Same partitionsSpec as what is set in the auto compaction config - PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from(null, null, null)); + PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from( + null, + null, + null + )); // Create segments that were compacted (CompactionState != null) and have segmentGranularity=DAY final SegmentTimeline timeline = createTimeline( @@ -878,20 +1004,21 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentTim // Duration of new segmentGranularity is the same as before (P1D), // but we changed the timezone from UTC to Bangkok in the auto compaction spec final CompactionSegmentIterator iterator = policy.reset( - ImmutableMap.of(DATA_SOURCE, - createCompactionConfig( - 130000, - new Period("P0D"), - new UserCompactionTaskGranularityConfig( - new PeriodGranularity( - new Period("P1D"), - null, - DateTimeZone.forTimeZone(TimeZone.getTimeZone("Asia/Bangkok")) - ), - null, - null - ) - ) + ImmutableMap.of( + DATA_SOURCE, + createCompactionConfig( + 130000, + new Period("P0D"), + new UserCompactionTaskGranularityConfig( + new PeriodGranularity( + new Period("P1D"), + null, + DateTimeZone.forTimeZone(TimeZone.getTimeZone("Asia/Bangkok")) + ), + null, + null + ) + ) ), ImmutableMap.of(DATA_SOURCE, timeline), Collections.emptyMap() @@ -899,7 +1026,10 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentTim // We should get all segments in timeline back since skip offset is P0D. Assert.assertTrue(iterator.hasNext()); List expectedSegmentsToCompact = new ArrayList<>( - timeline.findNonOvershadowedObjectsInInterval(Intervals.of("2017-10-01T00:00:00/2017-10-03T00:00:00"), Partitions.ONLY_COMPLETE) + timeline.findNonOvershadowedObjectsInInterval( + Intervals.of("2017-10-01T00:00:00/2017-10-03T00:00:00"), + Partitions.ONLY_COMPLETE + ) ); Assert.assertEquals( ImmutableSet.copyOf(expectedSegmentsToCompact), @@ -913,7 +1043,11 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentTim public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentOrigin() { // Same partitionsSpec as what is set in the auto compaction config - PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from(null, null, null)); + PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from( + null, + null, + null + )); // Create segments that were compacted (CompactionState != null) and have segmentGranularity=DAY final SegmentTimeline timeline = createTimeline( @@ -927,20 +1061,21 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentOri // Duration of new segmentGranularity is the same as before (P1D), but we changed the origin in the autocompaction spec final CompactionSegmentIterator iterator = policy.reset( - ImmutableMap.of(DATA_SOURCE, - createCompactionConfig( - 130000, - new Period("P0D"), - new UserCompactionTaskGranularityConfig( - new PeriodGranularity( - new Period("P1D"), - DateTimes.of("2012-01-02T00:05:00.000Z"), - DateTimeZone.UTC - ), - null, - null - ) - ) + ImmutableMap.of( + DATA_SOURCE, + createCompactionConfig( + 130000, + new Period("P0D"), + new UserCompactionTaskGranularityConfig( + new PeriodGranularity( + new Period("P1D"), + DateTimes.of("2012-01-02T00:05:00.000Z"), + DateTimeZone.UTC + ), + null, + null + ) + ) ), ImmutableMap.of(DATA_SOURCE, timeline), Collections.emptyMap() @@ -948,7 +1083,10 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentOri // We should get all segments in timeline back since skip offset is P0D. Assert.assertTrue(iterator.hasNext()); List expectedSegmentsToCompact = new ArrayList<>( - timeline.findNonOvershadowedObjectsInInterval(Intervals.of("2017-10-01T00:00:00/2017-10-03T00:00:00"), Partitions.ONLY_COMPLETE) + timeline.findNonOvershadowedObjectsInInterval( + Intervals.of("2017-10-01T00:00:00/2017-10-03T00:00:00"), + Partitions.ONLY_COMPLETE + ) ); Assert.assertEquals( ImmutableSet.copyOf(expectedSegmentsToCompact), @@ -962,7 +1100,11 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentOri public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentRollup() { // Same partitionsSpec as what is set in the auto compaction config - PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from(null, null, null)); + PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from( + null, + null, + null + )); // Create segments that were compacted (CompactionState != null) and have // rollup=false for interval 2017-10-01T00:00:00/2017-10-02T00:00:00, @@ -973,32 +1115,62 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentRol Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, new UniformGranularitySpec(null, null, false, null)) + new CompactionState( + partitionsSpec, + null, + null, + null, + IndexSpec.DEFAULT, + new UniformGranularitySpec(null, null, false, null) + ) ), new SegmentGenerateSpec( Intervals.of("2017-10-02T00:00:00/2017-10-03T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, UniformGranularitySpec.DEFAULT_SPEC) + new CompactionState( + partitionsSpec, + null, + null, + null, + IndexSpec.DEFAULT, + UniformGranularitySpec.DEFAULT_SPEC + ) ), new SegmentGenerateSpec( Intervals.of("2017-10-03T00:00:00/2017-10-04T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, new UniformGranularitySpec(null, null, false, null)) + new CompactionState( + partitionsSpec, + null, + null, + null, + IndexSpec.DEFAULT, + new UniformGranularitySpec(null, null, false, null) + ) ) ); // Auto compaction config sets rollup=true final CompactionSegmentIterator iterator = policy.reset( - ImmutableMap.of(DATA_SOURCE, createCompactionConfig(130000, new Period("P0D"), new UserCompactionTaskGranularityConfig(null, null, true))), + ImmutableMap.of( + DATA_SOURCE, + createCompactionConfig(130000, + new Period("P0D"), + new UserCompactionTaskGranularityConfig(null, null, true) + ) + ), ImmutableMap.of(DATA_SOURCE, timeline), Collections.emptyMap() ); // We should get interval 2017-10-01T00:00:00/2017-10-02T00:00:00 and interval 2017-10-03T00:00:00/2017-10-04T00:00:00. Assert.assertTrue(iterator.hasNext()); List expectedSegmentsToCompact = new ArrayList<>( - timeline.findNonOvershadowedObjectsInInterval(Intervals.of("2017-10-03T00:00:00/2017-10-04T00:00:00"), Partitions.ONLY_COMPLETE) + timeline.findNonOvershadowedObjectsInInterval( + Intervals.of("2017-10-03T00:00:00/2017-10-04T00:00:00"), + Partitions.ONLY_COMPLETE + ) ); Assert.assertEquals( ImmutableSet.copyOf(expectedSegmentsToCompact), @@ -1006,7 +1178,10 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentRol ); Assert.assertTrue(iterator.hasNext()); expectedSegmentsToCompact = new ArrayList<>( - timeline.findNonOvershadowedObjectsInInterval(Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), Partitions.ONLY_COMPLETE) + timeline.findNonOvershadowedObjectsInInterval( + Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), + Partitions.ONLY_COMPLETE + ) ); Assert.assertEquals( ImmutableSet.copyOf(expectedSegmentsToCompact), @@ -1020,7 +1195,11 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentRol public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentQueryGranularity() { // Same partitionsSpec as what is set in the auto compaction config - PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from(null, null, null)); + PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from( + null, + null, + null + )); // Create segments that were compacted (CompactionState != null) and have // queryGranularity=DAY for interval 2017-10-01T00:00:00/2017-10-02T00:00:00, @@ -1031,32 +1210,62 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentQue Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, new UniformGranularitySpec(null , Granularities.DAY, null, null)) + new CompactionState( + partitionsSpec, + null, + null, + null, + IndexSpec.DEFAULT, + new UniformGranularitySpec(null, Granularities.DAY, null, null) + ) ), new SegmentGenerateSpec( Intervals.of("2017-10-02T00:00:00/2017-10-03T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, new UniformGranularitySpec(null, Granularities.MINUTE, null)) + new CompactionState( + partitionsSpec, + null, + null, + null, + IndexSpec.DEFAULT, + new UniformGranularitySpec(null, Granularities.MINUTE, null) + ) ), new SegmentGenerateSpec( Intervals.of("2017-10-03T00:00:00/2017-10-04T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, null, null, null, IndexSpec.DEFAULT, UniformGranularitySpec.DEFAULT_SPEC) + new CompactionState( + partitionsSpec, + null, + null, + null, + IndexSpec.DEFAULT, + UniformGranularitySpec.DEFAULT_SPEC + ) ) ); // Auto compaction config sets queryGranularity=MINUTE final CompactionSegmentIterator iterator = policy.reset( - ImmutableMap.of(DATA_SOURCE, createCompactionConfig(130000, new Period("P0D"), new UserCompactionTaskGranularityConfig(null, Granularities.MINUTE, null))), + ImmutableMap.of( + DATA_SOURCE, + createCompactionConfig(130000, + new Period("P0D"), + new UserCompactionTaskGranularityConfig(null, Granularities.MINUTE, null) + ) + ), ImmutableMap.of(DATA_SOURCE, timeline), Collections.emptyMap() ); // We should get interval 2017-10-01T00:00:00/2017-10-02T00:00:00 and interval 2017-10-03T00:00:00/2017-10-04T00:00:00. Assert.assertTrue(iterator.hasNext()); List expectedSegmentsToCompact = new ArrayList<>( - timeline.findNonOvershadowedObjectsInInterval(Intervals.of("2017-10-03T00:00:00/2017-10-04T00:00:00"), Partitions.ONLY_COMPLETE) + timeline.findNonOvershadowedObjectsInInterval( + Intervals.of("2017-10-03T00:00:00/2017-10-04T00:00:00"), + Partitions.ONLY_COMPLETE + ) ); Assert.assertEquals( ImmutableSet.copyOf(expectedSegmentsToCompact), @@ -1064,7 +1273,10 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentQue ); Assert.assertTrue(iterator.hasNext()); expectedSegmentsToCompact = new ArrayList<>( - timeline.findNonOvershadowedObjectsInInterval(Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), Partitions.ONLY_COMPLETE) + timeline.findNonOvershadowedObjectsInInterval( + Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), + Partitions.ONLY_COMPLETE + ) ); Assert.assertEquals( ImmutableSet.copyOf(expectedSegmentsToCompact), @@ -1078,7 +1290,11 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentQue public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentDimensions() { // Same partitionsSpec as what is set in the auto compaction config - PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from(null, null, null)); + PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from( + null, + null, + null + )); // Create segments that were compacted (CompactionState != null) and have // Dimensions=["foo", "bar"] for interval 2017-10-01T00:00:00/2017-10-02T00:00:00, @@ -1090,13 +1306,27 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentDim Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("bar", "foo"))), null, null, IndexSpec.DEFAULT, null) + new CompactionState( + partitionsSpec, + new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("bar", "foo"))), + null, + null, + IndexSpec.DEFAULT, + null + ) ), new SegmentGenerateSpec( Intervals.of("2017-10-02T00:00:00/2017-10-03T00:00:00"), new Period("P1D"), null, - new CompactionState(partitionsSpec, new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("foo"))), null, null, IndexSpec.DEFAULT, null) + new CompactionState( + partitionsSpec, + new DimensionsSpec(DimensionsSpec.getDefaultSchemas(ImmutableList.of("foo"))), + null, + null, + IndexSpec.DEFAULT, + null + ) ), new SegmentGenerateSpec( Intervals.of("2017-10-03T00:00:00/2017-10-04T00:00:00"), @@ -1128,7 +1358,10 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentDim // We should get interval 2017-10-01T00:00:00/2017-10-02T00:00:00, interval 2017-10-04T00:00:00/2017-10-05T00:00:00, and interval 2017-10-03T00:00:00/2017-10-04T00:00:00. Assert.assertTrue(iterator.hasNext()); List expectedSegmentsToCompact = new ArrayList<>( - timeline.findNonOvershadowedObjectsInInterval(Intervals.of("2017-10-04T00:00:00/2017-10-05T00:00:00"), Partitions.ONLY_COMPLETE) + timeline.findNonOvershadowedObjectsInInterval( + Intervals.of("2017-10-04T00:00:00/2017-10-05T00:00:00"), + Partitions.ONLY_COMPLETE + ) ); Assert.assertEquals( ImmutableSet.copyOf(expectedSegmentsToCompact), @@ -1136,7 +1369,10 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentDim ); Assert.assertTrue(iterator.hasNext()); expectedSegmentsToCompact = new ArrayList<>( - timeline.findNonOvershadowedObjectsInInterval(Intervals.of("2017-10-03T00:00:00/2017-10-04T00:00:00"), Partitions.ONLY_COMPLETE) + timeline.findNonOvershadowedObjectsInInterval( + Intervals.of("2017-10-03T00:00:00/2017-10-04T00:00:00"), + Partitions.ONLY_COMPLETE + ) ); Assert.assertEquals( ImmutableSet.copyOf(expectedSegmentsToCompact), @@ -1144,7 +1380,10 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentDim ); Assert.assertTrue(iterator.hasNext()); expectedSegmentsToCompact = new ArrayList<>( - timeline.findNonOvershadowedObjectsInInterval(Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), Partitions.ONLY_COMPLETE) + timeline.findNonOvershadowedObjectsInInterval( + Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), + Partitions.ONLY_COMPLETE + ) ); Assert.assertEquals( ImmutableSet.copyOf(expectedSegmentsToCompact), @@ -1175,7 +1414,11 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentFil { NullHandling.initializeForTests(); // Same partitionsSpec as what is set in the auto compaction config - PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from(null, null, null)); + PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from( + null, + null, + null + )); // Create segments that were compacted (CompactionState != null) and have // filter=SelectorDimFilter("dim1", "foo", null) for interval 2017-10-01T00:00:00/2017-10-02T00:00:00, @@ -1246,7 +1489,10 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentFil // We should get interval 2017-10-01T00:00:00/2017-10-02T00:00:00, interval 2017-10-04T00:00:00/2017-10-05T00:00:00, and interval 2017-10-03T00:00:00/2017-10-04T00:00:00. Assert.assertTrue(iterator.hasNext()); List expectedSegmentsToCompact = new ArrayList<>( - timeline.findNonOvershadowedObjectsInInterval(Intervals.of("2017-10-04T00:00:00/2017-10-05T00:00:00"), Partitions.ONLY_COMPLETE) + timeline.findNonOvershadowedObjectsInInterval( + Intervals.of("2017-10-04T00:00:00/2017-10-05T00:00:00"), + Partitions.ONLY_COMPLETE + ) ); Assert.assertEquals( ImmutableSet.copyOf(expectedSegmentsToCompact), @@ -1254,7 +1500,10 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentFil ); Assert.assertTrue(iterator.hasNext()); expectedSegmentsToCompact = new ArrayList<>( - timeline.findNonOvershadowedObjectsInInterval(Intervals.of("2017-10-03T00:00:00/2017-10-04T00:00:00"), Partitions.ONLY_COMPLETE) + timeline.findNonOvershadowedObjectsInInterval( + Intervals.of("2017-10-03T00:00:00/2017-10-04T00:00:00"), + Partitions.ONLY_COMPLETE + ) ); Assert.assertEquals( ImmutableSet.copyOf(expectedSegmentsToCompact), @@ -1262,7 +1511,10 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentFil ); Assert.assertTrue(iterator.hasNext()); expectedSegmentsToCompact = new ArrayList<>( - timeline.findNonOvershadowedObjectsInInterval(Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), Partitions.ONLY_COMPLETE) + timeline.findNonOvershadowedObjectsInInterval( + Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), + Partitions.ONLY_COMPLETE + ) ); Assert.assertEquals( ImmutableSet.copyOf(expectedSegmentsToCompact), @@ -1297,7 +1549,11 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentMet .addValue(ExprMacroTable.class.getName(), TestExprMacroTable.INSTANCE) ); // Same partitionsSpec as what is set in the auto compaction config - PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from(null, null, null)); + PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from( + null, + null, + null + )); // Create segments that were compacted (CompactionState != null) and have // metricsSpec={CountAggregatorFactory("cnt")} for interval 2017-10-01T00:00:00/2017-10-02T00:00:00, @@ -1360,7 +1616,7 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentMet null, null, null, - new AggregatorFactory[] {new CountAggregatorFactory("cnt"), new LongSumAggregatorFactory("val", "val")} + new AggregatorFactory[]{new CountAggregatorFactory("cnt"), new LongSumAggregatorFactory("val", "val")} )), ImmutableMap.of(DATA_SOURCE, timeline), Collections.emptyMap() @@ -1368,7 +1624,10 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentMet // We should get interval 2017-10-01T00:00:00/2017-10-02T00:00:00, interval 2017-10-04T00:00:00/2017-10-05T00:00:00, and interval 2017-10-03T00:00:00/2017-10-04T00:00:00. Assert.assertTrue(iterator.hasNext()); List expectedSegmentsToCompact = new ArrayList<>( - timeline.findNonOvershadowedObjectsInInterval(Intervals.of("2017-10-04T00:00:00/2017-10-05T00:00:00"), Partitions.ONLY_COMPLETE) + timeline.findNonOvershadowedObjectsInInterval( + Intervals.of("2017-10-04T00:00:00/2017-10-05T00:00:00"), + Partitions.ONLY_COMPLETE + ) ); Assert.assertEquals( ImmutableSet.copyOf(expectedSegmentsToCompact), @@ -1376,7 +1635,10 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentMet ); Assert.assertTrue(iterator.hasNext()); expectedSegmentsToCompact = new ArrayList<>( - timeline.findNonOvershadowedObjectsInInterval(Intervals.of("2017-10-03T00:00:00/2017-10-04T00:00:00"), Partitions.ONLY_COMPLETE) + timeline.findNonOvershadowedObjectsInInterval( + Intervals.of("2017-10-03T00:00:00/2017-10-04T00:00:00"), + Partitions.ONLY_COMPLETE + ) ); Assert.assertEquals( ImmutableSet.copyOf(expectedSegmentsToCompact), @@ -1384,7 +1646,10 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentMet ); Assert.assertTrue(iterator.hasNext()); expectedSegmentsToCompact = new ArrayList<>( - timeline.findNonOvershadowedObjectsInInterval(Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), Partitions.ONLY_COMPLETE) + timeline.findNonOvershadowedObjectsInInterval( + Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), + Partitions.ONLY_COMPLETE + ) ); Assert.assertEquals( ImmutableSet.copyOf(expectedSegmentsToCompact), @@ -1414,12 +1679,28 @@ public void testIteratorReturnsSegmentsAsSegmentsWasCompactedAndHaveDifferentMet public void testIteratorReturnsSegmentsSmallerSegmentGranularityCoveringMultipleSegmentsInTimeline() { final SegmentTimeline timeline = createTimeline( - new SegmentGenerateSpec(Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), new Period("P1D"), "1994-04-29T00:00:00.000Z", null), - new SegmentGenerateSpec(Intervals.of("2017-10-01T01:00:00/2017-10-01T02:00:00"), new Period("PT1H"), "1994-04-30T00:00:00.000Z", null) + new SegmentGenerateSpec( + Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), + new Period("P1D"), + "1994-04-29T00:00:00.000Z", + null + ), + new SegmentGenerateSpec( + Intervals.of("2017-10-01T01:00:00/2017-10-01T02:00:00"), + new Period("PT1H"), + "1994-04-30T00:00:00.000Z", + null + ) ); final CompactionSegmentIterator iterator = policy.reset( - ImmutableMap.of(DATA_SOURCE, createCompactionConfig(130000, new Period("P0D"), new UserCompactionTaskGranularityConfig(Granularities.HOUR, null, null))), + ImmutableMap.of( + DATA_SOURCE, + createCompactionConfig(130000, + new Period("P0D"), + new UserCompactionTaskGranularityConfig(Granularities.HOUR, null, null) + ) + ), ImmutableMap.of(DATA_SOURCE, timeline), Collections.emptyMap() ); @@ -1430,7 +1711,10 @@ public void testIteratorReturnsSegmentsSmallerSegmentGranularityCoveringMultiple // also convers the HOUR segment (2017-10-01T01:00:00/2017-10-01T02:00:00) Assert.assertTrue(iterator.hasNext()); List expectedSegmentsToCompact = new ArrayList<>( - timeline.findNonOvershadowedObjectsInInterval(Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), Partitions.ONLY_COMPLETE) + timeline.findNonOvershadowedObjectsInInterval( + Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), + Partitions.ONLY_COMPLETE + ) ); Assert.assertEquals( ImmutableSet.copyOf(expectedSegmentsToCompact), @@ -1445,7 +1729,11 @@ public void testIteratorReturnsSegmentsAsCompactionStateChangedWithCompactedStat { // Different indexSpec as what is set in the auto compaction config IndexSpec newIndexSpec = IndexSpec.builder().withBitmapSerdeFactory(new ConciseBitmapSerdeFactory()).build(); - PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from(null, null, null)); + PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from( + null, + null, + null + )); // Create segments that were compacted (CompactionState != null) and have segmentGranularity=DAY final SegmentTimeline timeline = createTimeline( @@ -1459,20 +1747,21 @@ public void testIteratorReturnsSegmentsAsCompactionStateChangedWithCompactedStat // Duration of new segmentGranularity is the same as before (P1D) final CompactionSegmentIterator iterator = policy.reset( - ImmutableMap.of(DATA_SOURCE, - createCompactionConfig( - 130000, - new Period("P0D"), - new UserCompactionTaskGranularityConfig( - new PeriodGranularity( - new Period("P1D"), - null, - DateTimeZone.UTC - ), - null, - null - ) - ) + ImmutableMap.of( + DATA_SOURCE, + createCompactionConfig( + 130000, + new Period("P0D"), + new UserCompactionTaskGranularityConfig( + new PeriodGranularity( + new Period("P1D"), + null, + DateTimeZone.UTC + ), + null, + null + ) + ) ), ImmutableMap.of(DATA_SOURCE, timeline), Collections.emptyMap() @@ -1480,7 +1769,10 @@ public void testIteratorReturnsSegmentsAsCompactionStateChangedWithCompactedStat // We should get all segments in timeline back since indexSpec changed Assert.assertTrue(iterator.hasNext()); List expectedSegmentsToCompact = new ArrayList<>( - timeline.findNonOvershadowedObjectsInInterval(Intervals.of("2017-10-01T00:00:00/2017-10-03T00:00:00"), Partitions.ONLY_COMPLETE) + timeline.findNonOvershadowedObjectsInInterval( + Intervals.of("2017-10-01T00:00:00/2017-10-03T00:00:00"), + Partitions.ONLY_COMPLETE + ) ); Assert.assertEquals( ImmutableSet.copyOf(expectedSegmentsToCompact), @@ -1494,7 +1786,11 @@ public void testIteratorReturnsSegmentsAsCompactionStateChangedWithCompactedStat public void testIteratorDoesNotReturnSegmentWithChangingAppendableIndexSpec() { NullHandling.initializeForTests(); - PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from(null, null, null)); + PartitionsSpec partitionsSpec = CompactionStatus.findPartitionsSpecFromConfig(ClientCompactionTaskQueryTuningConfig.from( + null, + null, + null + )); final SegmentTimeline timeline = createTimeline( new SegmentGenerateSpec( Intervals.of("2017-10-01T00:00:00/2017-10-02T00:00:00"), @@ -1586,11 +1882,13 @@ public void testIteratorDoesNotReturnSegmentWithChangingAppendableIndexSpec() public void testSkipAllGranularityToDefault() { CompactionSegmentIterator iterator = policy.reset( - ImmutableMap.of(DATA_SOURCE, - createCompactionConfig(10000, - new Period("P0D"), - null - ) + ImmutableMap.of( + DATA_SOURCE, + createCompactionConfig( + 10000, + new Period("P0D"), + null + ) ), ImmutableMap.of( DATA_SOURCE, @@ -1604,7 +1902,8 @@ public void testSkipAllGranularityToDefault() new ArrayList<>(), new NumberedShardSpec(0, 0), 0, - 100) + 100 + ) ) ) ), @@ -1618,11 +1917,13 @@ public void testSkipAllGranularityToDefault() public void testSkipAllToAllGranularity() { CompactionSegmentIterator iterator = policy.reset( - ImmutableMap.of(DATA_SOURCE, - createCompactionConfig(10000, - new Period("P0D"), - new UserCompactionTaskGranularityConfig(Granularities.ALL, null, null) - ) + ImmutableMap.of( + DATA_SOURCE, + createCompactionConfig( + 10000, + new Period("P0D"), + new UserCompactionTaskGranularityConfig(Granularities.ALL, null, null) + ) ), ImmutableMap.of( DATA_SOURCE, @@ -1636,7 +1937,8 @@ public void testSkipAllToAllGranularity() new ArrayList<>(), new NumberedShardSpec(0, 0), 0, - 100) + 100 + ) ) ) ), @@ -1650,11 +1952,13 @@ public void testSkipAllToAllGranularity() public void testSkipAllToFinerGranularity() { CompactionSegmentIterator iterator = policy.reset( - ImmutableMap.of(DATA_SOURCE, - createCompactionConfig(10000, - new Period("P0D"), - new UserCompactionTaskGranularityConfig(Granularities.DAY, null, null) - ) + ImmutableMap.of( + DATA_SOURCE, + createCompactionConfig( + 10000, + new Period("P0D"), + new UserCompactionTaskGranularityConfig(Granularities.DAY, null, null) + ) ), ImmutableMap.of( DATA_SOURCE, @@ -1668,7 +1972,8 @@ public void testSkipAllToFinerGranularity() new ArrayList<>(), new NumberedShardSpec(0, 0), 0, - 100) + 100 + ) ) ) ), @@ -1799,7 +2104,15 @@ private DataSourceCompactionConfig createCompactionConfig( AggregatorFactory[] metricsSpec ) { - return createCompactionConfig(inputSegmentSizeBytes, skipOffsetFromLatest, granularitySpec, dimensionsSpec, transformSpec, null, metricsSpec); + return createCompactionConfig( + inputSegmentSizeBytes, + skipOffsetFromLatest, + granularitySpec, + dimensionsSpec, + transformSpec, + null, + metricsSpec + ); } private DataSourceCompactionConfig createCompactionConfig( @@ -1842,9 +2155,21 @@ private static class SegmentGenerateSpec this(totalInterval, segmentPeriod, null, null); } - SegmentGenerateSpec(Interval totalInterval, Period segmentPeriod, String version, CompactionState lastCompactionState) + SegmentGenerateSpec( + Interval totalInterval, + Period segmentPeriod, + String version, + CompactionState lastCompactionState + ) { - this(totalInterval, segmentPeriod, DEFAULT_SEGMENT_SIZE, DEFAULT_NUM_SEGMENTS_PER_SHARD, version, lastCompactionState); + this( + totalInterval, + segmentPeriod, + DEFAULT_SEGMENT_SIZE, + DEFAULT_NUM_SEGMENTS_PER_SHARD, + version, + lastCompactionState + ); } SegmentGenerateSpec(Interval totalInterval, Period segmentPeriod, long segmentSize, int numSegmentsPerShard) @@ -1852,7 +2177,14 @@ private static class SegmentGenerateSpec this(totalInterval, segmentPeriod, segmentSize, numSegmentsPerShard, null, null); } - SegmentGenerateSpec(Interval totalInterval, Period segmentPeriod, long segmentSize, int numSegmentsPerShard, String version, CompactionState lastCompactionState) + SegmentGenerateSpec( + Interval totalInterval, + Period segmentPeriod, + long segmentSize, + int numSegmentsPerShard, + String version, + CompactionState lastCompactionState + ) { Preconditions.checkArgument(numSegmentsPerShard >= 1); this.totalInterval = totalInterval; From 23964beffd579a51baaa5d9dac2c351e938727e8 Mon Sep 17 00:00:00 2001 From: Clint Wylie Date: Thu, 31 Aug 2023 12:06:33 -0700 Subject: [PATCH 5/5] adjust --- .../druid/indexing/common/task/AbstractBatchIndexTask.java | 2 +- .../indexing/common/task/CompactionTaskParallelRunTest.java | 2 +- .../main/java/org/apache/druid/timeline/CompactionState.java | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java index 1c42a02f5a45..1def99ed9a32 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/AbstractBatchIndexTask.java @@ -527,7 +527,7 @@ public static Function, Set> compactionStateAnnota TransformSpec transformSpec = ingestionSpec.getDataSchema().getTransformSpec(); if (TransformSpec.NONE.equals(transformSpec)) { transformSpec = null; - } else { + } else if (transformSpec != null) { transformSpec = new TransformSpec(transformSpec.getFilter(), Collections.emptyList()); } diff --git a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskParallelRunTest.java b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskParallelRunTest.java index 907df8687aac..230e5f13ab11 100644 --- a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskParallelRunTest.java +++ b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/CompactionTaskParallelRunTest.java @@ -151,7 +151,7 @@ public void setup() throws IOException } @Test - public void testRunParallelWithDynamicPartitioningMatchCompactionState() throws Exception + public void testRunParallelWithDynamicPartitioningMatchCompactionState() { allowSegmentFetchesByCompactionTask = true; runIndexTask(null, true); diff --git a/processing/src/main/java/org/apache/druid/timeline/CompactionState.java b/processing/src/main/java/org/apache/druid/timeline/CompactionState.java index b14cea05fc9e..b5cc8398ed5f 100644 --- a/processing/src/main/java/org/apache/druid/timeline/CompactionState.java +++ b/processing/src/main/java/org/apache/druid/timeline/CompactionState.java @@ -48,8 +48,6 @@ public class CompactionState private final DimensionsSpec dimensionsSpec; private final TransformSpec transformSpec; private final IndexSpec indexSpec; - // org.apache.druid.segment.indexing.granularity.GranularitySpec cannot be used here because it's in the - // 'server' module which has a dependency on the 'processing' module where this class is. private final GranularitySpec granularitySpec; private final List metricsSpec;