searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-11-26 23:04:26 +01:00
Code Issues Releases Wiki Activity

chore: Display more stats infos

Browse Source
This commit is contained in:
Clément Renault 2019-01-14 21:18:46 +01:00
parent 2473e289e8
commit 4fa10753c1
No known key found for this signature in database
GPG Key ID: 0151CDAB43460DAE
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -8,6 +8,7 @@ authors = ["Kerollmops <renault.cle@gmail.com>"]
bincode = "1.0" bincode = "1.0"
byteorder = "1.2" byteorder = "1.2"
crossbeam = "0.6" crossbeam = "0.6"
elapsed = "0.1"
fst = "0.3" fst = "0.3"
hashbrown = { version = "0.1", features = ["serde"] } hashbrown = { version = "0.1", features = ["serde"] }
lazy_static = "1.1" lazy_static = "1.1"
@ -42,7 +43,6 @@ nightly = ["hashbrown/nightly", "group-by/nightly"]
[dev-dependencies] [dev-dependencies]
csv = "1.0" csv = "1.0"
elapsed = "0.1"
env_logger = "0.6" env_logger = "0.6"
jemallocator = "0.1" jemallocator = "0.1"
quickcheck = "0.8" quickcheck = "0.8"

17
src/rank/query_builder.rs
View File

@ -93,6 +93,7 @@ where D: Deref<Target=DB>,
op_builder.union() op_builder.union()
}; };
let mut number_matches = 0;
let mut matches = HashMap::new(); let mut matches = HashMap::new();
while let Some((input, indexed_values)) = stream.next() { while let Some((input, indexed_values)) = stream.next() {
@ -104,6 +105,7 @@ where D: Deref<Target=DB>,
let doc_indexes = &self.view.index().positive.indexes(); let doc_indexes = &self.view.index().positive.indexes();
let doc_indexes = &doc_indexes[iv.value as usize]; let doc_indexes = &doc_indexes[iv.value as usize];
number_matches += doc_indexes.len();
for doc_index in doc_indexes { for doc_index in doc_indexes {
let match_ = Match { let match_ = Match {
query_index: iv.index as u32, query_index: iv.index as u32,
@ -117,7 +119,8 @@ where D: Deref<Target=DB>,
} }
} }
info!("{} documents to classify", matches.len()); info!("{} total documents to classify", matches.len());
info!("{} total matches to classify", number_matches);
matches.into_iter().map(|(i, m)| Document::from_matches(i, m)).collect() matches.into_iter().map(|(i, m)| Document::from_matches(i, m)).collect()
} }
@ -135,15 +138,19 @@ where D: Deref<Target=DB>,
return builder.query(query, range); return builder.query(query, range);
} }
let mut documents = self.query_all(query); let (elapsed, mut documents) = elapsed::measure_time(|| self.query_all(query));
info!("query_all took {}", elapsed);
let mut groups = vec![documents.as_mut_slice()]; let mut groups = vec![documents.as_mut_slice()];
let view = &self.view; let view = &self.view;
'criteria: for criterion in self.criteria.as_ref() { 'criteria: for (ci, criterion) in self.criteria.as_ref().iter().enumerate() {
let tmp_groups = mem::replace(&mut groups, Vec::new()); let tmp_groups = mem::replace(&mut groups, Vec::new());
let mut documents_seen = 0; let mut documents_seen = 0;
for group in tmp_groups { for group in tmp_groups {
info!("criterion {}, documents group of size {}", ci, group.len());
// if this group does not overlap with the requested range, // if this group does not overlap with the requested range,
// push it without sorting and splitting it // push it without sorting and splitting it
if documents_seen + group.len() < range.start { if documents_seen + group.len() < range.start {
@ -152,7 +159,11 @@ where D: Deref<Target=DB>,
continue; continue;
} }
let (elapsed, ()) = elapsed::measure_time(|| {
group.sort_unstable_by(|a, b| criterion.evaluate(a, b, view)); group.sort_unstable_by(|a, b| criterion.evaluate(a, b, view));
});
info!("criterion {} sort took {}", ci, elapsed);
for group in BinaryGroupByMut::new(group, |a, b| criterion.eq(a, b, view)) { for group in BinaryGroupByMut::new(group, |a, b| criterion.eq(a, b, view)) {
documents_seen += group.len(); documents_seen += group.len();