refactor update actor

meilisearch-lib/src/index_controller/dump_actor/actor.rs

@@ -7,19 +7,18 @@ use chrono::Utc;
 use futures::{lock::Mutex, stream::StreamExt};
 use log::{error, trace};
 use tokio::sync::{mpsc, oneshot, RwLock};
-use update_actor::UpdateActorHandle;
 
 use super::error::{DumpActorError, Result};
 use super::{DumpInfo, DumpMsg, DumpStatus, DumpTask};
 use crate::index_controller::uuid_resolver::UuidResolverSender;
-use crate::index_controller::update_actor;
+use crate::index_controller::updates::UpdateSender;
 
 pub const CONCURRENT_DUMP_MSG: usize = 10;
 
-pub struct DumpActor<Update> {
+pub struct DumpActor {
     inbox: Option<mpsc::Receiver<DumpMsg>>,
     uuid_resolver: UuidResolverSender,
-    update: Update,
+    update: UpdateSender,
     dump_path: PathBuf,
     lock: Arc<Mutex<()>>,
     dump_infos: Arc<RwLock<HashMap<String, DumpInfo>>>,
@@ -32,14 +31,11 @@ fn generate_uid() -> String {
     Utc::now().format("%Y%m%d-%H%M%S%3f").to_string()
 }
 
-impl<Update> DumpActor<Update>
-where
-    Update: UpdateActorHandle + Send + Sync + Clone + 'static,
-{
+impl DumpActor {
     pub fn new(
         inbox: mpsc::Receiver<DumpMsg>,
         uuid_resolver: UuidResolverSender,
-        update: Update,
+        update: UpdateSender,
         dump_path: impl AsRef<Path>,
         index_db_size: usize,
         update_db_size: usize,

meilisearch-lib/src/index_controller/dump_actor/error.rs

@@ -1,6 +1,6 @@
 use meilisearch_error::{Code, ErrorCode};
 
-use crate::index_controller::update_actor::error::UpdateActorError;
+use crate::index_controller::updates::error::UpdateActorError;
 use crate::index_controller::uuid_resolver::error::UuidResolverError;
 
 pub type Result<T> = std::result::Result<T, DumpActorError>;

meilisearch-lib/src/index_controller/dump_actor/handle_impl.rs

@@ -33,7 +33,7 @@ impl DumpActorHandleImpl {
     pub fn new(
         path: impl AsRef<Path>,
         uuid_resolver: UuidResolverSender,
-        update: crate::index_controller::update_actor::UpdateActorHandleImpl,
+        update: crate::index_controller::updates::UpdateSender,
         index_db_size: usize,
         update_db_size: usize,
     ) -> anyhow::Result<Self> {

meilisearch-lib/src/index_controller/dump_actor/loaders/v2.rs

@@ -5,7 +5,8 @@ use log::info;
 use serde::{Deserialize, Serialize};
 
 use crate::index::Index;
-use crate::index_controller::{update_actor::UpdateStore, uuid_resolver::store::HeedUuidStore};
+use crate::index_controller::updates::store::UpdateStore;
+use crate::index_controller::{uuid_resolver::store::HeedUuidStore};
 use crate::options::IndexerOpts;
 
 #[derive(Serialize, Deserialize, Debug)]

meilisearch-lib/src/index_controller/dump_actor/mod.rs

@@ -16,9 +16,10 @@ pub use actor::DumpActor;
 pub use handle_impl::*;
 pub use message::DumpMsg;
 
-use super::update_actor::UpdateActorHandle;
+use super::updates::UpdateSender;
 use super::uuid_resolver::UuidResolverSender;
 use crate::index_controller::dump_actor::error::DumpActorError;
+use crate::index_controller::updates::UpdateMsg;
 use crate::index_controller::uuid_resolver::UuidResolverMsg;
 use crate::options::IndexerOpts;
 use error::Result;
@@ -151,20 +152,16 @@ pub fn load_dump(
     Ok(())
 }
 
-struct DumpTask<P> {
+struct DumpTask {
     path: PathBuf,
     uuid_resolver: UuidResolverSender,
-    update_handle: P,
+    update_handle: UpdateSender,
     uid: String,
     update_db_size: usize,
     index_db_size: usize,
 }
 
-impl<P> DumpTask<P>
-where
-    P: UpdateActorHandle + Send + Sync + Clone + 'static,
-
-{
+impl DumpTask {
     async fn run(self) -> Result<()> {
         trace!("Performing dump.");
 
@@ -182,9 +179,7 @@ where
 
         let uuids = UuidResolverMsg::dump(&self.uuid_resolver, temp_dump_path.clone()).await?;
 
-        self.update_handle
-            .dump(uuids, temp_dump_path.clone())
-            .await?;
+        UpdateMsg::dump(&self.update_handle, uuids, temp_dump_path.clone()).await?;
 
         let dump_path = tokio::task::spawn_blocking(move || -> Result<PathBuf> {
             let temp_dump_file = tempfile::NamedTempFile::new_in(&self.path)?;