Skip to content

Commit f6abbb1

Browse files
fulmicotonguilload
andauthored
Apply suggestions from code review
Co-authored-by: Adrien Guillo <[email protected]>
1 parent 34f4351 commit f6abbb1

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

quickwit/quickwit-indexing/src/actors/merge_scheduler_service.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ impl Drop for MergePermit {
5656
.send_message_with_high_priority(PermitReleased)
5757
.is_err()
5858
{
59-
error!("schedule merge service is dead");
59+
error!("merge scheduler service is dead");
6060
}
6161
}
6262
}
@@ -108,15 +108,15 @@ impl Ord for ScheduledMerge {
108108
}
109109
}
110110

111-
/// The merge scheduler service is in charge of keeping track of all scheduled merge operation,
112-
/// and schedule them in the best possible order, and respecting the `merge_concurrency` limit.
111+
/// The merge scheduler service is in charge of keeping track of all scheduled merge operations,
112+
/// and schedule them in the best possible order, respecting the `merge_concurrency` limit.
113113
///
114-
/// This actor is not supervised, and should stay as simple as possible.
114+
/// This actor is not supervised and should stay as simple as possible.
115115
/// In particular,
116116
/// - the `ScheduleMerge` handler should reply in microseconds.
117117
/// - the task should never be dropped before reaching its `split_downloader_mailbox` destination
118118
/// as it would break the consistency of `MergePlanner` with the metastore (ie: several splits will
119-
/// never) be merged.
119+
/// never be merged).
120120
pub struct MergeSchedulerService {
121121
merge_semaphore: Arc<Semaphore>,
122122
merge_concurrency: usize,
@@ -144,8 +144,8 @@ impl MergeSchedulerService {
144144
}
145145

146146
fn schedule_pending_merges(&mut self, ctx: &ActorContext<Self>) {
147-
// We schedule as many pending merge as we can,
148-
// until there are no permit available or no merge to schedule.
147+
// We schedule as many pending merges as we can,
148+
// until there are no permits available or merges to schedule.
149149
loop {
150150
let merge_semaphore = self.merge_semaphore.clone();
151151
let Some(next_merge) = self.pending_merge_queue.peek_mut() else {

0 commit comments

Comments
 (0)