searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2025-07-04 04:17:10 +02:00
Code Issues Releases Wiki Activity

Replace the legacy Settings::execute by the new one

Browse source
This commit is contained in:
ManyTheFish 2025-06-25 11:48:58 +02:00
parent 3aa6c3c750
commit 82fe80b360
14 changed files with 137 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/milli/tests/search/distinct.rs
View file

@ -1,6 +1,7 @@
use std::collections::HashSet;
use big_s::S;
use milli::progress::Progress;
use milli::update::Settings;
use milli::{Criterion, Search, SearchResult, TermsMatchingStrategy};
use Criterion::*;
@ -19,7 +20,7 @@ macro_rules! test_distinct {
let config = milli::update::IndexerConfig::default();
let mut builder = Settings::new(&mut wtxn, &index, &config);
builder.set_distinct_field(S(stringify!($distinct)));
builder.execute(|_| (), || false, Default::default()).unwrap();
builder.execute(&|| false, &Progress::default()).unwrap();
wtxn.commit().unwrap();
let rtxn = index.read_txn().unwrap();

2
crates/milli/tests/search/facet_distribution.rs
View file

@ -25,7 +25,7 @@ fn test_facet_distribution_with_no_facet_values() {
FilterableAttributesRule::Field(S("genres")),
FilterableAttributesRule::Field(S("tags")),
]);
builder.execute(|_| (), || false, Default::default()).unwrap();
builder.execute(&|| false, &Progress::default()).unwrap();
wtxn.commit().unwrap();
// index documents

2
crates/milli/tests/search/mod.rs
View file

@ -63,7 +63,7 @@ pub fn setup_search_index_with_criteria(criteria: &[Criterion]) -> Index {
S("america") => vec![S("the united states")],
});
builder.set_searchable_fields(vec![S("title"), S("description")]);
builder.execute(|_| (), || false, Default::default()).unwrap();
builder.execute(&|| false, &Progress::default()).unwrap();
wtxn.commit().unwrap();
// index documents

3
crates/milli/tests/search/phrase_search.rs
View file

@ -1,3 +1,4 @@
use milli::progress::Progress;
use milli::update::{IndexerConfig, Settings};
use milli::{Criterion, Index, Search, TermsMatchingStrategy};
@ -10,7 +11,7 @@ fn set_stop_words(index: &Index, stop_words: &[&str]) {
let mut builder = Settings::new(&mut wtxn, index, &config);
let stop_words = stop_words.iter().map(|s| s.to_string()).collect();
builder.set_stop_words(stop_words);
builder.execute(|_| (), || false, Default::default()).unwrap();
builder.execute(&|| false, &Progress::default()).unwrap();
wtxn.commit().unwrap();
}

6
crates/milli/tests/search/query_criteria.rs
View file

@ -236,7 +236,7 @@ fn criteria_mixup() {
let mut wtxn = index.write_txn().unwrap();
let mut builder = Settings::new(&mut wtxn, &index, &config);
builder.set_criteria(criteria.clone());
builder.execute(|_| (), || false, Default::default()).unwrap();
builder.execute(&|| false, &Progress::default()).unwrap();
wtxn.commit().unwrap();
let rtxn = index.read_txn().unwrap();
@ -276,7 +276,7 @@ fn criteria_ascdesc() {
S("name"),
S("age"),
});
builder.execute(|_| (), || false, Default::default()).unwrap();
builder.execute(&|| false, &Progress::default()).unwrap();
wtxn.commit().unwrap();
let mut wtxn = index.write_txn().unwrap();
@ -359,7 +359,7 @@ fn criteria_ascdesc() {
let mut wtxn = index.write_txn().unwrap();
let mut builder = Settings::new(&mut wtxn, &index, &config);
builder.set_criteria(vec![criterion.clone()]);
builder.execute(|_| (), || false, Default::default()).unwrap();
builder.execute(&|| false, &Progress::default()).unwrap();
wtxn.commit().unwrap();
let rtxn = index.read_txn().unwrap();

8
crates/milli/tests/search/typo_tolerance.rs
View file

@ -46,7 +46,7 @@ fn test_typo_tolerance_one_typo() {
let config = IndexerConfig::default();
let mut builder = Settings::new(&mut txn, &index, &config);
builder.set_min_word_len_one_typo(4);
builder.execute(|_| (), || false, Default::default()).unwrap();
builder.execute(&|| false, &Progress::default()).unwrap();
// typo is now supported for 4 letters words
let mut search = Search::new(&txn, &index);
@ -92,7 +92,7 @@ fn test_typo_tolerance_two_typo() {
let config = IndexerConfig::default();
let mut builder = Settings::new(&mut txn, &index, &config);
builder.set_min_word_len_two_typos(7);
builder.execute(|_| (), || false, Default::default()).unwrap();
builder.execute(&|| false, &Progress::default()).unwrap();
// typo is now supported for 4 letters words
let mut search = Search::new(&txn, &index);
@ -181,7 +181,7 @@ fn test_typo_disabled_on_word() {
// `zealand` doesn't allow typos anymore
exact_words.insert("zealand".to_string());
builder.set_exact_words(exact_words);
builder.execute(|_| (), || false, Default::default()).unwrap();
builder.execute(&|| false, &Progress::default()).unwrap();
let mut search = Search::new(&txn, &index);
search.query("zealand");
@ -219,7 +219,7 @@ fn test_disable_typo_on_attribute() {
let mut builder = Settings::new(&mut txn, &index, &config);
// disable typos on `description`
builder.set_exact_attributes(vec!["description".to_string()].into_iter().collect());
builder.execute(|_| (), || false, Default::default()).unwrap();
builder.execute(&|| false, &Progress::default()).unwrap();
let mut search = Search::new(&txn, &index);
search.query("antebelum");