Copilot commented on code in PR #18622:
URL: https://github.com/apache/druid/pull/18622#discussion_r2422832360
##########
services/src/test/java/org/apache/druid/testing/embedded/EmbeddedClusterApis.java:
##########
@@ -286,17 +286,28 @@ public void verifyNumVisibleSegmentsIs(int
numExpectedSegments, String dataSourc
*/
public void waitForAllSegmentsToBeAvailable(String dataSource,
EmbeddedCoordinator coordinator, EmbeddedBroker broker)
{
- final int numSegments = coordinator
+ final Set<DataSegment> segments = coordinator
.bindings()
.segmentsMetadataStorage()
- .retrieveAllUsedSegments(dataSource, Segments.INCLUDING_OVERSHADOWED)
- .size();
+ .retrieveAllUsedSegments(dataSource, Segments.INCLUDING_OVERSHADOWED);
- broker.latchableEmitter().waitForEventAggregate(
- event -> event.hasMetricName("segment/schemaCache/refresh/count")
- .hasDimension(DruidMetrics.DATASOURCE, dataSource),
- agg -> agg.hasSumAtLeast(numSegments)
- );
+ final int numTombstones = (int)
segments.stream().filter(DataSegment::isTombstone).count();
+ final int numSegments = segments.size() - numTombstones;
+
+ if (numSegments > 0) {
+ broker.latchableEmitter().waitForEventAggregate(
+ event -> event.hasMetricName("segment/schemaCache/refresh/count")
+ .hasDimension(DruidMetrics.DATASOURCE, dataSource),
+ agg -> agg.hasSumAtLeast(numSegments)
+ );
+ }
+ if (numTombstones > 0) {
+ broker.latchableEmitter().waitForEventAggregate(
+ event ->
event.hasMetricName("segment/schemaCache/refresh/tombstone/count")
+ .hasDimension(DruidMetrics.DATASOURCE, dataSource),
+ agg -> agg.hasSumAtLeast(numTombstones)
+ );
+ }
Review Comment:
[nitpick] The duplicate metric waiting pattern could be extracted into a
helper method that accepts the metric name and count parameters.
##########
services/src/test/java/org/apache/druid/testing/embedded/EmbeddedClusterApis.java:
##########
@@ -286,17 +286,28 @@ public void verifyNumVisibleSegmentsIs(int
numExpectedSegments, String dataSourc
*/
public void waitForAllSegmentsToBeAvailable(String dataSource,
EmbeddedCoordinator coordinator, EmbeddedBroker broker)
{
- final int numSegments = coordinator
+ final Set<DataSegment> segments = coordinator
.bindings()
.segmentsMetadataStorage()
- .retrieveAllUsedSegments(dataSource, Segments.INCLUDING_OVERSHADOWED)
- .size();
+ .retrieveAllUsedSegments(dataSource, Segments.INCLUDING_OVERSHADOWED);
- broker.latchableEmitter().waitForEventAggregate(
- event -> event.hasMetricName("segment/schemaCache/refresh/count")
- .hasDimension(DruidMetrics.DATASOURCE, dataSource),
- agg -> agg.hasSumAtLeast(numSegments)
- );
+ final int numTombstones = (int)
segments.stream().filter(DataSegment::isTombstone).count();
+ final int numSegments = segments.size() - numTombstones;
Review Comment:
[nitpick] Consider extracting the tombstone filtering logic into a helper
method to improve readability and potential reuse.
--
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]
