From d489f5635f8737460e7167964c76b0ff487523b1 Mon Sep 17 00:00:00 2001
From: Tamo <tamo@meilisearch.com>
Date: Mon, 18 Nov 2024 10:46:56 +0100
Subject: [PATCH] add the mapping between the task and batches

---
 crates/index-scheduler/src/insta_snapshot.rs  |  18 +++
 crates/index-scheduler/src/lib.rs             | 145 +++++++++++-------
 .../initial_tasks_enqueued.snap               |   2 +
 .../aborted_indexation.snap                   |   3 +
 .../first_task_processed.snap                 |   3 +
 ...rocessing_second_task_cancel_enqueued.snap |   3 +
 .../after_dump_register.snap                  |   2 +
 .../cancel_registered.snap                    |   2 +
 .../aborted_indexation.snap                   |   2 +
 .../cancel_task_registered.snap               |   2 +
 .../initial_task_processing.snap              |   2 +
 .../registered_the_first_task.snap            |   2 +
 .../cancel_processed.snap                     |   4 +
 .../initial_task_processed.snap               |   3 +
 .../registered_the_first_task.snap            |   2 +
 .../all_tasks_processed.snap                  |   8 +
 .../document_addition/after_register.snap     |   2 +
 .../after_the_batch_creation.snap             |   2 +
 .../once_everything_is_processed.snap         |   3 +
 .../after_processing_the_batch.snap           |   3 +
 .../registered_the_first_task.snap            |   2 +
 .../registered_the_second_task.snap           |   2 +
 .../before_index_creation.snap                |   3 +
 .../both_task_succeeded.snap                  |   4 +
 .../registered_the_first_task.snap            |   2 +
 .../registered_the_second_task.snap           |   2 +
 .../registered_the_third_task.snap            |   2 +
 .../1.snap                                    |   2 +
 .../2.snap                                    |   3 +
 .../after_failing_the_deletion.snap           |   3 +
 .../after_last_successful_addition.snap       |   4 +
 .../registered_the_first_task.snap            |   2 +
 .../registered_the_second_task.snap           |   2 +
 .../document_addition_batch_created.snap      |   2 +
 .../document_addition_failed.snap             |   3 +
 .../registered_the_first_task.snap            |   2 +
 .../after_adding_the_documents.snap           |   4 +
 .../after_adding_the_settings.snap            |   3 +
 .../after_removing_the_documents.snap         |   5 +
 .../registered_the_document_deletions.snap    |   4 +
 ...red_the_setting_and_document_addition.snap |   2 +
 .../after_register.snap                       |   2 +
 .../index_creation_failed.snap                |   3 +
 .../after_batch_succeeded.snap                |   2 +
 .../after_failing_to_commit.snap              |   2 +
 ...eeded_but_index_scheduler_not_updated.snap |   2 +
 .../registered_the_first_task.snap            |   2 +
 .../task_successfully_processed.snap          |   3 +
 .../Intel to kefir succeeds.snap              |   5 +
 .../lib.rs/import_vectors/Intel to kefir.snap |   4 +
 .../import_vectors/adding Intel succeeds.snap |   4 +
 .../import_vectors/after adding Intel.snap    |   3 +
 ...ter_registering_settings_task_vectors.snap |   2 +
 .../settings_update_processed_vectors.snap    |   3 +
 .../after_batch_creation.snap                 |   2 +
 .../registered_the_first_task.snap            |   2 +
 .../registered_the_second_task.snap           |   2 +
 .../registered_the_third_task.snap            |   2 +
 .../index_creation_failed.snap                |   3 +
 .../registered_the_first_task.snap            |   2 +
 .../processed_the_first_task.snap             |   3 +
 .../processed_the_second_task.snap            |   4 +
 .../processed_the_third_task.snap             |   5 +
 .../registered_the_first_task.snap            |   2 +
 .../registered_the_second_task.snap           |   2 +
 .../registered_the_third_task.snap            |   2 +
 .../first.snap                                |   3 +
 .../fourth.snap                               |   6 +
 .../registered_the_first_task.snap            |   2 +
 .../registered_the_fourth_task.snap           |   2 +
 .../registered_the_second_task.snap           |   2 +
 .../registered_the_third_task.snap            |   2 +
 .../second.snap                               |   4 +
 .../third.snap                                |   5 +
 .../processed_all_tasks.snap                  |   5 +
 .../registered_the_first_task.snap            |   2 +
 .../registered_the_second_task.snap           |   2 +
 .../registered_the_third_task.snap            |   2 +
 .../lib.rs/query_tasks_simple/end.snap        |   5 +
 .../lib.rs/query_tasks_simple/start.snap      |   2 +
 .../query_tasks_special_rules/start.snap      |   2 +
 ...everything_is_successfully_registered.snap |   2 +
 .../lib.rs/swap_indexes/create_a.snap         |   3 +
 .../lib.rs/swap_indexes/create_b.snap         |   4 +
 .../lib.rs/swap_indexes/create_c.snap         |   5 +
 .../lib.rs/swap_indexes/create_d.snap         |   6 +
 .../swap_indexes/first_swap_processed.snap    |   7 +
 .../swap_indexes/first_swap_registered.snap   |   6 +
 .../swap_indexes/second_swap_processed.snap   |   8 +
 .../third_empty_swap_processed.snap           |   9 ++
 .../swap_indexes/two_swaps_registered.snap    |   6 +
 .../after_the_index_creation.snap             |   6 +
 .../first_swap_failed.snap                    |   7 +
 .../initial_tasks_processed.snap              |   6 +
 .../initial_tasks_enqueued.snap               |   2 +
 .../initial_tasks_processed.snap              |   3 +
 .../task_deletion_processed.snap              |   4 +
 .../after_registering_the_task_deletion.snap  |   3 +
 .../initial_tasks_enqueued.snap               |   2 +
 .../initial_tasks_processed.snap              |   3 +
 .../task_deletion_processed.snap              |   4 +
 .../initial_tasks_enqueued.snap               |   2 +
 .../task_deletion_done.snap                   |   3 +
 .../task_deletion_enqueued.snap               |   2 +
 .../task_deletion_processing.snap             |   2 +
 .../after_processing_the_10_tasks.snap        |   4 +
 .../after_registering_the_10_tasks.snap       |   3 +
 .../processed_the_first_task.snap             |   3 +
 .../registered_the_first_task.snap            |   2 +
 .../after_registering_the_10_tasks.snap       |   3 +
 .../all_tasks_processed.snap                  |  13 ++
 .../five_tasks_processed.snap                 |   8 +
 .../processed_the_first_task.snap             |   3 +
 .../registered_the_first_task.snap            |   2 +
 .../after_processing_the_10_tasks.snap        |   3 +
 .../after_registering_the_10_tasks.snap       |   2 +
 .../after_registering_the_10_tasks.snap       |   2 +
 .../all_tasks_processed.snap                  |  12 ++
 .../five_tasks_processed.snap                 |   7 +
 .../after_registering_the_10_tasks.snap       |   2 +
 .../all_tasks_processed.snap                  |   4 +
 .../only_first_task_failed.snap               |   3 +
 .../after_registering_the_10_tasks.snap       |   3 +
 .../all_tasks_processed.snap                  |   4 +
 .../processed_the_first_task.snap             |   3 +
 .../registered_the_first_task.snap            |   2 +
 .../after_registering_the_5_tasks.snap        |   2 +
 .../fifth_task_succeeds.snap                  |   6 +
 .../first_and_second_task_fails.snap          |   3 +
 .../fourth_task_fails.snap                    |   5 +
 .../third_task_succeeds.snap                  |   4 +
 .../after_registering_the_3_tasks.snap        |   2 +
 .../only_first_task_succeed.snap              |   3 +
 .../second_task_fails.snap                    |   4 +
 .../third_task_fails.snap                     |   5 +
 .../after_registering_the_3_tasks.snap        |   2 +
 .../only_first_task_succeed.snap              |   3 +
 .../second_and_third_tasks_fails.snap         |   4 +
 .../after_registering_the_6_tasks.snap        |   2 +
 .../all_other_tasks_succeeds.snap             |   6 +
 .../first_task_fails.snap                     |   3 +
 .../second_task_fails.snap                    |   4 +
 .../third_task_succeeds.snap                  |   5 +
 .../after_registering_the_6_tasks.snap        |   2 +
 .../all_other_tasks_succeeds.snap             |   6 +
 .../first_task_succeed.snap                   |   3 +
 .../second_task_fails.snap                    |   4 +
 .../third_task_succeeds.snap                  |   5 +
 .../lib.rs/test_document_replace/1.snap       |   2 +
 .../lib.rs/test_document_replace/2.snap       |   3 +
 .../after_registering_the_10_tasks.snap       |   2 +
 .../all_tasks_processed.snap                  |  12 ++
 .../five_tasks_processed.snap                 |   7 +
 .../lib.rs/test_document_update/1.snap        |   2 +
 .../lib.rs/test_document_update/2.snap        |   3 +
 .../after_registering_the_10_tasks.snap       |   2 +
 .../all_tasks_processed.snap                  |  12 ++
 .../five_tasks_processed.snap                 |   7 +
 .../after_registering_the_10_tasks.snap       |   2 +
 .../all_tasks_processed.snap                  |  12 ++
 .../five_tasks_processed.snap                 |   7 +
 .../after_registering_settings_task.snap      |   2 +
 .../settings_update_processed.snap            |   3 +
 .../registered_a_task.snap                    |   2 +
 crates/index-scheduler/src/utils.rs           |  22 ++-
 crates/meilisearch/src/routes/tasks.rs        |  27 ++--
 crates/meilisearch/tests/tasks/errors.rs      |   8 +-
 167 files changed, 730 insertions(+), 68 deletions(-)

