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

Replace prints by debug logs

Browse Source
This commit is contained in:
Clément Renault 2020-01-21 11:05:34 +01:00
parent 7604387701
commit 789e05304c
No known key found for this signature in database
GPG Key ID: 92ADA4E935E71FA4
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meilisearch-core/src/bucket_sort.rs
View File

@ -91,13 +91,13 @@ where
recurs_operation(&mut queries_kinds, &operation); recurs_operation(&mut queries_kinds, &operation);
let QueryResult { docids, queries } = traverse_query_tree(reader, &context, &operation)?; let QueryResult { docids, queries } = traverse_query_tree(reader, &context, &operation)?;
println!("found {} documents", docids.len()); debug!("found {} documents", docids.len());
println!("number of postings {:?}", queries.len()); debug!("number of postings {:?}", queries.len());
let before = Instant::now(); let before = Instant::now();
mk_arena!(arena); mk_arena!(arena);
let mut bare_matches = cleanup_bare_matches(&mut arena, &docids, queries); let mut bare_matches = cleanup_bare_matches(&mut arena, &docids, queries);
println!("matches cleaned in {:.02?}", before.elapsed()); debug!("matches cleaned in {:.02?}", before.elapsed());
let before_bucket_sort = Instant::now(); let before_bucket_sort = Instant::now();
@ -218,13 +218,13 @@ where
recurs_operation(&mut queries_kinds, &operation); recurs_operation(&mut queries_kinds, &operation);
let QueryResult { docids, queries } = traverse_query_tree(reader, &context, &operation)?; let QueryResult { docids, queries } = traverse_query_tree(reader, &context, &operation)?;
println!("found {} documents", docids.len()); debug!("found {} documents", docids.len());
println!("number of postings {:?}", queries.len()); debug!("number of postings {:?}", queries.len());
let before = Instant::now(); let before = Instant::now();
mk_arena!(arena); mk_arena!(arena);
let mut bare_matches = cleanup_bare_matches(&mut arena, &docids, queries); let mut bare_matches = cleanup_bare_matches(&mut arena, &docids, queries);
println!("matches cleaned in {:.02?}", before.elapsed()); debug!("matches cleaned in {:.02?}", before.elapsed());
let before_raw_documents_building = Instant::now(); let before_raw_documents_building = Instant::now();
let mut raw_documents = Vec::new(); let mut raw_documents = Vec::new();

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

