searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-12-24 13:40:31 +01:00
Code Issues Releases Wiki Activity

Reduce the number of calls to alterate_query_tree

Browse Source
This commit is contained in:
Kerollmops 2021-02-18 11:00:31 +01:00
parent 9ccaea2afc
commit 67c71130df
No known key found for this signature in database
GPG Key ID: 92ADA4E935E71FA4
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
milli/src/search/criteria/typo.rs
View File

@ -63,9 +63,16 @@ impl<'t> Criterion for Typo<'t> {
self.candidates = Candidates::default(); self.candidates = Candidates::default();
}, },
(Some(query_tree), Allowed(candidates)) => { (Some(query_tree), Allowed(candidates)) => {
// TODO if number_typos >= 2 the generated query_tree will allways be the same, let fst = self.ctx.words_fst();
// generate a new one on each iteration is a waste of time. let new_query_tree = if self.number_typos < 2 {
let new_query_tree = alterate_query_tree(&self.ctx.words_fst(), query_tree.clone(), self.number_typos)?; alterate_query_tree(&fst, query_tree.clone(), self.number_typos)?
} else if self.number_typos == 2 {
*query_tree = alterate_query_tree(&fst, query_tree.clone(), self.number_typos)?;
query_tree.clone()
} else {
query_tree.clone()
};
let mut new_candidates = resolve_candidates(self.ctx, &new_query_tree, self.number_typos)?; let mut new_candidates = resolve_candidates(self.ctx, &new_query_tree, self.number_typos)?;
new_candidates.intersect_with(&candidates); new_candidates.intersect_with(&candidates);
candidates.difference_with(&new_candidates); candidates.difference_with(&new_candidates);
@ -83,9 +90,16 @@ impl<'t> Criterion for Typo<'t> {
})); }));
}, },
(Some(query_tree), Forbidden(candidates)) => { (Some(query_tree), Forbidden(candidates)) => {
// TODO if number_typos >= 2 the generated query_tree will allways be the same, let fst = self.ctx.words_fst();
// generate a new one on each iteration is a waste of time. let new_query_tree = if self.number_typos < 2 {
let new_query_tree = alterate_query_tree(&self.ctx.words_fst(), query_tree.clone(), self.number_typos)?; alterate_query_tree(&fst, query_tree.clone(), self.number_typos)?
} else if self.number_typos == 2 {
*query_tree = alterate_query_tree(&fst, query_tree.clone(), self.number_typos)?;
query_tree.clone()
} else {
query_tree.clone()
};
let mut new_candidates = resolve_candidates(self.ctx, &new_query_tree, self.number_typos)?; let mut new_candidates = resolve_candidates(self.ctx, &new_query_tree, self.number_typos)?;
new_candidates.difference_with(&candidates); new_candidates.difference_with(&candidates);
candidates.union_with(&new_candidates); candidates.union_with(&new_candidates);