Skip to content

Commit 9316b87

Browse files
committed
Make it easier to review this change
1 parent 5ddcb4e commit 9316b87

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

server/src/main/java/org/apache/druid/segment/loading/SegmentLocalCacheManager.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -228,23 +228,24 @@ public List<DataSegment> getCachedSegments() throws IOException
228228
}
229229
}
230230

231-
final File[] segmentsToLoad = retrieveSegmentMetadataFiles();
232231
final ConcurrentLinkedQueue<DataSegment> cachedSegments = new ConcurrentLinkedQueue<>();
233-
AtomicInteger ignoredFilesCounter = new AtomicInteger(0);
232+
final File[] segmentsToLoad = retrieveSegmentMetadataFiles();
234233
CountDownLatch latch = new CountDownLatch(segmentsToLoad.length);
235234

236235
boolean createdNewExecutorServiceToLoadSegmentCache = loadOnBootstrapExec == null;
237236
ExecutorService executorService = createdNewExecutorServiceToLoadSegmentCache
238237
? MoreExecutors.newDirectExecutorService()
239238
: loadOnBootstrapExec;
240239

240+
AtomicInteger ignoredFilesCounter = new AtomicInteger(0);
241+
241242
Stopwatch stopwatch = Stopwatch.createStarted();
242243
log.info("Retrieving [%d] cached segment metadata files to cache.", segmentsToLoad.length);
243244

244245
for (File file : segmentsToLoad) {
245246
executorService.submit(() -> {
246247
try {
247-
loadToCachedSegmentsFromFile(cachedSegments, file, ignoredFilesCounter);
248+
addFilesToCachedSegments(file, ignoredFilesCounter, cachedSegments);
248249
}
249250
catch (Exception e) {
250251
log.makeAlert(e, "Failed to load segment from segment cache file.")
@@ -281,10 +282,10 @@ public List<DataSegment> getCachedSegments() throws IOException
281282
return new ArrayList<>(cachedSegments);
282283
}
283284

284-
private void loadToCachedSegmentsFromFile(
285-
ConcurrentLinkedQueue<DataSegment> cachedSegments,
285+
private void addFilesToCachedSegments(
286286
File file,
287-
AtomicInteger ignored
287+
AtomicInteger ignored,
288+
ConcurrentLinkedQueue<DataSegment> cachedSegments
288289
) throws IOException
289290
{
290291
final DataSegment segment = jsonMapper.readValue(file, DataSegment.class);

0 commit comments

Comments
 (0)