searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-11-26 14:54:27 +01:00
Code Issues Releases Wiki Activity

Remove criterion_implementation_strategy param of Search

Browse Source
This commit is contained in:
Loïc Lecrenier 2023-03-23 09:42:25 +01:00
parent d18ebe4f3a
commit 862714a18b
2 changed files with 19 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
milli/src/lib.rs
View File

@ -95,9 +95,8 @@ pub use self::heed_codec::{
}; };
pub use self::index::Index; pub use self::index::Index;
pub use self::search::{ pub use self::search::{
CriterionImplementationStrategy, FacetDistribution, Filter, FormatOptions, MatchBounds, FacetDistribution, Filter, FormatOptions, MatchBounds, MatcherBuilder, MatchingWord,
MatcherBuilder, MatchingWord, MatchingWords, Search, SearchResult, TermsMatchingStrategy, MatchingWords, Search, SearchResult, TermsMatchingStrategy, DEFAULT_VALUES_PER_FACET,
DEFAULT_VALUES_PER_FACET,
}; };
pub type Result<T> = std::result::Result<T, error::Error>; pub type Result<T> = std::result::Result<T, error::Error>;

54
milli/src/search/mod.rs
View File

@ -31,7 +31,6 @@ pub struct Search<'a> {
authorize_typos: bool, authorize_typos: bool,
words_limit: usize, words_limit: usize,
exhaustive_number_hits: bool, exhaustive_number_hits: bool,
criterion_implementation_strategy: CriterionImplementationStrategy,
rtxn: &'a heed::RoTxn<'a>, rtxn: &'a heed::RoTxn<'a>,
index: &'a Index, index: &'a Index,
} }
@ -48,7 +47,6 @@ impl<'a> Search<'a> {
authorize_typos: true, authorize_typos: true,
exhaustive_number_hits: false, exhaustive_number_hits: false,
words_limit: 10, words_limit: 10,
criterion_implementation_strategy: CriterionImplementationStrategy::default(),
rtxn, rtxn,
index, index,
} }
@ -101,14 +99,6 @@ impl<'a> Search<'a> {
self self
} }
pub fn criterion_implementation_strategy(
&mut self,
strategy: CriterionImplementationStrategy,
) -> &mut Search<'a> {
self.criterion_implementation_strategy = strategy;
self
}
// TODO! // TODO!
fn _is_typo_authorized(&self) -> Result<bool> { fn _is_typo_authorized(&self) -> Result<bool> {
let index_authorizes_typos = self.index.authorize_typos(self.rtxn)?; let index_authorizes_typos = self.index.authorize_typos(self.rtxn)?;
@ -144,7 +134,6 @@ impl fmt::Debug for Search<'_> {
authorize_typos, authorize_typos,
words_limit, words_limit,
exhaustive_number_hits, exhaustive_number_hits,
criterion_implementation_strategy,
rtxn: _, rtxn: _,
index: _, index: _,
} = self; } = self;
@ -157,7 +146,6 @@ impl fmt::Debug for Search<'_> {
.field("terms_matching_strategy", terms_matching_strategy) .field("terms_matching_strategy", terms_matching_strategy)
.field("authorize_typos", authorize_typos) .field("authorize_typos", authorize_typos)
.field("exhaustive_number_hits", exhaustive_number_hits) .field("exhaustive_number_hits", exhaustive_number_hits)
.field("criterion_implementation_strategy", criterion_implementation_strategy)
.field("words_limit", words_limit) .field("words_limit", words_limit)
.finish() .finish()
} }
@ -171,14 +159,6 @@ pub struct SearchResult {
pub documents_ids: Vec<DocumentId>, pub documents_ids: Vec<DocumentId>,
} }
#[derive(Debug, Default, Clone, Copy)]
pub enum CriterionImplementationStrategy {
OnlyIterative,
OnlySetBased,
#[default]
Dynamic,
}
#[derive(Debug, Clone, Copy, PartialEq, Eq)] #[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum TermsMatchingStrategy { pub enum TermsMatchingStrategy {
// remove last word first // remove last word first
@ -241,30 +221,30 @@ mod test {
assert_eq!(documents_ids, vec![1]); assert_eq!(documents_ids, vec![1]);
} }
#[test] // #[test]
fn test_is_authorized_typos() { // fn test_is_authorized_typos() {
let index = TempIndex::new(); // let index = TempIndex::new();
let mut txn = index.write_txn().unwrap(); // let mut txn = index.write_txn().unwrap();
let mut search = Search::new(&txn, &index); // let mut search = Search::new(&txn, &index);
// default is authorized // // default is authorized
assert!(search.is_typo_authorized().unwrap()); // assert!(search.is_typo_authorized().unwrap());
search.authorize_typos(false); // search.authorize_typos(false);
assert!(!search.is_typo_authorized().unwrap()); // assert!(!search.is_typo_authorized().unwrap());
index.put_authorize_typos(&mut txn, false).unwrap(); // index.put_authorize_typos(&mut txn, false).unwrap();
txn.commit().unwrap(); // txn.commit().unwrap();
let txn = index.read_txn().unwrap(); // let txn = index.read_txn().unwrap();
let mut search = Search::new(&txn, &index); // let mut search = Search::new(&txn, &index);
assert!(!search.is_typo_authorized().unwrap()); // assert!(!search.is_typo_authorized().unwrap());
search.authorize_typos(true); // search.authorize_typos(true);
assert!(!search.is_typo_authorized().unwrap()); // assert!(!search.is_typo_authorized().unwrap());
} // }
// #[test] // #[test]
// fn test_one_typos_tolerance() { // fn test_one_typos_tolerance() {