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

Avoid sorting sorted sequences, prefer using set operations

Browse Source
This commit is contained in:
Clément Renault 2020-01-19 10:57:54 +01:00
parent 5465e401bb
commit c334d6b7fe
No known key found for this signature in database
GPG Key ID: 0151CDAB43460DAE
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -428,20 +428,21 @@ pub fn traverse_query_tree<'o, 'txn>(
}; };
let before = Instant::now(); let before = Instant::now();
let mut docids = Vec::new(); let mut results = Vec::new();
while let Some(input) = stream.next() { while let Some(input) = stream.next() {
if let Some(result) = ctx.postings_lists.postings_list(reader, input)? { if let Some(result) = ctx.postings_lists.postings_list(reader, input)? {
let distance = dfa.eval(input).to_u8(); let distance = dfa.eval(input).to_u8();
let is_exact = distance == 0 && input.len() == word.len(); let is_exact = distance == 0 && input.len() == word.len();
docids.extend_from_slice(&result.docids); results.push(result.docids);
let key = PostingsKey { query, input: input.to_owned(), distance, is_exact }; let key = PostingsKey { query, input: input.to_owned(), distance, is_exact };
postings.insert(key, result.matches); postings.insert(key, result.matches);
} }
} }
println!("{:3$}docids extend ({:?}) took {:.02?}", "", docids.len(), before.elapsed(), depth * 2); println!("{:3$}docids retrieval ({:?}) took {:.02?}", "", results.len(), before.elapsed(), depth * 2);
let before = Instant::now(); let before = Instant::now();
let docids = SetBuf::from_dirty(docids); let sets = results.iter().map(AsRef::as_ref).collect();
let docids = sdset::multi::Union::new(sets).into_set_buf();
println!("{:2$}docids construction took {:.02?}", "", before.elapsed(), depth * 2); println!("{:2$}docids construction took {:.02?}", "", before.elapsed(), depth * 2);
Cow::Owned(docids) Cow::Owned(docids)
@ -458,18 +459,21 @@ pub fn traverse_query_tree<'o, 'txn>(
ctx.words_set.search(&dfa).ge(&[byte]).lt(&[byte + 1]).into_stream() ctx.words_set.search(&dfa).ge(&[byte]).lt(&[byte + 1]).into_stream()
}; };
let mut docids = Vec::new(); let before = Instant::now();
let mut results = Vec::new();
while let Some(input) = stream.next() { while let Some(input) = stream.next() {
if let Some(result) = ctx.postings_lists.postings_list(reader, input)? { if let Some(result) = ctx.postings_lists.postings_list(reader, input)? {
let distance = dfa.eval(input).to_u8(); let distance = dfa.eval(input).to_u8();
docids.extend_from_slice(&result.docids); results.push(result.docids);
let key = PostingsKey { query, input: input.to_owned(), distance, is_exact: true }; let key = PostingsKey { query, input: input.to_owned(), distance, is_exact: true };
postings.insert(key, result.matches); postings.insert(key, result.matches);
} }
} }
println!("{:3$}docids retrieval ({:?}) took {:.02?}", "", results.len(), before.elapsed(), depth * 2);
let before = Instant::now(); let before = Instant::now();
let docids = SetBuf::from_dirty(docids); let sets = results.iter().map(AsRef::as_ref).collect();
let docids = sdset::multi::Union::new(sets).into_set_buf();
println!("{:2$}docids construction took {:.02?}", "", before.elapsed(), depth * 2); println!("{:2$}docids construction took {:.02?}", "", before.elapsed(), depth * 2);
Cow::Owned(docids) Cow::Owned(docids)