From a964251cee096877f140cc5934a6d7bf48b1d7f4 Mon Sep 17 00:00:00 2001 From: ManyTheFish Date: Mon, 5 May 2025 16:22:13 +0200 Subject: [PATCH 1/4] Remove useless reset fixes https://github.com/meilisearch/meilisearch/pull/5494#discussion_r2069373494 --- crates/milli/src/update/settings.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/crates/milli/src/update/settings.rs b/crates/milli/src/update/settings.rs index 51d9aed27..fce2989b1 100644 --- a/crates/milli/src/update/settings.rs +++ b/crates/milli/src/update/settings.rs @@ -884,7 +884,6 @@ impl<'a, 't, 'i> Settings<'a, 't, 'i> { disabled_typos_terms.disable_on_numbers = disable_on_numbers; } Setting::Reset => { - self.index.delete_disabled_typos_terms(self.wtxn)?; disabled_typos_terms.disable_on_numbers = DisabledTyposTerms::default().disable_on_numbers; } From 73e4206b3c09cc4f02aa6290e3b236e81f5da65d Mon Sep 17 00:00:00 2001 From: ManyTheFish Date: Mon, 5 May 2025 16:23:01 +0200 Subject: [PATCH 2/4] Pass a progress callback to recompute_word_fst_from_word_docids_database fixes https://github.com/meilisearch/meilisearch/pull/5494#discussion_r2069377991 --- .../milli/src/update/new/indexer/post_processing.rs | 7 ++++++- crates/milli/src/update/upgrade/v1_15.rs | 11 ++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/crates/milli/src/update/new/indexer/post_processing.rs b/crates/milli/src/update/new/indexer/post_processing.rs index b5c89d0d9..288b9c5ed 100644 --- a/crates/milli/src/update/new/indexer/post_processing.rs +++ b/crates/milli/src/update/new/indexer/post_processing.rs @@ -131,7 +131,12 @@ fn compute_word_fst( } } -pub fn recompute_word_fst_from_word_docids_database(index: &Index, wtxn: &mut RwTxn) -> Result<()> { +pub fn recompute_word_fst_from_word_docids_database( + index: &Index, + wtxn: &mut RwTxn, + progress: &Progress, +) -> Result<()> { + progress.update_progress(PostProcessingWords::WordFst); let fst = fst::Set::default().map_data(std::borrow::Cow::Owned)?; let mut word_fst_builder = WordFstBuilder::new(&fst)?; let words = index.word_docids.iter(wtxn)?.remap_data_type::(); diff --git a/crates/milli/src/update/upgrade/v1_15.rs b/crates/milli/src/update/upgrade/v1_15.rs index 2c3cff355..cea4783a1 100644 --- a/crates/milli/src/update/upgrade/v1_15.rs +++ b/crates/milli/src/update/upgrade/v1_15.rs @@ -3,7 +3,7 @@ use heed::RwTxn; use super::UpgradeIndex; use crate::progress::Progress; use crate::update::new::indexer::recompute_word_fst_from_word_docids_database; -use crate::{make_enum_progress, Index, Result}; +use crate::{Index, Result}; #[allow(non_camel_case_types)] pub(super) struct Latest_V1_14_To_Latest_V1_15(); @@ -17,14 +17,7 @@ impl UpgradeIndex for Latest_V1_14_To_Latest_V1_15 { progress: Progress, ) -> Result { // Recompute the word FST from the word docids database. - make_enum_progress! { - enum TypoTolerance { - RecomputeWordFst, - } - }; - - progress.update_progress(TypoTolerance::RecomputeWordFst); - recompute_word_fst_from_word_docids_database(index, wtxn)?; + recompute_word_fst_from_word_docids_database(index, wtxn, &progress)?; Ok(false) } From 699ec18de80d967dc7193791e5dadbf0f9f9fde2 Mon Sep 17 00:00:00 2001 From: ManyTheFish Date: Tue, 6 May 2025 14:39:47 +0200 Subject: [PATCH 3/4] Fix warnings --- crates/milli/src/disabled_typos_terms.rs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/crates/milli/src/disabled_typos_terms.rs b/crates/milli/src/disabled_typos_terms.rs index 3a0d0c0f5..7ae35f828 100644 --- a/crates/milli/src/disabled_typos_terms.rs +++ b/crates/milli/src/disabled_typos_terms.rs @@ -33,13 +33,6 @@ impl Index { Ok(()) } - - pub(crate) fn delete_disabled_typos_terms(&self, txn: &mut RwTxn<'_>) -> heed::Result<()> { - self.main - .remap_types::>() - .delete(txn, main_key::DISABLED_TYPOS_TERMS)?; - Ok(()) - } } impl DisabledTyposTerms { From 293a42518303ae4850f89d3d53983a54b75df1e9 Mon Sep 17 00:00:00 2001 From: Many the fish Date: Tue, 20 May 2025 14:17:27 +0200 Subject: [PATCH 4/4] Apply suggestions from code review Co-authored-by: Martin Grigorov --- crates/meilisearch/tests/search/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/meilisearch/tests/search/mod.rs b/crates/meilisearch/tests/search/mod.rs index f1d9c8b3b..ff6d3e2b8 100644 --- a/crates/meilisearch/tests/search/mod.rs +++ b/crates/meilisearch/tests/search/mod.rs @@ -2045,7 +2045,7 @@ async fn test_exact_typos_terms() { }), &json!({"q": "12345"}), |response, code| { - assert_eq!(code, 200, "{}", response); + assert_eq!(code, 200, "{response}"); snapshot!(json_string!(response["hits"]), @r###" [ { @@ -2080,7 +2080,7 @@ async fn test_exact_typos_terms() { }), &json!({"q": "123457"}), |response, code| { - assert_eq!(code, 200, "{}", response); + assert_eq!(code, 200, "{response}"); snapshot!(json_string!(response["hits"]), @r###"[]"###); }, )