@ -9,6 +9,7 @@ use fst::{IntoStreamer, Streamer};
use itertools::{EitherOrBoth, merge_join_by}; use itertools::{EitherOrBoth, merge_join_by};
use meilisearch_tokenizer::split_query_string; use meilisearch_tokenizer::split_query_string;
use sdset::{Set, SetBuf, SetOperation}; use sdset::{Set, SetBuf, SetOperation};
use log::debug;
use crate::database::MainT; use crate::database::MainT;
use crate::{store, DocumentId, DocIndex, MResult}; use crate::{store, DocumentId, DocIndex, MResult};
@ -307,7 +308,7 @@ pub fn traverse_query_tree<'o, 'txn>(
operations: &'o [Operation], operations: &'o [Operation],
) -> MResult<Cow<'txn, Set<DocumentId>>> ) -> MResult<Cow<'txn, Set<DocumentId>>>
{ {
println!("{:1$}AND", "", depth * 2); debug!("{:1$}AND", "", depth * 2);
let before = Instant::now(); let before = Instant::now();
let mut results = Vec::new(); let mut results = Vec::new();
@ -332,7 +333,7 @@ pub fn traverse_query_tree<'o, 'txn>(
let op = sdset::multi::Intersection::new(results); let op = sdset::multi::Intersection::new(results);
let docids = op.into_set_buf(); let docids = op.into_set_buf();
println!("{:3$}--- AND fetched {} documents in {:.02?}", "", docids.len(), before.elapsed(), depth * 2); debug!("{:3$}--- AND fetched {} documents in {:.02?}", "", docids.len(), before.elapsed(), depth * 2);
Ok(Cow::Owned(docids)) Ok(Cow::Owned(docids))
} }
@ -346,7 +347,7 @@ pub fn traverse_query_tree<'o, 'txn>(
operations: &'o [Operation], operations: &'o [Operation],
) -> MResult<Cow<'txn, Set<DocumentId>>> ) -> MResult<Cow<'txn, Set<DocumentId>>>
{ {
println!("{:1$}OR", "", depth * 2); debug!("{:1$}OR", "", depth * 2);
let before = Instant::now(); let before = Instant::now();
let mut results = Vec::new(); let mut results = Vec::new();
@ -371,7 +372,7 @@ pub fn traverse_query_tree<'o, 'txn>(
let op = sdset::multi::Union::new(results); let op = sdset::multi::Union::new(results);
let docids = op.into_set_buf(); let docids = op.into_set_buf();
println!("{:3$}--- OR fetched {} documents in {:.02?}", "", docids.len(), before.elapsed(), depth * 2); debug!("{:3$}--- OR fetched {} documents in {:.02?}", "", docids.len(), before.elapsed(), depth * 2);
Ok(Cow::Owned(docids)) Ok(Cow::Owned(docids))
} }
@ -413,7 +414,7 @@ pub fn traverse_query_tree<'o, 'txn>(
let before = Instant::now(); let before = Instant::now();
let docids = sdset::duo::Union::new(prefix_docids, exact_docids).into_set_buf(); let docids = sdset::duo::Union::new(prefix_docids, exact_docids).into_set_buf();
println!("{:4$}prefix docids ({} and {}) construction took {:.02?}", debug!("{:4$}prefix docids ({} and {}) construction took {:.02?}",
"", prefix_docids.len(), exact_docids.len(), before.elapsed(), depth * 2); "", prefix_docids.len(), exact_docids.len(), before.elapsed(), depth * 2);
Cow::Owned(docids) Cow::Owned(docids)
@ -439,7 +440,7 @@ pub fn traverse_query_tree<'o, 'txn>(
postings.insert(key, result.matches); postings.insert(key, result.matches);
} }
} }
println!("{:3$}docids retrieval ({:?}) took {:.02?}", "", results.len(), before.elapsed(), depth * 2); debug!("{:3$}docids retrieval ({:?}) took {:.02?}", "", results.len(), before.elapsed(), depth * 2);
let before = Instant::now(); let before = Instant::now();
let docids = if results.len() > 10 { let docids = if results.len() > 10 {
@ -453,7 +454,7 @@ pub fn traverse_query_tree<'o, 'txn>(
let sets = results.iter().map(AsRef::as_ref).collect(); let sets = results.iter().map(AsRef::as_ref).collect();
sdset::multi::Union::new(sets).into_set_buf() sdset::multi::Union::new(sets).into_set_buf()
}; };
println!("{:2$}docids construction took {:.02?}", "", before.elapsed(), depth * 2); debug!("{:2$}docids construction took {:.02?}", "", before.elapsed(), depth * 2);
Cow::Owned(docids) Cow::Owned(docids)
} }
@ -479,7 +480,7 @@ pub fn traverse_query_tree<'o, 'txn>(
postings.insert(key, result.matches); postings.insert(key, result.matches);
} }
} }
println!("{:3$}docids retrieval ({:?}) took {:.02?}", "", results.len(), before.elapsed(), depth * 2); debug!("{:3$}docids retrieval ({:?}) took {:.02?}", "", results.len(), before.elapsed(), depth * 2);
let before = Instant::now(); let before = Instant::now();
let docids = if results.len() > 10 { let docids = if results.len() > 10 {
@ -493,7 +494,7 @@ pub fn traverse_query_tree<'o, 'txn>(
let sets = results.iter().map(AsRef::as_ref).collect(); let sets = results.iter().map(AsRef::as_ref).collect();
sdset::multi::Union::new(sets).into_set_buf() sdset::multi::Union::new(sets).into_set_buf()
}; };
println!("{:2$}docids construction took {:.02?}", "", before.elapsed(), depth * 2); debug!("{:2$}docids construction took {:.02?}", "", before.elapsed(), depth * 2);
Cow::Owned(docids) Cow::Owned(docids)
}, },
@ -518,7 +519,7 @@ pub fn traverse_query_tree<'o, 'txn>(
let mut docids: Vec<_> = matches.iter().map(|m| m.document_id).collect(); let mut docids: Vec<_> = matches.iter().map(|m| m.document_id).collect();
docids.dedup(); docids.dedup();
let docids = SetBuf::new(docids).unwrap(); let docids = SetBuf::new(docids).unwrap();
println!("{:2$}docids construction took {:.02?}", "", before.elapsed(), depth * 2); debug!("{:2$}docids construction took {:.02?}", "", before.elapsed(), depth * 2);
let matches = Cow::Owned(SetBuf::new(matches).unwrap()); let matches = Cow::Owned(SetBuf::new(matches).unwrap());
let key = PostingsKey { query, input: vec![], distance: 0, is_exact: true }; let key = PostingsKey { query, input: vec![], distance: 0, is_exact: true };
@ -526,13 +527,13 @@ pub fn traverse_query_tree<'o, 'txn>(
Cow::Owned(docids) Cow::Owned(docids)
} else { } else {
println!("{:2$}{:?} skipped", "", words, depth * 2); debug!("{:2$}{:?} skipped", "", words, depth * 2);
Cow::default() Cow::default()
} }
}, },
}; };
println!("{:4$}{:?} fetched {:?} documents in {:.02?}", "", query, docids.len(), before.elapsed(), depth * 2); debug!("{:4$}{:?} fetched {:?} documents in {:.02?}", "", query, docids.len(), before.elapsed(), depth * 2);
Ok(docids) Ok(docids)
} }