@@ -56,7 +56,7 @@ impl Drop for MergePermit {
56
56
. send_message_with_high_priority ( PermitReleased )
57
57
. is_err ( )
58
58
{
59
- error ! ( "schedule merge service is dead" ) ;
59
+ error ! ( "merge scheduler service is dead" ) ;
60
60
}
61
61
}
62
62
}
@@ -108,15 +108,15 @@ impl Ord for ScheduledMerge {
108
108
}
109
109
}
110
110
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.
113
113
///
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.
115
115
/// In particular,
116
116
/// - the `ScheduleMerge` handler should reply in microseconds.
117
117
/// - the task should never be dropped before reaching its `split_downloader_mailbox` destination
118
118
/// as it would break the consistency of `MergePlanner` with the metastore (ie: several splits will
119
- /// never) be merged.
119
+ /// never be merged) .
120
120
pub struct MergeSchedulerService {
121
121
merge_semaphore : Arc < Semaphore > ,
122
122
merge_concurrency : usize ,
@@ -144,8 +144,8 @@ impl MergeSchedulerService {
144
144
}
145
145
146
146
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.
149
149
loop {
150
150
let merge_semaphore = self . merge_semaphore . clone ( ) ;
151
151
let Some ( next_merge) = self . pending_merge_queue . peek_mut ( ) else {
0 commit comments