snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-26 12:05:05 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge #737

Browse Source 
737: Fix typo initial candidates computation r=Kerollmops a=ManyTheFish

When `Typo` criterion was after a different criterion than `Words` and the previous criterion wasn't returning any candidates at the first iteration of the bucket sort, then the `initial_candidates` were lost.

Now, `Typo`ensure to keep the `initial_candidates` between iterations.


related to https://github.com/meilisearch/meilisearch/issues/3200#issuecomment-1345179578
related to https://github.com/meilisearch/meilisearch/issues/3228

Co-authored-by: ManyTheFish <many@meilisearch.com>
This commit is contained in:
bors[bot] 2022-12-13 10:29:28 +00:00 committed by GitHub
commit 406ee31d1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,7 +141,12 @@ impl<'t> Criterion for Typo<'t> {
filtered_candidates, filtered_candidates,
initial_candidates, initial_candidates,
}) => { }) => {
self.initial_candidates = initial_candidates; self.initial_candidates =
match (self.initial_candidates.take(), initial_candidates) {
(Some(self_ic), Some(parent_ic)) => Some(self_ic | parent_ic),
(self_ic, parent_ic) => self_ic.or(parent_ic),
};
let candidates = match candidates.or(filtered_candidates) { let candidates = match candidates.or(filtered_candidates) {
Some(candidates) => { Some(candidates) => {
Candidates::Allowed(candidates - params.excluded_candidates) Candidates::Allowed(candidates - params.excluded_candidates)

4
milli/src/search/criteria/words.rs
View File

@ -74,8 +74,8 @@ impl<'t> Criterion for Words<'t> {
self.initial_candidates = self.initial_candidates =
match (self.initial_candidates.take(), initial_candidates) { match (self.initial_candidates.take(), initial_candidates) {
(Some(self_bc), Some(parent_bc)) => Some(self_bc | parent_bc), (Some(self_ic), Some(parent_ic)) => Some(self_ic | parent_ic),
(self_bc, parent_bc) => self_bc.or(parent_bc), (self_ic, parent_ic) => self_ic.or(parent_ic),
}; };
} }
Some(CriterionResult { Some(CriterionResult {