Skip to content

Commit 6f122e8

Browse files
committed
cleanup, and maybe fix compile i guess? idk it builds for me with jdk21
1 parent 6290b0b commit 6f122e8

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

indexing-service/src/main/java/org/apache/druid/indexing/common/task/CompactionTask.java

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
import org.apache.druid.query.OrderBy;
8080
import org.apache.druid.query.aggregation.AggregatorFactory;
8181
import org.apache.druid.segment.AggregateProjectionMetadata;
82-
import org.apache.druid.segment.IndexIO;
8382
import org.apache.druid.segment.IndexSpec;
8483
import org.apache.druid.segment.Metadata;
8584
import org.apache.druid.segment.QueryableIndex;
@@ -615,7 +614,7 @@ static Map<Interval, DataSchema> createDataSchemasForIntervals(
615614
metricBuilder,
616615
segmentProvider.dataSource,
617616
interval,
618-
lazyFetchSegments(segmentsToCompact, toolbox.getSegmentCacheManager(), toolbox.getIndexIO()),
617+
lazyFetchSegments(segmentsToCompact, toolbox.getSegmentCacheManager()),
619618
dimensionsSpec,
620619
transformSpec,
621620
metricsSpec,
@@ -642,8 +641,7 @@ static Map<Interval, DataSchema> createDataSchemasForIntervals(
642641
),
643642
lazyFetchSegments(
644643
timelineSegments,
645-
toolbox.getSegmentCacheManager(),
646-
toolbox.getIndexIO()
644+
toolbox.getSegmentCacheManager()
647645
),
648646
dimensionsSpec,
649647
transformSpec,
@@ -768,13 +766,12 @@ private static DataSchema createDataSchema(
768766
*/
769767
private static Iterable<Pair<DataSegment, Supplier<ResourceHolder<QueryableIndex>>>> lazyFetchSegments(
770768
Iterable<DataSegment> dataSegments,
771-
SegmentCacheManager segmentCacheManager,
772-
IndexIO indexIO
769+
SegmentCacheManager segmentCacheManager
773770
)
774771
{
775772
return Iterables.transform(
776773
Iterables.filter(dataSegments, dataSegment -> !dataSegment.isTombstone()),
777-
dataSegment -> fetchSegment(dataSegment, segmentCacheManager, indexIO)
774+
dataSegment -> fetchSegment(dataSegment, segmentCacheManager)
778775
);
779776
}
780777

@@ -783,23 +780,24 @@ private static Iterable<Pair<DataSegment, Supplier<ResourceHolder<QueryableIndex
783780
// an error. Creating a function keeps everyone happy.
784781
private static Pair<DataSegment, Supplier<ResourceHolder<QueryableIndex>>> fetchSegment(
785782
DataSegment dataSegment,
786-
SegmentCacheManager segmentCacheManager,
787-
IndexIO indexIO
783+
SegmentCacheManager segmentCacheManager
788784
)
789785
{
790786
return Pair.of(
791787
dataSegment,
792788
() -> {
793789
try {
794790
final Closer closer = Closer.create();
795-
final ReferenceCountedSegmentProvider segmentProvider = closer.register(segmentCacheManager.getSegment(dataSegment));
791+
final ReferenceCountedSegmentProvider referenceProvider = closer.register(
792+
segmentCacheManager.getSegment(dataSegment)
793+
);
796794
closer.register(() -> segmentCacheManager.cleanup(dataSegment));
797795
return new ResourceHolder<>()
798796
{
799797
@Override
800798
public QueryableIndex get()
801799
{
802-
return segmentProvider.getBaseSegment().as(QueryableIndex.class);
800+
return referenceProvider.getBaseSegment().as(QueryableIndex.class);
803801
}
804802

805803
@Override

0 commit comments

Comments
 (0)