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

Cache prefixes of a length of 2

Browse Source
This commit is contained in:
Clément Renault 2020-01-14 18:07:14 +01:00
parent 54dacb362d
commit 44fec1b6c9
No known key found for this signature in database
GPG Key ID: 92ADA4E935E71FA4
2 changed files with 47 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -370,8 +370,14 @@ pub fn traverse_query_tree<'o, 'txn>(
let Query { id, prefix, kind } = query; let Query { id, prefix, kind } = query;
let docids = match kind { let docids = match kind {
QueryKind::Tolerant(word) => { QueryKind::Tolerant(word) => {
if *prefix && word.len() == 1 { if *prefix && word.len() <= 2 {
let prefix = [word.as_bytes()[0], 0, 0, 0]; let prefix = {
let mut array = [0; 4];
let bytes = word.as_bytes();
array[..bytes.len()].copy_from_slice(bytes);
array
};
let result = ctx.prefix_postings_lists.prefix_postings_list(reader, prefix)?.unwrap_or_default(); let result = ctx.prefix_postings_lists.prefix_postings_list(reader, prefix)?.unwrap_or_default();
let distance = 0; let distance = 0;
postings.insert((query, word.clone().into_bytes(), distance), result.matches); postings.insert((query, word.clone().into_bytes(), distance), result.matches);

31
meilisearch-core/src/update/documents_addition.rs
View File

@ -195,29 +195,26 @@ pub fn apply_documents_addition<'a, 'b>(
let pplc_store = prefix_postings_lists_cache_store; let pplc_store = prefix_postings_lists_cache_store;
pplc_store.clear(writer)?; pplc_store.clear(writer)?;
let mut previous_prefix: Option<([u8; 4], Vec<_>)> = None; for prefix_len in 1..=2 {
// compute prefixes and store those in the PrefixPostingsListsCache. // compute prefixes and store those in the PrefixPostingsListsCache.
let mut previous_prefix: Option<([u8; 4], Vec<_>)> = None;
let mut stream = words_fst.into_stream(); let mut stream = words_fst.into_stream();
while let Some(input) = stream.next() { while let Some(input) = stream.next() {
if input.len() < prefix_len { continue }
if let Some(postings_list) = postings_lists_store.postings_list(writer, input)?.map(|p| p.matches.into_owned()) { if let Some(postings_list) = postings_lists_store.postings_list(writer, input)?.map(|p| p.matches.into_owned()) {
let prefix = &input[..1]; let prefix = &input[..prefix_len];
let mut arr = [0; 4]; let mut array = [0; 4];
let len = std::cmp::min(4, prefix.len()); array[..prefix_len].copy_from_slice(prefix);
arr[..len].copy_from_slice(prefix); let arr_prefix = array;
let arr_prefix = arr;
// if let (Ok(input), Ok(prefix)) = (std::str::from_utf8(input), std::str::from_utf8(prefix)) {
// debug!("{:?} postings list (prefix {:?}) length {}", input, prefix, postings_list.len());
// }
match previous_prefix { match previous_prefix {
Some((ref mut prev_prefix, ref mut prev_postings_list)) if *prev_prefix != arr_prefix => { Some((ref mut prev_prefix, ref mut prev_postings_list)) if *prev_prefix != arr_prefix => {
prev_postings_list.sort_unstable(); prev_postings_list.sort_unstable();
prev_postings_list.dedup(); prev_postings_list.dedup();
if let Ok(prefix) = std::str::from_utf8(&prev_prefix[..1]) { if let Ok(prefix) = std::str::from_utf8(&prev_prefix[..prefix_len]) {
debug!("writing the prefix of {:?} of length {}", debug!("writing the prefix of {:?} of length {}",
prefix, prev_postings_list.len()); prefix, prev_postings_list.len());
} }
@ -233,16 +230,9 @@ pub fn apply_documents_addition<'a, 'b>(
prev_postings_list.extend_from_slice(&postings_list); prev_postings_list.extend_from_slice(&postings_list);
}, },
None => { None => {
let mut arr = [0; 4]; previous_prefix = Some((arr_prefix, postings_list.to_vec()));
let len = std::cmp::min(4, prefix.len());
arr[..len].copy_from_slice(&prefix[..len]);
let prev_prefix = arr;
previous_prefix = Some((prev_prefix, postings_list.to_vec()));
}, },
} }
// debug!("new length {}", new_postings_list.len());
} }
} }
@ -254,6 +244,7 @@ pub fn apply_documents_addition<'a, 'b>(
let pls = Set::new_unchecked(&prev_postings_list); let pls = Set::new_unchecked(&prev_postings_list);
pplc_store.put_prefix_postings_list(writer, prev_prefix, &pls)?; pplc_store.put_prefix_postings_list(writer, prev_prefix, &pls)?;
} }
}
Ok(()) Ok(())
} }