snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-01-18 17:11:15 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge #442

Browse Source 
442: fix phrase search r=curquiza a=MarinPostma

Run the exact match search on 7 words windows instead of only two. This makes false positive very very unlikely, and impossible on phrase query that are less than seven words.


Co-authored-by: ad hoc <postma.marin@protonmail.com>
This commit is contained in:
bors[bot] 2022-02-07 16:18:20 +00:00 committed by GitHub
commit 5d58cb7449
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cli/src/main.rs
View File

@ -448,8 +448,10 @@ impl Search {
#[derive(Debug, StructOpt)] #[derive(Debug, StructOpt)]
struct SettingsUpdate { struct SettingsUpdate {
#[structopt(short, long)] #[structopt(long)]
filterable_attributes: Option<Vec<String>>, filterable_attributes: Option<Vec<String>>,
#[structopt(long)]
criteria: Option<Vec<String>>,
} }
impl Performer for SettingsUpdate { impl Performer for SettingsUpdate {
@ -468,6 +470,14 @@ impl Performer for SettingsUpdate {
} }
} }
if let Some(criteria) = self.criteria {
if !criteria.is_empty() {
update.set_criteria(criteria);
} else {
update.reset_criteria();
}
}
let mut bars = Vec::new(); let mut bars = Vec::new();
let progesses = MultiProgress::new(); let progesses = MultiProgress::new();
for _ in 0..4 { for _ in 0..4 {

42
milli/src/search/criteria/mod.rs
View File

@ -318,21 +318,37 @@ pub fn resolve_query_tree<'t>(
} }
Phrase(words) => { Phrase(words) => {
let mut candidates = RoaringBitmap::new(); let mut candidates = RoaringBitmap::new();
let mut first_loop = true; let mut first_iter = true;
for slice in words.windows(2) { let winsize = words.len().min(7);
let (left, right) = (&slice[0], &slice[1]);
match ctx.word_pair_proximity_docids(left, right, 1)? { for win in words.windows(winsize) {
Some(pair_docids) => { // Get all the documents with the matching distance for each word pairs.
if pair_docids.is_empty() { let mut bitmaps = Vec::with_capacity(winsize.pow(2));
return Ok(RoaringBitmap::new()); for (offset, s1) in win.iter().enumerate() {
} else if first_loop { for (dist, s2) in win.iter().skip(offset).enumerate() {
candidates = pair_docids; match ctx.word_pair_proximity_docids(s1, s2, dist as u8 + 1)? {
first_loop = false; Some(m) => bitmaps.push(m),
} else { // If there are no document for this distance, there will be no
candidates &= pair_docids; // results for the phrase query.
None => return Ok(RoaringBitmap::new()),
} }
} }
None => return Ok(RoaringBitmap::new()), }
// We sort the bitmaps so that we perform the small intersections first, which is faster.
bitmaps.sort_unstable_by(|a, b| a.len().cmp(&b.len()));
for bitmap in bitmaps {
if first_iter {
candidates = bitmap;
first_iter = false;
} else {
candidates &= bitmap;
}
// There will be no match, return early
if candidates.is_empty() {
break;
}
} }
} }
Ok(candidates) Ok(candidates)