snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-07-27 00:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

incorporate review changes

Browse Source
This commit is contained in:
mpostma
2021-02-04 13:21:15 +01:00
parent 9af0a08122
commit f8f02af23e
7 changed files with 43 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/data/search.rs
View File

@ -51,7 +51,7 @@ impl SearchQuery {
if let Some(ref condition) = self.facet_condition {
if !condition.trim().is_empty() {
let condition = FacetCondition::from_str(&rtxn, &index, &condition).unwrap();
let condition = FacetCondition::from_str(&rtxn, &index, &condition)?;
search.facet_condition(condition);
}
}

15
src/data/updates.rs
View File

@ -25,7 +25,9 @@ impl Data {
let file = tokio::fs::File::from_std(file?);
let mut encoder = GzipEncoder::new(file);
let mut empty_update = true;
while let Some(result) = stream.next().await {
empty_update = false;
let bytes = &*result?;
encoder.write_all(&bytes[..]).await?;
}
@ -34,10 +36,19 @@ impl Data {
let mut file = encoder.into_inner();
file.sync_all().await?;
let file = file.into_std().await;
let mmap = unsafe { memmap::Mmap::map(&file)? };
let index_controller = self.index_controller.clone();
let update = tokio::task::spawn_blocking(move || index_controller.add_documents(index, method, format, &mmap[..])).await??;
let update = tokio::task::spawn_blocking(move ||{
let mmap;
let bytes = if empty_update {
&[][..]
} else {
mmap = unsafe { memmap::Mmap::map(&file)? };
&mmap
};
index_controller.add_documents(index, method, format, &bytes)
}).await??;
Ok(update.into())
}