snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-09-10 14:46:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Differentiate short words as prefix or exact matches

Browse Source
This commit is contained in:
Clément Renault
2020-01-16 12:01:51 +01:00
parent 9809ded23d
commit 70d4f47f37
2 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
meilisearch-core/src/query_tree.rs
View File

@ -380,7 +380,7 @@ pub fn traverse_query_tree<'o, 'txn>(
let before = Instant::now();
let Query { id, prefix, kind } = query;
let docids = match kind {
let docids: Cow<Set<_>> = match kind {
QueryKind::Tolerant(word) => {
if *prefix && word.len() <= 2 {
let prefix = {
@ -390,10 +390,29 @@ pub fn traverse_query_tree<'o, 'txn>(
array
};
let mut docids = Vec::new();
// We retrieve the cached postings list for all
// the words that starts with this short prefix.
let result = ctx.prefix_postings_lists.prefix_postings_list(reader, prefix)?.unwrap_or_default();
let distance = 0;
postings.insert((query, word.clone().into_bytes(), distance), result.matches);
result.docids
docids.extend_from_slice(&result.docids);
// We retrieve the exact postings list for the prefix,
// because we must consider these matches as exact.
if let Some(result) = ctx.postings_lists.postings_list(reader, word.as_bytes())? {
let distance = 0;
postings.insert((query, word.clone().into_bytes(), distance), result.matches);
docids.extend_from_slice(&result.docids);
}
let before = Instant::now();
let docids = SetBuf::from_dirty(docids);
println!("{:2$}prefix docids construction took {:.02?}", "", before.elapsed(), depth * 2);
Cow::Owned(docids)
} else {
let dfa = if *prefix { build_prefix_dfa(word) } else { build_dfa(word) };
@ -442,7 +461,11 @@ pub fn traverse_query_tree<'o, 'txn>(
}
}
Cow::Owned(SetBuf::from_dirty(docids))
let before = Instant::now();
let docids = SetBuf::from_dirty(docids);
println!("{:2$}docids construction took {:.02?}", "", before.elapsed(), depth * 2);
Cow::Owned(docids)
},
QueryKind::Phrase(words) => {
// TODO support prefix and non-prefix exact DFA