snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-09-12 07:36:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

review fixes

Browse Source
This commit is contained in:
Marin Postma
2021-04-19 09:47:43 +02:00
parent c78f351300
commit 51829ad85e
4 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
meilisearch-http/src/index_controller/update_actor/mod.rs
View File

@ -37,7 +37,6 @@ pub struct UpdateStoreInfo {
pub size: u64,
/// Uuid of the currently processing update if it exists
pub processing: Option<Uuid>,
}
#[async_trait::async_trait]

13
meilisearch-http/src/index_controller/update_actor/update_store.rs
View File

@ -130,7 +130,7 @@ where
// Init update loop to perform any pending updates at launch.
// Since we just launched the update store, and we still own the receiving end of the
// channel, this call is guarenteed to succeed.
// channel, this call is guaranteed to succeed.
notification_sender.try_send(()).expect("Failed to init update store");
let update_store = Arc::new(UpdateStore {
@ -339,20 +339,19 @@ where
let pending = self
.pending_meta
.prefix_iter(&rtxn, index_uuid.as_bytes())?
.filter_map(Result::ok)
.filter_map(|(_, p)| {
.filter_map(|entry| {
let (_, p) = entry.ok()?;
if let Some((uuid, ref processing)) = *processing {
// Filter out the currently processing update if it is from this index.
if uuid == index_uuid && processing.id() == p.id() {
None
} else {
Some(p)
Some(UpdateStatus::from(p))
}
} else {
Some(p)
Some(UpdateStatus::from(p))
}
})
.map(UpdateStatus::from);
});
updates.extend(pending);