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

fixes after review

Browse Source
This commit is contained in:
Alexey Shekhirin
2021-04-08 16:35:28 +03:00
parent 698a1ea582
commit ae1655586c
9 changed files with 56 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,9 +72,6 @@ where
Some(Snapshot { uuid, path, ret }) => {
let _ = ret.send(self.handle_snapshot(uuid, path).await);
}
Some(IsLocked { uuid, ret }) => {
let _ = ret.send(self.handle_is_locked(uuid).await);
}
None => break,
}
}
@ -226,14 +223,4 @@ where
Ok(())
}
async fn handle_is_locked(&self, uuid: Uuid) -> Result<bool> {
let store = self
.store
.get(uuid)
.await?
.ok_or(UpdateError::UnexistingIndex(uuid))?;
Ok(store.update_lock.is_locked())
}
}

7
meilisearch-http/src/index_controller/update_actor/handle_impl.rs
View File

@ -95,11 +95,4 @@ where
let _ = self.sender.send(msg).await;
receiver.await.expect("update actor killed.")
}
async fn is_locked(&self, uuid: Uuid) -> Result<bool> {
let (ret, receiver) = oneshot::channel();
let msg = UpdateMsg::IsLocked { uuid, ret };
let _ = self.sender.send(msg).await;
receiver.await.expect("update actor killed.")
}
}

4
meilisearch-http/src/index_controller/update_actor/message.rs
View File

@ -34,8 +34,4 @@ pub enum UpdateMsg<D> {
path: PathBuf,
ret: oneshot::Sender<Result<()>>,
},
IsLocked {
uuid: Uuid,
ret: oneshot::Sender<Result<bool>>,
},
}

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

@ -52,5 +52,4 @@ pub trait UpdateActorHandle {
data: mpsc::Receiver<PayloadData<Self::Data>>,
uuid: Uuid,
) -> Result<UpdateStatus>;
async fn is_locked(&self, uuid: Uuid) -> Result<bool>;
}