From ec06879d28838bae678052adc1b0cbf7f718b42b Mon Sep 17 00:00:00 2001 From: Tamo Date: Wed, 20 Nov 2024 14:40:36 +0100 Subject: [PATCH] apply review changes --- crates/index-scheduler/src/batch.rs | 10 +++++----- crates/index-scheduler/src/utils.rs | 11 ++++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/crates/index-scheduler/src/batch.rs b/crates/index-scheduler/src/batch.rs index 8d6d3e49b..96f8c1cd0 100644 --- a/crates/index-scheduler/src/batch.rs +++ b/crates/index-scheduler/src/batch.rs @@ -282,7 +282,7 @@ impl IndexScheduler { match batch { BatchKind::DocumentClear { ids } => Ok(Some(Batch::IndexOperation { op: IndexOperation::DocumentClear { - tasks: self.get_existing_tasks_with_processing_batch( + tasks: self.get_existing_tasks_for_processing_batch( rtxn, current_batch, ids, @@ -308,7 +308,7 @@ impl IndexScheduler { } } BatchKind::DocumentOperation { method, operation_ids, .. } => { - let tasks = self.get_existing_tasks_with_processing_batch( + let tasks = self.get_existing_tasks_for_processing_batch( rtxn, current_batch, operation_ids, @@ -359,7 +359,7 @@ impl IndexScheduler { })) } BatchKind::DocumentDeletion { deletion_ids, includes_by_filter: _ } => { - let tasks = self.get_existing_tasks_with_processing_batch( + let tasks = self.get_existing_tasks_for_processing_batch( rtxn, current_batch, deletion_ids, @@ -371,7 +371,7 @@ impl IndexScheduler { })) } BatchKind::Settings { settings_ids, .. } => { - let tasks = self.get_existing_tasks_with_processing_batch( + let tasks = self.get_existing_tasks_for_processing_batch( rtxn, current_batch, settings_ids, @@ -520,7 +520,7 @@ impl IndexScheduler { BatchKind::IndexDeletion { ids } => Ok(Some(Batch::IndexDeletion { index_uid, index_has_been_created: must_create_index, - tasks: self.get_existing_tasks_with_processing_batch(rtxn, current_batch, ids)?, + tasks: self.get_existing_tasks_for_processing_batch(rtxn, current_batch, ids)?, })), BatchKind::IndexSwap { id } => { let mut task = self.get_task(rtxn, id)?.ok_or(Error::CorruptedTaskQueue)?; diff --git a/crates/index-scheduler/src/utils.rs b/crates/index-scheduler/src/utils.rs index 827cdf95e..08459aa2c 100644 --- a/crates/index-scheduler/src/utils.rs +++ b/crates/index-scheduler/src/utils.rs @@ -211,9 +211,10 @@ impl IndexScheduler { Ok(()) } - /// Convert an iterator to a `Vec` of tasks. The tasks MUST exist or a - /// `CorruptedTaskQueue` error will be throwed. - pub(crate) fn get_existing_tasks_with_processing_batch( + /// Convert an iterator to a `Vec` of tasks and edit the `ProcessingBatch` to add the given tasks. + /// + /// The tasks MUST exist, or a `CorruptedTaskQueue` error will be thrown. + pub(crate) fn get_existing_tasks_for_processing_batch( &self, rtxn: &RoTxn, processing_batch: &mut ProcessingBatch, @@ -232,7 +233,7 @@ impl IndexScheduler { } /// Convert an iterator to a `Vec` of tasks. The tasks MUST exist or a - /// `CorruptedTaskQueue` error will be throwed. + /// `CorruptedTaskQueue` error will be thrown. pub(crate) fn get_existing_tasks( &self, rtxn: &RoTxn, @@ -247,7 +248,7 @@ impl IndexScheduler { } /// Convert an iterator to a `Vec` of batches. The batches MUST exist or a - /// `CorruptedTaskQueue` error will be throwed. + /// `CorruptedTaskQueue` error will be thrown. pub(crate) fn get_existing_batches( &self, rtxn: &RoTxn,