Merge #3036

3036: Bump milli to v0.35.1 r=irevoire a=Kerollmops

This PR bumps milli to v0.35.1 which brings some fixes. You can see [the changelog of milli on the release page](https://github.com/meilisearch/milli/releases/tag/v0.35.1).

Fixes #2905
Fixes #3004
Fixes #3000
Fixes #3021
Fixes #2945

Co-authored-by: Clément Renault <clement@meilisearch.com>
Co-authored-by: Kerollmops <clement@meilisearch.com>

Cargo.lock

@@ -1332,8 +1332,8 @@ dependencies = [
 
 [[package]]
 name = "filter-parser"
-version = "0.35.0"
-source = "git+https://github.com/meilisearch/milli.git#2e539249cb16f5e88be9f21ab712f8b4266cad36"
+version = "0.35.1"
+source = "git+https://github.com/meilisearch/milli.git?tag=v0.35.1#c3b75bbe5dad27aab76fe5a0d0c70aaadf81c48c"
 dependencies = [
  "nom",
  "nom_locate",
@@ -1351,8 +1351,8 @@ dependencies = [
 
 [[package]]
 name = "flatten-serde-json"
-version = "0.35.0"
-source = "git+https://github.com/meilisearch/milli.git#2e539249cb16f5e88be9f21ab712f8b4266cad36"
+version = "0.35.1"
+source = "git+https://github.com/meilisearch/milli.git?tag=v0.35.1#c3b75bbe5dad27aab76fe5a0d0c70aaadf81c48c"
 dependencies = [
  "serde_json",
 ]
@@ -1897,8 +1897,8 @@ dependencies = [
 
 [[package]]
 name = "json-depth-checker"
-version = "0.35.0"
-source = "git+https://github.com/meilisearch/milli.git#2e539249cb16f5e88be9f21ab712f8b4266cad36"
+version = "0.35.1"
+source = "git+https://github.com/meilisearch/milli.git?tag=v0.35.1#c3b75bbe5dad27aab76fe5a0d0c70aaadf81c48c"
 dependencies = [
  "serde_json",
 ]
@@ -2416,8 +2416,8 @@ dependencies = [
 
 [[package]]
 name = "milli"
-version = "0.35.0"
-source = "git+https://github.com/meilisearch/milli.git#2e539249cb16f5e88be9f21ab712f8b4266cad36"
+version = "0.35.1"
+source = "git+https://github.com/meilisearch/milli.git?tag=v0.35.1#c3b75bbe5dad27aab76fe5a0d0c70aaadf81c48c"
 dependencies = [
  "bimap",
  "bincode",

index-scheduler/src/batch.rs

@@ -41,7 +41,7 @@ use uuid::Uuid;
 
 use crate::autobatcher::{self, BatchKind};
 use crate::utils::{self, swap_index_uid_in_task};
-use crate::{Error, IndexScheduler, Result, TaskId};
+use crate::{Error, IndexScheduler, ProcessingTasks, Result, TaskId};
 
 /// Represents a combination of tasks that can all be processed at the same time.
 ///
@@ -50,15 +50,39 @@ use crate::{Error, IndexScheduler, Result, TaskId};
 /// be processed.
 #[derive(Debug)]
 pub(crate) enum Batch {
-    TaskCancelation(Task),
+    TaskCancelation {
+        /// The task cancelation itself.
+        task: Task,
+        /// The date and time at which the previously processing tasks started.
+        previous_started_at: OffsetDateTime,
+        /// The list of tasks that were processing when this task cancelation appeared.
+        previous_processing_tasks: RoaringBitmap,
+    },
     TaskDeletion(Task),
     SnapshotCreation(Vec<Task>),
     Dump(Task),
-    IndexOperation { op: IndexOperation, must_create_index: bool },
-    IndexCreation { index_uid: String, primary_key: Option<String>, task: Task },
-    IndexUpdate { index_uid: String, primary_key: Option<String>, task: Task },
-    IndexDeletion { index_uid: String, tasks: Vec<Task>, index_has_been_created: bool },
-    IndexSwap { task: Task },
+    IndexOperation {
+        op: IndexOperation,
+        must_create_index: bool,
+    },
+    IndexCreation {
+        index_uid: String,
+        primary_key: Option<String>,
+        task: Task,
+    },
+    IndexUpdate {
+        index_uid: String,
+        primary_key: Option<String>,
+        task: Task,
+    },
+    IndexDeletion {
+        index_uid: String,
+        tasks: Vec<Task>,
+        index_has_been_created: bool,
+    },
+    IndexSwap {
+        task: Task,
+    },
 }
 
 /// A [batch](Batch) that combines multiple tasks operating on an index.
@@ -115,7 +139,7 @@ impl Batch {
     /// Return the task ids associated with this batch.
     pub fn ids(&self) -> Vec<TaskId> {
         match self {
-            Batch::TaskCancelation(task)
+            Batch::TaskCancelation { task, .. }
             | Batch::TaskDeletion(task)
             | Batch::Dump(task)
             | Batch::IndexCreation { task, .. }
@@ -394,9 +418,15 @@ impl IndexScheduler {
 
         // 1. we get the last task to cancel.
         if let Some(task_id) = to_cancel.max() {
-            return Ok(Some(Batch::TaskCancelation(
-                self.get_task(rtxn, task_id)?.ok_or(Error::CorruptedTaskQueue)?,
-            )));
+            // We retrieve the tasks that were processing before this tasks cancelation started.
+            // We must *not* reset the processing tasks before calling this method.
+            let ProcessingTasks { started_at, processing } =
+                &*self.processing_tasks.read().unwrap();
+            return Ok(Some(Batch::TaskCancelation {
+                task: self.get_task(rtxn, task_id)?.ok_or(Error::CorruptedTaskQueue)?,
+                previous_started_at: *started_at,
+                previous_processing_tasks: processing.clone(),
+            }));
         }
 
         // 2. we get the next task to delete
@@ -482,7 +512,7 @@ impl IndexScheduler {
             self.breakpoint(crate::Breakpoint::InsideProcessBatch);
         }
         match batch {
-            Batch::TaskCancelation(mut task) => {
+            Batch::TaskCancelation { mut task, previous_started_at, previous_processing_tasks } => {
                 // 1. Retrieve the tasks that matched the query at enqueue-time.
                 let matched_tasks =
                     if let KindWithContent::TaskCancelation { tasks, query: _ } = &task.kind {
@@ -492,15 +522,20 @@ impl IndexScheduler {
                     };
 
                 let mut wtxn = self.env.write_txn()?;
-                let canceled_tasks_content_uuids =
-                    self.cancel_matched_tasks(&mut wtxn, task.uid, matched_tasks)?;
+                let canceled_tasks_content_uuids = self.cancel_matched_tasks(
+                    &mut wtxn,
+                    task.uid,
+                    matched_tasks,
+                    previous_started_at,
+                    &previous_processing_tasks,
+                )?;
 
                 task.status = Status::Succeeded;
                 match &mut task.details {
                     Some(Details::TaskCancelation {
                         matched_tasks: _,
                         canceled_tasks,
-                        original_query: _,
+                        original_filters: _,
                     }) => {
                         *canceled_tasks = Some(canceled_tasks_content_uuids.len() as u64);
                     }
@@ -544,7 +579,7 @@ impl IndexScheduler {
                     Some(Details::TaskDeletion {
                         matched_tasks: _,
                         deleted_tasks,
-                        original_query: _,
+                        original_filters: _,
                     }) => {
                         *deleted_tasks = Some(deleted_tasks_count);
                     }
@@ -1152,6 +1187,7 @@ impl IndexScheduler {
         let mut affected_indexes = HashSet::new();
         let mut affected_statuses = HashSet::new();
         let mut affected_kinds = HashSet::new();
+        let mut affected_canceled_by = RoaringBitmap::new();
 
         for task_id in to_delete_tasks.iter() {
             let task = self.get_task(wtxn, task_id)?.ok_or(Error::CorruptedTaskQueue)?;
@@ -1170,6 +1206,9 @@ impl IndexScheduler {
             if let Some(finished_at) = task.finished_at {
                 utils::remove_task_datetime(wtxn, self.finished_at, finished_at, task.uid)?;
             }
+            if let Some(canceled_by) = task.canceled_by {
+                affected_canceled_by.insert(canceled_by);
+            }
         }
 
         for index in affected_indexes {
@@ -1187,6 +1226,17 @@ impl IndexScheduler {
         for task in to_delete_tasks.iter() {
             self.all_tasks.delete(wtxn, &BEU32::new(task))?;
         }
+        for canceled_by in affected_canceled_by {
+            let canceled_by = BEU32::new(canceled_by);
+            if let Some(mut tasks) = self.canceled_by.get(wtxn, &canceled_by)? {
+                tasks -= &to_delete_tasks;
+                if tasks.is_empty() {
+                    self.canceled_by.delete(wtxn, &canceled_by)?;
+                } else {
+                    self.canceled_by.put(wtxn, &canceled_by, &tasks)?;
+                }
+            }
+        }
 
         Ok(to_delete_tasks.len())
     }
@@ -1199,6 +1249,8 @@ impl IndexScheduler {
         wtxn: &mut RwTxn,
         cancel_task_id: TaskId,
         matched_tasks: &RoaringBitmap,
+        previous_started_at: OffsetDateTime,
+        previous_processing_tasks: &RoaringBitmap,
     ) -> Result<Vec<Uuid>> {
         let now = OffsetDateTime::now_utc();
 
@@ -1214,11 +1266,15 @@ impl IndexScheduler {
             if let Some(uuid) = task.content_uuid() {
                 content_files_to_delete.push(uuid);
             }
+            if previous_processing_tasks.contains(task.uid) {
+                task.started_at = Some(previous_started_at);
+            }
             task.status = Status::Canceled;
             task.canceled_by = Some(cancel_task_id);
             task.finished_at = Some(now);
             self.update_task(wtxn, &task)?;
         }
+        self.canceled_by.put(wtxn, &BEU32::new(cancel_task_id), &tasks_to_cancel)?;
 
         Ok(content_files_to_delete)
     }

index-scheduler/src/error.rs

@@ -1,4 +1,5 @@
 use meilisearch_types::error::{Code, ErrorCode};
+use meilisearch_types::tasks::{Kind, Status};
 use meilisearch_types::{heed, milli};
 use thiserror::Error;
 
@@ -27,6 +28,36 @@ pub enum Error {
     SwapDuplicateIndexesFound(Vec<String>),
     #[error("Corrupted dump.")]
     CorruptedDump,
+    #[error(
+        "Task `{field}` `{date}` is invalid. It should follow the YYYY-MM-DD or RFC 3339 date-time format."
+    )]
+    InvalidTaskDate { field: String, date: String },
+    #[error("Task uid `{task_uid}` is invalid. It should only contain numeric characters.")]
+    InvalidTaskUids { task_uid: String },
+    #[error(
+        "Task status `{status}` is invalid. Available task statuses are {}.",
+            enum_iterator::all::<Status>()
+                .map(|s| format!("`{s}`"))
+                .collect::<Vec<String>>()
+                .join(", ")
+    )]
+    InvalidTaskStatuses { status: String },
+    #[error(
+        "Task type `{type_}` is invalid. Available task types are {}",
+            enum_iterator::all::<Kind>()
+                .map(|s| format!("`{s}`"))
+                .collect::<Vec<String>>()
+                .join(", ")
+    )]
+    InvalidTaskTypes { type_: String },
+    #[error(
+        "Task canceledBy `{canceled_by}` is invalid. It should only contains numeric characters separated by `,` character."
+    )]
+    InvalidTaskCanceledBy { canceled_by: String },
+    #[error(
+        "{index_uid} is not a valid index uid. Index uid can be an integer or a string containing only alphanumeric characters, hyphens (-) and underscores (_)."
+    )]
+    InvalidIndexUid { index_uid: String },
     #[error("Task `{0}` not found.")]
     TaskNotFound(TaskId),
     #[error("Query parameters to filter the tasks to delete are missing. Available query parameters are: `uid`, `indexUid`, `status`, `type`.")]
@@ -69,8 +100,14 @@ impl ErrorCode for Error {
             Error::IndexNotFound(_) => Code::IndexNotFound,
             Error::IndexesNotFound(_) => Code::IndexNotFound,
             Error::IndexAlreadyExists(_) => Code::IndexAlreadyExists,
-            Error::SwapDuplicateIndexesFound(_) => Code::BadRequest,
-            Error::SwapDuplicateIndexFound(_) => Code::BadRequest,
+            Error::SwapDuplicateIndexesFound(_) => Code::DuplicateIndexFound,
+            Error::SwapDuplicateIndexFound(_) => Code::DuplicateIndexFound,
+            Error::InvalidTaskDate { .. } => Code::InvalidTaskDate,
+            Error::InvalidTaskUids { .. } => Code::InvalidTaskUids,
+            Error::InvalidTaskStatuses { .. } => Code::InvalidTaskStatuses,
+            Error::InvalidTaskTypes { .. } => Code::InvalidTaskTypes,
+            Error::InvalidTaskCanceledBy { .. } => Code::InvalidTaskCanceledBy,
+            Error::InvalidIndexUid { .. } => Code::InvalidIndexUid,
             Error::TaskNotFound(_) => Code::TaskNotFound,
             Error::TaskDeletionWithEmptyQuery => Code::TaskDeletionWithEmptyQuery,
             Error::TaskCancelationWithEmptyQuery => Code::TaskCancelationWithEmptyQuery,

index-scheduler/src/insta_snapshot.rs

@@ -20,6 +20,7 @@ pub fn snapshot_index_scheduler(scheduler: &IndexScheduler) -> String {
         status,
         kind,
         index_tasks,
+        canceled_by,
         enqueued_at,
         started_at,
         finished_at,
@@ -64,6 +65,10 @@ pub fn snapshot_index_scheduler(scheduler: &IndexScheduler) -> String {
     snap.push_str(&snapshot_index_mapper(&rtxn, index_mapper));
     snap.push_str("\n----------------------------------------------------------------------\n");
 
+    snap.push_str("### Canceled By:\n");
+    snap.push_str(&snapshot_canceled_by(&rtxn, *canceled_by));
+    snap.push_str("\n----------------------------------------------------------------------\n");
+
     snap.push_str("### Enqueued At:\n");
     snap.push_str(&snapshot_date_db(&rtxn, *enqueued_at));
     snap.push_str("----------------------------------------------------------------------\n");
@@ -179,16 +184,16 @@ fn snapshot_details(d: &Details) -> String {
         Details::TaskCancelation {
             matched_tasks,
             canceled_tasks,
-            original_query,
+            original_filters,
         } => {
-            format!("{{ matched_tasks: {matched_tasks:?}, canceled_tasks: {canceled_tasks:?}, original_query: {original_query:?} }}")
+            format!("{{ matched_tasks: {matched_tasks:?}, canceled_tasks: {canceled_tasks:?}, original_filters: {original_filters:?} }}")
         }
         Details::TaskDeletion {
             matched_tasks,
             deleted_tasks,
-            original_query,
+            original_filters,
         } => {
-            format!("{{ matched_tasks: {matched_tasks:?}, deleted_tasks: {deleted_tasks:?}, original_query: {original_query:?} }}")
+            format!("{{ matched_tasks: {matched_tasks:?}, deleted_tasks: {deleted_tasks:?}, original_filters: {original_filters:?} }}")
         },
         Details::Dump { dump_uid } => {
             format!("{{ dump_uid: {dump_uid:?} }}")
@@ -231,7 +236,18 @@ pub fn snapshot_index_tasks(rtxn: &RoTxn, db: Database<Str, RoaringBitmapCodec>)
     }
     snap
 }
-
+pub fn snapshot_canceled_by(
+    rtxn: &RoTxn,
+    db: Database<OwnedType<BEU32>, RoaringBitmapCodec>,
+) -> String {
+    let mut snap = String::new();
+    let iter = db.iter(rtxn).unwrap();
+    for next in iter {
+        let (kind, task_ids) = next.unwrap();
+        writeln!(snap, "{kind} {}", snapshot_bitmap(&task_ids)).unwrap();
+    }
+    snap
+}
 pub fn snapshot_index_mapper(rtxn: &RoTxn, mapper: &IndexMapper) -> String {
     let names = mapper.indexes(rtxn).unwrap().into_iter().map(|(n, _)| n).collect::<Vec<_>>();
     format!("{names:?}")

index-scheduler/src/lib.rs

@@ -70,7 +70,7 @@ pub struct Query {
     /// The minimum [task id](`meilisearch_types::tasks::Task::uid`) to be matched
     pub from: Option<u32>,
     /// The allowed [statuses](`meilisearch_types::tasks::Task::status`) of the matched tasls
-    pub status: Option<Vec<Status>>,
+    pub statuses: Option<Vec<Status>>,
     /// The allowed [kinds](meilisearch_types::tasks::Kind) of the matched tasks.
     ///
     /// The kind of a task is given by:
@@ -80,12 +80,14 @@ pub struct Query {
     /// task.kind.as_kind()
     /// # }
     /// ```
-    pub kind: Option<Vec<Kind>>,
+    pub types: Option<Vec<Kind>>,
     /// The allowed [index ids](meilisearch_types::tasks::Task::index_uid) of the matched tasks
-    pub index_uid: Option<Vec<String>>,
+    pub index_uids: Option<Vec<String>>,
     /// The [task ids](`meilisearch_types::tasks::Task::uid`) to be matched
-    pub uid: Option<Vec<TaskId>>,
-
+    pub uids: Option<Vec<TaskId>>,
+    /// The [task ids](`meilisearch_types::tasks::Task::uid`) of the [`TaskCancelation`](meilisearch_types::tasks::Task::Kind::TaskCancelation) tasks
+    /// that canceled the matched tasks.
+    pub canceled_by: Option<Vec<TaskId>>,
     /// Exclusive upper bound of the matched tasks' [`enqueued_at`](meilisearch_types::tasks::Task::enqueued_at) field.
     pub before_enqueued_at: Option<OffsetDateTime>,
     /// Exclusive lower bound of the matched tasks' [`enqueued_at`](meilisearch_types::tasks::Task::enqueued_at) field.
@@ -109,10 +111,11 @@ impl Query {
             Query {
                 limit: None,
                 from: None,
-                status: None,
-                kind: None,
-                index_uid: None,
-                uid: None,
+                statuses: None,
+                types: None,
+                index_uids: None,
+                uids: None,
+                canceled_by: None,
                 before_enqueued_at: None,
                 after_enqueued_at: None,
                 before_started_at: None,
@@ -125,9 +128,9 @@ impl Query {
 
     /// Add an [index id](meilisearch_types::tasks::Task::index_uid) to the list of permitted indexes.
     pub fn with_index(self, index_uid: String) -> Self {
-        let mut index_vec = self.index_uid.unwrap_or_default();
+        let mut index_vec = self.index_uids.unwrap_or_default();
         index_vec.push(index_uid);
-        Self { index_uid: Some(index_vec), ..self }
+        Self { index_uids: Some(index_vec), ..self }
     }
 }
 
@@ -151,13 +154,12 @@ impl ProcessingTasks {
         self.processing = processing;
     }
 
-    /// Set the processing tasks to an empty list.
-    fn stop_processing_at(&mut self, stopped_at: OffsetDateTime) {
-        self.started_at = stopped_at;
+    /// Set the processing tasks to an empty list
+    fn stop_processing(&mut self) {
         self.processing = RoaringBitmap::new();
     }
 
-    /// Returns `true` if there, at least, is one task that is currently processing we must stop.
+    /// Returns `true` if there, at least, is one task that is currently processing that we must stop.
     fn must_cancel_processing_tasks(&self, canceled_tasks: &RoaringBitmap) -> bool {
         !self.processing.is_disjoint(canceled_tasks)
     }
@@ -186,6 +188,7 @@ mod db_name {
     pub const STATUS: &str = "status";
     pub const KIND: &str = "kind";
     pub const INDEX_TASKS: &str = "index-tasks";
+    pub const CANCELED_BY: &str = "canceled_by";
     pub const ENQUEUED_AT: &str = "enqueued-at";
     pub const STARTED_AT: &str = "started-at";
     pub const FINISHED_AT: &str = "finished-at";
@@ -257,6 +260,9 @@ pub struct IndexScheduler {
     /// Store the tasks associated to an index.
     pub(crate) index_tasks: Database<Str, RoaringBitmapCodec>,
 
+    /// Store the tasks that were canceled by a task uid
+    pub(crate) canceled_by: Database<OwnedType<BEU32>, RoaringBitmapCodec>,
+
     /// Store the task ids of tasks which were enqueued at a specific date
     pub(crate) enqueued_at: Database<OwnedType<BEI128>, CboRoaringBitmapCodec>,
 
@@ -317,6 +323,7 @@ impl IndexScheduler {
             status: self.status,
             kind: self.kind,
             index_tasks: self.index_tasks,
+            canceled_by: self.canceled_by,
             enqueued_at: self.enqueued_at,
             started_at: self.started_at,
             finished_at: self.finished_at,
@@ -350,7 +357,7 @@ impl IndexScheduler {
         std::fs::create_dir_all(&options.dumps_path)?;
 
         let env = heed::EnvOpenOptions::new()
-            .max_dbs(9)
+            .max_dbs(10)
             .map_size(options.task_db_size)
             .open(options.tasks_path)?;
         let file_store = FileStore::new(&options.update_file_path)?;
@@ -364,6 +371,7 @@ impl IndexScheduler {
             status: env.create_database(Some(db_name::STATUS))?,
             kind: env.create_database(Some(db_name::KIND))?,
             index_tasks: env.create_database(Some(db_name::INDEX_TASKS))?,
+            canceled_by: env.create_database(Some(db_name::CANCELED_BY))?,
             enqueued_at: env.create_database(Some(db_name::ENQUEUED_AT))?,
             started_at: env.create_database(Some(db_name::STARTED_AT))?,
             finished_at: env.create_database(Some(db_name::FINISHED_AT))?,
@@ -404,7 +412,6 @@ impl IndexScheduler {
     /// only once per index scheduler.
     fn run(&self) {
         let run = self.private_clone();
-
         std::thread::spawn(move || loop {
             run.wake_up.wait();
 
@@ -423,6 +430,7 @@ impl IndexScheduler {
                     ) {
                         std::thread::sleep(Duration::from_secs(1));
                     }
+                    run.wake_up.signal();
                 }
             }
         });
@@ -449,8 +457,9 @@ impl IndexScheduler {
 
     /// Return the task ids matched by the given query from the index scheduler's point of view.
     pub(crate) fn get_task_ids(&self, rtxn: &RoTxn, query: &Query) -> Result<RoaringBitmap> {
-        let ProcessingTasks { started_at: started_at_processing, processing: processing_tasks } =
-            self.processing_tasks.read().unwrap().clone();
+        let ProcessingTasks {
+            started_at: started_at_processing, processing: processing_tasks, ..
+        } = self.processing_tasks.read().unwrap().clone();
 
         let mut tasks = self.all_task_ids(rtxn)?;
 
@@ -458,7 +467,7 @@ impl IndexScheduler {
             tasks.remove_range(from.saturating_add(1)..);
         }
 
-        if let Some(status) = &query.status {
+        if let Some(status) = &query.statuses {
             let mut status_tasks = RoaringBitmap::new();
             for status in status {
                 match status {
@@ -475,12 +484,22 @@ impl IndexScheduler {
             tasks &= status_tasks;
         }
 
-        if let Some(uids) = &query.uid {
+        if let Some(uids) = &query.uids {
             let uids = RoaringBitmap::from_iter(uids);
             tasks &= &uids;
         }
 
-        if let Some(kind) = &query.kind {
+        if let Some(canceled_by) = &query.canceled_by {
+            for cancel_task_uid in canceled_by {
+                if let Some(canceled_by_uid) =
+                    self.canceled_by.get(rtxn, &BEU32::new(*cancel_task_uid))?
+                {
+                    tasks &= canceled_by_uid;
+                }
+            }
+        }
+
+        if let Some(kind) = &query.types {
             let mut kind_tasks = RoaringBitmap::new();
             for kind in kind {
                 kind_tasks |= self.get_kind(rtxn, *kind)?;
@@ -488,7 +507,7 @@ impl IndexScheduler {
             tasks &= &kind_tasks;
         }
 
-        if let Some(index) = &query.index_uid {
+        if let Some(index) = &query.index_uids {
             let mut index_tasks = RoaringBitmap::new();
             for index in index {
                 index_tasks |= self.index_tasks(rtxn, index)?;
@@ -590,9 +609,9 @@ impl IndexScheduler {
     ) -> Result<RoaringBitmap> {
         let mut tasks = self.get_task_ids(rtxn, query)?;
 
-        // If the query contains a list of `index_uid`, then we must exclude all the kind that
-        // arn't associated to one and only one index.
-        if query.index_uid.is_some() {
+        // If the query contains a list of index uid or there is a finite list of authorized indexes,
+        // then we must exclude all the kinds that aren't associated to one and only one index.
+        if query.index_uids.is_some() || authorized_indexes.is_some() {
             for kind in enum_iterator::all::<Kind>().filter(|kind| !kind.related_to_one_index()) {
                 tasks -= self.get_kind(rtxn, kind)?;
             }
@@ -947,6 +966,12 @@ impl IndexScheduler {
                 #[cfg(test)]
                 self.breakpoint(Breakpoint::AbortedIndexation);
                 wtxn.abort().map_err(Error::HeedTransaction)?;
+
+                // We make sure that we don't call `stop_processing` on the `processing_tasks`,
+                // this is because we want to let the next tick call `create_next_batch` and keep
+                // the `started_at` date times and `processings` of the current processing tasks.
+                // This date time is used by the task cancelation to store the right `started_at`
+                // date in the task on disk.
                 return Ok(0);
             }
             // In case of a failure we must get back and patch all the tasks with the error.
@@ -976,7 +1001,7 @@ impl IndexScheduler {
             }
         }
 
-        self.processing_tasks.write().unwrap().stop_processing_at(finished_at);
+        self.processing_tasks.write().unwrap().stop_processing();
 
         #[cfg(test)]
         self.maybe_fail(tests::FailureLocation::CommittingWtxn)?;
@@ -1780,6 +1805,7 @@ mod tests {
             .unwrap();
         index_scheduler.assert_internally_consistent();
 
+        snapshot!(snapshot_index_scheduler(&index_scheduler), name: "cancel_task_registered");
         // Now we check that we can reach the AbortedIndexation error handling
         handle.wait_till(Breakpoint::AbortedIndexation);
         index_scheduler.assert_internally_consistent();
@@ -2212,18 +2238,18 @@ mod tests {
 
         let rtxn = index_scheduler.env.read_txn().unwrap();
 
-        let query = Query { status: Some(vec![Status::Processing]), ..Default::default() };
+        let query = Query { statuses: Some(vec![Status::Processing]), ..Default::default() };
         let tasks =
             index_scheduler.get_task_ids_from_authorized_indexes(&rtxn, &query, &None).unwrap();
         snapshot!(snapshot_bitmap(&tasks), @"[0,]"); // only the processing tasks in the first tick
 
-        let query = Query { status: Some(vec![Status::Enqueued]), ..Default::default() };
+        let query = Query { statuses: Some(vec![Status::Enqueued]), ..Default::default() };
         let tasks =
             index_scheduler.get_task_ids_from_authorized_indexes(&rtxn, &query, &None).unwrap();
         snapshot!(snapshot_bitmap(&tasks), @"[1,2,]"); // only the enqueued tasks in the first tick
 
         let query = Query {
-            status: Some(vec![Status::Enqueued, Status::Processing]),
+            statuses: Some(vec![Status::Enqueued, Status::Processing]),
             ..Default::default()
         };
         let tasks =
@@ -2231,7 +2257,7 @@ mod tests {
         snapshot!(snapshot_bitmap(&tasks), @"[0,1,2,]"); // both enqueued and processing tasks in the first tick
 
         let query = Query {
-            status: Some(vec![Status::Enqueued, Status::Processing]),
+            statuses: Some(vec![Status::Enqueued, Status::Processing]),
             after_started_at: Some(start_time),
             ..Default::default()
         };
@@ -2242,7 +2268,7 @@ mod tests {
         snapshot!(snapshot_bitmap(&tasks), @"[0,]");
 
         let query = Query {
-            status: Some(vec![Status::Enqueued, Status::Processing]),
+            statuses: Some(vec![Status::Enqueued, Status::Processing]),
             before_started_at: Some(start_time),
             ..Default::default()
         };
@@ -2253,7 +2279,7 @@ mod tests {
         snapshot!(snapshot_bitmap(&tasks), @"[]");
 
         let query = Query {
-            status: Some(vec![Status::Enqueued, Status::Processing]),
+            statuses: Some(vec![Status::Enqueued, Status::Processing]),
             after_started_at: Some(start_time),
             before_started_at: Some(start_time + Duration::minutes(1)),
             ..Default::default()
@@ -2272,7 +2298,7 @@ mod tests {
         let second_start_time = OffsetDateTime::now_utc();
 
         let query = Query {
-            status: Some(vec![Status::Succeeded, Status::Processing]),
+            statuses: Some(vec![Status::Succeeded, Status::Processing]),
             after_started_at: Some(start_time),
             before_started_at: Some(start_time + Duration::minutes(1)),
             ..Default::default()
@@ -2285,7 +2311,7 @@ mod tests {
         snapshot!(snapshot_bitmap(&tasks), @"[0,1,]");
 
         let query = Query {
-            status: Some(vec![Status::Succeeded, Status::Processing]),
+            statuses: Some(vec![Status::Succeeded, Status::Processing]),
             before_started_at: Some(start_time),
             ..Default::default()
         };
@@ -2296,7 +2322,7 @@ mod tests {
         snapshot!(snapshot_bitmap(&tasks), @"[]");
 
         let query = Query {
-            status: Some(vec![Status::Enqueued, Status::Succeeded, Status::Processing]),
+            statuses: Some(vec![Status::Enqueued, Status::Succeeded, Status::Processing]),
             after_started_at: Some(second_start_time),
             before_started_at: Some(second_start_time + Duration::minutes(1)),
             ..Default::default()
@@ -2319,7 +2345,7 @@ mod tests {
         snapshot!(snapshot_bitmap(&tasks), @"[2,]");
 
         let query = Query {
-            status: Some(vec![Status::Enqueued, Status::Succeeded, Status::Processing]),
+            statuses: Some(vec![Status::Enqueued, Status::Succeeded, Status::Processing]),
             after_started_at: Some(second_start_time),
             before_started_at: Some(second_start_time + Duration::minutes(1)),
             ..Default::default()
@@ -2341,7 +2367,7 @@ mod tests {
         snapshot!(snapshot_bitmap(&tasks), @"[]");
 
         let query = Query {
-            status: Some(vec![Status::Failed]),
+            statuses: Some(vec![Status::Failed]),
             after_started_at: Some(second_start_time),
             before_started_at: Some(second_start_time + Duration::minutes(1)),
             ..Default::default()
@@ -2352,7 +2378,7 @@ mod tests {
         snapshot!(snapshot_bitmap(&tasks), @"[2,]");
 
         let query = Query {
-            status: Some(vec![Status::Failed]),
+            statuses: Some(vec![Status::Failed]),
             after_started_at: Some(second_start_time),
             before_started_at: Some(second_start_time + Duration::minutes(1)),
             ..Default::default()
@@ -2363,8 +2389,8 @@ mod tests {
         snapshot!(snapshot_bitmap(&tasks), @"[2,]");
 
         let query = Query {
-            status: Some(vec![Status::Failed]),
-            uid: Some(vec![1]),
+            statuses: Some(vec![Status::Failed]),
+            uids: Some(vec![1]),
             after_started_at: Some(second_start_time),
             before_started_at: Some(second_start_time + Duration::minutes(1)),
             ..Default::default()
@@ -2375,8 +2401,8 @@ mod tests {
         snapshot!(snapshot_bitmap(&tasks), @"[]");
 
         let query = Query {
-            status: Some(vec![Status::Failed]),
-            uid: Some(vec![2]),
+            statuses: Some(vec![Status::Failed]),
+            uids: Some(vec![2]),
             after_started_at: Some(second_start_time),
             before_started_at: Some(second_start_time + Duration::minutes(1)),
             ..Default::default()
@@ -2411,13 +2437,13 @@ mod tests {
 
         let rtxn = index_scheduler.env.read_txn().unwrap();
 
-        let query = Query { index_uid: Some(vec!["catto".to_owned()]), ..Default::default() };
+        let query = Query { index_uids: Some(vec!["catto".to_owned()]), ..Default::default() };
         let tasks =
             index_scheduler.get_task_ids_from_authorized_indexes(&rtxn, &query, &None).unwrap();
         // only the first task associated with catto is returned, the indexSwap tasks are excluded!
         snapshot!(snapshot_bitmap(&tasks), @"[0,]");
 
-        let query = Query { index_uid: Some(vec!["catto".to_owned()]), ..Default::default() };
+        let query = Query { index_uids: Some(vec!["catto".to_owned()]), ..Default::default() };
         let tasks = index_scheduler
             .get_task_ids_from_authorized_indexes(&rtxn, &query, &Some(vec!["doggo".to_owned()]))
             .unwrap();
@@ -2443,7 +2469,7 @@ mod tests {
             .unwrap();
         // we asked for all the tasks, but we are only authorized to retrieve the doggo and catto tasks
         // -> all tasks except the swap of catto with whalo are returned
-        snapshot!(snapshot_bitmap(&tasks), @"[0,1,2,]");
+        snapshot!(snapshot_bitmap(&tasks), @"[0,1,]");
 
         let query = Query::default();
         let tasks =
@@ -2453,23 +2479,43 @@ mod tests {
     }
 
     #[test]
-    fn fail_in_create_batch_for_index_creation() {
+    fn query_tasks_canceled_by() {
         let (index_scheduler, handle) =
-            IndexScheduler::test(true, vec![(1, FailureLocation::InsideCreateBatch)]);
+            IndexScheduler::test(true, vec![(3, FailureLocation::InsideProcessBatch)]);
 
-        let kinds = [index_creation_task("catto", "mouse")];
+        let kind = index_creation_task("catto", "mouse");
+        let _ = index_scheduler.register(kind).unwrap();
+        let kind = index_creation_task("doggo", "sheep");
+        let _ = index_scheduler.register(kind).unwrap();
+        let kind = KindWithContent::IndexSwap {
+            swaps: vec![IndexSwap { indexes: ("catto".to_owned(), "doggo".to_owned()) }],
+        };
+        let _task = index_scheduler.register(kind).unwrap();
 
-        for kind in kinds {
-            let _task = index_scheduler.register(kind).unwrap();
-            index_scheduler.assert_internally_consistent();
-        }
-        handle.wait_till(Breakpoint::BatchCreated);
+        handle.advance_n_batch(1);
+        let kind = KindWithContent::TaskCancelation {
+            query: "test_query".to_string(),
+            tasks: [0, 1, 2, 3].into_iter().collect(),
+        };
+        let task_cancelation = index_scheduler.register(kind).unwrap();
+        handle.advance_n_batch(1);
 
-        // We skipped an iteration of `tick` to reach BatchCreated
-        assert_eq!(*index_scheduler.run_loop_iteration.read().unwrap(), 2);
-        // Otherwise nothing weird happened
-        index_scheduler.assert_internally_consistent();
-        snapshot!(snapshot_index_scheduler(&index_scheduler));
+        snapshot!(snapshot_index_scheduler(&index_scheduler), name: "start");
+
+        let rtxn = index_scheduler.read_txn().unwrap();
+        let query = Query { canceled_by: Some(vec![task_cancelation.uid]), ..Query::default() };
+        let tasks =
+            index_scheduler.get_task_ids_from_authorized_indexes(&rtxn, &query, &None).unwrap();
+        // 0 is not returned because it was not canceled, 3 is not returned because it is the uid of the
+        // taskCancelation itself
+        snapshot!(snapshot_bitmap(&tasks), @"[1,2,]");
+
+        let query = Query { canceled_by: Some(vec![task_cancelation.uid]), ..Query::default() };
+        let tasks = index_scheduler
+            .get_task_ids_from_authorized_indexes(&rtxn, &query, &Some(vec!["doggo".to_string()]))
+            .unwrap();
+        // Return only 1 because the user is not authorized to see task 2
+        snapshot!(snapshot_bitmap(&tasks), @"[1,]");
     }
 
     #[test]

index-scheduler/src/snapshots/lib.rs/cancel_enqueued_task/cancel_processed.snap

@@ -7,7 +7,7 @@ source: index-scheduler/src/lib.rs
 ----------------------------------------------------------------------
 ### All Tasks:
 0 {uid: 0, status: canceled, canceled_by: 1, details: { received_documents: 1, indexed_documents: None }, kind: DocumentAdditionOrUpdate { index_uid: "catto", primary_key: None, method: ReplaceDocuments, content_file: 00000000-0000-0000-0000-000000000000, documents_count: 1, allow_index_creation: true }}
-1 {uid: 1, status: succeeded, details: { matched_tasks: 1, canceled_tasks: Some(1), original_query: "test_query" }, kind: TaskCancelation { query: "test_query", tasks: RoaringBitmap<[0]> }}
+1 {uid: 1, status: succeeded, details: { matched_tasks: 1, canceled_tasks: Some(1), original_filters: "test_query" }, kind: TaskCancelation { query: "test_query", tasks: RoaringBitmap<[0]> }}
 ----------------------------------------------------------------------
 ### Status:
 enqueued []
@@ -23,6 +23,10 @@ catto [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+1 [0,]
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/cancel_enqueued_task/initial_tasks_enqueued.snap

@@ -7,7 +7,7 @@ source: index-scheduler/src/lib.rs
 ----------------------------------------------------------------------
 ### All Tasks:
 0 {uid: 0, status: enqueued, details: { received_documents: 1, indexed_documents: None }, kind: DocumentAdditionOrUpdate { index_uid: "catto", primary_key: None, method: ReplaceDocuments, content_file: 00000000-0000-0000-0000-000000000000, documents_count: 1, allow_index_creation: true }}
-1 {uid: 1, status: enqueued, details: { matched_tasks: 1, canceled_tasks: None, original_query: "test_query" }, kind: TaskCancelation { query: "test_query", tasks: RoaringBitmap<[0]> }}
+1 {uid: 1, status: enqueued, details: { matched_tasks: 1, canceled_tasks: None, original_filters: "test_query" }, kind: TaskCancelation { query: "test_query", tasks: RoaringBitmap<[0]> }}
 ----------------------------------------------------------------------
 ### Status:
 enqueued [0,1,]
@@ -21,6 +21,9 @@ catto [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/cancel_processed.snap

@@ -9,7 +9,7 @@ source: index-scheduler/src/lib.rs
 0 {uid: 0, status: succeeded, details: { received_documents: 1, indexed_documents: Some(1) }, kind: DocumentAdditionOrUpdate { index_uid: "catto", primary_key: None, method: ReplaceDocuments, content_file: 00000000-0000-0000-0000-000000000000, documents_count: 1, allow_index_creation: true }}
 1 {uid: 1, status: canceled, canceled_by: 3, details: { received_documents: 1, indexed_documents: None }, kind: DocumentAdditionOrUpdate { index_uid: "beavero", primary_key: None, method: ReplaceDocuments, content_file: 00000000-0000-0000-0000-000000000001, documents_count: 1, allow_index_creation: true }}
 2 {uid: 2, status: canceled, canceled_by: 3, details: { received_documents: 1, indexed_documents: None }, kind: DocumentAdditionOrUpdate { index_uid: "wolfo", primary_key: None, method: ReplaceDocuments, content_file: 00000000-0000-0000-0000-000000000002, documents_count: 1, allow_index_creation: true }}
-3 {uid: 3, status: succeeded, details: { matched_tasks: 3, canceled_tasks: Some(2), original_query: "test_query" }, kind: TaskCancelation { query: "test_query", tasks: RoaringBitmap<[0, 1, 2]> }}
+3 {uid: 3, status: succeeded, details: { matched_tasks: 3, canceled_tasks: Some(2), original_filters: "test_query" }, kind: TaskCancelation { query: "test_query", tasks: RoaringBitmap<[0, 1, 2]> }}
 ----------------------------------------------------------------------
 ### Status:
 enqueued []
@@ -27,6 +27,10 @@ wolfo [2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["beavero", "catto"]
+----------------------------------------------------------------------
+### Canceled By:
+3 [1,2,]
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]
@@ -36,6 +40,7 @@ wolfo [2,]
 ----------------------------------------------------------------------
 ### Started At:
 [timestamp] [0,]
+[timestamp] [1,]
 [timestamp] [3,]
 ----------------------------------------------------------------------
 ### Finished At:

index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/first_task_processed.snap

@@ -24,6 +24,9 @@ wolfo [2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["catto"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/processing_second_task_cancel_enqueued.snap

@@ -9,7 +9,7 @@ source: index-scheduler/src/lib.rs
 0 {uid: 0, status: succeeded, details: { received_documents: 1, indexed_documents: Some(1) }, kind: DocumentAdditionOrUpdate { index_uid: "catto", primary_key: None, method: ReplaceDocuments, content_file: 00000000-0000-0000-0000-000000000000, documents_count: 1, allow_index_creation: true }}
 1 {uid: 1, status: enqueued, details: { received_documents: 1, indexed_documents: None }, kind: DocumentAdditionOrUpdate { index_uid: "beavero", primary_key: None, method: ReplaceDocuments, content_file: 00000000-0000-0000-0000-000000000001, documents_count: 1, allow_index_creation: true }}
 2 {uid: 2, status: enqueued, details: { received_documents: 1, indexed_documents: None }, kind: DocumentAdditionOrUpdate { index_uid: "wolfo", primary_key: None, method: ReplaceDocuments, content_file: 00000000-0000-0000-0000-000000000002, documents_count: 1, allow_index_creation: true }}
-3 {uid: 3, status: enqueued, details: { matched_tasks: 3, canceled_tasks: None, original_query: "test_query" }, kind: TaskCancelation { query: "test_query", tasks: RoaringBitmap<[0, 1, 2]> }}
+3 {uid: 3, status: enqueued, details: { matched_tasks: 3, canceled_tasks: None, original_filters: "test_query" }, kind: TaskCancelation { query: "test_query", tasks: RoaringBitmap<[0, 1, 2]> }}
 ----------------------------------------------------------------------
 ### Status:
 enqueued [1,2,3,]
@@ -26,6 +26,9 @@ wolfo [2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["catto"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/cancel_processing_task/cancel_processed.snap

@@ -7,7 +7,7 @@ source: index-scheduler/src/lib.rs
 ----------------------------------------------------------------------
 ### All Tasks:
 0 {uid: 0, status: canceled, canceled_by: 1, details: { received_documents: 1, indexed_documents: None }, kind: DocumentAdditionOrUpdate { index_uid: "catto", primary_key: None, method: ReplaceDocuments, content_file: 00000000-0000-0000-0000-000000000000, documents_count: 1, allow_index_creation: true }}
-1 {uid: 1, status: succeeded, details: { matched_tasks: 1, canceled_tasks: Some(1), original_query: "test_query" }, kind: TaskCancelation { query: "test_query", tasks: RoaringBitmap<[0]> }}
+1 {uid: 1, status: succeeded, details: { matched_tasks: 1, canceled_tasks: Some(1), original_filters: "test_query" }, kind: TaskCancelation { query: "test_query", tasks: RoaringBitmap<[0]> }}
 ----------------------------------------------------------------------
 ### Status:
 enqueued []
@@ -23,12 +23,17 @@ catto [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["catto"]
+----------------------------------------------------------------------
+### Canceled By:
+1 [0,]
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]
 [timestamp] [1,]
 ----------------------------------------------------------------------
 ### Started At:
+[timestamp] [0,]
 [timestamp] [1,]
 ----------------------------------------------------------------------
 ### Finished At:

index-scheduler/src/snapshots/lib.rs/cancel_processing_task/cancel_task_registered.snap

@@ -6,28 +6,35 @@ source: index-scheduler/src/lib.rs
 [0,]
 ----------------------------------------------------------------------
 ### All Tasks:
-0 {uid: 0, status: enqueued, details: { primary_key: Some("mouse") }, kind: IndexCreation { index_uid: "catto", primary_key: Some("mouse") }}
+0 {uid: 0, status: enqueued, details: { received_documents: 1, indexed_documents: None }, kind: DocumentAdditionOrUpdate { index_uid: "catto", primary_key: None, method: ReplaceDocuments, content_file: 00000000-0000-0000-0000-000000000000, documents_count: 1, allow_index_creation: true }}
+1 {uid: 1, status: enqueued, details: { matched_tasks: 1, canceled_tasks: None, original_filters: "test_query" }, kind: TaskCancelation { query: "test_query", tasks: RoaringBitmap<[0]> }}
 ----------------------------------------------------------------------
 ### Status:
-enqueued [0,]
+enqueued [0,1,]
 ----------------------------------------------------------------------
 ### Kind:
-"indexCreation" [0,]
+"documentAdditionOrUpdate" [0,]
+"taskCancelation" [1,]
 ----------------------------------------------------------------------
 ### Index Tasks:
 catto [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]
+[timestamp] [1,]
 ----------------------------------------------------------------------
 ### Started At:
 ----------------------------------------------------------------------
 ### Finished At:
 ----------------------------------------------------------------------
 ### File Store:
+00000000-0000-0000-0000-000000000000
 
 ----------------------------------------------------------------------
 

index-scheduler/src/snapshots/lib.rs/cancel_processing_task/initial_task_processing.snap

@@ -19,6 +19,9 @@ catto [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/cancel_succeeded_task/cancel_processed.snap

@@ -7,7 +7,7 @@ source: index-scheduler/src/lib.rs
 ----------------------------------------------------------------------
 ### All Tasks:
 0 {uid: 0, status: succeeded, details: { received_documents: 1, indexed_documents: Some(1) }, kind: DocumentAdditionOrUpdate { index_uid: "catto", primary_key: None, method: ReplaceDocuments, content_file: 00000000-0000-0000-0000-000000000000, documents_count: 1, allow_index_creation: true }}
-1 {uid: 1, status: succeeded, details: { matched_tasks: 1, canceled_tasks: Some(0), original_query: "test_query" }, kind: TaskCancelation { query: "test_query", tasks: RoaringBitmap<[0]> }}
+1 {uid: 1, status: succeeded, details: { matched_tasks: 1, canceled_tasks: Some(0), original_filters: "test_query" }, kind: TaskCancelation { query: "test_query", tasks: RoaringBitmap<[0]> }}
 ----------------------------------------------------------------------
 ### Status:
 enqueued []
@@ -22,6 +22,10 @@ catto [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["catto"]
+----------------------------------------------------------------------
+### Canceled By:
+1 []
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/cancel_succeeded_task/initial_task_processed.snap

@@ -20,6 +20,9 @@ catto [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["catto"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/do_not_batch_task_of_different_indexes/all_tasks_processed.snap

@@ -28,6 +28,9 @@ girafos [2,5,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["cattos", "doggos", "girafos"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/document_addition/1.snap

@@ -19,6 +19,9 @@ doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/document_addition/2.snap

@@ -19,6 +19,9 @@ doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/document_addition/3.snap

@@ -20,6 +20,9 @@ doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["doggos"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/1.snap

@@ -23,6 +23,9 @@ doggos [0,1,2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/2.snap

@@ -24,6 +24,9 @@ doggos [0,1,2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion_on_unexisting_index/1.snap

@@ -21,6 +21,9 @@ doggos [0,1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion_on_unexisting_index/2.snap

@@ -22,6 +22,9 @@ doggos [0,1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_addition/document_addition_batch_created.snap

@@ -19,6 +19,9 @@ doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_addition/document_addition_failed.snap

@@ -20,6 +20,9 @@ doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_index_creation/index_creation_failed.snap

@@ -20,6 +20,9 @@ catto [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/document_addition_succeeded_but_index_scheduler_not_updated.snap

@@ -19,6 +19,9 @@ doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/second_iteration.snap

@@ -20,6 +20,9 @@ doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["doggos"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/1.snap

@@ -23,6 +23,9 @@ index_b [1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/panic_in_process_batch_for_index_creation/index_creation_failed.snap

@@ -20,6 +20,9 @@ catto [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/all_tasks_processed.snap

@@ -24,6 +24,9 @@ doggos [0,2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["cattos"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/all_tasks_processed.snap

@@ -24,6 +24,9 @@ doggos [0,1,2,3,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["doggos"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/query_tasks_canceled_by/start.snap

@@ -0,0 +1,53 @@
+---
+source: index-scheduler/src/lib.rs
+---
+### Autobatching Enabled = true
+### Processing Tasks:
+[]
+----------------------------------------------------------------------
+### All Tasks:
+0 {uid: 0, status: succeeded, details: { primary_key: Some("mouse") }, kind: IndexCreation { index_uid: "catto", primary_key: Some("mouse") }}
+1 {uid: 1, status: canceled, canceled_by: 3, details: { primary_key: Some("sheep") }, kind: IndexCreation { index_uid: "doggo", primary_key: Some("sheep") }}
+2 {uid: 2, status: canceled, canceled_by: 3, details: { swaps: [IndexSwap { indexes: ("catto", "doggo") }] }, kind: IndexSwap { swaps: [IndexSwap { indexes: ("catto", "doggo") }] }}
+3 {uid: 3, status: succeeded, details: { matched_tasks: 3, canceled_tasks: Some(0), original_filters: "test_query" }, kind: TaskCancelation { query: "test_query", tasks: RoaringBitmap<[0, 1, 2]> }}
+----------------------------------------------------------------------
+### Status:
+enqueued []
+succeeded [0,3,]
+canceled [1,2,]
+----------------------------------------------------------------------
+### Kind:
+"indexCreation" [0,1,]
+"indexSwap" [2,]
+"taskCancelation" [3,]
+----------------------------------------------------------------------
+### Index Tasks:
+catto [0,2,]
+doggo [1,2,]
+----------------------------------------------------------------------
+### Index Mapper:
+["catto"]
+----------------------------------------------------------------------
+### Canceled By:
+3 [1,2,]
+
+----------------------------------------------------------------------
+### Enqueued At:
+[timestamp] [0,]
+[timestamp] [1,]
+[timestamp] [2,]
+[timestamp] [3,]
+----------------------------------------------------------------------
+### Started At:
+[timestamp] [0,]
+[timestamp] [3,]
+----------------------------------------------------------------------
+### Finished At:
+[timestamp] [0,]
+[timestamp] [1,2,]
+[timestamp] [3,]
+----------------------------------------------------------------------
+### File Store:
+
+----------------------------------------------------------------------
+

index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/finished.snap

@@ -24,6 +24,9 @@ whalo [1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["catto", "doggo", "whalo"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/start.snap

@@ -23,6 +23,9 @@ whalo [1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/query_tasks_simple/end.snap

@@ -25,6 +25,9 @@ whalo [2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["catto", "doggo"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/query_tasks_simple/start.snap

@@ -23,6 +23,9 @@ whalo [2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/query_tasks_special_rules/start.snap

@@ -25,6 +25,9 @@ whalo [3,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/register/1.snap

@@ -24,6 +24,9 @@ doggo [3,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/swap_indexes/first_swap_processed.snap

@@ -29,6 +29,9 @@ d [2,4,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["a", "b", "c", "d"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/swap_indexes/initial_tasks_processed.snap

@@ -26,6 +26,9 @@ d [3,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["a", "b", "c", "d"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/swap_indexes/second_swap_processed.snap

@@ -29,6 +29,9 @@ d [2,4,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["a", "b", "c", "d"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/swap_indexes/third_empty_swap_processed.snap

@@ -30,6 +30,9 @@ d [2,4,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["a", "b", "c", "d"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/swap_indexes/two_swaps_registered.snap

@@ -29,6 +29,9 @@ d [3,4,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["a", "b", "c", "d"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/swap_indexes_errors/first_swap_failed.snap

@@ -31,6 +31,9 @@ f [4,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["a", "b", "c", "d"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/swap_indexes_errors/initial_tasks_processed.snap

@@ -26,6 +26,9 @@ d [3,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["a", "b", "c", "d"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/task_deletion_delete_same_task_twice/initial_tasks_enqueued.snap

@@ -21,6 +21,9 @@ doggo [1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/task_deletion_delete_same_task_twice/initial_tasks_processed.snap

@@ -22,6 +22,9 @@ doggo [1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["catto"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/task_deletion_delete_same_task_twice/task_deletion_processed.snap

@@ -7,8 +7,8 @@ source: index-scheduler/src/lib.rs
 ----------------------------------------------------------------------
 ### All Tasks:
 1 {uid: 1, status: enqueued, details: { received_documents: 1, indexed_documents: None }, kind: DocumentAdditionOrUpdate { index_uid: "doggo", primary_key: Some("bone"), method: ReplaceDocuments, content_file: 00000000-0000-0000-0000-000000000001, documents_count: 1, allow_index_creation: true }}
-2 {uid: 2, status: succeeded, details: { matched_tasks: 1, deleted_tasks: Some(1), original_query: "test_query" }, kind: TaskDeletion { query: "test_query", tasks: RoaringBitmap<[0]> }}
-3 {uid: 3, status: succeeded, details: { matched_tasks: 1, deleted_tasks: Some(0), original_query: "test_query" }, kind: TaskDeletion { query: "test_query", tasks: RoaringBitmap<[0]> }}
+2 {uid: 2, status: succeeded, details: { matched_tasks: 1, deleted_tasks: Some(1), original_filters: "test_query" }, kind: TaskDeletion { query: "test_query", tasks: RoaringBitmap<[0]> }}
+3 {uid: 3, status: succeeded, details: { matched_tasks: 1, deleted_tasks: Some(0), original_filters: "test_query" }, kind: TaskDeletion { query: "test_query", tasks: RoaringBitmap<[0]> }}
 ----------------------------------------------------------------------
 ### Status:
 enqueued [1,]
@@ -23,6 +23,9 @@ doggo [1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["catto"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [1,]

index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/initial_tasks_enqueued.snap

@@ -21,6 +21,9 @@ doggo [1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/initial_tasks_processed.snap

@@ -22,6 +22,9 @@ doggo [1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["catto"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/task_deletion_processed.snap

@@ -7,7 +7,7 @@ source: index-scheduler/src/lib.rs
 ----------------------------------------------------------------------
 ### All Tasks:
 1 {uid: 1, status: enqueued, details: { received_documents: 1, indexed_documents: None }, kind: DocumentAdditionOrUpdate { index_uid: "doggo", primary_key: Some("bone"), method: ReplaceDocuments, content_file: 00000000-0000-0000-0000-000000000001, documents_count: 1, allow_index_creation: true }}
-2 {uid: 2, status: succeeded, details: { matched_tasks: 1, deleted_tasks: Some(1), original_query: "test_query" }, kind: TaskDeletion { query: "test_query", tasks: RoaringBitmap<[0]> }}
+2 {uid: 2, status: succeeded, details: { matched_tasks: 1, deleted_tasks: Some(1), original_filters: "test_query" }, kind: TaskDeletion { query: "test_query", tasks: RoaringBitmap<[0]> }}
 ----------------------------------------------------------------------
 ### Status:
 enqueued [1,]
@@ -22,6 +22,9 @@ doggo [1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["catto"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [1,]

index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/initial_tasks_enqueued.snap

@@ -23,6 +23,9 @@ doggo [2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/task_deletion_done.snap

@@ -9,7 +9,7 @@ source: index-scheduler/src/lib.rs
 0 {uid: 0, status: enqueued, details: { primary_key: Some("mouse") }, kind: IndexCreation { index_uid: "catto", primary_key: Some("mouse") }}
 1 {uid: 1, status: enqueued, details: { received_documents: 1, indexed_documents: None }, kind: DocumentAdditionOrUpdate { index_uid: "catto", primary_key: None, method: ReplaceDocuments, content_file: 00000000-0000-0000-0000-000000000000, documents_count: 1, allow_index_creation: true }}
 2 {uid: 2, status: enqueued, details: { received_documents: 1, indexed_documents: None }, kind: DocumentAdditionOrUpdate { index_uid: "doggo", primary_key: Some("bone"), method: ReplaceDocuments, content_file: 00000000-0000-0000-0000-000000000001, documents_count: 1, allow_index_creation: true }}
-3 {uid: 3, status: succeeded, details: { matched_tasks: 2, deleted_tasks: Some(0), original_query: "test_query" }, kind: TaskDeletion { query: "test_query", tasks: RoaringBitmap<[0, 1]> }}
+3 {uid: 3, status: succeeded, details: { matched_tasks: 2, deleted_tasks: Some(0), original_filters: "test_query" }, kind: TaskDeletion { query: "test_query", tasks: RoaringBitmap<[0, 1]> }}
 ----------------------------------------------------------------------
 ### Status:
 enqueued [0,1,2,]
@@ -26,6 +26,9 @@ doggo [2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/task_deletion_enqueued.snap

@@ -9,7 +9,7 @@ source: index-scheduler/src/lib.rs
 0 {uid: 0, status: enqueued, details: { primary_key: Some("mouse") }, kind: IndexCreation { index_uid: "catto", primary_key: Some("mouse") }}
 1 {uid: 1, status: enqueued, details: { received_documents: 1, indexed_documents: None }, kind: DocumentAdditionOrUpdate { index_uid: "catto", primary_key: None, method: ReplaceDocuments, content_file: 00000000-0000-0000-0000-000000000000, documents_count: 1, allow_index_creation: true }}
 2 {uid: 2, status: enqueued, details: { received_documents: 1, indexed_documents: None }, kind: DocumentAdditionOrUpdate { index_uid: "doggo", primary_key: Some("bone"), method: ReplaceDocuments, content_file: 00000000-0000-0000-0000-000000000001, documents_count: 1, allow_index_creation: true }}
-3 {uid: 3, status: enqueued, details: { matched_tasks: 2, deleted_tasks: None, original_query: "test_query" }, kind: TaskDeletion { query: "test_query", tasks: RoaringBitmap<[0, 1]> }}
+3 {uid: 3, status: enqueued, details: { matched_tasks: 2, deleted_tasks: None, original_filters: "test_query" }, kind: TaskDeletion { query: "test_query", tasks: RoaringBitmap<[0, 1]> }}
 ----------------------------------------------------------------------
 ### Status:
 enqueued [0,1,2,3,]
@@ -25,6 +25,9 @@ doggo [2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/task_deletion_processing.snap

@@ -9,7 +9,7 @@ source: index-scheduler/src/lib.rs
 0 {uid: 0, status: enqueued, details: { primary_key: Some("mouse") }, kind: IndexCreation { index_uid: "catto", primary_key: Some("mouse") }}
 1 {uid: 1, status: enqueued, details: { received_documents: 1, indexed_documents: None }, kind: DocumentAdditionOrUpdate { index_uid: "catto", primary_key: None, method: ReplaceDocuments, content_file: 00000000-0000-0000-0000-000000000000, documents_count: 1, allow_index_creation: true }}
 2 {uid: 2, status: enqueued, details: { received_documents: 1, indexed_documents: None }, kind: DocumentAdditionOrUpdate { index_uid: "doggo", primary_key: Some("bone"), method: ReplaceDocuments, content_file: 00000000-0000-0000-0000-000000000001, documents_count: 1, allow_index_creation: true }}
-3 {uid: 3, status: enqueued, details: { matched_tasks: 2, deleted_tasks: None, original_query: "test_query" }, kind: TaskDeletion { query: "test_query", tasks: RoaringBitmap<[0, 1]> }}
+3 {uid: 3, status: enqueued, details: { matched_tasks: 2, deleted_tasks: None, original_filters: "test_query" }, kind: TaskDeletion { query: "test_query", tasks: RoaringBitmap<[0, 1]> }}
 ----------------------------------------------------------------------
 ### Status:
 enqueued [0,1,2,3,]
@@ -25,6 +25,9 @@ doggo [2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/1.snap

@@ -31,6 +31,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,10,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["doggos"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/2.snap

@@ -31,6 +31,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,10,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["doggos"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/1.snap

@@ -31,6 +31,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,10,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["doggos"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/2.snap

@@ -31,6 +31,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,10,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["doggos"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/3.snap

@@ -31,6 +31,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,10,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["doggos"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index/1.snap

@@ -28,6 +28,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index/2.snap

@@ -29,6 +29,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index_without_autobatching/1.snap

@@ -28,6 +28,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index_without_autobatching/2.snap

@@ -29,6 +29,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index_without_autobatching/3.snap

@@ -29,6 +29,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_right_without_index_starts_with_cant_create/1.snap

@@ -28,6 +28,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_right_without_index_starts_with_cant_create/2.snap

@@ -29,6 +29,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_right_without_index_starts_with_cant_create/3.snap

@@ -30,6 +30,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["doggos"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/1.snap

@@ -31,6 +31,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,10,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["doggos"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/2.snap

@@ -31,6 +31,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,10,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["doggos"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/test_document_replace/1.snap

@@ -28,6 +28,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/test_document_replace/2.snap

@@ -29,6 +29,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["doggos"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/test_document_replace_without_autobatching/1.snap

@@ -28,6 +28,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/test_document_replace_without_autobatching/2.snap

@@ -29,6 +29,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["doggos"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/test_document_replace_without_autobatching/3.snap

@@ -29,6 +29,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["doggos"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/test_document_update/1.snap

@@ -28,6 +28,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/test_document_update/2.snap

@@ -29,6 +29,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["doggos"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/test_document_update_without_autobatching/1.snap

@@ -28,6 +28,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/test_document_update_without_autobatching/2.snap

@@ -29,6 +29,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["doggos"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/test_document_update_without_autobatching/3.snap

@@ -29,6 +29,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["doggos"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/test_mixed_document_addition/1.snap

@@ -28,6 +28,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 []
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/snapshots/lib.rs/test_mixed_document_addition/2.snap

@@ -29,6 +29,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
 ["doggos"]
+----------------------------------------------------------------------
+### Canceled By:
+
 ----------------------------------------------------------------------
 ### Enqueued At:
 [timestamp] [0,]

index-scheduler/src/utils.rs

@@ -451,13 +451,17 @@ impl IndexScheduler {
                             assert_ne!(status, Status::Succeeded);
                         }
                     }
-                    Details::TaskCancelation { matched_tasks, canceled_tasks, original_query } => {
+                    Details::TaskCancelation {
+                        matched_tasks,
+                        canceled_tasks,
+                        original_filters,
+                    } => {
                         if let Some(canceled_tasks) = canceled_tasks {
                             assert_eq!(status, Status::Succeeded);
                             assert!(canceled_tasks <= matched_tasks);
                             match &kind {
                                 KindWithContent::TaskCancelation { query, tasks } => {
-                                    assert_eq!(query, &original_query);
+                                    assert_eq!(query, &original_filters);
                                     assert_eq!(tasks.len(), matched_tasks);
                                 }
                                 _ => panic!(),
@@ -466,13 +470,13 @@ impl IndexScheduler {
                             assert_ne!(status, Status::Succeeded);
                         }
                     }
-                    Details::TaskDeletion { matched_tasks, deleted_tasks, original_query } => {
+                    Details::TaskDeletion { matched_tasks, deleted_tasks, original_filters } => {
                         if let Some(deleted_tasks) = deleted_tasks {
                             assert_eq!(status, Status::Succeeded);
                             assert!(deleted_tasks <= matched_tasks);
                             match &kind {
                                 KindWithContent::TaskDeletion { query, tasks } => {
-                                    assert_eq!(query, &original_query);
+                                    assert_eq!(query, &original_filters);
                                     assert_eq!(tasks.len(), matched_tasks);
                                 }
                                 _ => panic!(),

meilisearch-http/src/routes/mod.rs

@@ -271,7 +271,7 @@ pub fn create_all_stats(
     let mut indexes = BTreeMap::new();
     let mut database_size = 0;
     let processing_task = index_scheduler.get_tasks_from_authorized_indexes(
-        Query { status: Some(vec![Status::Processing]), limit: Some(1), ..Query::default() },
+        Query { statuses: Some(vec![Status::Processing]), limit: Some(1), ..Query::default() },
         search_rules.authorized_indexes(),
     )?;
     let processing_index = processing_task.first().and_then(|task| task.index_uid());

meilisearch-http/tests/auth/api_keys.rs

@@ -352,7 +352,7 @@ async fn error_add_api_key_invalid_parameters_indexes() {
     assert_eq!(400, code, "{:?}", &response);
 
     let expected_response = json!({
-        "message": r#"`{"name":"products"}` is not a valid index uid. It should be an array of string representing index names."#,
+        "message": r#"`indexes` field value `{"name":"products"}` is invalid. It should be an array of string representing index names."#,
         "code": "invalid_api_key_indexes",
         "type": "invalid_request",
         "link": "https://docs.meilisearch.com/errors#invalid_api_key_indexes"
@@ -377,7 +377,7 @@ async fn error_add_api_key_invalid_index_uids() {
     let (response, code) = server.add_api_key(content).await;
 
     let expected_response = json!({
-        "message": r#"`["invalid index # / \\name with spaces"]` is not a valid index uid. It should be an array of string representing index names."#,
+        "message": r#"`invalid index # / \name with spaces` is not a valid index uid. Index uid can be an integer or a string containing only alphanumeric characters, hyphens (-) and underscores (_)."#,
         "code": "invalid_api_key_indexes",
         "type": "invalid_request",
         "link": "https://docs.meilisearch.com/errors#invalid_api_key_indexes"

meilisearch-http/tests/common/index.rs

@@ -106,17 +106,17 @@ impl Index<'_> {
     }
 
     pub async fn list_tasks(&self) -> (Value, StatusCode) {
-        let url = format!("/tasks?indexUid={}", self.uid);
+        let url = format!("/tasks?indexUids={}", self.uid);
         self.service.get(url).await
     }
 
     pub async fn filtered_tasks(&self, type_: &[&str], status: &[&str]) -> (Value, StatusCode) {
-        let mut url = format!("/tasks?indexUid={}", self.uid);
+        let mut url = format!("/tasks?indexUids={}", self.uid);
         if !type_.is_empty() {
-            let _ = write!(url, "&type={}", type_.join(","));
+            let _ = write!(url, "&types={}", type_.join(","));
         }
         if !status.is_empty() {
-            let _ = write!(url, "&status={}", status.join(","));
+            let _ = write!(url, "&statuses={}", status.join(","));
         }
         self.service.get(url).await
     }

meilisearch-http/tests/documents/add_documents.rs

@@ -636,7 +636,7 @@ async fn error_document_add_create_index_bad_uid() {
     let (response, code) = index.add_documents(json!([{"id": 1}]), None).await;
 
     let expected_response = json!({
-        "message": "invalid index uid `883  fj!`, the uid must be an integer or a string containing only alphanumeric characters a-z A-Z 0-9, hyphens - and underscores _.",
+        "message": "`883  fj!` is not a valid index uid. Index uid can be an integer or a string containing only alphanumeric characters, hyphens (-) and underscores (_).",
         "code": "invalid_index_uid",
         "type": "invalid_request",
         "link": "https://docs.meilisearch.com/errors#invalid_index_uid"

meilisearch-http/tests/documents/update_documents.rs

@@ -10,7 +10,7 @@ async fn error_document_update_create_index_bad_uid() {
     let (response, code) = index.update_documents(json!([{"id": 1}]), None).await;
 
     let expected_response = json!({
-        "message": "invalid index uid `883  fj!`, the uid must be an integer or a string containing only alphanumeric characters a-z A-Z 0-9, hyphens - and underscores _.",
+        "message": "`883  fj!` is not a valid index uid. Index uid can be an integer or a string containing only alphanumeric characters, hyphens (-) and underscores (_).",
         "code": "invalid_index_uid",
         "type": "invalid_request",
         "link": "https://docs.meilisearch.com/errors#invalid_index_uid"

meilisearch-http/tests/dumps/mod.rs

@@ -59,7 +59,7 @@ async fn import_dump_v2_movie_raw() {
     assert_eq!(code, 200);
     assert_eq!(
         tasks,
-        json!({ "results": [{"uid": 0, "indexUid": "indexUID", "status": "succeeded", "type": "documentAdditionOrUpdate", "details": { "receivedDocuments": 0, "indexedDocuments": 31944 }, "duration": "PT41.751156S", "enqueuedAt": "2021-09-08T08:30:30.550282Z", "startedAt": "2021-09-08T08:30:30.553012Z", "finishedAt": "2021-09-08T08:31:12.304168Z" }], "limit": 20, "from": 0, "next": null })
+        json!({ "results": [{"uid": 0, "indexUid": "indexUID", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": { "receivedDocuments": 0, "indexedDocuments": 31944 }, "error": null, "duration": "PT41.751156S", "enqueuedAt": "2021-09-08T08:30:30.550282Z", "startedAt": "2021-09-08T08:30:30.553012Z", "finishedAt": "2021-09-08T08:31:12.304168Z" }], "limit": 20, "from": 0, "next": null })
     );
 
     // finally we're just going to check that we can still get a few documents by id
@@ -122,7 +122,7 @@ async fn import_dump_v2_movie_with_settings() {
     assert_eq!(code, 200);
     assert_eq!(
         tasks,
-        json!({ "results": [{ "uid": 1, "indexUid": "indexUID", "status": "succeeded", "type": "settingsUpdate", "details": { "displayedAttributes": ["title", "genres", "overview", "poster", "release_date"], "searchableAttributes": ["title", "overview"], "filterableAttributes": ["genres"], "stopWords": ["of", "the"] }, "duration": "PT37.488777S", "enqueuedAt": "2021-09-08T08:24:02.323444Z", "startedAt": "2021-09-08T08:24:02.324145Z", "finishedAt": "2021-09-08T08:24:39.812922Z" }, { "uid": 0, "indexUid": "indexUID", "status": "succeeded", "type": "documentAdditionOrUpdate", "details": { "receivedDocuments": 0, "indexedDocuments": 31944 }, "duration": "PT39.941318S", "enqueuedAt": "2021-09-08T08:21:14.742672Z", "startedAt": "2021-09-08T08:21:14.750166Z", "finishedAt": "2021-09-08T08:21:54.691484Z" }], "limit": 20, "from": 1, "next": null })
+        json!({ "results": [{ "uid": 1, "indexUid": "indexUID", "status": "succeeded", "type": "settingsUpdate", "canceledBy": null, "details": { "displayedAttributes": ["title", "genres", "overview", "poster", "release_date"], "searchableAttributes": ["title", "overview"], "filterableAttributes": ["genres"], "stopWords": ["of", "the"] }, "error": null, "duration": "PT37.488777S", "enqueuedAt": "2021-09-08T08:24:02.323444Z", "startedAt": "2021-09-08T08:24:02.324145Z", "finishedAt": "2021-09-08T08:24:39.812922Z" }, { "uid": 0, "indexUid": "indexUID", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": { "receivedDocuments": 0, "indexedDocuments": 31944 }, "error": null, "duration": "PT39.941318S", "enqueuedAt": "2021-09-08T08:21:14.742672Z", "startedAt": "2021-09-08T08:21:14.750166Z", "finishedAt": "2021-09-08T08:21:54.691484Z" }], "limit": 20, "from": 1, "next": null })
     );
 
     // finally we're just going to check that we can still get a few documents by id
@@ -185,7 +185,7 @@ async fn import_dump_v2_rubygems_with_settings() {
     assert_eq!(code, 200);
     assert_eq!(
         tasks["results"][0],
-        json!({"uid": 92, "indexUid": "rubygems", "status": "succeeded", "type": "documentAdditionOrUpdate", "details": {"receivedDocuments": 0, "indexedDocuments": 1042}, "duration": "PT14.034672S", "enqueuedAt": "2021-09-08T08:40:31.390775Z", "startedAt": "2021-09-08T08:51:39.060642Z", "finishedAt": "2021-09-08T08:51:53.095314Z"})
+        json!({"uid": 92, "indexUid": "rubygems", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": {"receivedDocuments": 0, "indexedDocuments": 1042}, "error": null, "duration": "PT14.034672S", "enqueuedAt": "2021-09-08T08:40:31.390775Z", "startedAt": "2021-09-08T08:51:39.060642Z", "finishedAt": "2021-09-08T08:51:53.095314Z"})
     );
 
     // finally we're just going to check that we can still get a few documents by id
@@ -246,7 +246,7 @@ async fn import_dump_v3_movie_raw() {
     assert_eq!(code, 200);
     assert_eq!(
         tasks,
-        json!({ "results": [{"uid": 0, "indexUid": "indexUID", "status": "succeeded", "type": "documentAdditionOrUpdate", "details": { "receivedDocuments": 0, "indexedDocuments": 31944 }, "duration": "PT41.751156S", "enqueuedAt": "2021-09-08T08:30:30.550282Z", "startedAt": "2021-09-08T08:30:30.553012Z", "finishedAt": "2021-09-08T08:31:12.304168Z" }], "limit": 20, "from": 0, "next": null })
+        json!({ "results": [{"uid": 0, "indexUid": "indexUID", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": { "receivedDocuments": 0, "indexedDocuments": 31944 }, "error": null, "duration": "PT41.751156S", "enqueuedAt": "2021-09-08T08:30:30.550282Z", "startedAt": "2021-09-08T08:30:30.553012Z", "finishedAt": "2021-09-08T08:31:12.304168Z" }], "limit": 20, "from": 0, "next": null })
     );
 
     // finally we're just going to check that we can still get a few documents by id
@@ -309,7 +309,7 @@ async fn import_dump_v3_movie_with_settings() {
     assert_eq!(code, 200);
     assert_eq!(
         tasks,
-        json!({ "results": [{ "uid": 1, "indexUid": "indexUID", "status": "succeeded", "type": "settingsUpdate", "details": { "displayedAttributes": ["title", "genres", "overview", "poster", "release_date"], "searchableAttributes": ["title", "overview"], "filterableAttributes": ["genres"], "stopWords": ["of", "the"] }, "duration": "PT37.488777S", "enqueuedAt": "2021-09-08T08:24:02.323444Z", "startedAt": "2021-09-08T08:24:02.324145Z", "finishedAt": "2021-09-08T08:24:39.812922Z" }, { "uid": 0, "indexUid": "indexUID", "status": "succeeded", "type": "documentAdditionOrUpdate", "details": { "receivedDocuments": 0, "indexedDocuments": 31944 }, "duration": "PT39.941318S", "enqueuedAt": "2021-09-08T08:21:14.742672Z", "startedAt": "2021-09-08T08:21:14.750166Z", "finishedAt": "2021-09-08T08:21:54.691484Z" }], "limit": 20, "from": 1, "next": null })
+        json!({ "results": [{ "uid": 1, "indexUid": "indexUID", "status": "succeeded", "type": "settingsUpdate", "canceledBy": null, "details": { "displayedAttributes": ["title", "genres", "overview", "poster", "release_date"], "searchableAttributes": ["title", "overview"], "filterableAttributes": ["genres"], "stopWords": ["of", "the"] }, "error": null, "duration": "PT37.488777S", "enqueuedAt": "2021-09-08T08:24:02.323444Z", "startedAt": "2021-09-08T08:24:02.324145Z", "finishedAt": "2021-09-08T08:24:39.812922Z" }, { "uid": 0, "indexUid": "indexUID", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": { "receivedDocuments": 0, "indexedDocuments": 31944 }, "error": null, "duration": "PT39.941318S", "enqueuedAt": "2021-09-08T08:21:14.742672Z", "startedAt": "2021-09-08T08:21:14.750166Z", "finishedAt": "2021-09-08T08:21:54.691484Z" }], "limit": 20, "from": 1, "next": null })
     );
 
     // finally we're just going to check that we can["results"] still get a few documents by id
@@ -372,7 +372,7 @@ async fn import_dump_v3_rubygems_with_settings() {
     assert_eq!(code, 200);
     assert_eq!(
         tasks["results"][0],
-        json!({"uid": 92, "indexUid": "rubygems", "status": "succeeded", "type": "documentAdditionOrUpdate", "details": {"receivedDocuments": 0, "indexedDocuments": 1042}, "duration": "PT14.034672S", "enqueuedAt": "2021-09-08T08:40:31.390775Z", "startedAt": "2021-09-08T08:51:39.060642Z", "finishedAt": "2021-09-08T08:51:53.095314Z"})
+        json!({"uid": 92, "indexUid": "rubygems", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": {"receivedDocuments": 0, "indexedDocuments": 1042}, "error": null, "duration": "PT14.034672S", "enqueuedAt": "2021-09-08T08:40:31.390775Z", "startedAt": "2021-09-08T08:51:39.060642Z", "finishedAt": "2021-09-08T08:51:53.095314Z"})
     );
 
     // finally we're just going to check that we can still get a few documents by id
@@ -433,7 +433,7 @@ async fn import_dump_v4_movie_raw() {
     assert_eq!(code, 200);
     assert_eq!(
         tasks,
-        json!({ "results": [{"uid": 0, "indexUid": "indexUID", "status": "succeeded", "type": "documentAdditionOrUpdate", "details": { "receivedDocuments": 0, "indexedDocuments": 31944 }, "duration": "PT41.751156S", "enqueuedAt": "2021-09-08T08:30:30.550282Z", "startedAt": "2021-09-08T08:30:30.553012Z", "finishedAt": "2021-09-08T08:31:12.304168Z" }], "limit" : 20, "from": 0, "next": null })
+        json!({ "results": [{"uid": 0, "indexUid": "indexUID", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": { "receivedDocuments": 0, "indexedDocuments": 31944 }, "error": null, "duration": "PT41.751156S", "enqueuedAt": "2021-09-08T08:30:30.550282Z", "startedAt": "2021-09-08T08:30:30.553012Z", "finishedAt": "2021-09-08T08:31:12.304168Z" }], "limit" : 20, "from": 0, "next": null })
     );
 
     // finally we're just going to check that we can still get a few documents by id
@@ -496,7 +496,7 @@ async fn import_dump_v4_movie_with_settings() {
     assert_eq!(code, 200);
     assert_eq!(
         tasks,
-        json!({ "results": [{ "uid": 1, "indexUid": "indexUID", "status": "succeeded", "type": "settingsUpdate", "details": { "displayedAttributes": ["title", "genres", "overview", "poster", "release_date"], "searchableAttributes": ["title", "overview"], "filterableAttributes": ["genres"], "stopWords": ["of", "the"] }, "duration": "PT37.488777S", "enqueuedAt": "2021-09-08T08:24:02.323444Z", "startedAt": "2021-09-08T08:24:02.324145Z", "finishedAt": "2021-09-08T08:24:39.812922Z" }, { "uid": 0, "indexUid": "indexUID", "status": "succeeded", "type": "documentAdditionOrUpdate", "details": { "receivedDocuments": 0, "indexedDocuments": 31944 }, "duration": "PT39.941318S", "enqueuedAt": "2021-09-08T08:21:14.742672Z", "startedAt": "2021-09-08T08:21:14.750166Z", "finishedAt": "2021-09-08T08:21:54.691484Z" }], "limit": 20, "from": 1, "next": null })
+        json!({ "results": [{ "uid": 1, "indexUid": "indexUID", "status": "succeeded", "type": "settingsUpdate", "canceledBy": null, "details": { "displayedAttributes": ["title", "genres", "overview", "poster", "release_date"], "searchableAttributes": ["title", "overview"], "filterableAttributes": ["genres"], "stopWords": ["of", "the"] }, "error": null, "duration": "PT37.488777S", "enqueuedAt": "2021-09-08T08:24:02.323444Z", "startedAt": "2021-09-08T08:24:02.324145Z", "finishedAt": "2021-09-08T08:24:39.812922Z" }, { "uid": 0, "indexUid": "indexUID", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": { "receivedDocuments": 0, "indexedDocuments": 31944 }, "error": null, "duration": "PT39.941318S", "enqueuedAt": "2021-09-08T08:21:14.742672Z", "startedAt": "2021-09-08T08:21:14.750166Z", "finishedAt": "2021-09-08T08:21:54.691484Z" }], "limit": 20, "from": 1, "next": null })
     );
 
     // finally we're just going to check that we can still get a few documents by id
@@ -559,7 +559,7 @@ async fn import_dump_v4_rubygems_with_settings() {
     assert_eq!(code, 200);
     assert_eq!(
         tasks["results"][0],
-        json!({ "uid": 92, "indexUid": "rubygems", "status": "succeeded", "type": "documentAdditionOrUpdate", "details": {"receivedDocuments": 0, "indexedDocuments": 1042}, "duration": "PT14.034672S", "enqueuedAt": "2021-09-08T08:40:31.390775Z", "startedAt": "2021-09-08T08:51:39.060642Z", "finishedAt": "2021-09-08T08:51:53.095314Z"})
+        json!({ "uid": 92, "indexUid": "rubygems", "status": "succeeded", "type": "documentAdditionOrUpdate", "canceledBy": null, "details": {"receivedDocuments": 0, "indexedDocuments": 1042}, "error": null, "duration": "PT14.034672S", "enqueuedAt": "2021-09-08T08:40:31.390775Z", "startedAt": "2021-09-08T08:51:39.060642Z", "finishedAt": "2021-09-08T08:51:53.095314Z"})
     );
 
     // finally we're just going to check that we can still get a few documents by id

meilisearch-http/tests/index/create_index.rs

@@ -189,7 +189,7 @@ async fn error_create_with_invalid_index_uid() {
     let (response, code) = index.create(None).await;
 
     let expected_response = json!({
-        "message": "invalid index uid `test test#!`, the uid must be an integer or a string containing only alphanumeric characters a-z A-Z 0-9, hyphens - and underscores _.",
+        "message": "`test test#!` is not a valid index uid. Index uid can be an integer or a string containing only alphanumeric characters, hyphens (-) and underscores (_).",
         "code": "invalid_index_uid",
         "type": "invalid_request",
         "link": "https://docs.meilisearch.com/errors#invalid_index_uid"

meilisearch-http/tests/search/errors.rs

@@ -70,7 +70,7 @@ async fn filter_invalid_syntax_object() {
     index.wait_task(1).await;
 
     let expected_response = json!({
-        "message": "Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `TO`, `EXISTS`, `NOT EXISTS`, or `_geoRadius` at `title & Glass`.\n1:14 title & Glass",
+        "message": "Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, or `_geoRadius` at `title & Glass`.\n1:14 title & Glass",
         "code": "invalid_filter",
         "type": "invalid_request",
         "link": "https://docs.meilisearch.com/errors#invalid_filter"
@@ -95,7 +95,7 @@ async fn filter_invalid_syntax_array() {
     index.wait_task(1).await;
 
     let expected_response = json!({
-        "message": "Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `TO`, `EXISTS`, `NOT EXISTS`, or `_geoRadius` at `title & Glass`.\n1:14 title & Glass",
+        "message": "Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, or `_geoRadius` at `title & Glass`.\n1:14 title & Glass",
         "code": "invalid_filter",
         "type": "invalid_request",
         "link": "https://docs.meilisearch.com/errors#invalid_filter"

meilisearch-http/tests/settings/get_settings.rs

@@ -182,7 +182,7 @@ async fn error_update_setting_unexisting_index_invalid_uid() {
     assert_eq!(code, 400);
 
     let expected = json!({
-        "message": "invalid index uid `test##!  `, the uid must be an integer or a string containing only alphanumeric characters a-z A-Z 0-9, hyphens - and underscores _.",
+        "message": "`test##!  ` is not a valid index uid. Index uid can be an integer or a string containing only alphanumeric characters, hyphens (-) and underscores (_).",
         "code": "invalid_index_uid",
         "type": "invalid_request",
         "link": "https://docs.meilisearch.com/errors#invalid_index_uid"});

meilisearch-http/tests/tasks/mod.rs

@@ -67,37 +67,37 @@ async fn list_tasks_with_star_filters() {
     index
         .add_documents(serde_json::from_str(include_str!("../assets/test_set.json")).unwrap(), None)
         .await;
-    let (response, code) = index.service.get("/tasks?indexUid=test").await;
+    let (response, code) = index.service.get("/tasks?indexUids=test").await;
     assert_eq!(code, 200);
     assert_eq!(response["results"].as_array().unwrap().len(), 2);
 
-    let (response, code) = index.service.get("/tasks?indexUid=*").await;
+    let (response, code) = index.service.get("/tasks?indexUids=*").await;
     assert_eq!(code, 200);
     assert_eq!(response["results"].as_array().unwrap().len(), 2);
 
-    let (response, code) = index.service.get("/tasks?indexUid=*,pasteque").await;
+    let (response, code) = index.service.get("/tasks?indexUids=*,pasteque").await;
     assert_eq!(code, 200);
     assert_eq!(response["results"].as_array().unwrap().len(), 2);
 
-    let (response, code) = index.service.get("/tasks?type=*").await;
+    let (response, code) = index.service.get("/tasks?types=*").await;
     assert_eq!(code, 200);
     assert_eq!(response["results"].as_array().unwrap().len(), 2);
 
     let (response, code) =
-        index.service.get("/tasks?type=*,documentAdditionOrUpdate&status=*").await;
+        index.service.get("/tasks?types=*,documentAdditionOrUpdate&statuses=*").await;
     assert_eq!(code, 200, "{:?}", response);
     assert_eq!(response["results"].as_array().unwrap().len(), 2);
 
     let (response, code) = index
         .service
-        .get("/tasks?type=*,documentAdditionOrUpdate&status=*,failed&indexUid=test")
+        .get("/tasks?types=*,documentAdditionOrUpdate&statuses=*,failed&indexUids=test")
         .await;
     assert_eq!(code, 200, "{:?}", response);
     assert_eq!(response["results"].as_array().unwrap().len(), 2);
 
     let (response, code) = index
         .service
-        .get("/tasks?type=*,documentAdditionOrUpdate&status=*,failed&indexUid=test,*")
+        .get("/tasks?types=*,documentAdditionOrUpdate&statuses=*,failed&indexUids=test,*")
         .await;
     assert_eq!(code, 200, "{:?}", response);
     assert_eq!(response["results"].as_array().unwrap().len(), 2);
@@ -231,10 +231,12 @@ async fn test_summarized_document_addition_or_update() {
       "indexUid": "test",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
       "details": {
         "receivedDocuments": 1,
         "indexedDocuments": 1
       },
+      "error": null,
       "duration": "[duration]",
       "enqueuedAt": "[date]",
       "startedAt": "[date]",
@@ -253,10 +255,12 @@ async fn test_summarized_document_addition_or_update() {
       "indexUid": "test",
       "status": "succeeded",
       "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
       "details": {
         "receivedDocuments": 1,
         "indexedDocuments": 1
       },
+      "error": null,
       "duration": "[duration]",
       "enqueuedAt": "[date]",
       "startedAt": "[date]",
@@ -280,6 +284,7 @@ async fn test_summarized_delete_batch() {
       "indexUid": "test",
       "status": "failed",
       "type": "documentDeletion",
+      "canceledBy": null,
       "details": {
         "matchedDocuments": 3,
         "deletedDocuments": null
@@ -309,10 +314,12 @@ async fn test_summarized_delete_batch() {
       "indexUid": "test",
       "status": "succeeded",
       "type": "documentDeletion",
+      "canceledBy": null,
       "details": {
         "matchedDocuments": 1,
         "deletedDocuments": 0
       },
+      "error": null,
       "duration": "[duration]",
       "enqueuedAt": "[date]",
       "startedAt": "[date]",
@@ -336,6 +343,7 @@ async fn test_summarized_delete_document() {
       "indexUid": "test",
       "status": "failed",
       "type": "documentDeletion",
+      "canceledBy": null,
       "details": {
         "matchedDocuments": 1,
         "deletedDocuments": null
@@ -365,10 +373,12 @@ async fn test_summarized_delete_document() {
       "indexUid": "test",
       "status": "succeeded",
       "type": "documentDeletion",
+      "canceledBy": null,
       "details": {
         "matchedDocuments": 1,
         "deletedDocuments": 0
       },
+      "error": null,
       "duration": "[duration]",
       "enqueuedAt": "[date]",
       "startedAt": "[date]",
@@ -394,6 +404,7 @@ async fn test_summarized_settings_update() {
       "indexUid": "test",
       "status": "failed",
       "type": "settingsUpdate",
+      "canceledBy": null,
       "details": {
         "rankingRules": [
           "custom"
@@ -423,6 +434,7 @@ async fn test_summarized_settings_update() {
       "indexUid": "test",
       "status": "succeeded",
       "type": "settingsUpdate",
+      "canceledBy": null,
       "details": {
         "displayedAttributes": [
           "doggos",
@@ -436,6 +448,7 @@ async fn test_summarized_settings_update() {
           "iq"
         ]
       },
+      "error": null,
       "duration": "[duration]",
       "enqueuedAt": "[date]",
       "startedAt": "[date]",
@@ -459,9 +472,11 @@ async fn test_summarized_index_creation() {
       "indexUid": "test",
       "status": "succeeded",
       "type": "indexCreation",
+      "canceledBy": null,
       "details": {
         "primaryKey": null
       },
+      "error": null,
       "duration": "[duration]",
       "enqueuedAt": "[date]",
       "startedAt": "[date]",
@@ -480,6 +495,7 @@ async fn test_summarized_index_creation() {
       "indexUid": "test",
       "status": "failed",
       "type": "indexCreation",
+      "canceledBy": null,
       "details": {
         "primaryKey": "doggos"
       },
@@ -512,6 +528,7 @@ async fn test_summarized_index_deletion() {
       "indexUid": "test",
       "status": "failed",
       "type": "indexDeletion",
+      "canceledBy": null,
       "error": {
         "message": "Index `test` not found.",
         "code": "index_not_found",
@@ -538,9 +555,11 @@ async fn test_summarized_index_deletion() {
       "indexUid": "test",
       "status": "succeeded",
       "type": "indexDeletion",
+      "canceledBy": null,
       "details": {
         "deletedDocuments": 1
       },
+      "error": null,
       "duration": "[duration]",
       "enqueuedAt": "[date]",
       "startedAt": "[date]",
@@ -560,9 +579,11 @@ async fn test_summarized_index_deletion() {
       "indexUid": "test",
       "status": "succeeded",
       "type": "indexDeletion",
+      "canceledBy": null,
       "details": {
         "deletedDocuments": 1
       },
+      "error": null,
       "duration": "[duration]",
       "enqueuedAt": "[date]",
       "startedAt": "[date]",
@@ -587,6 +608,7 @@ async fn test_summarized_index_update() {
       "indexUid": "test",
       "status": "failed",
       "type": "indexUpdate",
+      "canceledBy": null,
       "details": {
         "primaryKey": null
       },
@@ -614,6 +636,7 @@ async fn test_summarized_index_update() {
       "indexUid": "test",
       "status": "failed",
       "type": "indexUpdate",
+      "canceledBy": null,
       "details": {
         "primaryKey": "bones"
       },
@@ -644,9 +667,11 @@ async fn test_summarized_index_update() {
       "indexUid": "test",
       "status": "succeeded",
       "type": "indexUpdate",
+      "canceledBy": null,
       "details": {
         "primaryKey": null
       },
+      "error": null,
       "duration": "[duration]",
       "enqueuedAt": "[date]",
       "startedAt": "[date]",
@@ -665,9 +690,11 @@ async fn test_summarized_index_update() {
       "indexUid": "test",
       "status": "succeeded",
       "type": "indexUpdate",
+      "canceledBy": null,
       "details": {
         "primaryKey": "bones"
       },
+      "error": null,
       "duration": "[duration]",
       "enqueuedAt": "[date]",
       "startedAt": "[date]",
@@ -694,6 +721,7 @@ async fn test_summarized_index_swap() {
       "indexUid": null,
       "status": "failed",
       "type": "indexSwap",
+      "canceledBy": null,
       "details": {
         "swaps": [
           {
@@ -734,6 +762,7 @@ async fn test_summarized_index_swap() {
       "indexUid": null,
       "status": "succeeded",
       "type": "indexSwap",
+      "canceledBy": null,
       "details": {
         "swaps": [
           {
@@ -744,6 +773,7 @@ async fn test_summarized_index_swap() {
           }
         ]
       },
+      "error": null,
       "duration": "[duration]",
       "enqueuedAt": "[date]",
       "startedAt": "[date]",
@@ -759,7 +789,7 @@ async fn test_summarized_task_cancelation() {
     // to avoid being flaky we're only going to cancel an already finished task :(
     index.create(None).await;
     index.wait_task(0).await;
-    server.cancel_task(json!({ "uid": [0] })).await;
+    server.cancel_task(json!({ "uids": [0] })).await;
     index.wait_task(1).await;
     let (task, _) = index.get_task(1).await;
     assert_json_snapshot!(task, 
@@ -770,11 +800,13 @@ async fn test_summarized_task_cancelation() {
       "indexUid": null,
       "status": "succeeded",
       "type": "taskCancelation",
+      "canceledBy": null,
       "details": {
         "matchedTasks": 1,
         "canceledTasks": 0,
-        "originalQuery": "uid=0"
+        "originalFilters": "uids=0"
       },
+      "error": null,
       "duration": "[duration]",
       "enqueuedAt": "[date]",
       "startedAt": "[date]",
@@ -790,7 +822,7 @@ async fn test_summarized_task_deletion() {
     // to avoid being flaky we're only going to delete an already finished task :(
     index.create(None).await;
     index.wait_task(0).await;
-    server.delete_task(json!({ "uid": [0] })).await;
+    server.delete_task(json!({ "uids": [0] })).await;
     index.wait_task(1).await;
     let (task, _) = index.get_task(1).await;
     assert_json_snapshot!(task, 
@@ -801,11 +833,13 @@ async fn test_summarized_task_deletion() {
       "indexUid": null,
       "status": "succeeded",
       "type": "taskDeletion",
+      "canceledBy": null,
       "details": {
         "matchedTasks": 1,
         "deletedTasks": 1,
-        "originalQuery": "uid=0"
+        "originalFilters": "uids=0"
       },
+      "error": null,
       "duration": "[duration]",
       "enqueuedAt": "[date]",
       "startedAt": "[date]",
@@ -828,6 +862,8 @@ async fn test_summarized_dump_creation() {
       "indexUid": null,
       "status": "succeeded",
       "type": "dumpCreation",
+      "canceledBy": null,
+      "error": null,
       "duration": "[duration]",
       "enqueuedAt": "[date]",
       "startedAt": "[date]",

meilisearch-types/Cargo.toml

@@ -12,7 +12,7 @@ either = { version = "1.6.1", features = ["serde"] }
 enum-iterator = "1.1.3"
 flate2 = "1.0.24"
 fst = "0.4.7"
-milli = { git = "https://github.com/meilisearch/milli.git", version = "0.35.0", default-features = false }
+milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.35.1", default-features = false }
 proptest = { version = "1.0.0", optional = true }
 proptest-derive = { version = "0.3.0", optional = true }
 roaring = { version = "0.10.0", features = ["serde"] }

meilisearch-types/src/error.rs

@@ -147,6 +147,11 @@ pub enum Code {
     MissingMasterKey,
     NoSpaceLeftOnDevice,
     DumpNotFound,
+    InvalidTaskDate,
+    InvalidTaskStatuses,
+    InvalidTaskTypes,
+    InvalidTaskCanceledBy,
+    InvalidTaskUids,
     TaskNotFound,
     TaskDeletionWithEmptyQuery,
     TaskCancelationWithEmptyQuery,
@@ -238,12 +243,27 @@ impl Code {
             MissingMasterKey => {
                 ErrCode::authentication("missing_master_key", StatusCode::UNAUTHORIZED)
             }
+            InvalidTaskDate => {
+                ErrCode::invalid("invalid_task_date_filter", StatusCode::BAD_REQUEST)
+            }
+            InvalidTaskUids => {
+                ErrCode::invalid("invalid_task_uids_filter", StatusCode::BAD_REQUEST)
+            }
+            InvalidTaskStatuses => {
+                ErrCode::invalid("invalid_task_statuses_filter", StatusCode::BAD_REQUEST)
+            }
+            InvalidTaskTypes => {
+                ErrCode::invalid("invalid_task_types_filter", StatusCode::BAD_REQUEST)
+            }
+            InvalidTaskCanceledBy => {
+                ErrCode::invalid("invalid_task_canceled_by_filter", StatusCode::BAD_REQUEST)
+            }
             TaskNotFound => ErrCode::invalid("task_not_found", StatusCode::NOT_FOUND),
             TaskDeletionWithEmptyQuery => {
-                ErrCode::invalid("missing_filters", StatusCode::BAD_REQUEST)
+                ErrCode::invalid("missing_task_filters", StatusCode::BAD_REQUEST)
             }
             TaskCancelationWithEmptyQuery => {
-                ErrCode::invalid("missing_filters", StatusCode::BAD_REQUEST)
+                ErrCode::invalid("missing_task_filters", StatusCode::BAD_REQUEST)
             }
             DumpNotFound => ErrCode::invalid("dump_not_found", StatusCode::NOT_FOUND),
             NoSpaceLeftOnDevice => {

meilisearch-types/src/index_uid.rs

@@ -75,9 +75,9 @@ impl fmt::Display for IndexUidFormatError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(
             f,
-            "invalid index uid `{}`, the uid must be an integer \
-            or a string containing only alphanumeric characters \
-            a-z A-Z 0-9, hyphens - and underscores _.",
+            "`{}` is not a valid index uid. Index uid can be an \
+            integer or a string containing only alphanumeric \
+            characters, hyphens (-) and underscores (_).",
             self.invalid_uid,
         )
     }

meilisearch-types/src/keys.rs

@@ -1,4 +1,5 @@
 use std::hash::Hash;
+use std::str::FromStr;
 
 use enum_iterator::Sequence;
 use serde::{Deserialize, Serialize};
@@ -9,7 +10,7 @@ use time::{Date, OffsetDateTime, PrimitiveDateTime};
 use uuid::Uuid;
 
 use crate::error::{Code, ErrorCode};
-use crate::index_uid::IndexUid;
+use crate::index_uid::{IndexUid, IndexUidFormatError};
 use crate::star_or::StarOr;
 
 type Result<T> = std::result::Result<T, Error>;
@@ -64,7 +65,15 @@ impl Key {
         let indexes = value
             .get("indexes")
             .map(|ind| {
-                from_value(ind.clone()).map_err(|_| Error::InvalidApiKeyIndexes(ind.clone()))
+                from_value::<Vec<String>>(ind.clone())
+                    // If it's not a vec of string, return an API key parsing error.
+                    .map_err(|_| Error::InvalidApiKeyIndexes(ind.clone()))
+                    .and_then(|ind| {
+                        ind.into_iter()
+                            // If it's not a valid Index uid, return an Index Uid parsing error.
+                            .map(|i| StarOr::<IndexUid>::from_str(&i).map_err(Error::from))
+                            .collect()
+                    })
             })
             .ok_or(Error::MissingParameter("indexes"))??;
 
@@ -339,10 +348,10 @@ pub enum Error {
     MissingParameter(&'static str),
     #[error("`actions` field value `{0}` is invalid. It should be an array of string representing action names.")]
     InvalidApiKeyActions(Value),
-    #[error(
-        "`{0}` is not a valid index uid. It should be an array of string representing index names."
-    )]
+    #[error("`indexes` field value `{0}` is invalid. It should be an array of string representing index names.")]
     InvalidApiKeyIndexes(Value),
+    #[error("{0}")]
+    InvalidApiKeyIndexUid(IndexUidFormatError),
     #[error("`expiresAt` field value `{0}` is invalid. It should follow the RFC 3339 format to represents a date or datetime in the future or specified as a null value. e.g. 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS'.")]
     InvalidApiKeyExpiresAt(Value),
     #[error("`description` field value `{0}` is invalid. It should be a string or specified as a null value.")]
@@ -357,12 +366,20 @@ pub enum Error {
     ImmutableField(String),
 }
 
+impl From<IndexUidFormatError> for Error {
+    fn from(e: IndexUidFormatError) -> Self {
+        Self::InvalidApiKeyIndexUid(e)
+    }
+}
+
 impl ErrorCode for Error {
     fn error_code(&self) -> Code {
         match self {
             Self::MissingParameter(_) => Code::MissingParameter,
             Self::InvalidApiKeyActions(_) => Code::InvalidApiKeyActions,
-            Self::InvalidApiKeyIndexes(_) => Code::InvalidApiKeyIndexes,
+            Self::InvalidApiKeyIndexes(_) | Self::InvalidApiKeyIndexUid(_) => {
+                Code::InvalidApiKeyIndexes
+            }
             Self::InvalidApiKeyExpiresAt(_) => Code::InvalidApiKeyExpiresAt,
             Self::InvalidApiKeyDescription(_) => Code::InvalidApiKeyDescription,
             Self::InvalidApiKeyName(_) => Code::InvalidApiKeyName,

meilisearch-types/src/tasks.rs

@@ -217,12 +217,12 @@ impl KindWithContent {
             KindWithContent::TaskCancelation { query, tasks } => Some(Details::TaskCancelation {
                 matched_tasks: tasks.len(),
                 canceled_tasks: None,
-                original_query: query.clone(),
+                original_filters: query.clone(),
             }),
             KindWithContent::TaskDeletion { query, tasks } => Some(Details::TaskDeletion {
                 matched_tasks: tasks.len(),
                 deleted_tasks: None,
-                original_query: query.clone(),
+                original_filters: query.clone(),
             }),
             KindWithContent::DumpCreation { .. } => None,
             KindWithContent::SnapshotCreation => None,
@@ -260,12 +260,12 @@ impl KindWithContent {
             KindWithContent::TaskCancelation { query, tasks } => Some(Details::TaskCancelation {
                 matched_tasks: tasks.len(),
                 canceled_tasks: Some(0),
-                original_query: query.clone(),
+                original_filters: query.clone(),
             }),
             KindWithContent::TaskDeletion { query, tasks } => Some(Details::TaskDeletion {
                 matched_tasks: tasks.len(),
                 deleted_tasks: Some(0),
-                original_query: query.clone(),
+                original_filters: query.clone(),
             }),
             KindWithContent::DumpCreation { .. } => None,
             KindWithContent::SnapshotCreation => None,
@@ -298,12 +298,12 @@ impl From<&KindWithContent> for Option<Details> {
             KindWithContent::TaskCancelation { query, tasks } => Some(Details::TaskCancelation {
                 matched_tasks: tasks.len(),
                 canceled_tasks: None,
-                original_query: query.clone(),
+                original_filters: query.clone(),
             }),
             KindWithContent::TaskDeletion { query, tasks } => Some(Details::TaskDeletion {
                 matched_tasks: tasks.len(),
                 deleted_tasks: None,
-                original_query: query.clone(),
+                original_filters: query.clone(),
             }),
             KindWithContent::DumpCreation { dump_uid, .. } => {
                 Some(Details::Dump { dump_uid: dump_uid.clone() })
@@ -398,7 +398,23 @@ impl Kind {
         }
     }
 }
-
+impl Display for Kind {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Kind::DocumentAdditionOrUpdate => write!(f, "documentAdditionOrUpdate"),
+            Kind::DocumentDeletion => write!(f, "documentDeletion"),
+            Kind::SettingsUpdate => write!(f, "settingsUpdate"),
+            Kind::IndexCreation => write!(f, "indexCreation"),
+            Kind::IndexDeletion => write!(f, "indexDeletion"),
+            Kind::IndexUpdate => write!(f, "indexUpdate"),
+            Kind::IndexSwap => write!(f, "indexSwap"),
+            Kind::TaskCancelation => write!(f, "taskCancelation"),
+            Kind::TaskDeletion => write!(f, "taskDeletion"),
+            Kind::DumpCreation => write!(f, "dumpCreation"),
+            Kind::SnapshotCreation => write!(f, "snapshotCreation"),
+        }
+    }
+}
 impl FromStr for Kind {
     type Err = ResponseError;
 
@@ -452,8 +468,8 @@ pub enum Details {
     IndexInfo { primary_key: Option<String> },
     DocumentDeletion { matched_documents: usize, deleted_documents: Option<u64> },
     ClearAll { deleted_documents: Option<u64> },
-    TaskCancelation { matched_tasks: u64, canceled_tasks: Option<u64>, original_query: String },
-    TaskDeletion { matched_tasks: u64, deleted_tasks: Option<u64>, original_query: String },
+    TaskCancelation { matched_tasks: u64, canceled_tasks: Option<u64>, original_filters: String },
+    TaskDeletion { matched_tasks: u64, deleted_tasks: Option<u64>, original_filters: String },
     Dump { dump_uid: String },
     IndexSwap { swaps: Vec<IndexSwap> },
 }
@@ -520,11 +536,11 @@ mod tests {
         let details = Details::TaskDeletion {
             matched_tasks: 1,
             deleted_tasks: None,
-            original_query: "hello".to_owned(),
+            original_filters: "hello".to_owned(),
         };
         let serialised = SerdeJson::<Details>::bytes_encode(&details).unwrap();
         let deserialised = SerdeJson::<Details>::bytes_decode(&serialised).unwrap();
-        meili_snap::snapshot!(format!("{:?}", details), @r###"TaskDeletion { matched_tasks: 1, deleted_tasks: None, original_query: "hello" }"###);
-        meili_snap::snapshot!(format!("{:?}", deserialised), @r###"TaskDeletion { matched_tasks: 1, deleted_tasks: None, original_query: "hello" }"###);
+        meili_snap::snapshot!(format!("{:?}", details), @r###"TaskDeletion { matched_tasks: 1, deleted_tasks: None, original_filters: "hello" }"###);
+        meili_snap::snapshot!(format!("{:?}", deserialised), @r###"TaskDeletion { matched_tasks: 1, deleted_tasks: None, original_filters: "hello" }"###);
     }
 }