Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -555,16 +555,26 @@ public File persist(
@Nullable SegmentWriteOutMediumFactory segmentWriteOutMediumFactory
)
{
ListenableFuture<File> mergeFuture = mergeExecutor.submit(
() ->
baseMerger.persist(
// Include calling thread's name in the mergeExecutor thread name. This includes at least the task ID.
final String callerThreadName = Thread.currentThread().getName();
final ListenableFuture<File> mergeFuture = mergeExecutor.submit(
() -> {
final String runnableThreadName = Thread.currentThread().getName();
try {
Thread.currentThread().setName(runnableThreadName + "[" + callerThreadName + "]");
return baseMerger.persist(
index,
dataInterval,
outDir,
indexSpec,
progress,
segmentWriteOutMediumFactory
)
);
}
finally {
Thread.currentThread().setName(runnableThreadName);
}
}
);

try {
Expand Down Expand Up @@ -604,9 +614,14 @@ public File mergeQueryableIndex(
int maxColumnsToMerge
)
{
ListenableFuture<File> mergeFuture = mergeExecutor.submit(
() ->
baseMerger.mergeQueryableIndex(
// Include calling thread's name in the mergeExecutor thread name. This includes at least the task ID.
final String callerThreadName = Thread.currentThread().getName();
final ListenableFuture<File> mergeFuture = mergeExecutor.submit(
() -> {
final String runnableThreadName = Thread.currentThread().getName();
try {
Thread.currentThread().setName(runnableThreadName + "[" + callerThreadName + "]");
return baseMerger.mergeQueryableIndex(
indexes,
rollup,
metricAggs,
Expand All @@ -617,7 +632,12 @@ public File mergeQueryableIndex(
new BaseProgressIndicator(),
segmentWriteOutMediumFactory,
maxColumnsToMerge
)
);
}
finally {
Thread.currentThread().setName(runnableThreadName);
}
}
);

try {
Expand Down
Loading