79
79
import org .apache .druid .query .OrderBy ;
80
80
import org .apache .druid .query .aggregation .AggregatorFactory ;
81
81
import org .apache .druid .segment .AggregateProjectionMetadata ;
82
- import org .apache .druid .segment .IndexIO ;
83
82
import org .apache .druid .segment .IndexSpec ;
84
83
import org .apache .druid .segment .Metadata ;
85
84
import org .apache .druid .segment .QueryableIndex ;
@@ -615,7 +614,7 @@ static Map<Interval, DataSchema> createDataSchemasForIntervals(
615
614
metricBuilder ,
616
615
segmentProvider .dataSource ,
617
616
interval ,
618
- lazyFetchSegments (segmentsToCompact , toolbox .getSegmentCacheManager (), toolbox . getIndexIO () ),
617
+ lazyFetchSegments (segmentsToCompact , toolbox .getSegmentCacheManager ()),
619
618
dimensionsSpec ,
620
619
transformSpec ,
621
620
metricsSpec ,
@@ -642,8 +641,7 @@ static Map<Interval, DataSchema> createDataSchemasForIntervals(
642
641
),
643
642
lazyFetchSegments (
644
643
timelineSegments ,
645
- toolbox .getSegmentCacheManager (),
646
- toolbox .getIndexIO ()
644
+ toolbox .getSegmentCacheManager ()
647
645
),
648
646
dimensionsSpec ,
649
647
transformSpec ,
@@ -768,13 +766,12 @@ private static DataSchema createDataSchema(
768
766
*/
769
767
private static Iterable <Pair <DataSegment , Supplier <ResourceHolder <QueryableIndex >>>> lazyFetchSegments (
770
768
Iterable <DataSegment > dataSegments ,
771
- SegmentCacheManager segmentCacheManager ,
772
- IndexIO indexIO
769
+ SegmentCacheManager segmentCacheManager
773
770
)
774
771
{
775
772
return Iterables .transform (
776
773
Iterables .filter (dataSegments , dataSegment -> !dataSegment .isTombstone ()),
777
- dataSegment -> fetchSegment (dataSegment , segmentCacheManager , indexIO )
774
+ dataSegment -> fetchSegment (dataSegment , segmentCacheManager )
778
775
);
779
776
}
780
777
@@ -783,23 +780,24 @@ private static Iterable<Pair<DataSegment, Supplier<ResourceHolder<QueryableIndex
783
780
// an error. Creating a function keeps everyone happy.
784
781
private static Pair <DataSegment , Supplier <ResourceHolder <QueryableIndex >>> fetchSegment (
785
782
DataSegment dataSegment ,
786
- SegmentCacheManager segmentCacheManager ,
787
- IndexIO indexIO
783
+ SegmentCacheManager segmentCacheManager
788
784
)
789
785
{
790
786
return Pair .of (
791
787
dataSegment ,
792
788
() -> {
793
789
try {
794
790
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
+ );
796
794
closer .register (() -> segmentCacheManager .cleanup (dataSegment ));
797
795
return new ResourceHolder <>()
798
796
{
799
797
@ Override
800
798
public QueryableIndex get ()
801
799
{
802
- return segmentProvider .getBaseSegment ().as (QueryableIndex .class );
800
+ return referenceProvider .getBaseSegment ().as (QueryableIndex .class );
803
801
}
804
802
805
803
@ Override
0 commit comments