From a9802d0ea4f14439f8187f18e7bd5002ec9a144c Mon Sep 17 00:00:00 2001 From: Kerollmops Date: Thu, 20 Feb 2025 16:58:45 +0100 Subject: [PATCH] Clarify the tail writing to database --- crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs | 2 +- crates/milli/src/update/new/indexer/extract.rs | 2 +- crates/milli/src/update/new/steps.rs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) 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 3a93ba81e..906b2ac02 100644 --- a/crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs +++ b/crates/meilisearch/tests/upgrade/v1_12/v1_12_0.rs @@ -213,7 +213,7 @@ async fn check_the_index_scheduler(server: &Server) { snapshot!(json_string!(batches, { ".results[0].duration" => "[duration]", ".results[0].enqueuedAt" => "[date]", ".results[0].startedAt" => "[date]", ".results[0].finishedAt" => "[date]", ".results[0].stats.callTrace" => "[callTrace]", ".results[0].stats.writeChannelCongestion" => "[writeChannelCongestion]" }), name: "batches_filter_afterFinishedAt_equal_2025-01-16T16_47_41"); let (stats, _) = server.stats().await; - snapshot!(stats, { + assert_json_snapshot!(stats, { ".databaseSize" => "[bytes]", ".usedDatabaseSize" => "[bytes]" }, diff --git a/crates/milli/src/update/new/indexer/extract.rs b/crates/milli/src/update/new/indexer/extract.rs index 1606851cb..792b0c03b 100644 --- a/crates/milli/src/update/new/indexer/extract.rs +++ b/crates/milli/src/update/new/indexer/extract.rs @@ -291,7 +291,7 @@ where &indexing_context.must_stop_processing, )?; } - indexing_context.progress.update_progress(IndexingStep::TailWritingToDatabase); + indexing_context.progress.update_progress(IndexingStep::WaitingForDatabaseWrites); finished_extraction.store(true, std::sync::atomic::Ordering::Relaxed); Result::Ok((facet_field_ids_delta, index_embeddings)) diff --git a/crates/milli/src/update/new/steps.rs b/crates/milli/src/update/new/steps.rs index 38964d8ec..ad8fe9cb1 100644 --- a/crates/milli/src/update/new/steps.rs +++ b/crates/milli/src/update/new/steps.rs @@ -14,7 +14,7 @@ pub enum IndexingStep { ExtractingWordProximity, ExtractingEmbeddings, WritingGeoPoints, - TailWritingToDatabase, + WaitingForDatabaseWrites, WaitingForExtractors, WritingEmbeddingsToDatabase, PostProcessingFacets, @@ -32,7 +32,7 @@ impl Step for IndexingStep { IndexingStep::ExtractingWordProximity => "extracting word proximity", IndexingStep::ExtractingEmbeddings => "extracting embeddings", IndexingStep::WritingGeoPoints => "writing geo points", - IndexingStep::TailWritingToDatabase => "tail writing to database", + IndexingStep::WaitingForDatabaseWrites => "waiting for database writes", IndexingStep::WaitingForExtractors => "waiting for extractors", IndexingStep::WritingEmbeddingsToDatabase => "writing embeddings to database", IndexingStep::PostProcessingFacets => "post-processing facets",