mirror of
https://github.com/meilisearch/meilisearch.git
synced 2025-09-06 04:36:32 +00:00
Optim E
This commit is contained in:
@ -19,7 +19,7 @@ use crate::processing::{
|
|||||||
UpdateIndexProgress,
|
UpdateIndexProgress,
|
||||||
};
|
};
|
||||||
use crate::utils::{
|
use crate::utils::{
|
||||||
self, remove_n_tasks_datetime_earlier_than, remove_task_datetime, swap_index_uid_in_task,
|
remove_n_tasks_datetime_earlier_than, remove_task_datetime, swap_index_uid_in_task,
|
||||||
ProcessingBatch,
|
ProcessingBatch,
|
||||||
};
|
};
|
||||||
use crate::{Error, IndexScheduler, Result, TaskId};
|
use crate::{Error, IndexScheduler, Result, TaskId};
|
||||||
@ -566,17 +566,18 @@ impl IndexScheduler {
|
|||||||
let mut enqueued_to_remove: HashMap<i128, RoaringBitmap> = HashMap::new();
|
let mut enqueued_to_remove: HashMap<i128, RoaringBitmap> = HashMap::new();
|
||||||
let mut started_to_remove: HashMap<i128, RoaringBitmap> = HashMap::new();
|
let mut started_to_remove: HashMap<i128, RoaringBitmap> = HashMap::new();
|
||||||
let mut finished_to_remove: HashMap<i128, RoaringBitmap> = HashMap::new();
|
let mut finished_to_remove: HashMap<i128, RoaringBitmap> = HashMap::new();
|
||||||
for task_id in to_delete_tasks.iter() {
|
for range in consecutive_ranges(to_delete_tasks.iter()) {
|
||||||
let task =
|
let iter = self
|
||||||
self.queue.tasks.get_task(wtxn, task_id)?.ok_or(Error::CorruptedTaskQueue)?;
|
.queue
|
||||||
|
.tasks
|
||||||
|
.all_tasks
|
||||||
|
.range(wtxn, &(Bound::Included(range.0), Bound::Included(range.1)))?;
|
||||||
|
for task in iter {
|
||||||
|
let (task_id, task) = task?;
|
||||||
|
|
||||||
affected_indexes.extend(task.indexes().into_iter().map(|x| x.to_owned()));
|
affected_indexes.extend(task.indexes().into_iter().map(|x| x.to_owned()));
|
||||||
affected_statuses.insert(task.status);
|
affected_statuses.insert(task.status);
|
||||||
affected_kinds.insert(task.kind.as_kind());
|
affected_kinds.insert(task.kind.as_kind());
|
||||||
// Note: don't delete the persisted task data since
|
|
||||||
// we can only delete succeeded, failed, and canceled tasks.
|
|
||||||
// In each of those cases, the persisted data is supposed to
|
|
||||||
// have been deleted already.
|
|
||||||
|
|
||||||
let enqueued_at = task.enqueued_at.unix_timestamp_nanos();
|
let enqueued_at = task.enqueued_at.unix_timestamp_nanos();
|
||||||
if enqueued_at < min_enqueued {
|
if enqueued_at < min_enqueued {
|
||||||
@ -617,6 +618,12 @@ impl IndexScheduler {
|
|||||||
}
|
}
|
||||||
atomic_progress.fetch_add(1, Ordering::Relaxed);
|
atomic_progress.fetch_add(1, Ordering::Relaxed);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Note: don't delete the persisted task data since
|
||||||
|
// we can only delete succeeded, failed, and canceled tasks.
|
||||||
|
// In each of those cases, the persisted data is supposed to
|
||||||
|
// have been deleted already.
|
||||||
|
|
||||||
progress.update_progress(TaskDeletionProgress::DeletingTasksDateTime);
|
progress.update_progress(TaskDeletionProgress::DeletingTasksDateTime);
|
||||||
for (mut to_remove, db) in [
|
for (mut to_remove, db) in [
|
||||||
|
Reference in New Issue
Block a user