snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-27 04:25:06 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Factorize phrase computation

Browse Source
This commit is contained in:
ManyTheFish 2022-08-08 10:37:31 +02:00
parent cbb3b25459
commit b389be48a0
2 changed files with 42 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -326,12 +326,28 @@ pub fn resolve_query_tree<'t>(
} }
Ok(candidates) Ok(candidates)
} }
Phrase(words) => { Phrase(words) => resolve_phrase(ctx, &words),
Or(_, ops) => {
let mut candidates = RoaringBitmap::new();
for op in ops {
let docids = resolve_operation(ctx, op, wdcache)?;
candidates |= docids;
}
Ok(candidates)
}
Query(q) => Ok(query_docids(ctx, q, wdcache)?),
}
}
resolve_operation(ctx, query_tree, wdcache)
}
pub fn resolve_phrase<'t>(ctx: &'t dyn Context, phrase: &[String]) -> Result<RoaringBitmap> {
let mut candidates = RoaringBitmap::new(); let mut candidates = RoaringBitmap::new();
let mut first_iter = true; let mut first_iter = true;
let winsize = words.len().min(7); let winsize = phrase.len().min(7);
for win in words.windows(winsize) { for win in phrase.windows(winsize) {
// Get all the documents with the matching distance for each word pairs. // Get all the documents with the matching distance for each word pairs.
let mut bitmaps = Vec::with_capacity(winsize.pow(2)); let mut bitmaps = Vec::with_capacity(winsize.pow(2));
for (offset, s1) in win.iter().enumerate() { for (offset, s1) in win.iter().enumerate() {
@ -362,20 +378,6 @@ pub fn resolve_query_tree<'t>(
} }
} }
Ok(candidates) Ok(candidates)
}
Or(_, ops) => {
let mut candidates = RoaringBitmap::new();
for op in ops {
let docids = resolve_operation(ctx, op, wdcache)?;
candidates |= docids;
}
Ok(candidates)
}
Query(q) => Ok(query_docids(ctx, q, wdcache)?),
}
}
resolve_operation(ctx, query_tree, wdcache)
} }
fn all_word_pair_proximity_docids<T: AsRef<str>, U: AsRef<str>>( fn all_word_pair_proximity_docids<T: AsRef<str>, U: AsRef<str>>(

39
milli/src/search/criteria/proximity.rs
View File

@ -6,8 +6,8 @@ use log::debug;
use roaring::RoaringBitmap; use roaring::RoaringBitmap;
use super::{ use super::{
query_docids, query_pair_proximity_docids, resolve_query_tree, Context, Criterion, query_docids, query_pair_proximity_docids, resolve_phrase, resolve_query_tree, Context,
CriterionParameters, CriterionResult, Criterion, CriterionParameters, CriterionResult,
}; };
use crate::search::query_tree::{maximum_proximity, Operation, Query, QueryKind}; use crate::search::query_tree::{maximum_proximity, Operation, Query, QueryKind};
use crate::search::{build_dfa, WordDerivationsCache}; use crate::search::{build_dfa, WordDerivationsCache};
@ -192,42 +192,9 @@ fn resolve_candidates<'t>(
let most_right = words let most_right = words
.last() .last()
.map(|w| Query { prefix: false, kind: QueryKind::exact(w.clone()) }); .map(|w| Query { prefix: false, kind: QueryKind::exact(w.clone()) });
let mut candidates = RoaringBitmap::new();
let mut first_iter = true;
let winsize = words.len().min(7);
for win in words.windows(winsize) {
// Get all the documents with the matching distance for each word pairs.
let mut bitmaps = Vec::with_capacity(winsize.pow(2));
for (offset, s1) in win.iter().enumerate() {
for (dist, s2) in win.iter().skip(offset + 1).enumerate() {
match ctx.word_pair_proximity_docids(s1, s2, dist as u8 + 1)? {
Some(m) => bitmaps.push(m),
// If there are no document for this distance, there will be no
// results for the phrase query.
None => return Ok(Default::default()),
}
}
}
// 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;
}
}
}
match (most_left, most_right) { match (most_left, most_right) {
(Some(l), Some(r)) => vec![(l, r, candidates)], (Some(l), Some(r)) => vec![(l, r, resolve_phrase(ctx, &words)?)],
_otherwise => Default::default(), _otherwise => Default::default(),
} }
} else { } else {