snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-09-06 04:36:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make it more idiomatic

Browse Source
This commit is contained in:
Mubelotix
2025-08-08 12:56:49 +02:00
parent 418730ef73
commit eb8ff31513
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
crates/index-scheduler/src/scheduler/process_batch.rs
View File

@ -540,7 +540,7 @@ impl IndexScheduler {
Some((start, end)) Some((start, end))
}) })
} }
progress.update_progress(TaskDeletionProgress::DeletingTasksDateTime); progress.update_progress(TaskDeletionProgress::RetrievingTasks);
// 1. Remove from this list the tasks that we are not allowed to delete // 1. Remove from this list the tasks that we are not allowed to delete
let enqueued_tasks = self.queue.tasks.get_status(wtxn, Status::Enqueued)?; let enqueued_tasks = self.queue.tasks.get_status(wtxn, Status::Enqueued)?;
@ -563,9 +563,9 @@ impl IndexScheduler {
progress.update_progress(task_progress); progress.update_progress(task_progress);
let mut min_enqueued = i128::MAX; let mut min_enqueued = i128::MAX;
let mut max_enqueued = i128::MIN; let mut max_enqueued = i128::MIN;
let mut enqueued_to_remove = HashMap::new(); let mut enqueued_to_remove: HashMap<i128, RoaringBitmap> = HashMap::new();
let mut started_to_remove = HashMap::new(); let mut started_to_remove: HashMap<i128, RoaringBitmap> = HashMap::new();
let mut finished_to_remove = HashMap::new(); let mut finished_to_remove: HashMap<i128, RoaringBitmap> = HashMap::new();
for task_id in to_delete_tasks.iter() { for task_id in to_delete_tasks.iter() {
let task = let task =
self.queue.tasks.get_task(wtxn, task_id)?.ok_or(Error::CorruptedTaskQueue)?; self.queue.tasks.get_task(wtxn, task_id)?.ok_or(Error::CorruptedTaskQueue)?;
@ -585,10 +585,7 @@ impl IndexScheduler {
if enqueued_at > max_enqueued { if enqueued_at > max_enqueued {
max_enqueued = enqueued_at; max_enqueued = enqueued_at;
} }
enqueued_to_remove enqueued_to_remove.entry(enqueued_at).or_default().insert(task_id);
.entry(enqueued_at)
.or_insert_with(RoaringBitmap::new)
.insert(task_id);
if let Some(started_at) = task.started_at { if let Some(started_at) = task.started_at {
let started_at = started_at.unix_timestamp_nanos(); let started_at = started_at.unix_timestamp_nanos();
@ -598,10 +595,7 @@ impl IndexScheduler {
if started_at > max_enqueued { if started_at > max_enqueued {
max_enqueued = started_at; max_enqueued = started_at;
} }
started_to_remove started_to_remove.entry(started_at).or_default().insert(task_id);
.entry(started_at)
.or_insert_with(RoaringBitmap::new)
.insert(task_id);
} }
if let Some(finished_at) = task.finished_at { if let Some(finished_at) = task.finished_at {
@ -612,10 +606,7 @@ impl IndexScheduler {
if finished_at > max_enqueued { if finished_at > max_enqueued {
max_enqueued = finished_at; max_enqueued = finished_at;
} }
finished_to_remove finished_to_remove.entry(finished_at).or_default().insert(task_id);
.entry(finished_at)
.or_insert_with(RoaringBitmap::new)
.insert(task_id);
} }
if let Some(canceled_by) = task.canceled_by { if let Some(canceled_by) = task.canceled_by {
@ -627,6 +618,7 @@ impl IndexScheduler {
atomic_progress.fetch_add(1, Ordering::Relaxed); atomic_progress.fetch_add(1, Ordering::Relaxed);
} }
progress.update_progress(TaskDeletionProgress::DeletingTasksDateTime);
for (mut to_remove, db) in [ for (mut to_remove, db) in [
(enqueued_to_remove, &self.queue.tasks.enqueued_at), (enqueued_to_remove, &self.queue.tasks.enqueued_at),
(started_to_remove, &self.queue.tasks.started_at), (started_to_remove, &self.queue.tasks.started_at),