stuff

server/src/main/java/org/apache/druid/server/coordinator/compact/DatasourceCompactibleSegmentIterator.java

@@ -168,7 +168,7 @@ private void populateQueue(SegmentTimeline timeline, List<Interval> skipInterval
       }
     }
 
-    updateQueue(dataSource);
+    findSegmentsToCompact(dataSource);
   }
 
   public CompactionStatistics totalCompactedStatistics()
@@ -202,21 +202,9 @@ public SegmentsToCompact next()
     final List<DataSegment> resultSegments = entry.getSegments();
     Preconditions.checkState(!resultSegments.isEmpty(), "Queue entry must not be empty");
 
-    updateQueue(dataSource);
     return entry;
   }
 
-  /**
-   * Find the next segments to compact for the given dataSource and add them to the queue.
-   */
-  private void updateQueue(String dataSourceName)
-  {
-    final SegmentsToCompact segmentsToCompact = findSegmentsToCompact(dataSourceName, config);
-    if (!segmentsToCompact.isEmpty()) {
-      queue.add(segmentsToCompact);
-    }
-  }
-
   /**
    * Iterates compactible segments in a {@link SegmentTimeline}.
    */
@@ -307,22 +295,18 @@ public List<DataSegment> next()
   }
 
   /**
-   * Finds segments to compact together for the given datasource.
-   *
-   * @return An empty {@link SegmentsToCompact} if there are no eligible candidates.
+   * Finds segments to compact together for the given datasource and adds them to
+   * the priority queue.
    */
-  private SegmentsToCompact findSegmentsToCompact(
-      final String dataSourceName,
-      final DataSourceCompactionConfig config
-  )
+  private void findSegmentsToCompact(String dataSourceName)
   {
     final CompactibleSegmentIterator compactibleSegmentIterator = timelineIterator.get();
     if (compactibleSegmentIterator == null) {
       log.warn(
           "Skipping compaction for datasource[%s] as there is no compactible segment in its timeline.",
           dataSourceName
       );
-      return SegmentsToCompact.empty();
+      return;
     }
 
     final long inputSegmentSize = config.getInputSegmentSizeBytes();
@@ -362,15 +346,14 @@ private SegmentsToCompact findSegmentsToCompact(
           // Skip these candidate segments as we have already compacted this interval
         } else {
           compactedIntervals.add(interval);
-          return candidates;
+          queue.add(candidates);
         }
       } else {
-        return candidates;
+        queue.add(candidates);
       }
     }
 
     log.debug("No more segments to compact for datasource[%s].", dataSourceName);
-    return SegmentsToCompact.empty();
   }
 
   /**