From 3deb1ef78ff77d59fbb57bd6ba7eaf4c5e4fe0cb Mon Sep 17 00:00:00 2001 From: Kerollmops Date: Tue, 25 Mar 2025 18:53:32 +0100 Subject: [PATCH] Fix the snapshots again --- crates/meilisearch/tests/batches/mod.rs | 102 ++++++------------ crates/meilisearch/tests/dumps/mod.rs | 2 +- .../batches.snap | 1 - ...rEnqueuedAt_equal_2025-01-16T16_47_41.snap | 3 +- ...rFinishedAt_equal_2025-01-16T16_47_41.snap | 3 +- ...erStartedAt_equal_2025-01-16T16_47_41.snap | 3 +- ...ue_once_everything_has_been_processed.snap | 3 +- .../tests/upgrade/v1_12/v1_12_0.rs | 2 +- 8 files changed, 40 insertions(+), 79 deletions(-) diff --git a/crates/meilisearch/tests/batches/mod.rs b/crates/meilisearch/tests/batches/mod.rs index e955c6883..6c2aa4aaf 100644 --- a/crates/meilisearch/tests/batches/mod.rs +++ b/crates/meilisearch/tests/batches/mod.rs @@ -347,8 +347,7 @@ async fn test_summarized_document_addition_or_update() { "test": 1 }, "progressTrace": "[progressTrace]", - "writeChannelCongestion": "[writeChannelCongestion]", - "internalDatabaseSizes": "[internalDatabaseSizes]" + "writeChannelCongestion": "[writeChannelCongestion]" }, "duration": "[duration]", "startedAt": "[date]", @@ -371,8 +370,7 @@ async fn test_summarized_delete_documents_by_batch() { ".startedAt" => "[date]", ".finishedAt" => "[date]", ".stats.progressTrace" => "[progressTrace]", - ".stats.writeChannelCongestion" => "[writeChannelCongestion]", - ".stats.internalDatabaseSizes" => "[internalDatabaseSizes]" + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" { @@ -393,8 +391,7 @@ async fn test_summarized_delete_documents_by_batch() { "indexUids": { "test": 1 }, - "progressTrace": "[progressTrace]", - "internalDatabaseSizes": "[internalDatabaseSizes]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -435,8 +432,7 @@ async fn test_summarized_delete_documents_by_batch() { "indexUids": { "test": 1 }, - "progressTrace": "[progressTrace]", - "internalDatabaseSizes": "[internalDatabaseSizes]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -461,8 +457,7 @@ async fn test_summarized_delete_documents_by_filter() { ".startedAt" => "[date]", ".finishedAt" => "[date]", ".stats.progressTrace" => "[progressTrace]", - ".stats.writeChannelCongestion" => "[writeChannelCongestion]", - ".stats.internalDatabaseSizes" => "[internalDatabaseSizes]" + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" { @@ -484,8 +479,7 @@ async fn test_summarized_delete_documents_by_filter() { "indexUids": { "test": 1 }, - "progressTrace": "[progressTrace]", - "internalDatabaseSizes": "[internalDatabaseSizes]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -528,8 +522,7 @@ async fn test_summarized_delete_documents_by_filter() { "indexUids": { "test": 1 }, - "progressTrace": "[progressTrace]", - "internalDatabaseSizes": "[internalDatabaseSizes]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -572,8 +565,7 @@ async fn test_summarized_delete_documents_by_filter() { "indexUids": { "test": 1 }, - "progressTrace": "[progressTrace]", - "internalDatabaseSizes": "[internalDatabaseSizes]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -597,8 +589,7 @@ async fn test_summarized_delete_document_by_id() { ".startedAt" => "[date]", ".finishedAt" => "[date]", ".stats.progressTrace" => "[progressTrace]", - ".stats.writeChannelCongestion" => "[writeChannelCongestion]", - ".stats.internalDatabaseSizes" => "[internalDatabaseSizes]" + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r#" { @@ -619,8 +610,7 @@ async fn test_summarized_delete_document_by_id() { "indexUids": { "test": 1 }, - "progressTrace": "[progressTrace]", - "internalDatabaseSizes": "[internalDatabaseSizes]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -661,8 +651,7 @@ async fn test_summarized_delete_document_by_id() { "indexUids": { "test": 1 }, - "progressTrace": "[progressTrace]", - "internalDatabaseSizes": "[internalDatabaseSizes]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -728,8 +717,7 @@ async fn test_summarized_settings_update() { "indexUids": { "test": 1 }, - "progressTrace": "[progressTrace]", - "internalDatabaseSizes": "[internalDatabaseSizes]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -752,8 +740,7 @@ async fn test_summarized_index_creation() { ".startedAt" => "[date]", ".finishedAt" => "[date]", ".stats.progressTrace" => "[progressTrace]", - ".stats.writeChannelCongestion" => "[writeChannelCongestion]", - ".stats.internalDatabaseSizes" => "[internalDatabaseSizes]" + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" { @@ -771,8 +758,7 @@ async fn test_summarized_index_creation() { "indexUids": { "test": 1 }, - "progressTrace": "[progressTrace]", - "internalDatabaseSizes": "[internalDatabaseSizes]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -790,8 +776,7 @@ async fn test_summarized_index_creation() { ".startedAt" => "[date]", ".finishedAt" => "[date]", ".stats.progressTrace" => "[progressTrace]", - ".stats.writeChannelCongestion" => "[writeChannelCongestion]", - ".stats.internalDatabaseSizes" => "[internalDatabaseSizes]" + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" { @@ -811,8 +796,7 @@ async fn test_summarized_index_creation() { "indexUids": { "test": 1 }, - "progressTrace": "[progressTrace]", - "internalDatabaseSizes": "[internalDatabaseSizes]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -945,8 +929,7 @@ async fn test_summarized_index_update() { ".startedAt" => "[date]", ".finishedAt" => "[date]", ".stats.progressTrace" => "[progressTrace]", - ".stats.writeChannelCongestion" => "[writeChannelCongestion]", - ".stats.internalDatabaseSizes" => "[internalDatabaseSizes]" + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" { @@ -964,8 +947,7 @@ async fn test_summarized_index_update() { "indexUids": { "test": 1 }, - "progressTrace": "[progressTrace]", - "internalDatabaseSizes": "[internalDatabaseSizes]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -983,8 +965,7 @@ async fn test_summarized_index_update() { ".startedAt" => "[date]", ".finishedAt" => "[date]", ".stats.progressTrace" => "[progressTrace]", - ".stats.writeChannelCongestion" => "[writeChannelCongestion]", - ".stats.internalDatabaseSizes" => "[internalDatabaseSizes]" + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" { @@ -1004,8 +985,7 @@ async fn test_summarized_index_update() { "indexUids": { "test": 1 }, - "progressTrace": "[progressTrace]", - "internalDatabaseSizes": "[internalDatabaseSizes]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -1026,8 +1006,7 @@ async fn test_summarized_index_update() { ".startedAt" => "[date]", ".finishedAt" => "[date]", ".stats.progressTrace" => "[progressTrace]", - ".stats.writeChannelCongestion" => "[writeChannelCongestion]", - ".stats.internalDatabaseSizes" => "[internalDatabaseSizes]" + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r#" { @@ -1045,8 +1024,7 @@ async fn test_summarized_index_update() { "indexUids": { "test": 1 }, - "progressTrace": "[progressTrace]", - "internalDatabaseSizes": "[internalDatabaseSizes]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -1064,8 +1042,7 @@ async fn test_summarized_index_update() { ".startedAt" => "[date]", ".finishedAt" => "[date]", ".stats.progressTrace" => "[progressTrace]", - ".stats.writeChannelCongestion" => "[writeChannelCongestion]", - ".stats.internalDatabaseSizes" => "[internalDatabaseSizes]" + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" { @@ -1085,8 +1062,7 @@ async fn test_summarized_index_update() { "indexUids": { "test": 1 }, - "progressTrace": "[progressTrace]", - "internalDatabaseSizes": "[internalDatabaseSizes]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -1112,8 +1088,7 @@ async fn test_summarized_index_swap() { ".startedAt" => "[date]", ".finishedAt" => "[date]", ".stats.progressTrace" => "[progressTrace]", - ".stats.writeChannelCongestion" => "[writeChannelCongestion]", - ".stats.internalDatabaseSizes" => "[internalDatabaseSizes]" + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" { @@ -1138,8 +1113,7 @@ async fn test_summarized_index_swap() { "indexSwap": 1 }, "indexUids": {}, - "progressTrace": "[progressTrace]", - "internalDatabaseSizes": "[internalDatabaseSizes]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -1163,8 +1137,7 @@ async fn test_summarized_index_swap() { ".startedAt" => "[date]", ".finishedAt" => "[date]", ".stats.progressTrace" => "[progressTrace]", - ".stats.writeChannelCongestion" => "[writeChannelCongestion]", - ".stats.internalDatabaseSizes" => "[internalDatabaseSizes]" + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" { @@ -1182,8 +1155,7 @@ async fn test_summarized_index_swap() { "indexUids": { "doggos": 1 }, - "progressTrace": "[progressTrace]", - "internalDatabaseSizes": "[internalDatabaseSizes]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -1209,8 +1181,7 @@ async fn test_summarized_batch_cancelation() { ".startedAt" => "[date]", ".finishedAt" => "[date]", ".stats.progressTrace" => "[progressTrace]", - ".stats.writeChannelCongestion" => "[writeChannelCongestion]", - ".stats.internalDatabaseSizes" => "[internalDatabaseSizes]" + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" { @@ -1230,8 +1201,7 @@ async fn test_summarized_batch_cancelation() { "taskCancelation": 1 }, "indexUids": {}, - "progressTrace": "[progressTrace]", - "internalDatabaseSizes": "[internalDatabaseSizes]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -1257,8 +1227,7 @@ async fn test_summarized_batch_deletion() { ".startedAt" => "[date]", ".finishedAt" => "[date]", ".stats.progressTrace" => "[progressTrace]", - ".stats.writeChannelCongestion" => "[writeChannelCongestion]", - ".stats.internalDatabaseSizes" => "[internalDatabaseSizes]" + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" { @@ -1278,8 +1247,7 @@ async fn test_summarized_batch_deletion() { "taskDeletion": 1 }, "indexUids": {}, - "progressTrace": "[progressTrace]", - "internalDatabaseSizes": "[internalDatabaseSizes]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", @@ -1302,8 +1270,7 @@ async fn test_summarized_dump_creation() { ".startedAt" => "[date]", ".finishedAt" => "[date]", ".stats.progressTrace" => "[progressTrace]", - ".stats.writeChannelCongestion" => "[writeChannelCongestion]", - ".stats.internalDatabaseSizes" => "[internalDatabaseSizes]" + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" }, @r###" { @@ -1321,8 +1288,7 @@ async fn test_summarized_dump_creation() { "dumpCreation": 1 }, "indexUids": {}, - "progressTrace": "[progressTrace]", - "internalDatabaseSizes": "[internalDatabaseSizes]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", diff --git a/crates/meilisearch/tests/dumps/mod.rs b/crates/meilisearch/tests/dumps/mod.rs index fa05d9ec9..addcbeeb5 100644 --- a/crates/meilisearch/tests/dumps/mod.rs +++ b/crates/meilisearch/tests/dumps/mod.rs @@ -2236,8 +2236,8 @@ async fn import_dump_v6_containing_batches_and_enqueued_tasks() { ".results[0].finishedAt" => "[date]", ".results[0].duration" => "[date]", ".results[0].stats.progressTrace" => "[progressTrace]", - ".results[0].stats.internalDatabaseSizes" => "[internalDatabaseSizes]", ".results[0].stats.writeChannelCongestion" => "[writeChannelCongestion]", + ".results[0].stats.internalDatabaseSizes" => "[internalDatabaseSizes]", }), name: "batches"); let (indexes, code) = server.list_indexes(None, None).await; diff --git a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v6_containing_batches_and_enqueued_tasks/batches.snap b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v6_containing_batches_and_enqueued_tasks/batches.snap index b2dea1f06..b38340ef6 100644 --- a/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v6_containing_batches_and_enqueued_tasks/batches.snap +++ b/crates/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v6_containing_batches_and_enqueued_tasks/batches.snap @@ -22,7 +22,6 @@ source: crates/meilisearch/tests/dumps/mod.rs "kefir": 1 }, "progressTrace": "[progressTrace]", - "internalDatabaseSizes": "[internalDatabaseSizes]", "writeChannelCongestion": "[writeChannelCongestion]" }, "duration": "[date]", diff --git a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterEnqueuedAt_equal_2025-01-16T16_47_41.snap b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterEnqueuedAt_equal_2025-01-16T16_47_41.snap index b79f55351..99caeaf96 100644 --- a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterEnqueuedAt_equal_2025-01-16T16_47_41.snap +++ b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterEnqueuedAt_equal_2025-01-16T16_47_41.snap @@ -19,8 +19,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs "upgradeDatabase": 1 }, "indexUids": {}, - "progressTrace": "[progressTrace]", - "internalDatabaseSizes": "[internalDatabaseSizes]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", diff --git a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterFinishedAt_equal_2025-01-16T16_47_41.snap b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterFinishedAt_equal_2025-01-16T16_47_41.snap index b79f55351..99caeaf96 100644 --- a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterFinishedAt_equal_2025-01-16T16_47_41.snap +++ b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterFinishedAt_equal_2025-01-16T16_47_41.snap @@ -19,8 +19,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs "upgradeDatabase": 1 }, "indexUids": {}, - "progressTrace": "[progressTrace]", - "internalDatabaseSizes": "[internalDatabaseSizes]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", diff --git a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterStartedAt_equal_2025-01-16T16_47_41.snap b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterStartedAt_equal_2025-01-16T16_47_41.snap index b79f55351..99caeaf96 100644 --- a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterStartedAt_equal_2025-01-16T16_47_41.snap +++ b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/batches_filter_afterStartedAt_equal_2025-01-16T16_47_41.snap @@ -19,8 +19,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs "upgradeDatabase": 1 }, "indexUids": {}, - "progressTrace": "[progressTrace]", - "internalDatabaseSizes": "[internalDatabaseSizes]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", diff --git a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/the_whole_batch_queue_once_everything_has_been_processed.snap b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/the_whole_batch_queue_once_everything_has_been_processed.snap index 3cfed9f74..623c1f778 100644 --- a/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/the_whole_batch_queue_once_everything_has_been_processed.snap +++ b/crates/meilisearch/tests/upgrade/v1_12/snapshots/v1_12_0.rs/check_the_index_scheduler/the_whole_batch_queue_once_everything_has_been_processed.snap @@ -19,8 +19,7 @@ source: crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs "upgradeDatabase": 1 }, "indexUids": {}, - "progressTrace": "[progressTrace]", - "internalDatabaseSizes": "[internalDatabaseSizes]" + "progressTrace": "[progressTrace]" }, "duration": "[duration]", "startedAt": "[date]", diff --git a/crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs b/crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs index 8157f0923..9fc4d0e5b 100644 --- a/crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs +++ b/crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs @@ -166,7 +166,7 @@ async fn check_the_index_scheduler(server: &Server) { let (tasks, _) = server.tasks_filter("limit=1000").await; snapshot!(json_string!(tasks, { ".results[0].duration" => "[duration]", ".results[0].enqueuedAt" => "[date]", ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]" }), name: "the_whole_task_queue_once_everything_has_been_processed"); let (batches, _) = server.batches_filter("limit=1000").await; - snapshot!(json_string!(batches, { ".results[0].duration" => "[duration]", ".results[0].enqueuedAt" => "[date]", ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]", ".results[0].stats.progressTrace" => "[progressTrace]", ".results[0].stats.internalDatabaseSizes" => "[internalDatabaseSizes]", ".results[0].stats.writeChannelCongestion" => "[writeChannelCongestion]" }), name: "the_whole_batch_queue_once_everything_has_been_processed"); + snapshot!(json_string!(batches, { ".results[0].duration" => "[duration]", ".results[0].enqueuedAt" => "[date]", ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]", ".results[0].stats.progressTrace" => "[progressTrace]", ".results[0].stats.writeChannelCongestion" => "[writeChannelCongestion]" }), name: "the_whole_batch_queue_once_everything_has_been_processed"); // Tests all the tasks query parameters let (tasks, _) = server.tasks_filter("uids=10").await;