diff --git a/crates/index-scheduler/src/insta_snapshot.rs b/crates/index-scheduler/src/insta_snapshot.rs
index 4cf639889..2ca12e1ee 100644
--- a/crates/index-scheduler/src/insta_snapshot.rs
+++ b/crates/index-scheduler/src/insta_snapshot.rs
@@ -26,6 +26,7 @@ pub fn snapshot_index_scheduler(scheduler: &IndexScheduler) -> String {
         env,
         all_tasks,
         all_batches,
+        batch_to_tasks_mapping,
         // task reverse index
         status,
         kind,
@@ -111,6 +112,10 @@ pub fn snapshot_index_scheduler(scheduler: &IndexScheduler) -> String {
     snap.push_str(&snapshot_all_batches(&rtxn, *all_batches));
     snap.push_str("----------------------------------------------------------------------\n");
 
+    snap.push_str("### Batch to tasks mapping:\n");
+    snap.push_str(&snapshot_batches_to_tasks_mappings(&rtxn, *batch_to_tasks_mapping));
+    snap.push_str("----------------------------------------------------------------------\n");
+
     snap.push_str("### Batches Status:\n");
     snap.push_str(&snapshot_status(&rtxn, *batch_status));
     snap.push_str("----------------------------------------------------------------------\n");
@@ -186,6 +191,19 @@ pub fn snapshot_all_batches(rtxn: &RoTxn, db: Database<BEU32, SerdeJson<Batch>>)
     snap
 }
 
+pub fn snapshot_batches_to_tasks_mappings(
+    rtxn: &RoTxn,
+    db: Database<BEU32, CboRoaringBitmapCodec>,
+) -> String {
+    let mut snap = String::new();
+    let iter = db.iter(rtxn).unwrap();
+    for next in iter {
+        let (batch_id, tasks) = next.unwrap();
+        snap.push_str(&format!("{batch_id} {}\n", snapshot_bitmap(&tasks)));
+    }
+    snap
+}
+
 pub fn snapshot_date_db(rtxn: &RoTxn, db: Database<BEI128, CboRoaringBitmapCodec>) -> String {
     let mut snap = String::new();
     let iter = db.iter(rtxn).unwrap();
diff --git a/crates/index-scheduler/src/lib.rs b/crates/index-scheduler/src/lib.rs
index 78bf1268b..4d242d677 100644
--- a/crates/index-scheduler/src/lib.rs
+++ b/crates/index-scheduler/src/lib.rs
@@ -87,6 +87,10 @@ pub struct Query {
     pub from: Option<u32>,
     /// The order used to return the tasks. By default the newest tasks are returned first and the boolean is `false`.
     pub reverse: Option<bool>,
+    /// The [task ids](`meilisearch_types::tasks::Task::uid`) to be matched
+    pub uids: Option<Vec<TaskId>>,
+    /// The [batch ids](`meilisearch_types::batches::Batch::uid`) to be matched
+    pub batch_uids: Option<Vec<BatchId>>,
     /// The allowed [statuses](`meilisearch_types::tasks::Task::status`) of the matched tasls
     pub statuses: Option<Vec<Status>>,
     /// The allowed [kinds](meilisearch_types::tasks::Kind) of the matched tasks.
@@ -101,8 +105,6 @@ pub struct Query {
     pub types: Option<Vec<Kind>>,
     /// The allowed [index ids](meilisearch_types::tasks::Task::index_uid) of the matched tasks
     pub index_uids: Option<Vec<String>>,
-    /// The [task ids](`meilisearch_types::tasks::Task::uid`) to be matched
-    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>>,
@@ -130,10 +132,11 @@ impl Query {
                 limit: None,
                 from: None,
                 reverse: None,
+                uids: None,
+                batch_uids: None,
                 statuses: None,
                 types: None,
                 index_uids: None,
-                uids: None,
                 canceled_by: None,
                 before_enqueued_at: None,
                 after_enqueued_at: None,
@@ -227,6 +230,7 @@ impl MustStopProcessing {
 mod db_name {
     pub const ALL_TASKS: &str = "all-tasks";
     pub const ALL_BATCHES: &str = "all-batches";
+    pub const BATCH_TO_TASKS_MAPPING: &str = "batch-to-tasks-mapping";
     pub const STATUS: &str = "status";
     pub const KIND: &str = "kind";
     pub const INDEX_TASKS: &str = "index-tasks";
@@ -323,30 +327,14 @@ pub struct IndexScheduler {
     /// The list of files referenced by the tasks
     pub(crate) file_store: FileStore,
 
-    // The main database, it contains all the tasks accessible by their Id.
+    /// The main database, it contains all the tasks accessible by their Id.
     pub(crate) all_tasks: Database<BEU32, SerdeJson<Task>>,
 
-    // Contains all the batches accessible by their Id.
+    /// Contains all the batches accessible by their Id.
     pub(crate) all_batches: Database<BEU32, SerdeJson<Batch>>,
 
-    /// All the batches containing a task matching the selected status.
-    pub(crate) batch_status: Database<SerdeBincode<Status>, RoaringBitmapCodec>,
-    /// All the batches ids grouped by the kind of their task.
-    pub(crate) batch_kind: Database<SerdeBincode<Kind>, RoaringBitmapCodec>,
-    /// Store the batches associated to an index.
-    pub(crate) batch_index_tasks: Database<Str, RoaringBitmapCodec>,
-
-    /// Store the batches containing a task canceled by a task uid
-    pub(crate) batch_canceled_by: Database<BEU32, RoaringBitmapCodec>,
-
-    /// Store the batches containing tasks which were enqueued at a specific date
-    pub(crate) batch_enqueued_at: Database<BEI128, CboRoaringBitmapCodec>,
-
-    /// Store the batches containing finished tasks started at a specific date
-    pub(crate) batch_started_at: Database<BEI128, CboRoaringBitmapCodec>,
-
-    /// Store the batches containing tasks finished at a specific date
-    pub(crate) batch_finished_at: Database<BEI128, CboRoaringBitmapCodec>,
+    /// Matches a batch id with the associated task ids.
+    pub(crate) batch_to_tasks_mapping: Database<BEU32, CboRoaringBitmapCodec>,
 
     /// All the tasks ids grouped by their status.
     // TODO we should not be able to serialize a `Status::Processing` in this database.
@@ -355,19 +343,30 @@ pub struct IndexScheduler {
     pub(crate) kind: Database<SerdeBincode<Kind>, RoaringBitmapCodec>,
     /// 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<BEU32, RoaringBitmapCodec>,
-
     /// Store the task ids of tasks which were enqueued at a specific date
     pub(crate) enqueued_at: Database<BEI128, CboRoaringBitmapCodec>,
-
     /// Store the task ids of finished tasks which started being processed at a specific date
     pub(crate) started_at: Database<BEI128, CboRoaringBitmapCodec>,
-
     /// Store the task ids of tasks which finished at a specific date
     pub(crate) finished_at: Database<BEI128, CboRoaringBitmapCodec>,
 
+    /// All the batches containing a task matching the selected status.
+    pub(crate) batch_status: Database<SerdeBincode<Status>, RoaringBitmapCodec>,
+    /// All the batches ids grouped by the kind of their task.
+    pub(crate) batch_kind: Database<SerdeBincode<Kind>, RoaringBitmapCodec>,
+    /// Store the batches associated to an index.
+    pub(crate) batch_index_tasks: Database<Str, RoaringBitmapCodec>,
+    /// Store the batches containing a task canceled by a task uid
+    pub(crate) batch_canceled_by: Database<BEU32, RoaringBitmapCodec>,
+    /// Store the batches containing tasks which were enqueued at a specific date
+    pub(crate) batch_enqueued_at: Database<BEI128, CboRoaringBitmapCodec>,
+    /// Store the batches containing finished tasks started at a specific date
+    pub(crate) batch_started_at: Database<BEI128, CboRoaringBitmapCodec>,
+    /// Store the batches containing tasks finished at a specific date
+    pub(crate) batch_finished_at: Database<BEI128, CboRoaringBitmapCodec>,
+
     /// In charge of creating, opening, storing and returning indexes.
     pub(crate) index_mapper: IndexMapper,
 
@@ -437,6 +436,7 @@ impl IndexScheduler {
             file_store: self.file_store.clone(),
             all_tasks: self.all_tasks,
             all_batches: self.all_batches,
+            batch_to_tasks_mapping: self.batch_to_tasks_mapping,
 
             // Tasks reverse index
             status: self.status,
@@ -515,7 +515,7 @@ impl IndexScheduler {
 
         let env = unsafe {
             heed::EnvOpenOptions::new()
-                .max_dbs(19)
+                .max_dbs(20)
                 .map_size(budget.task_db_size)
                 .open(options.tasks_path)
         }?;
@@ -527,6 +527,9 @@ impl IndexScheduler {
         let mut wtxn = env.write_txn()?;
         let all_tasks = env.create_database(&mut wtxn, Some(db_name::ALL_TASKS))?;
         let all_batches = env.create_database(&mut wtxn, Some(db_name::ALL_BATCHES))?;
+        let batch_to_tasks_mapping =
+            env.create_database(&mut wtxn, Some(db_name::BATCH_TO_TASKS_MAPPING))?;
+
         let status = env.create_database(&mut wtxn, Some(db_name::STATUS))?;
         let kind = env.create_database(&mut wtxn, Some(db_name::KIND))?;
         let index_tasks = env.create_database(&mut wtxn, Some(db_name::INDEX_TASKS))?;
@@ -551,6 +554,7 @@ impl IndexScheduler {
             file_store,
             all_tasks,
             all_batches,
+            batch_to_tasks_mapping,
             // Task reverse indexes
             status,
             kind,
@@ -785,13 +789,32 @@ 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, ..
+            started_at: started_at_processing,
+            processing: processing_tasks,
+            batch_id: current_batch_processing,
         } = self.processing_tasks.read().unwrap().clone();
+        let Query {
+            limit,
+            from,
+            reverse,
+            uids,
+            batch_uids,
+            statuses,
+            types,
+            index_uids,
+            canceled_by,
+            before_enqueued_at,
+            after_enqueued_at,
+            before_started_at,
+            after_started_at,
+            before_finished_at,
+            after_finished_at,
+        } = query;
 
         let mut tasks = self.all_task_ids(rtxn)?;
 
-        if let Some(from) = &query.from {
-            let range = if query.reverse.unwrap_or_default() {
+        if let Some(from) = from {
+            let range = if reverse.unwrap_or_default() {
                 u32::MIN..*from
             } else {
                 from.saturating_add(1)..u32::MAX
@@ -799,7 +822,19 @@ impl IndexScheduler {
             tasks.remove_range(range);
         }
 
-        if let Some(status) = &query.statuses {
+        if let Some(batch_uids) = batch_uids {
+            let mut batch_tasks = RoaringBitmap::new();
+            for batch_uid in batch_uids {
+                if Some(*batch_uid) == current_batch_processing {
+                    batch_tasks |= &processing_tasks;
+                } else {
+                    batch_tasks |= self.tasks_in_batch(rtxn, *batch_uid)?;
+                }
+            }
+            tasks &= batch_tasks;
+        }
+
+        if let Some(status) = statuses {
             let mut status_tasks = RoaringBitmap::new();
             for status in status {
                 match status {
@@ -816,12 +851,12 @@ impl IndexScheduler {
             tasks &= status_tasks;
         }
 
-        if let Some(uids) = &query.uids {
+        if let Some(uids) = uids {
             let uids = RoaringBitmap::from_iter(uids);
             tasks &= &uids;
         }
 
-        if let Some(canceled_by) = &query.canceled_by {
+        if let Some(canceled_by) = canceled_by {
             let mut all_canceled_tasks = RoaringBitmap::new();
             for cancel_task_uid in canceled_by {
                 if let Some(canceled_by_uid) = self.canceled_by.get(rtxn, cancel_task_uid)? {
@@ -838,7 +873,7 @@ impl IndexScheduler {
             }
         }
 
-        if let Some(kind) = &query.types {
+        if let Some(kind) = types {
             let mut kind_tasks = RoaringBitmap::new();
             for kind in kind {
                 kind_tasks |= self.get_kind(rtxn, *kind)?;
@@ -846,7 +881,7 @@ impl IndexScheduler {
             tasks &= &kind_tasks;
         }
 
-        if let Some(index) = &query.index_uids {
+        if let Some(index) = index_uids {
             let mut index_tasks = RoaringBitmap::new();
             for index in index {
                 index_tasks |= self.index_tasks(rtxn, index)?;
@@ -876,25 +911,26 @@ impl IndexScheduler {
                         filtered_processing_tasks.clear();
                     }
                 };
-            match (query.after_started_at, query.before_started_at) {
+            match (after_started_at, before_started_at) {
                 (None, None) => (),
                 (None, Some(before)) => {
-                    clear_filtered_processing_tasks(Bound::Unbounded, Bound::Excluded(before))
+                    clear_filtered_processing_tasks(Bound::Unbounded, Bound::Excluded(*before))
                 }
                 (Some(after), None) => {
-                    clear_filtered_processing_tasks(Bound::Excluded(after), Bound::Unbounded)
-                }
-                (Some(after), Some(before)) => {
-                    clear_filtered_processing_tasks(Bound::Excluded(after), Bound::Excluded(before))
+                    clear_filtered_processing_tasks(Bound::Excluded(*after), Bound::Unbounded)
                 }
+                (Some(after), Some(before)) => clear_filtered_processing_tasks(
+                    Bound::Excluded(*after),
+                    Bound::Excluded(*before),
+                ),
             };
 
             keep_tasks_within_datetimes(
                 rtxn,
                 &mut filtered_non_processing_tasks,
                 self.started_at,
-                query.after_started_at,
-                query.before_started_at,
+                *after_started_at,
+                *before_started_at,
             )?;
             filtered_non_processing_tasks | filtered_processing_tasks
         };
@@ -903,23 +939,23 @@ impl IndexScheduler {
             rtxn,
             &mut tasks,
             self.enqueued_at,
-            query.after_enqueued_at,
-            query.before_enqueued_at,
+            *after_enqueued_at,
+            *before_enqueued_at,
         )?;
 
         keep_tasks_within_datetimes(
             rtxn,
             &mut tasks,
             self.finished_at,
-            query.after_finished_at,
-            query.before_finished_at,
+            *after_finished_at,
+            *before_finished_at,
         )?;
 
-        if let Some(limit) = query.limit {
+        if let Some(limit) = limit {
             tasks = if query.reverse.unwrap_or_default() {
-                tasks.into_iter().take(limit as usize).collect()
+                tasks.into_iter().take(*limit as usize).collect()
             } else {
-                tasks.into_iter().rev().take(limit as usize).collect()
+                tasks.into_iter().rev().take(*limit as usize).collect()
             };
         }
 
@@ -1295,7 +1331,6 @@ impl IndexScheduler {
         if processing.is_empty() {
             Ok((ret.collect(), total))
         } else {
-            // TODO: We must re-insert the current processing batch somewhere in some way
             Ok((
                 ret.map(|batch| {
                     if processing.contains(batch.uid) {
@@ -1612,7 +1647,7 @@ impl IndexScheduler {
 
         let processed = self.processing_tasks.write().unwrap().stop_processing();
 
-        self.write_batch(&mut wtxn, current_batch)?;
+        self.write_batch(&mut wtxn, current_batch, &processed.processing)?;
 
         #[cfg(test)]
         self.maybe_fail(tests::FailureLocation::CommittingWtxn)?;
@@ -5420,6 +5455,8 @@ mod tests {
         ----------------------------------------------------------------------
         ### All Batches:
         ----------------------------------------------------------------------
+        ### Batch to tasks mapping:
+        ----------------------------------------------------------------------
         ### Batches Status:
         ----------------------------------------------------------------------
         ### Batches Kind:
@@ -5470,6 +5507,8 @@ mod tests {
         ----------------------------------------------------------------------
         ### All Batches:
         ----------------------------------------------------------------------
+        ### Batch to tasks mapping:
+        ----------------------------------------------------------------------
         ### Batches Status:
         ----------------------------------------------------------------------
         ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/cancel_enqueued_task/initial_tasks_enqueued.snap b/crates/index-scheduler/src/snapshots/lib.rs/cancel_enqueued_task/initial_tasks_enqueued.snap
index e98f753ee..d1938e82d 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/cancel_enqueued_task/initial_tasks_enqueued.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/cancel_enqueued_task/initial_tasks_enqueued.snap
@@ -35,6 +35,8 @@ catto [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/aborted_indexation.snap b/crates/index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/aborted_indexation.snap
index 4dc48d1f0..1784652c2 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/aborted_indexation.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/aborted_indexation.snap
@@ -47,6 +47,9 @@ catto: { number_of_documents: 1, field_distribution: {"id": 1} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/first_task_processed.snap b/crates/index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/first_task_processed.snap
index f665ae94e..d3671cb4d 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/first_task_processed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/first_task_processed.snap
@@ -43,6 +43,9 @@ catto: { number_of_documents: 1, field_distribution: {"id": 1} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/processing_second_task_cancel_enqueued.snap b/crates/index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/processing_second_task_cancel_enqueued.snap
index b68dd1feb..92e484c93 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/processing_second_task_cancel_enqueued.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/processing_second_task_cancel_enqueued.snap
@@ -46,6 +46,9 @@ catto: { number_of_documents: 1, field_distribution: {"id": 1} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/cancel_processing_dump/after_dump_register.snap b/crates/index-scheduler/src/snapshots/lib.rs/cancel_processing_dump/after_dump_register.snap
index f785eed48..8c6b6be65 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/cancel_processing_dump/after_dump_register.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/cancel_processing_dump/after_dump_register.snap
@@ -31,6 +31,8 @@ enqueued [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/cancel_processing_dump/cancel_registered.snap b/crates/index-scheduler/src/snapshots/lib.rs/cancel_processing_dump/cancel_registered.snap
index 808a3b662..7406a373b 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/cancel_processing_dump/cancel_registered.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/cancel_processing_dump/cancel_registered.snap
@@ -34,6 +34,8 @@ enqueued [0,1,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/aborted_indexation.snap b/crates/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/aborted_indexation.snap
index 6e3713ceb..38925a23d 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/aborted_indexation.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/aborted_indexation.snap
@@ -36,6 +36,8 @@ catto: { number_of_documents: 0, field_distribution: {} }
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/cancel_task_registered.snap b/crates/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/cancel_task_registered.snap
index 9cd11b76f..3b8a9a623 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/cancel_task_registered.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/cancel_task_registered.snap
@@ -35,6 +35,8 @@ catto [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/initial_task_processing.snap b/crates/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/initial_task_processing.snap
index bd03ada39..5c1c3a765 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/initial_task_processing.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/initial_task_processing.snap
@@ -32,6 +32,8 @@ catto [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/registered_the_first_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/registered_the_first_task.snap
index a96abf42d..6b6af0667 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/registered_the_first_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/registered_the_first_task.snap
@@ -32,6 +32,8 @@ catto [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/cancel_succeeded_task/cancel_processed.snap b/crates/index-scheduler/src/snapshots/lib.rs/cancel_succeeded_task/cancel_processed.snap
index 756edc2f2..6c8ead6b4 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/cancel_succeeded_task/cancel_processed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/cancel_succeeded_task/cancel_processed.snap
@@ -44,6 +44,10 @@ catto: { number_of_documents: 1, field_distribution: {"id": 1} }
 0 {uid: 0, }
 1 {uid: 1, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/cancel_succeeded_task/initial_task_processed.snap b/crates/index-scheduler/src/snapshots/lib.rs/cancel_succeeded_task/initial_task_processed.snap
index d0388328b..ab62eb146 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/cancel_succeeded_task/initial_task_processed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/cancel_succeeded_task/initial_task_processed.snap
@@ -37,6 +37,9 @@ catto: { number_of_documents: 1, field_distribution: {"id": 1} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/cancel_succeeded_task/registered_the_first_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/cancel_succeeded_task/registered_the_first_task.snap
index a96abf42d..6b6af0667 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/cancel_succeeded_task/registered_the_first_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/cancel_succeeded_task/registered_the_first_task.snap
@@ -32,6 +32,8 @@ catto [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/do_not_batch_task_of_different_indexes/all_tasks_processed.snap b/crates/index-scheduler/src/snapshots/lib.rs/do_not_batch_task_of_different_indexes/all_tasks_processed.snap
index 0d0ddd63d..3b4d6db02 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/do_not_batch_task_of_different_indexes/all_tasks_processed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/do_not_batch_task_of_different_indexes/all_tasks_processed.snap
@@ -67,6 +67,14 @@ girafos: { number_of_documents: 0, field_distribution: {} }
 4 {uid: 4, }
 5 {uid: 5, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+3 [3,]
+4 [4,]
+5 [5,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,2,3,4,5,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/document_addition/after_register.snap b/crates/index-scheduler/src/snapshots/lib.rs/document_addition/after_register.snap
index 189e84249..07ab97def 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/document_addition/after_register.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/document_addition/after_register.snap
@@ -32,6 +32,8 @@ doggos [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/document_addition/after_the_batch_creation.snap b/crates/index-scheduler/src/snapshots/lib.rs/document_addition/after_the_batch_creation.snap
index 333505b3c..03484afe0 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/document_addition/after_the_batch_creation.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/document_addition/after_the_batch_creation.snap
@@ -32,6 +32,8 @@ doggos [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/document_addition/once_everything_is_processed.snap b/crates/index-scheduler/src/snapshots/lib.rs/document_addition/once_everything_is_processed.snap
index 6a445dd2f..c194af741 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/document_addition/once_everything_is_processed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/document_addition/once_everything_is_processed.snap
@@ -37,6 +37,9 @@ doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "id": 1} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_document_deletion/after_processing_the_batch.snap b/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_document_deletion/after_processing_the_batch.snap
index 337f68862..668f9d5bf 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_document_deletion/after_processing_the_batch.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_document_deletion/after_processing_the_batch.snap
@@ -40,6 +40,9 @@ doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "id": 1} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,1,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_document_deletion/registered_the_first_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_document_deletion/registered_the_first_task.snap
index 60a3a9ad4..a26cb23aa 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_document_deletion/registered_the_first_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_document_deletion/registered_the_first_task.snap
@@ -32,6 +32,8 @@ doggos [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_document_deletion/registered_the_second_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_document_deletion/registered_the_second_task.snap
index dfb0af950..9765289fb 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_document_deletion/registered_the_second_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_document_deletion/registered_the_second_task.snap
@@ -35,6 +35,8 @@ doggos [0,1,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/before_index_creation.snap b/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/before_index_creation.snap
index d629deb13..f8642736c 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/before_index_creation.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/before_index_creation.snap
@@ -43,6 +43,9 @@ doggos: { number_of_documents: 0, field_distribution: {} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/both_task_succeeded.snap b/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/both_task_succeeded.snap
index ccf2f375e..deafc4c81 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/both_task_succeeded.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/both_task_succeeded.snap
@@ -45,6 +45,10 @@ doggos [0,1,2,]
 0 {uid: 0, }
 1 {uid: 1, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,2,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/registered_the_first_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/registered_the_first_task.snap
index 4d37e461d..198956185 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/registered_the_first_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/registered_the_first_task.snap
@@ -32,6 +32,8 @@ doggos [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/registered_the_second_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/registered_the_second_task.snap
index 5599779ca..4e9b84e52 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/registered_the_second_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/registered_the_second_task.snap
@@ -35,6 +35,8 @@ doggos [0,1,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/registered_the_third_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/registered_the_third_task.snap
index 05594e75a..84e037b05 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/registered_the_third_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/registered_the_third_task.snap
@@ -38,6 +38,8 @@ doggos [0,1,2,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion_on_unexisting_index/1.snap b/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion_on_unexisting_index/1.snap
index d27aa6637..8f2bed791 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion_on_unexisting_index/1.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion_on_unexisting_index/1.snap
@@ -35,6 +35,8 @@ doggos [0,1,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion_on_unexisting_index/2.snap b/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion_on_unexisting_index/2.snap
index bfd425625..ade21179b 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion_on_unexisting_index/2.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion_on_unexisting_index/2.snap
@@ -39,6 +39,9 @@ doggos [0,1,]
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,1,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/after_failing_the_deletion.snap b/crates/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/after_failing_the_deletion.snap
index 49cfb5558..9a7b4686c 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/after_failing_the_deletion.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/after_failing_the_deletion.snap
@@ -39,6 +39,9 @@ doggos [0,1,]
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 failed [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/after_last_successful_addition.snap b/crates/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/after_last_successful_addition.snap
index 24ea830aa..60f71df9e 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/after_last_successful_addition.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/after_last_successful_addition.snap
@@ -44,6 +44,10 @@ doggos: { number_of_documents: 3, field_distribution: {"catto": 1, "doggo": 2, "
 0 {uid: 0, }
 1 {uid: 1, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [1,]
 failed [0,]
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/registered_the_first_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/registered_the_first_task.snap
index 95911d88c..acfdb5e51 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/registered_the_first_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/registered_the_first_task.snap
@@ -32,6 +32,8 @@ doggos [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/registered_the_second_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/registered_the_second_task.snap
index 805b45c09..9748964e3 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/registered_the_second_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/registered_the_second_task.snap
@@ -35,6 +35,8 @@ doggos [0,1,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_addition/document_addition_batch_created.snap b/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_addition/document_addition_batch_created.snap
index 333505b3c..03484afe0 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_addition/document_addition_batch_created.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_addition/document_addition_batch_created.snap
@@ -32,6 +32,8 @@ doggos [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_addition/document_addition_failed.snap b/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_addition/document_addition_failed.snap
index 6a46f7021..19881a91c 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_addition/document_addition_failed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_addition/document_addition_failed.snap
@@ -36,6 +36,9 @@ doggos [0,]
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 failed [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_addition/registered_the_first_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_addition/registered_the_first_task.snap
index 189e84249..07ab97def 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_addition/registered_the_first_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_addition/registered_the_first_task.snap
@@ -32,6 +32,8 @@ doggos [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/after_adding_the_documents.snap b/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/after_adding_the_documents.snap
index 57fb1ff22..74e001fba 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/after_adding_the_documents.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/after_adding_the_documents.snap
@@ -43,6 +43,10 @@ doggos: { number_of_documents: 3, field_distribution: {"catto": 1, "doggo": 2, "
 0 {uid: 0, }
 1 {uid: 1, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/after_adding_the_settings.snap b/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/after_adding_the_settings.snap
index c418f7108..19d7a0c0a 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/after_adding_the_settings.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/after_adding_the_settings.snap
@@ -40,6 +40,9 @@ doggos: { number_of_documents: 0, field_distribution: {} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/after_removing_the_documents.snap b/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/after_removing_the_documents.snap
index 8a92b08c2..a6a036eee 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/after_removing_the_documents.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/after_removing_the_documents.snap
@@ -56,6 +56,11 @@ doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "id": 1} }
 1 {uid: 1, }
 2 {uid: 2, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,3,4,5,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,2,]
 failed [2,]
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/registered_the_document_deletions.snap b/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/registered_the_document_deletions.snap
index 80d76435e..093e693d1 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/registered_the_document_deletions.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/registered_the_document_deletions.snap
@@ -52,6 +52,10 @@ doggos: { number_of_documents: 3, field_distribution: {"catto": 1, "doggo": 2, "
 0 {uid: 0, }
 1 {uid: 1, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/registered_the_setting_and_document_addition.snap b/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/registered_the_setting_and_document_addition.snap
index 056350b03..f6ff0721e 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/registered_the_setting_and_document_addition.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/registered_the_setting_and_document_addition.snap
@@ -35,6 +35,8 @@ doggos [0,1,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_index_creation/after_register.snap b/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_index_creation/after_register.snap
index 04abc4309..03d239939 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_index_creation/after_register.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_index_creation/after_register.snap
@@ -32,6 +32,8 @@ catto [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_index_creation/index_creation_failed.snap b/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_index_creation/index_creation_failed.snap
index 1c4ccd6fe..154b1f35b 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_index_creation/index_creation_failed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_index_creation/index_creation_failed.snap
@@ -36,6 +36,9 @@ catto [0,]
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 failed [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/after_batch_succeeded.snap b/crates/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/after_batch_succeeded.snap
index 918ce228b..177307427 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/after_batch_succeeded.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/after_batch_succeeded.snap
@@ -33,6 +33,8 @@ doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "id": 1} }
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/after_failing_to_commit.snap b/crates/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/after_failing_to_commit.snap
index 918ce228b..177307427 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/after_failing_to_commit.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/after_failing_to_commit.snap
@@ -33,6 +33,8 @@ doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "id": 1} }
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/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 b/crates/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
index 189e84249..07ab97def 100644
--- a/crates/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
+++ b/crates/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
@@ -32,6 +32,8 @@ doggos [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/registered_the_first_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/registered_the_first_task.snap
index 189e84249..07ab97def 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/registered_the_first_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/registered_the_first_task.snap
@@ -32,6 +32,8 @@ doggos [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/task_successfully_processed.snap b/crates/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/task_successfully_processed.snap
index 6a445dd2f..c194af741 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/task_successfully_processed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/task_successfully_processed.snap
@@ -37,6 +37,9 @@ doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "id": 1} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/import_vectors/Intel to kefir succeeds.snap b/crates/index-scheduler/src/snapshots/lib.rs/import_vectors/Intel to kefir succeeds.snap
index f958f60ed..e2cdc8d46 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/import_vectors/Intel to kefir succeeds.snap	
+++ b/crates/index-scheduler/src/snapshots/lib.rs/import_vectors/Intel to kefir succeeds.snap	
@@ -48,6 +48,11 @@ doggos: { number_of_documents: 1, field_distribution: {"_vectors": 1, "breed": 1
 1 {uid: 1, }
 2 {uid: 2, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,2,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/import_vectors/Intel to kefir.snap b/crates/index-scheduler/src/snapshots/lib.rs/import_vectors/Intel to kefir.snap
index 340eed008..859e3b95d 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/import_vectors/Intel to kefir.snap	
+++ b/crates/index-scheduler/src/snapshots/lib.rs/import_vectors/Intel to kefir.snap	
@@ -45,6 +45,10 @@ doggos: { number_of_documents: 1, field_distribution: {"_vectors": 1, "breed": 1
 0 {uid: 0, }
 1 {uid: 1, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/import_vectors/adding Intel succeeds.snap b/crates/index-scheduler/src/snapshots/lib.rs/import_vectors/adding Intel succeeds.snap
index e7c904490..44b25b149 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/import_vectors/adding Intel succeeds.snap	
+++ b/crates/index-scheduler/src/snapshots/lib.rs/import_vectors/adding Intel succeeds.snap	
@@ -43,6 +43,10 @@ doggos: { number_of_documents: 1, field_distribution: {"_vectors": 1, "breed": 1
 0 {uid: 0, }
 1 {uid: 1, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/import_vectors/after adding Intel.snap b/crates/index-scheduler/src/snapshots/lib.rs/import_vectors/after adding Intel.snap
index 76e87dca5..4eefe83c2 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/import_vectors/after adding Intel.snap	
+++ b/crates/index-scheduler/src/snapshots/lib.rs/import_vectors/after adding Intel.snap	
@@ -40,6 +40,9 @@ doggos: { number_of_documents: 0, field_distribution: {} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/import_vectors/after_registering_settings_task_vectors.snap b/crates/index-scheduler/src/snapshots/lib.rs/import_vectors/after_registering_settings_task_vectors.snap
index 99f4d2aac..96d060a92 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/import_vectors/after_registering_settings_task_vectors.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/import_vectors/after_registering_settings_task_vectors.snap
@@ -32,6 +32,8 @@ doggos [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/import_vectors/settings_update_processed_vectors.snap b/crates/index-scheduler/src/snapshots/lib.rs/import_vectors/settings_update_processed_vectors.snap
index 15f21e689..044791d61 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/import_vectors/settings_update_processed_vectors.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/import_vectors/settings_update_processed_vectors.snap
@@ -37,6 +37,9 @@ doggos: { number_of_documents: 0, field_distribution: {} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/after_batch_creation.snap b/crates/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/after_batch_creation.snap
index 8d1a6088a..eabfaed29 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/after_batch_creation.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/after_batch_creation.snap
@@ -32,6 +32,8 @@ index_a [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/registered_the_first_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/registered_the_first_task.snap
index 02c70b5b9..05bad8454 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/registered_the_first_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/registered_the_first_task.snap
@@ -32,6 +32,8 @@ index_a [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/registered_the_second_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/registered_the_second_task.snap
index 073661a22..bf009e414 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/registered_the_second_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/registered_the_second_task.snap
@@ -35,6 +35,8 @@ index_b [1,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/registered_the_third_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/registered_the_third_task.snap
index f2b1304b7..9c86652db 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/registered_the_third_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/registered_the_third_task.snap
@@ -38,6 +38,8 @@ index_b [1,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/panic_in_process_batch_for_index_creation/index_creation_failed.snap b/crates/index-scheduler/src/snapshots/lib.rs/panic_in_process_batch_for_index_creation/index_creation_failed.snap
index 590c2195a..17ed67aaf 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/panic_in_process_batch_for_index_creation/index_creation_failed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/panic_in_process_batch_for_index_creation/index_creation_failed.snap
@@ -36,6 +36,9 @@ catto [0,]
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 failed [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/panic_in_process_batch_for_index_creation/registered_the_first_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/panic_in_process_batch_for_index_creation/registered_the_first_task.snap
index 04abc4309..03d239939 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/panic_in_process_batch_for_index_creation/registered_the_first_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/panic_in_process_batch_for_index_creation/registered_the_first_task.snap
@@ -32,6 +32,8 @@ catto [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/processed_the_first_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/processed_the_first_task.snap
index e45973d8a..31fb88530 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/processed_the_first_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/processed_the_first_task.snap
@@ -43,6 +43,9 @@ doggos: { number_of_documents: 0, field_distribution: {} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/processed_the_second_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/processed_the_second_task.snap
index dcf93ae65..7bafb0848 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/processed_the_second_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/processed_the_second_task.snap
@@ -47,6 +47,10 @@ doggos: { number_of_documents: 0, field_distribution: {} }
 0 {uid: 0, }
 1 {uid: 1, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/processed_the_third_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/processed_the_third_task.snap
index addd5fa0b..b2967a78e 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/processed_the_third_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/processed_the_third_task.snap
@@ -49,6 +49,11 @@ cattos: { number_of_documents: 0, field_distribution: {} }
 1 {uid: 1, }
 2 {uid: 2, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,2,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/registered_the_first_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/registered_the_first_task.snap
index 4d37e461d..198956185 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/registered_the_first_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/registered_the_first_task.snap
@@ -32,6 +32,8 @@ doggos [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/registered_the_second_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/registered_the_second_task.snap
index a61a566ac..5460e7476 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/registered_the_second_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/registered_the_second_task.snap
@@ -35,6 +35,8 @@ doggos [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/registered_the_third_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/registered_the_third_task.snap
index 4baac782e..610282102 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/registered_the_third_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/registered_the_third_task.snap
@@ -38,6 +38,8 @@ doggos [0,2,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/first.snap b/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/first.snap
index b1f5bdf62..915a39cb0 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/first.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/first.snap
@@ -44,6 +44,9 @@ doggos: { number_of_documents: 0, field_distribution: {} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/fourth.snap b/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/fourth.snap
index 93bcdbc96..dfe92d4b3 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/fourth.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/fourth.snap
@@ -53,6 +53,12 @@ doggos: { number_of_documents: 0, field_distribution: {} }
 2 {uid: 2, }
 3 {uid: 3, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+3 [3,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,2,3,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_first_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_first_task.snap
index 40866fe27..d92fa144c 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_first_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_first_task.snap
@@ -32,6 +32,8 @@ doggos [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_fourth_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_fourth_task.snap
index d16440245..c75e0c550 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_fourth_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_fourth_task.snap
@@ -39,6 +39,8 @@ doggos [0,1,2,3,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_second_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_second_task.snap
index 5fe720fca..87f7406dd 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_second_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_second_task.snap
@@ -35,6 +35,8 @@ doggos [0,1,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_third_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_third_task.snap
index fbeeb76c3..86cb34f85 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_third_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_third_task.snap
@@ -37,6 +37,8 @@ doggos [0,1,2,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/second.snap b/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/second.snap
index b0e395856..597e6704d 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/second.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/second.snap
@@ -47,6 +47,10 @@ doggos: { number_of_documents: 0, field_distribution: {} }
 0 {uid: 0, }
 1 {uid: 1, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/third.snap b/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/third.snap
index 4c6e0dbc8..85cf963be 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/third.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/third.snap
@@ -50,6 +50,11 @@ doggos: { number_of_documents: 0, field_distribution: {} }
 1 {uid: 1, }
 2 {uid: 2, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,2,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/processed_all_tasks.snap b/crates/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/processed_all_tasks.snap
index 502324155..d22441b0b 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/processed_all_tasks.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/processed_all_tasks.snap
@@ -51,6 +51,11 @@ whalo: { number_of_documents: 0, field_distribution: {} }
 1 {uid: 1, }
 2 {uid: 2, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,2,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/registered_the_first_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/registered_the_first_task.snap
index 7e04681ae..c6bf88bb0 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/registered_the_first_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/registered_the_first_task.snap
@@ -32,6 +32,8 @@ doggo [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/registered_the_second_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/registered_the_second_task.snap
index 446635e88..cae2c4806 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/registered_the_second_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/registered_the_second_task.snap
@@ -35,6 +35,8 @@ whalo [1,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/registered_the_third_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/registered_the_third_task.snap
index 17d6e3c06..2346e5e68 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/registered_the_third_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/registered_the_third_task.snap
@@ -38,6 +38,8 @@ whalo [1,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/query_tasks_simple/end.snap b/crates/index-scheduler/src/snapshots/lib.rs/query_tasks_simple/end.snap
index 1e27e37de..b87a06b2b 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/query_tasks_simple/end.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/query_tasks_simple/end.snap
@@ -51,6 +51,11 @@ doggo: { number_of_documents: 0, field_distribution: {} }
 1 {uid: 1, }
 2 {uid: 2, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,]
 failed [2,]
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/query_tasks_simple/start.snap b/crates/index-scheduler/src/snapshots/lib.rs/query_tasks_simple/start.snap
index d08e1e91c..7428155e9 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/query_tasks_simple/start.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/query_tasks_simple/start.snap
@@ -38,6 +38,8 @@ whalo [2,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/query_tasks_special_rules/start.snap b/crates/index-scheduler/src/snapshots/lib.rs/query_tasks_special_rules/start.snap
index 65002e258..f5a544f18 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/query_tasks_special_rules/start.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/query_tasks_special_rules/start.snap
@@ -41,6 +41,8 @@ whalo [3,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/register/everything_is_successfully_registered.snap b/crates/index-scheduler/src/snapshots/lib.rs/register/everything_is_successfully_registered.snap
index 6e7351489..62a7ae13a 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/register/everything_is_successfully_registered.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/register/everything_is_successfully_registered.snap
@@ -40,6 +40,8 @@ doggo [3,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_a.snap b/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_a.snap
index e829d7511..91c15c3ee 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_a.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_a.snap
@@ -46,6 +46,9 @@ a: { number_of_documents: 0, field_distribution: {} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_b.snap b/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_b.snap
index 57ed0b162..63e254e35 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_b.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_b.snap
@@ -50,6 +50,10 @@ b: { number_of_documents: 0, field_distribution: {} }
 0 {uid: 0, }
 1 {uid: 1, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_c.snap b/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_c.snap
index 5bb7a5e4a..529fa818e 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_c.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_c.snap
@@ -54,6 +54,11 @@ c: { number_of_documents: 0, field_distribution: {} }
 1 {uid: 1, }
 2 {uid: 2, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,2,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_d.snap b/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_d.snap
index 93a600529..9f47fbebd 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_d.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_d.snap
@@ -58,6 +58,12 @@ d: { number_of_documents: 0, field_distribution: {} }
 2 {uid: 2, }
 3 {uid: 3, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+3 [3,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,2,3,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/first_swap_processed.snap b/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/first_swap_processed.snap
index a0713f706..74bf714b1 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/first_swap_processed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/first_swap_processed.snap
@@ -66,6 +66,13 @@ d: { number_of_documents: 0, field_distribution: {} }
 3 {uid: 3, }
 4 {uid: 4, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+3 [3,]
+4 [4,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,2,3,4,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/first_swap_registered.snap b/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/first_swap_registered.snap
index 31d8e17ce..23cb14ac1 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/first_swap_registered.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/first_swap_registered.snap
@@ -61,6 +61,12 @@ d: { number_of_documents: 0, field_distribution: {} }
 2 {uid: 2, }
 3 {uid: 3, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+3 [3,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,2,3,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/second_swap_processed.snap b/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/second_swap_processed.snap
index 0faa77720..a279d967f 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/second_swap_processed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/second_swap_processed.snap
@@ -69,6 +69,14 @@ d: { number_of_documents: 0, field_distribution: {} }
 4 {uid: 4, }
 5 {uid: 5, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+3 [3,]
+4 [4,]
+5 [5,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,2,3,4,5,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/third_empty_swap_processed.snap b/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/third_empty_swap_processed.snap
index d9797e688..e3be49476 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/third_empty_swap_processed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/third_empty_swap_processed.snap
@@ -74,6 +74,15 @@ d: { number_of_documents: 0, field_distribution: {} }
 5 {uid: 5, }
 6 {uid: 6, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+3 [3,]
+4 [4,]
+5 [5,]
+6 [6,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,2,3,4,5,6,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/two_swaps_registered.snap b/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/two_swaps_registered.snap
index f86b42f84..2014150bb 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/two_swaps_registered.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes/two_swaps_registered.snap
@@ -63,6 +63,12 @@ d: { number_of_documents: 0, field_distribution: {} }
 2 {uid: 2, }
 3 {uid: 3, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+3 [3,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,2,3,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes_errors/after_the_index_creation.snap b/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes_errors/after_the_index_creation.snap
index 93a600529..9f47fbebd 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes_errors/after_the_index_creation.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes_errors/after_the_index_creation.snap
@@ -58,6 +58,12 @@ d: { number_of_documents: 0, field_distribution: {} }
 2 {uid: 2, }
 3 {uid: 3, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+3 [3,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,2,3,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes_errors/first_swap_failed.snap b/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes_errors/first_swap_failed.snap
index a5f9c698a..df676be58 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes_errors/first_swap_failed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes_errors/first_swap_failed.snap
@@ -67,6 +67,13 @@ d: { number_of_documents: 0, field_distribution: {} }
 3 {uid: 3, }
 4 {uid: 4, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+3 [3,]
+4 [4,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,2,3,]
 failed [4,]
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes_errors/initial_tasks_processed.snap b/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes_errors/initial_tasks_processed.snap
index 93a600529..9f47fbebd 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes_errors/initial_tasks_processed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/swap_indexes_errors/initial_tasks_processed.snap
@@ -58,6 +58,12 @@ d: { number_of_documents: 0, field_distribution: {} }
 2 {uid: 2, }
 3 {uid: 3, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+3 [3,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,2,3,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_delete_same_task_twice/initial_tasks_enqueued.snap b/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_delete_same_task_twice/initial_tasks_enqueued.snap
index 11676902e..88e7db81c 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_delete_same_task_twice/initial_tasks_enqueued.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_delete_same_task_twice/initial_tasks_enqueued.snap
@@ -35,6 +35,8 @@ doggo [1,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_delete_same_task_twice/initial_tasks_processed.snap b/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_delete_same_task_twice/initial_tasks_processed.snap
index 76397487f..50d9a972a 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_delete_same_task_twice/initial_tasks_processed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_delete_same_task_twice/initial_tasks_processed.snap
@@ -40,6 +40,9 @@ catto: { number_of_documents: 1, field_distribution: {"id": 1} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_delete_same_task_twice/task_deletion_processed.snap b/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_delete_same_task_twice/task_deletion_processed.snap
index 7bd8fe151..72dc1bfae 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_delete_same_task_twice/task_deletion_processed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_delete_same_task_twice/task_deletion_processed.snap
@@ -43,6 +43,10 @@ catto: { number_of_documents: 1, field_distribution: {"id": 1} }
 0 {uid: 0, }
 1 {uid: 1, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [2,3,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/after_registering_the_task_deletion.snap b/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/after_registering_the_task_deletion.snap
index 804508a4b..42d528498 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/after_registering_the_task_deletion.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/after_registering_the_task_deletion.snap
@@ -43,6 +43,9 @@ catto: { number_of_documents: 1, field_distribution: {"id": 1} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/initial_tasks_enqueued.snap b/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/initial_tasks_enqueued.snap
index 11676902e..88e7db81c 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/initial_tasks_enqueued.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/initial_tasks_enqueued.snap
@@ -35,6 +35,8 @@ doggo [1,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/initial_tasks_processed.snap b/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/initial_tasks_processed.snap
index 76397487f..50d9a972a 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/initial_tasks_processed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/initial_tasks_processed.snap
@@ -40,6 +40,9 @@ catto: { number_of_documents: 1, field_distribution: {"id": 1} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/task_deletion_processed.snap b/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/task_deletion_processed.snap
index 6ed2345c0..71e834518 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/task_deletion_processed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/task_deletion_processed.snap
@@ -41,6 +41,10 @@ catto: { number_of_documents: 1, field_distribution: {"id": 1} }
 0 {uid: 0, }
 1 {uid: 1, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [2,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/initial_tasks_enqueued.snap b/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/initial_tasks_enqueued.snap
index 678a16a18..4be93852c 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/initial_tasks_enqueued.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/initial_tasks_enqueued.snap
@@ -38,6 +38,8 @@ doggo [2,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/task_deletion_done.snap b/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/task_deletion_done.snap
index a56083a2c..834dd2e74 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/task_deletion_done.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/task_deletion_done.snap
@@ -45,6 +45,9 @@ doggo [2,]
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [3,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/task_deletion_enqueued.snap b/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/task_deletion_enqueued.snap
index a4b8c1684..f5d93baa3 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/task_deletion_enqueued.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/task_deletion_enqueued.snap
@@ -41,6 +41,8 @@ doggo [2,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/task_deletion_processing.snap b/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/task_deletion_processing.snap
index 40dae1197..d9e7733d4 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/task_deletion_processing.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/task_deletion_processing.snap
@@ -41,6 +41,8 @@ doggo [2,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/after_processing_the_10_tasks.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/after_processing_the_10_tasks.snap
index dfba0ed23..10149200c 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/after_processing_the_10_tasks.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/after_processing_the_10_tasks.snap
@@ -61,6 +61,10 @@ doggos: { number_of_documents: 10, field_distribution: {"doggo": 10, "id": 10} }
 0 {uid: 0, }
 1 {uid: 1, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,2,3,4,5,6,7,8,9,10,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/after_registering_the_10_tasks.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/after_registering_the_10_tasks.snap
index ae2297eeb..fdbef5f31 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/after_registering_the_10_tasks.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/after_registering_the_10_tasks.snap
@@ -58,6 +58,9 @@ doggos: { number_of_documents: 0, field_distribution: {} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/processed_the_first_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/processed_the_first_task.snap
index bdb6e01ff..0260edea5 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/processed_the_first_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/processed_the_first_task.snap
@@ -37,6 +37,9 @@ doggos: { number_of_documents: 0, field_distribution: {} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/registered_the_first_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/registered_the_first_task.snap
index 4d37e461d..198956185 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/registered_the_first_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/registered_the_first_task.snap
@@ -32,6 +32,8 @@ doggos [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/after_registering_the_10_tasks.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/after_registering_the_10_tasks.snap
index 61505d069..6e4179250 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/after_registering_the_10_tasks.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/after_registering_the_10_tasks.snap
@@ -58,6 +58,9 @@ doggos: { number_of_documents: 0, field_distribution: {} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/all_tasks_processed.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/all_tasks_processed.snap
index 5739c8105..c66a50d47 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/all_tasks_processed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/all_tasks_processed.snap
@@ -88,6 +88,19 @@ doggos: { number_of_documents: 10, field_distribution: {"doggo": 10, "id": 10} }
 9 {uid: 9, }
 10 {uid: 10, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+3 [3,]
+4 [4,]
+5 [5,]
+6 [6,]
+7 [7,]
+8 [8,]
+9 [9,]
+10 [10,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,2,3,4,5,6,7,8,9,10,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/five_tasks_processed.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/five_tasks_processed.snap
index b806721fd..8440c7113 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/five_tasks_processed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/five_tasks_processed.snap
@@ -73,6 +73,14 @@ doggos: { number_of_documents: 5, field_distribution: {"doggo": 5, "id": 5} }
 4 {uid: 4, }
 5 {uid: 5, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+3 [3,]
+4 [4,]
+5 [5,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,2,3,4,5,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/processed_the_first_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/processed_the_first_task.snap
index e7740fcf1..45eb1b027 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/processed_the_first_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/processed_the_first_task.snap
@@ -37,6 +37,9 @@ doggos: { number_of_documents: 0, field_distribution: {} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/registered_the_first_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/registered_the_first_task.snap
index 40866fe27..d92fa144c 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/registered_the_first_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/registered_the_first_task.snap
@@ -32,6 +32,8 @@ doggos [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index/after_processing_the_10_tasks.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index/after_processing_the_10_tasks.snap
index 579b2246d..9600955a0 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index/after_processing_the_10_tasks.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index/after_processing_the_10_tasks.snap
@@ -54,6 +54,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,1,2,3,4,5,6,7,8,9,]
+----------------------------------------------------------------------
 ### Batches Status:
 failed [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index/after_registering_the_10_tasks.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index/after_registering_the_10_tasks.snap
index 29d40f34d..06cc66a60 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index/after_registering_the_10_tasks.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index/after_registering_the_10_tasks.snap
@@ -50,6 +50,8 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index_without_autobatching/after_registering_the_10_tasks.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index_without_autobatching/after_registering_the_10_tasks.snap
index 11c6d42de..74111aac3 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index_without_autobatching/after_registering_the_10_tasks.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index_without_autobatching/after_registering_the_10_tasks.snap
@@ -50,6 +50,8 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index_without_autobatching/all_tasks_processed.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index_without_autobatching/all_tasks_processed.snap
index 2dfa22ba1..2fe601741 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index_without_autobatching/all_tasks_processed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index_without_autobatching/all_tasks_processed.snap
@@ -81,6 +81,18 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 8 {uid: 8, }
 9 {uid: 9, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+3 [3,]
+4 [4,]
+5 [5,]
+6 [6,]
+7 [7,]
+8 [8,]
+9 [9,]
+----------------------------------------------------------------------
 ### Batches Status:
 failed [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index_without_autobatching/five_tasks_processed.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index_without_autobatching/five_tasks_processed.snap
index 5c4954e33..bc6fecb2a 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index_without_autobatching/five_tasks_processed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index_without_autobatching/five_tasks_processed.snap
@@ -66,6 +66,13 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 3 {uid: 3, }
 4 {uid: 4, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+3 [3,]
+4 [4,]
+----------------------------------------------------------------------
 ### Batches Status:
 failed [0,1,2,3,4,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_right_without_index_starts_with_cant_create/after_registering_the_10_tasks.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_right_without_index_starts_with_cant_create/after_registering_the_10_tasks.snap
index 686a1d431..8ee0a9b12 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_right_without_index_starts_with_cant_create/after_registering_the_10_tasks.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_right_without_index_starts_with_cant_create/after_registering_the_10_tasks.snap
@@ -50,6 +50,8 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_right_without_index_starts_with_cant_create/all_tasks_processed.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_right_without_index_starts_with_cant_create/all_tasks_processed.snap
index 4336145b7..0e225ea8d 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_right_without_index_starts_with_cant_create/all_tasks_processed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_right_without_index_starts_with_cant_create/all_tasks_processed.snap
@@ -59,6 +59,10 @@ doggos: { number_of_documents: 9, field_distribution: {"doggo": 9, "id": 9} }
 0 {uid: 0, }
 1 {uid: 1, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,2,3,4,5,6,7,8,9,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [1,]
 failed [0,]
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_right_without_index_starts_with_cant_create/only_first_task_failed.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_right_without_index_starts_with_cant_create/only_first_task_failed.snap
index a5154407d..ac3c29fcb 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_right_without_index_starts_with_cant_create/only_first_task_failed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_right_without_index_starts_with_cant_create/only_first_task_failed.snap
@@ -54,6 +54,9 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 failed [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/after_registering_the_10_tasks.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/after_registering_the_10_tasks.snap
index 7e96a40c7..1a0f4a54d 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/after_registering_the_10_tasks.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/after_registering_the_10_tasks.snap
@@ -58,6 +58,9 @@ doggos: { number_of_documents: 0, field_distribution: {} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/all_tasks_processed.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/all_tasks_processed.snap
index 38c797bf6..feec34884 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/all_tasks_processed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/all_tasks_processed.snap
@@ -61,6 +61,10 @@ doggos: { number_of_documents: 10, field_distribution: {"doggo": 10, "id": 10} }
 0 {uid: 0, }
 1 {uid: 1, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,2,3,4,5,6,7,8,9,10,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/processed_the_first_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/processed_the_first_task.snap
index bdb6e01ff..0260edea5 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/processed_the_first_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/processed_the_first_task.snap
@@ -37,6 +37,9 @@ doggos: { number_of_documents: 0, field_distribution: {} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/registered_the_first_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/registered_the_first_task.snap
index 4d37e461d..198956185 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/registered_the_first_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/registered_the_first_task.snap
@@ -32,6 +32,8 @@ doggos [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/after_registering_the_5_tasks.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/after_registering_the_5_tasks.snap
index 37a09f901..f0f74b328 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/after_registering_the_5_tasks.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/after_registering_the_5_tasks.snap
@@ -40,6 +40,8 @@ doggos [0,1,2,3,4,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/fifth_task_succeeds.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/fifth_task_succeeds.snap
index d786f8b22..953297977 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/fifth_task_succeeds.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/fifth_task_succeeds.snap
@@ -55,6 +55,12 @@ doggos: { number_of_documents: 2, field_distribution: {"doggo": 2, "id": 2} }
 2 {uid: 2, }
 3 {uid: 3, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,1,]
+1 [2,]
+2 [3,]
+3 [4,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [1,3,]
 failed [0,2,]
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/first_and_second_task_fails.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/first_and_second_task_fails.snap
index 1e2b68bc3..502fefbfd 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/first_and_second_task_fails.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/first_and_second_task_fails.snap
@@ -45,6 +45,9 @@ doggos: { number_of_documents: 0, field_distribution: {} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,1,]
+----------------------------------------------------------------------
 ### Batches Status:
 failed [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/fourth_task_fails.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/fourth_task_fails.snap
index 3227bdf8f..95c76085b 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/fourth_task_fails.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/fourth_task_fails.snap
@@ -52,6 +52,11 @@ doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "id": 1} }
 1 {uid: 1, }
 2 {uid: 2, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,1,]
+1 [2,]
+2 [3,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [1,]
 failed [0,2,]
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/third_task_succeeds.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/third_task_succeeds.snap
index d0fc43f43..e29c5e90c 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/third_task_succeeds.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/third_task_succeeds.snap
@@ -49,6 +49,10 @@ doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "id": 1} }
 0 {uid: 0, }
 1 {uid: 1, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,1,]
+1 [2,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [1,]
 failed [0,]
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/after_registering_the_3_tasks.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/after_registering_the_3_tasks.snap
index 83309739d..3ea317c43 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/after_registering_the_3_tasks.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/after_registering_the_3_tasks.snap
@@ -36,6 +36,8 @@ doggos [0,1,2,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/only_first_task_succeed.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/only_first_task_succeed.snap
index 3029a930b..651b3cf5b 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/only_first_task_succeed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/only_first_task_succeed.snap
@@ -41,6 +41,9 @@ doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "id": 1} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/second_task_fails.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/second_task_fails.snap
index ef1ec1880..6fca659b1 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/second_task_fails.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/second_task_fails.snap
@@ -45,6 +45,10 @@ doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "id": 1} }
 0 {uid: 0, }
 1 {uid: 1, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 failed [1,]
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/third_task_fails.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/third_task_fails.snap
index d7b5c6f02..18baf7207 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/third_task_fails.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/third_task_fails.snap
@@ -48,6 +48,11 @@ doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "id": 1} }
 1 {uid: 1, }
 2 {uid: 2, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 failed [1,2,]
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key_batch_wrong_key/after_registering_the_3_tasks.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key_batch_wrong_key/after_registering_the_3_tasks.snap
index cac51c8c0..9df0f214d 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key_batch_wrong_key/after_registering_the_3_tasks.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key_batch_wrong_key/after_registering_the_3_tasks.snap
@@ -36,6 +36,8 @@ doggos [0,1,2,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key_batch_wrong_key/only_first_task_succeed.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key_batch_wrong_key/only_first_task_succeed.snap
index c90477046..cfe528340 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key_batch_wrong_key/only_first_task_succeed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key_batch_wrong_key/only_first_task_succeed.snap
@@ -41,6 +41,9 @@ doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "id": 1} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key_batch_wrong_key/second_and_third_tasks_fails.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key_batch_wrong_key/second_and_third_tasks_fails.snap
index 3b16d875b..7ed185b9b 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key_batch_wrong_key/second_and_third_tasks_fails.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key_batch_wrong_key/second_and_third_tasks_fails.snap
@@ -45,6 +45,10 @@ doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "id": 1} }
 0 {uid: 0, }
 1 {uid: 1, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 failed [1,]
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/after_registering_the_6_tasks.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/after_registering_the_6_tasks.snap
index a738c59cb..1e6cff26c 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/after_registering_the_6_tasks.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/after_registering_the_6_tasks.snap
@@ -42,6 +42,8 @@ doggos [0,1,2,3,4,5,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/all_other_tasks_succeeds.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/all_other_tasks_succeeds.snap
index dbe7f75a5..577938932 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/all_other_tasks_succeeds.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/all_other_tasks_succeeds.snap
@@ -57,6 +57,12 @@ doggos: { number_of_documents: 4, field_distribution: {"doggo": 4, "paw": 4} }
 2 {uid: 2, }
 3 {uid: 3, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+3 [3,4,5,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [2,3,]
 failed [0,1,]
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/first_task_fails.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/first_task_fails.snap
index 7ee25125b..e807035a9 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/first_task_fails.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/first_task_fails.snap
@@ -47,6 +47,9 @@ doggos: { number_of_documents: 0, field_distribution: {} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 failed [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/second_task_fails.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/second_task_fails.snap
index 2cbfaa5cf..9e718473f 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/second_task_fails.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/second_task_fails.snap
@@ -50,6 +50,10 @@ doggos: { number_of_documents: 0, field_distribution: {} }
 0 {uid: 0, }
 1 {uid: 1, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+----------------------------------------------------------------------
 ### Batches Status:
 failed [0,1,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/third_task_succeeds.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/third_task_succeeds.snap
index 7a6dc3ead..ec4449e29 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/third_task_succeeds.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/third_task_succeeds.snap
@@ -54,6 +54,11 @@ doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "paw": 1} }
 1 {uid: 1, }
 2 {uid: 2, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [2,]
 failed [0,1,]
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/after_registering_the_6_tasks.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/after_registering_the_6_tasks.snap
index df0b40cab..de01fce5a 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/after_registering_the_6_tasks.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/after_registering_the_6_tasks.snap
@@ -42,6 +42,8 @@ doggos [0,1,2,3,4,5,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/all_other_tasks_succeeds.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/all_other_tasks_succeeds.snap
index 0a4e65ea9..b4d54f680 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/all_other_tasks_succeeds.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/all_other_tasks_succeeds.snap
@@ -57,6 +57,12 @@ doggos: { number_of_documents: 5, field_distribution: {"doggo": 5, "doggoid": 5}
 2 {uid: 2, }
 3 {uid: 3, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+3 [3,4,5,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,2,3,]
 failed [1,]
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/first_task_succeed.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/first_task_succeed.snap
index 20d5216a5..8f4ceb94e 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/first_task_succeed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/first_task_succeed.snap
@@ -47,6 +47,9 @@ doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "doggoid": 1}
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/second_task_fails.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/second_task_fails.snap
index a044ca823..350ace217 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/second_task_fails.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/second_task_fails.snap
@@ -51,6 +51,10 @@ doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "doggoid": 1}
 0 {uid: 0, }
 1 {uid: 1, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 failed [1,]
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/third_task_succeeds.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/third_task_succeeds.snap
index 238636df6..f908e7a8c 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/third_task_succeeds.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/third_task_succeeds.snap
@@ -54,6 +54,11 @@ doggos: { number_of_documents: 2, field_distribution: {"doggo": 2, "doggoid": 2}
 1 {uid: 1, }
 2 {uid: 2, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,2,]
 failed [1,]
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_replace/1.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_replace/1.snap
index e91fda83f..355ef8821 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_replace/1.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_replace/1.snap
@@ -50,6 +50,8 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_replace/2.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_replace/2.snap
index 9e8ce7422..c3ff75f58 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_replace/2.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_replace/2.snap
@@ -55,6 +55,9 @@ doggos: { number_of_documents: 10, field_distribution: {"doggo": 10, "id": 10} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,1,2,3,4,5,6,7,8,9,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_replace_without_autobatching/after_registering_the_10_tasks.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_replace_without_autobatching/after_registering_the_10_tasks.snap
index 6289818cc..88d9addb8 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_replace_without_autobatching/after_registering_the_10_tasks.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_replace_without_autobatching/after_registering_the_10_tasks.snap
@@ -50,6 +50,8 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_replace_without_autobatching/all_tasks_processed.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_replace_without_autobatching/all_tasks_processed.snap
index b9d1a914b..40b51ed14 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_replace_without_autobatching/all_tasks_processed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_replace_without_autobatching/all_tasks_processed.snap
@@ -82,6 +82,18 @@ doggos: { number_of_documents: 10, field_distribution: {"doggo": 10, "id": 10} }
 8 {uid: 8, }
 9 {uid: 9, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+3 [3,]
+4 [4,]
+5 [5,]
+6 [6,]
+7 [7,]
+8 [8,]
+9 [9,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_replace_without_autobatching/five_tasks_processed.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_replace_without_autobatching/five_tasks_processed.snap
index ea13f7d97..62ea510d1 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_replace_without_autobatching/five_tasks_processed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_replace_without_autobatching/five_tasks_processed.snap
@@ -67,6 +67,13 @@ doggos: { number_of_documents: 5, field_distribution: {"doggo": 5, "id": 5} }
 3 {uid: 3, }
 4 {uid: 4, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+3 [3,]
+4 [4,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,2,3,4,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_update/1.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_update/1.snap
index 5a03a2aa8..7aeb7da17 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_update/1.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_update/1.snap
@@ -50,6 +50,8 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_update/2.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_update/2.snap
index 0239ded3a..a922b0595 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_update/2.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_update/2.snap
@@ -55,6 +55,9 @@ doggos: { number_of_documents: 10, field_distribution: {"doggo": 10, "id": 10} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,1,2,3,4,5,6,7,8,9,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_update_without_autobatching/after_registering_the_10_tasks.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_update_without_autobatching/after_registering_the_10_tasks.snap
index 2bd63c492..fea75fb83 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_update_without_autobatching/after_registering_the_10_tasks.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_update_without_autobatching/after_registering_the_10_tasks.snap
@@ -50,6 +50,8 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_update_without_autobatching/all_tasks_processed.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_update_without_autobatching/all_tasks_processed.snap
index 9222896d5..2f8a5e4d8 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_update_without_autobatching/all_tasks_processed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_update_without_autobatching/all_tasks_processed.snap
@@ -82,6 +82,18 @@ doggos: { number_of_documents: 10, field_distribution: {"doggo": 10, "id": 10} }
 8 {uid: 8, }
 9 {uid: 9, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+3 [3,]
+4 [4,]
+5 [5,]
+6 [6,]
+7 [7,]
+8 [8,]
+9 [9,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_document_update_without_autobatching/five_tasks_processed.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_document_update_without_autobatching/five_tasks_processed.snap
index 3f599636b..ca1f46581 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_document_update_without_autobatching/five_tasks_processed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_document_update_without_autobatching/five_tasks_processed.snap
@@ -67,6 +67,13 @@ doggos: { number_of_documents: 5, field_distribution: {"doggo": 5, "id": 5} }
 3 {uid: 3, }
 4 {uid: 4, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+3 [3,]
+4 [4,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,2,3,4,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_mixed_document_addition/after_registering_the_10_tasks.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_mixed_document_addition/after_registering_the_10_tasks.snap
index 47e701bc9..6575b835d 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_mixed_document_addition/after_registering_the_10_tasks.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_mixed_document_addition/after_registering_the_10_tasks.snap
@@ -50,6 +50,8 @@ doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_mixed_document_addition/all_tasks_processed.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_mixed_document_addition/all_tasks_processed.snap
index f9eb836ef..453ff8c61 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_mixed_document_addition/all_tasks_processed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_mixed_document_addition/all_tasks_processed.snap
@@ -82,6 +82,18 @@ doggos: { number_of_documents: 10, field_distribution: {"doggo": 10, "id": 10} }
 8 {uid: 8, }
 9 {uid: 9, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+3 [3,]
+4 [4,]
+5 [5,]
+6 [6,]
+7 [7,]
+8 [8,]
+9 [9,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_mixed_document_addition/five_tasks_processed.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_mixed_document_addition/five_tasks_processed.snap
index 323cb7552..1e06b6dce 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_mixed_document_addition/five_tasks_processed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_mixed_document_addition/five_tasks_processed.snap
@@ -67,6 +67,13 @@ doggos: { number_of_documents: 5, field_distribution: {"doggo": 5, "id": 5} }
 3 {uid: 3, }
 4 {uid: 4, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+1 [1,]
+2 [2,]
+3 [3,]
+4 [4,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,1,2,3,4,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_settings_update/after_registering_settings_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_settings_update/after_registering_settings_task.snap
index ac6e7b258..dd81f33e7 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_settings_update/after_registering_settings_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_settings_update/after_registering_settings_task.snap
@@ -32,6 +32,8 @@ doggos [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_settings_update/settings_update_processed.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_settings_update/settings_update_processed.snap
index f2108b7b0..d889e5706 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_settings_update/settings_update_processed.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_settings_update/settings_update_processed.snap
@@ -37,6 +37,9 @@ doggos: { number_of_documents: 0, field_distribution: {} }
 ### All Batches:
 0 {uid: 0, }
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+0 [0,]
+----------------------------------------------------------------------
 ### Batches Status:
 succeeded [0,]
 ----------------------------------------------------------------------
diff --git a/crates/index-scheduler/src/snapshots/lib.rs/test_task_is_processing/registered_a_task.snap b/crates/index-scheduler/src/snapshots/lib.rs/test_task_is_processing/registered_a_task.snap
index 02c70b5b9..05bad8454 100644
--- a/crates/index-scheduler/src/snapshots/lib.rs/test_task_is_processing/registered_a_task.snap
+++ b/crates/index-scheduler/src/snapshots/lib.rs/test_task_is_processing/registered_a_task.snap
@@ -32,6 +32,8 @@ index_a [0,]
 ----------------------------------------------------------------------
 ### All Batches:
 ----------------------------------------------------------------------
+### Batch to tasks mapping:
+----------------------------------------------------------------------
 ### Batches Status:
 ----------------------------------------------------------------------
 ### Batches Kind:
diff --git a/crates/index-scheduler/src/utils.rs b/crates/index-scheduler/src/utils.rs
index d8f4f0521..d557d3e2e 100644
--- a/crates/index-scheduler/src/utils.rs
+++ b/crates/index-scheduler/src/utils.rs
@@ -94,7 +94,12 @@ impl IndexScheduler {
         Ok(self.all_batches.get(rtxn, &batch_id)?)
     }
 
-    pub(crate) fn write_batch(&self, wtxn: &mut RwTxn, batch: CachedBatch) -> Result<()> {
+    pub(crate) fn write_batch(
+        &self,
+        wtxn: &mut RwTxn,
+        batch: CachedBatch,
+        tasks: &RoaringBitmap,
+    ) -> Result<()> {
         self.all_batches.put(
             wtxn,
             &batch.uid,
@@ -104,6 +109,7 @@ impl IndexScheduler {
                 finished_at: Some(batch.finished_at),
             },
         )?;
+        self.batch_to_tasks_mapping.put(wtxn, &batch.uid, tasks)?;
 
         for status in batch.statuses {
             self.update_batch_status(wtxn, status, |bitmap| {
@@ -233,6 +239,11 @@ impl IndexScheduler {
         Ok(())
     }
 
+    /// Returns the whole set of tasks that belongs to this batch.
+    pub(crate) fn tasks_in_batch(&self, rtxn: &RoTxn, batch_id: BatchId) -> Result<RoaringBitmap> {
+        Ok(self.batch_to_tasks_mapping.get(rtxn, &batch_id)?.unwrap_or_default())
+    }
+
     /// Returns the whole set of tasks that belongs to this index.
     pub(crate) fn index_tasks(&self, rtxn: &RoTxn, index: &str) -> Result<RoaringBitmap> {
         Ok(self.index_tasks.get(rtxn, index)?.unwrap_or_default())
@@ -558,7 +569,6 @@ impl IndexScheduler {
 
             let Task {
                 uid,
-                /// We should iterate over the list of batch to ensure this task is effectively in the right batch
                 batch_uid,
                 enqueued_at,
                 started_at,
@@ -570,6 +580,14 @@ impl IndexScheduler {
                 kind,
             } = task;
             assert_eq!(uid, task.uid);
+            if let Some(ref batch) = batch_uid {
+                assert!(self
+                    .batch_to_tasks_mapping
+                    .get(&rtxn, batch)
+                    .unwrap()
+                    .unwrap()
+                    .contains(uid));
+            }
             if let Some(task_index_uid) = &task_index_uid {
                 assert!(self
                     .index_tasks
diff --git a/crates/meilisearch/src/routes/tasks.rs b/crates/meilisearch/src/routes/tasks.rs
index 7cdad308e..cd82a6a18 100644
--- a/crates/meilisearch/src/routes/tasks.rs
+++ b/crates/meilisearch/src/routes/tasks.rs
@@ -3,6 +3,7 @@ use actix_web::{web, HttpRequest, HttpResponse};
 use deserr::actix_web::AwebQueryParameter;
 use deserr::Deserr;
 use index_scheduler::{IndexScheduler, Query, TaskId};
+use meilisearch_types::batches::BatchId;
 use meilisearch_types::deserr::query_params::Param;
 use meilisearch_types::deserr::DeserrQueryParamError;
 use meilisearch_types::error::deserr_codes::*;
@@ -44,6 +45,9 @@ pub struct TasksFilterQuery {
     #[deserr(default, error = DeserrQueryParamError<InvalidTaskReverse>)]
     pub reverse: Option<Param<bool>>,
 
+    #[deserr(default, error = DeserrQueryParamError<InvalidBatchUids>)]
+    pub batch_uids: OptionStarOrList<BatchId>,
+
     #[deserr(default, error = DeserrQueryParamError<InvalidTaskUids>)]
     pub uids: OptionStarOrList<u32>,
     #[deserr(default, error = DeserrQueryParamError<InvalidTaskCanceledBy>)]
@@ -75,6 +79,7 @@ impl TasksFilterQuery {
             limit: Some(self.limit.0),
             from: self.from.as_deref().copied(),
             reverse: self.reverse.as_deref().copied(),
+            batch_uids: self.batch_uids.merge_star_and_none(),
             statuses: self.statuses.merge_star_and_none(),
             types: self.types.merge_star_and_none(),
             index_uids: self.index_uids.map(|x| x.to_string()).merge_star_and_none(),
@@ -96,6 +101,7 @@ impl TaskDeletionOrCancelationQuery {
             self,
             TaskDeletionOrCancelationQuery {
                 uids: OptionStarOrList::None,
+                batch_uids: OptionStarOrList::None,
                 canceled_by: OptionStarOrList::None,
                 types: OptionStarOrList::None,
                 statuses: OptionStarOrList::None,
@@ -115,9 +121,11 @@ impl TaskDeletionOrCancelationQuery {
 #[deserr(error = DeserrQueryParamError, rename_all = camelCase, deny_unknown_fields)]
 pub struct TaskDeletionOrCancelationQuery {
     #[deserr(default, error = DeserrQueryParamError<InvalidTaskUids>)]
-    pub uids: OptionStarOrList<u32>,
+    pub uids: OptionStarOrList<TaskId>,
+    #[deserr(default, error = DeserrQueryParamError<InvalidBatchUids>)]
+    pub batch_uids: OptionStarOrList<BatchId>,
     #[deserr(default, error = DeserrQueryParamError<InvalidTaskCanceledBy>)]
-    pub canceled_by: OptionStarOrList<u32>,
+    pub canceled_by: OptionStarOrList<TaskId>,
     #[deserr(default, error = DeserrQueryParamError<InvalidTaskTypes>)]
     pub types: OptionStarOrList<Kind>,
     #[deserr(default, error = DeserrQueryParamError<InvalidTaskStatuses>)]
@@ -145,6 +153,7 @@ impl TaskDeletionOrCancelationQuery {
             limit: None,
             from: None,
             reverse: None,
+            batch_uids: self.batch_uids.merge_star_and_none(),
             statuses: self.statuses.merge_star_and_none(),
             types: self.types.merge_star_and_none(),
             index_uids: self.index_uids.map(|x| x.to_string()).merge_star_and_none(),
@@ -484,7 +493,7 @@ mod tests {
             // Stars are allowed in date fields as well
             let params = "afterEnqueuedAt=*&beforeStartedAt=*&afterFinishedAt=*&beforeFinishedAt=*&afterStartedAt=*&beforeEnqueuedAt=*";
             let query = deserr_query_params::<TaskDeletionOrCancelationQuery>(params).unwrap();
-            snapshot!(format!("{:?}", query), @"TaskDeletionOrCancelationQuery { uids: None, canceled_by: None, types: None, statuses: None, index_uids: None, after_enqueued_at: Star, before_enqueued_at: Star, after_started_at: Star, before_started_at: Star, after_finished_at: Star, before_finished_at: Star }");
+            snapshot!(format!("{:?}", query), @"TaskDeletionOrCancelationQuery { uids: None, batch_uids: None, canceled_by: None, types: None, statuses: None, index_uids: None, after_enqueued_at: Star, before_enqueued_at: Star, after_started_at: Star, before_started_at: Star, after_finished_at: Star, before_finished_at: Star }");
         }
         {
             let params = "afterFinishedAt=2021";
@@ -704,20 +713,20 @@ mod tests {
         {
             let params = "from=12&limit=15&indexUids=toto,tata-78&statuses=succeeded,enqueued&afterEnqueuedAt=2012-04-23&uids=1,2,3";
             let query = deserr_query_params::<TasksFilterQuery>(params).unwrap();
-            snapshot!(format!("{:?}", query), @r###"TasksFilterQuery { limit: Param(15), from: Some(Param(12)), reverse: None, uids: List([1, 2, 3]), canceled_by: None, types: None, statuses: List([Succeeded, Enqueued]), index_uids: List([IndexUid("toto"), IndexUid("tata-78")]), after_enqueued_at: Other(2012-04-24 0:00:00.0 +00:00:00), before_enqueued_at: None, after_started_at: None, before_started_at: None, after_finished_at: None, before_finished_at: None }"###);
+            snapshot!(format!("{:?}", query), @r###"TasksFilterQuery { limit: Param(15), from: Some(Param(12)), reverse: None, batch_uids: None, uids: List([1, 2, 3]), canceled_by: None, types: None, statuses: List([Succeeded, Enqueued]), index_uids: List([IndexUid("toto"), IndexUid("tata-78")]), after_enqueued_at: Other(2012-04-24 0:00:00.0 +00:00:00), before_enqueued_at: None, after_started_at: None, before_started_at: None, after_finished_at: None, before_finished_at: None }"###);
         }
         {
             // Stars should translate to `None` in the query
             // Verify value of the default limit
             let params = "indexUids=*&statuses=succeeded,*&afterEnqueuedAt=2012-04-23&uids=1,2,3";
             let query = deserr_query_params::<TasksFilterQuery>(params).unwrap();
-            snapshot!(format!("{:?}", query), @"TasksFilterQuery { limit: Param(20), from: None, reverse: None, uids: List([1, 2, 3]), canceled_by: None, types: None, statuses: Star, index_uids: Star, after_enqueued_at: Other(2012-04-24 0:00:00.0 +00:00:00), before_enqueued_at: None, after_started_at: None, before_started_at: None, after_finished_at: None, before_finished_at: None }");
+            snapshot!(format!("{:?}", query), @"TasksFilterQuery { limit: Param(20), from: None, reverse: None, batch_uids: None, uids: List([1, 2, 3]), canceled_by: None, types: None, statuses: Star, index_uids: Star, after_enqueued_at: Other(2012-04-24 0:00:00.0 +00:00:00), before_enqueued_at: None, after_started_at: None, before_started_at: None, after_finished_at: None, before_finished_at: None }");
         }
         {
             // Stars should also translate to `None` in task deletion/cancelation queries
             let params = "indexUids=*&statuses=succeeded,*&afterEnqueuedAt=2012-04-23&uids=1,2,3";
             let query = deserr_query_params::<TaskDeletionOrCancelationQuery>(params).unwrap();
-            snapshot!(format!("{:?}", query), @"TaskDeletionOrCancelationQuery { uids: List([1, 2, 3]), canceled_by: None, types: None, statuses: Star, index_uids: Star, after_enqueued_at: Other(2012-04-24 0:00:00.0 +00:00:00), before_enqueued_at: None, after_started_at: None, before_started_at: None, after_finished_at: None, before_finished_at: None }");
+            snapshot!(format!("{:?}", query), @"TaskDeletionOrCancelationQuery { uids: List([1, 2, 3]), batch_uids: None, canceled_by: None, types: None, statuses: Star, index_uids: Star, after_enqueued_at: Other(2012-04-24 0:00:00.0 +00:00:00), before_enqueued_at: None, after_started_at: None, before_started_at: None, after_finished_at: None, before_finished_at: None }");
         }
         {
             // Star in from not allowed
@@ -738,7 +747,7 @@ mod tests {
             let err = deserr_query_params::<TaskDeletionOrCancelationQuery>(params).unwrap_err();
             snapshot!(meili_snap::json_string!(err), @r###"
             {
-              "message": "Unknown parameter `from`: expected one of `uids`, `canceledBy`, `types`, `statuses`, `indexUids`, `afterEnqueuedAt`, `beforeEnqueuedAt`, `afterStartedAt`, `beforeStartedAt`, `afterFinishedAt`, `beforeFinishedAt`",
+              "message": "Unknown parameter `from`: expected one of `uids`, `batchUids`, `canceledBy`, `types`, `statuses`, `indexUids`, `afterEnqueuedAt`, `beforeEnqueuedAt`, `afterStartedAt`, `beforeStartedAt`, `afterFinishedAt`, `beforeFinishedAt`",
               "code": "bad_request",
               "type": "invalid_request",
               "link": "https://docs.meilisearch.com/errors#bad_request"
@@ -751,7 +760,7 @@ mod tests {
             let err = deserr_query_params::<TaskDeletionOrCancelationQuery>(params).unwrap_err();
             snapshot!(meili_snap::json_string!(err), @r###"
             {
-              "message": "Unknown parameter `limit`: expected one of `uids`, `canceledBy`, `types`, `statuses`, `indexUids`, `afterEnqueuedAt`, `beforeEnqueuedAt`, `afterStartedAt`, `beforeStartedAt`, `afterFinishedAt`, `beforeFinishedAt`",
+              "message": "Unknown parameter `limit`: expected one of `uids`, `batchUids`, `canceledBy`, `types`, `statuses`, `indexUids`, `afterEnqueuedAt`, `beforeEnqueuedAt`, `afterStartedAt`, `beforeStartedAt`, `afterFinishedAt`, `beforeFinishedAt`",
               "code": "bad_request",
               "type": "invalid_request",
               "link": "https://docs.meilisearch.com/errors#bad_request"
@@ -771,7 +780,7 @@ mod tests {
             let params = "statuses=*";
             let query = deserr_query_params::<TaskDeletionOrCancelationQuery>(params).unwrap();
             assert!(!query.is_empty());
-            snapshot!(format!("{query:?}"), @"TaskDeletionOrCancelationQuery { uids: None, canceled_by: None, types: None, statuses: Star, index_uids: None, after_enqueued_at: None, before_enqueued_at: None, after_started_at: None, before_started_at: None, after_finished_at: None, before_finished_at: None }");
+            snapshot!(format!("{query:?}"), @"TaskDeletionOrCancelationQuery { uids: None, batch_uids: None, canceled_by: None, types: None, statuses: Star, index_uids: None, after_enqueued_at: None, before_enqueued_at: None, after_started_at: None, before_started_at: None, after_finished_at: None, before_finished_at: None }");
         }
     }
 }
diff --git a/crates/meilisearch/tests/tasks/errors.rs b/crates/meilisearch/tests/tasks/errors.rs
index 0e2966c8f..2ff497db9 100644
--- a/crates/meilisearch/tests/tasks/errors.rs
+++ b/crates/meilisearch/tests/tasks/errors.rs
@@ -222,7 +222,7 @@ async fn task_bad_limit() {
     snapshot!(code, @"400 Bad Request");
     snapshot!(json_string!(response), @r###"
     {
-      "message": "Unknown parameter `limit`: expected one of `uids`, `canceledBy`, `types`, `statuses`, `indexUids`, `afterEnqueuedAt`, `beforeEnqueuedAt`, `afterStartedAt`, `beforeStartedAt`, `afterFinishedAt`, `beforeFinishedAt`",
+      "message": "Unknown parameter `limit`: expected one of `uids`, `batchUids`, `canceledBy`, `types`, `statuses`, `indexUids`, `afterEnqueuedAt`, `beforeEnqueuedAt`, `afterStartedAt`, `beforeStartedAt`, `afterFinishedAt`, `beforeFinishedAt`",
       "code": "bad_request",
       "type": "invalid_request",
       "link": "https://docs.meilisearch.com/errors#bad_request"
@@ -233,7 +233,7 @@ async fn task_bad_limit() {
     snapshot!(code, @"400 Bad Request");
     snapshot!(json_string!(response), @r###"
     {
-      "message": "Unknown parameter `limit`: expected one of `uids`, `canceledBy`, `types`, `statuses`, `indexUids`, `afterEnqueuedAt`, `beforeEnqueuedAt`, `afterStartedAt`, `beforeStartedAt`, `afterFinishedAt`, `beforeFinishedAt`",
+      "message": "Unknown parameter `limit`: expected one of `uids`, `batchUids`, `canceledBy`, `types`, `statuses`, `indexUids`, `afterEnqueuedAt`, `beforeEnqueuedAt`, `afterStartedAt`, `beforeStartedAt`, `afterFinishedAt`, `beforeFinishedAt`",
       "code": "bad_request",
       "type": "invalid_request",
       "link": "https://docs.meilisearch.com/errors#bad_request"
@@ -260,7 +260,7 @@ async fn task_bad_from() {
     snapshot!(code, @"400 Bad Request");
     snapshot!(json_string!(response), @r###"
     {
-      "message": "Unknown parameter `from`: expected one of `uids`, `canceledBy`, `types`, `statuses`, `indexUids`, `afterEnqueuedAt`, `beforeEnqueuedAt`, `afterStartedAt`, `beforeStartedAt`, `afterFinishedAt`, `beforeFinishedAt`",
+      "message": "Unknown parameter `from`: expected one of `uids`, `batchUids`, `canceledBy`, `types`, `statuses`, `indexUids`, `afterEnqueuedAt`, `beforeEnqueuedAt`, `afterStartedAt`, `beforeStartedAt`, `afterFinishedAt`, `beforeFinishedAt`",
       "code": "bad_request",
       "type": "invalid_request",
       "link": "https://docs.meilisearch.com/errors#bad_request"
@@ -271,7 +271,7 @@ async fn task_bad_from() {
     snapshot!(code, @"400 Bad Request");
     snapshot!(json_string!(response), @r###"
     {
-      "message": "Unknown parameter `from`: expected one of `uids`, `canceledBy`, `types`, `statuses`, `indexUids`, `afterEnqueuedAt`, `beforeEnqueuedAt`, `afterStartedAt`, `beforeStartedAt`, `afterFinishedAt`, `beforeFinishedAt`",
+      "message": "Unknown parameter `from`: expected one of `uids`, `batchUids`, `canceledBy`, `types`, `statuses`, `indexUids`, `afterEnqueuedAt`, `beforeEnqueuedAt`, `afterStartedAt`, `beforeStartedAt`, `afterFinishedAt`, `beforeFinishedAt`",
       "code": "bad_request",
       "type": "invalid_request",
       "link": "https://docs.meilisearch.com/errors#bad_request"