zachjsh commented on code in PR #15738:
URL: https://github.com/apache/druid/pull/15738#discussion_r1467897688
##########
server/src/main/java/org/apache/druid/metadata/SqlSegmentsMetadataQuery.java:
##########
@@ -455,12 +547,73 @@ private UnmodifiableIterator<DataSegment>
retrieveSegmentsInIntervalsBatch(
@Nullable final SortOrder sortOrder,
@Nullable final DateTime maxUsedStatusLastUpdatedTime
)
+ {
+ final Query<Map<String, Object>> sql = buildSegmentQuery(
+ dataSource,
+ intervals,
+ matchMode,
+ used,
+ limit,
+ lastSegmentId,
+ sortOrder,
+ maxUsedStatusLastUpdatedTime,
+ false
+ );
+
+ final ResultIterator<DataSegment> resultIterator =
getDataSegmentResultIterator(sql);
+
+ return filterDataSegmentIteratorByInterval(resultIterator, intervals,
matchMode);
+ }
+
+ private UnmodifiableIterator<DataSegmentPlus>
retrieveSegmentsPlusInIntervalsBatch(
+ final String dataSource,
+ final Collection<Interval> intervals,
+ final IntervalMode matchMode,
+ final boolean used,
+ @Nullable final Integer limit,
+ @Nullable final String lastSegmentId,
+ @Nullable final SortOrder sortOrder,
+ @Nullable final DateTime maxUsedStatusLastUpdatedTime
+ )
+ {
+
+ final Query<Map<String, Object>> sql = buildSegmentQuery(
+ dataSource,
+ intervals,
+ matchMode,
+ used,
+ limit,
+ lastSegmentId,
+ sortOrder,
+ maxUsedStatusLastUpdatedTime,
+ true
+ );
+
+ final ResultIterator<DataSegmentPlus> resultIterator =
getDataSegmentPlusResultIterator(sql);
+
+ return filterDataSegmentPlusIteratorByInterval(resultIterator, intervals,
matchMode);
+ }
+
+ private Query<Map<String, Object>> buildSegmentQuery(
Review Comment:
Fixed
##########
server/src/test/java/org/apache/druid/server/http/MetadataResourceTest.java:
##########
@@ -74,6 +75,10 @@ public class MetadataResourceTest
.withNumPartitions(NUM_PARTITIONS)
.eachOfSizeInMb(500)
.toArray(new DataSegment[0]);
+
+ private final List<DataSegmentPlus> segmentDtos = Arrays.stream(segments)
Review Comment:
fixed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
