From 1b1172ad16a07c38c84f8efaa6e184a603139d07 Mon Sep 17 00:00:00 2001 From: Kerollmops Date: Thu, 20 Feb 2025 10:44:53 +0100 Subject: [PATCH] Fix dump tests --- crates/meilisearch/tests/batches/mod.rs | 181 ++++++++++++++++-- crates/meilisearch/tests/dumps/mod.rs | 8 +- .../tests/upgrade/v1_12/v1_12_0.rs | 2 +- 3 files changed, 169 insertions(+), 22 deletions(-) diff --git a/crates/meilisearch/tests/batches/mod.rs b/crates/meilisearch/tests/batches/mod.rs index 6ef40be8e..dac1a2339 100644 --- a/crates/meilisearch/tests/batches/mod.rs +++ b/crates/meilisearch/tests/batches/mod.rs @@ -275,7 +275,14 @@ async fn test_summarized_document_addition_or_update() { index.wait_task(task.uid()).await.succeeded(); let (batch, _) = index.get_batch(0).await; assert_json_snapshot!(batch, - { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }, + { + ".duration" => "[duration]", + ".enqueuedAt" => "[date]", + ".startedAt" => "[date]", + ".finishedAt" => "[date]", + ".stats.callTrace" => "[callTrace]", + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" + }, @r#" { "uid": 0, @@ -307,7 +314,14 @@ async fn test_summarized_document_addition_or_update() { index.wait_task(task.uid()).await.succeeded(); let (batch, _) = index.get_batch(1).await; assert_json_snapshot!(batch, - { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }, + { + ".duration" => "[duration]", + ".enqueuedAt" => "[date]", + ".startedAt" => "[date]", + ".finishedAt" => "[date]", + ".stats.callTrace" => "[callTrace]", + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" + }, @r#" { "uid": 1, @@ -343,7 +357,14 @@ async fn test_summarized_delete_documents_by_batch() { index.wait_task(task.uid()).await.failed(); let (batch, _) = index.get_batch(0).await; assert_json_snapshot!(batch, - { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }, + { + ".duration" => "[duration]", + ".enqueuedAt" => "[date]", + ".startedAt" => "[date]", + ".finishedAt" => "[date]", + ".stats.callTrace" => "[callTrace]", + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" + }, @r#" { "uid": 0, @@ -375,7 +396,14 @@ async fn test_summarized_delete_documents_by_batch() { index.wait_task(task.uid()).await.succeeded(); let (batch, _) = index.get_batch(2).await; assert_json_snapshot!(batch, - { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }, + { + ".duration" => "[duration]", + ".enqueuedAt" => "[date]", + ".startedAt" => "[date]", + ".finishedAt" => "[date]", + ".stats.callTrace" => "[callTrace]", + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" + }, @r#" { "uid": 2, @@ -413,7 +441,14 @@ async fn test_summarized_delete_documents_by_filter() { index.wait_task(task.uid()).await.failed(); let (batch, _) = index.get_batch(0).await; assert_json_snapshot!(batch, - { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }, + { + ".duration" => "[duration]", + ".enqueuedAt" => "[date]", + ".startedAt" => "[date]", + ".finishedAt" => "[date]", + ".stats.callTrace" => "[callTrace]", + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" + }, @r#" { "uid": 0, @@ -447,7 +482,14 @@ async fn test_summarized_delete_documents_by_filter() { index.wait_task(task.uid()).await.failed(); let (batch, _) = index.get_batch(2).await; assert_json_snapshot!(batch, - { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }, + { + ".duration" => "[duration]", + ".enqueuedAt" => "[date]", + ".startedAt" => "[date]", + ".finishedAt" => "[date]", + ".stats.callTrace" => "[callTrace]", + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" + }, @r#" { "uid": 2, @@ -481,7 +523,14 @@ async fn test_summarized_delete_documents_by_filter() { index.wait_task(task.uid()).await.succeeded(); let (batch, _) = index.get_batch(4).await; assert_json_snapshot!(batch, - { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }, + { + ".duration" => "[duration]", + ".enqueuedAt" => "[date]", + ".startedAt" => "[date]", + ".finishedAt" => "[date]", + ".stats.callTrace" => "[callTrace]", + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" + }, @r#" { "uid": 4, @@ -549,7 +598,14 @@ async fn test_summarized_delete_document_by_id() { index.wait_task(task.uid()).await.succeeded(); let (batch, _) = index.get_batch(2).await; assert_json_snapshot!(batch, - { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }, + { + ".duration" => "[duration]", + ".enqueuedAt" => "[date]", + ".startedAt" => "[date]", + ".finishedAt" => "[date]", + ".stats.callTrace" => "[callTrace]", + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" + }, @r#" { "uid": 2, @@ -597,7 +653,14 @@ async fn test_summarized_settings_update() { index.wait_task(task.uid()).await.succeeded(); let (batch, _) = index.get_batch(0).await; assert_json_snapshot!(batch, - { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }, + { + ".duration" => "[duration]", + ".enqueuedAt" => "[date]", + ".startedAt" => "[date]", + ".finishedAt" => "[date]", + ".stats.callTrace" => "[callTrace]", + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" + }, @r#" { "uid": 0, @@ -642,7 +705,14 @@ async fn test_summarized_index_creation() { index.wait_task(task.uid()).await.succeeded(); let (batch, _) = index.get_batch(0).await; assert_json_snapshot!(batch, - { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }, + { + ".duration" => "[duration]", + ".enqueuedAt" => "[date]", + ".startedAt" => "[date]", + ".finishedAt" => "[date]", + ".stats.callTrace" => "[callTrace]", + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" + }, @r#" { "uid": 0, @@ -670,7 +740,14 @@ async fn test_summarized_index_creation() { index.wait_task(task.uid()).await.failed(); let (batch, _) = index.get_batch(1).await; assert_json_snapshot!(batch, - { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }, + { + ".duration" => "[duration]", + ".enqueuedAt" => "[date]", + ".startedAt" => "[date]", + ".finishedAt" => "[date]", + ".stats.callTrace" => "[callTrace]", + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" + }, @r#" { "uid": 1, @@ -815,7 +892,14 @@ async fn test_summarized_index_update() { index.wait_task(task.uid()).await.failed(); let (batch, _) = index.get_batch(0).await; assert_json_snapshot!(batch, - { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }, + { + ".duration" => "[duration]", + ".enqueuedAt" => "[date]", + ".startedAt" => "[date]", + ".finishedAt" => "[date]", + ".stats.callTrace" => "[callTrace]", + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" + }, @r#" { "uid": 0, @@ -843,7 +927,14 @@ async fn test_summarized_index_update() { index.wait_task(task.uid()).await.failed(); let (batch, _) = index.get_batch(1).await; assert_json_snapshot!(batch, - { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }, + { + ".duration" => "[duration]", + ".enqueuedAt" => "[date]", + ".startedAt" => "[date]", + ".finishedAt" => "[date]", + ".stats.callTrace" => "[callTrace]", + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" + }, @r#" { "uid": 1, @@ -876,7 +967,14 @@ async fn test_summarized_index_update() { index.wait_task(task.uid()).await.succeeded(); let (batch, _) = index.get_batch(3).await; assert_json_snapshot!(batch, - { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }, + { + ".duration" => "[duration]", + ".enqueuedAt" => "[date]", + ".startedAt" => "[date]", + ".finishedAt" => "[date]", + ".stats.callTrace" => "[callTrace]", + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" + }, @r#" { "uid": 3, @@ -904,7 +1002,14 @@ async fn test_summarized_index_update() { index.wait_task(task.uid()).await.succeeded(); let (batch, _) = index.get_batch(4).await; assert_json_snapshot!(batch, - { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }, + { + ".duration" => "[duration]", + ".enqueuedAt" => "[date]", + ".startedAt" => "[date]", + ".finishedAt" => "[date]", + ".stats.callTrace" => "[callTrace]", + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" + }, @r#" { "uid": 4, @@ -942,7 +1047,14 @@ async fn test_summarized_index_swap() { server.wait_task(task.uid()).await.failed(); let (batch, _) = server.get_batch(0).await; assert_json_snapshot!(batch, - { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }, + { + ".duration" => "[duration]", + ".enqueuedAt" => "[date]", + ".startedAt" => "[date]", + ".finishedAt" => "[date]", + ".stats.callTrace" => "[callTrace]", + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" + }, @r#" { "uid": 0, @@ -983,7 +1095,14 @@ async fn test_summarized_index_swap() { server.wait_task(task.uid()).await.succeeded(); let (batch, _) = server.get_batch(1).await; assert_json_snapshot!(batch, - { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }, + { + ".duration" => "[duration]", + ".enqueuedAt" => "[date]", + ".startedAt" => "[date]", + ".finishedAt" => "[date]", + ".stats.callTrace" => "[callTrace]", + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" + }, @r#" { "uid": 1, @@ -1019,7 +1138,14 @@ async fn test_summarized_batch_cancelation() { index.wait_task(task.uid()).await.succeeded(); let (batch, _) = index.get_batch(1).await; assert_json_snapshot!(batch, - { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }, + { + ".duration" => "[duration]", + ".enqueuedAt" => "[date]", + ".startedAt" => "[date]", + ".finishedAt" => "[date]", + ".stats.callTrace" => "[callTrace]", + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" + }, @r#" { "uid": 1, @@ -1057,7 +1183,14 @@ async fn test_summarized_batch_deletion() { index.wait_task(task.uid()).await.succeeded(); let (batch, _) = index.get_batch(1).await; assert_json_snapshot!(batch, - { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }, + { + ".duration" => "[duration]", + ".enqueuedAt" => "[date]", + ".startedAt" => "[date]", + ".finishedAt" => "[date]", + ".stats.callTrace" => "[callTrace]", + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" + }, @r#" { "uid": 1, @@ -1091,7 +1224,15 @@ async fn test_summarized_dump_creation() { server.wait_task(task.uid()).await; let (batch, _) = server.get_batch(0).await; assert_json_snapshot!(batch, - { ".details.dumpUid" => "[dumpUid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }, + { + ".details.dumpUid" => "[dumpUid]", + ".duration" => "[duration]", + ".enqueuedAt" => "[date]", + ".startedAt" => "[date]", + ".finishedAt" => "[date]", + ".stats.callTrace" => "[callTrace]", + ".stats.writeChannelCongestion" => "[writeChannelCongestion]" + }, @r#" { "uid": 0, diff --git a/crates/meilisearch/tests/dumps/mod.rs b/crates/meilisearch/tests/dumps/mod.rs index 1b07afdfd..6d83c9be5 100644 --- a/crates/meilisearch/tests/dumps/mod.rs +++ b/crates/meilisearch/tests/dumps/mod.rs @@ -2202,7 +2202,13 @@ async fn import_dump_v6_containing_batches_and_enqueued_tasks() { let (tasks, _) = server.tasks().await; snapshot!(json_string!(tasks, { ".results[1].startedAt" => "[date]", ".results[1].finishedAt" => "[date]", ".results[1].duration" => "[date]" }), name: "tasks"); let (batches, _) = server.batches().await; - snapshot!(json_string!(batches, { ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]", ".results[0].duration" => "[date]" }), name: "batches"); + snapshot!(json_string!(batches, { + ".results[0].startedAt" => "[date]", + ".results[0].finishedAt" => "[date]", + ".results[0].duration" => "[date]", + ".results[0].stats.callTrace" => "[callTrace]", + ".results[0].stats.writeChannelCongestion" => "[writeChannelCongestion]", + }), name: "batches"); let (indexes, code) = server.list_indexes(None, None).await; assert_eq!(code, 200, "{indexes}"); 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 6aab2861a..2e71450d8 100644 --- a/crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs +++ b/crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs @@ -129,7 +129,7 @@ async fn check_the_index_scheduler(server: &Server) { snapshot!(stats, @r###" { "databaseSize": 438272, - "usedDatabaseSize": 196608, + "usedDatabaseSize": 200704, "lastUpdate": "2025-01-23T11:36:22.634859166Z", "indexes": { "kefir": {