introduce index resolver

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

@@ -10,14 +10,14 @@ use tokio::sync::{mpsc, oneshot, RwLock};
 
 use super::error::{DumpActorError, Result};
 use super::{DumpInfo, DumpMsg, DumpStatus, DumpTask};
-use crate::index_controller::uuid_resolver::UuidResolverSender;
+use crate::index_controller::index_resolver::HardStateIndexResolver;
 use crate::index_controller::updates::UpdateSender;
 
 pub const CONCURRENT_DUMP_MSG: usize = 10;
 
 pub struct DumpActor {
     inbox: Option<mpsc::Receiver<DumpMsg>>,
-    uuid_resolver: UuidResolverSender,
+    index_resolver: Arc<HardStateIndexResolver>,
     update: UpdateSender,
     dump_path: PathBuf,
     lock: Arc<Mutex<()>>,
@@ -34,7 +34,7 @@ fn generate_uid() -> String {
 impl DumpActor {
     pub fn new(
         inbox: mpsc::Receiver<DumpMsg>,
-        uuid_resolver: UuidResolverSender,
+        index_resolver: Arc<HardStateIndexResolver>,
         update: UpdateSender,
         dump_path: impl AsRef<Path>,
         index_db_size: usize,
@@ -44,7 +44,7 @@ impl DumpActor {
         let lock = Arc::new(Mutex::new(()));
         Self {
             inbox: Some(inbox),
-            uuid_resolver,
+            index_resolver,
             update,
             dump_path: dump_path.as_ref().into(),
             dump_infos,
@@ -113,7 +113,7 @@ impl DumpActor {
 
         let task = DumpTask {
             path: self.dump_path.clone(),
-            uuid_resolver: self.uuid_resolver.clone(),
+            index_resolver: self.index_resolver.clone(),
             update_handle: self.update.clone(),
             uid: uid.clone(),
             update_db_size: self.update_db_size,

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

@@ -1,7 +1,7 @@
 use meilisearch_error::{Code, ErrorCode};
 
-use crate::index_controller::updates::error::UpdateActorError;
-use crate::index_controller::uuid_resolver::error::UuidResolverError;
+use crate::index_controller::index_resolver::error::IndexResolverError;
+use crate::index_controller::updates::error::UpdateLoopError;
 
 pub type Result<T> = std::result::Result<T, DumpActorError>;
 
@@ -14,9 +14,9 @@ pub enum DumpActorError {
     #[error("Internal error: {0}")]
     Internal(Box<dyn std::error::Error + Send + Sync + 'static>),
     #[error("{0}")]
-    UuidResolver(#[from] UuidResolverError),
+    IndexResolver(#[from] IndexResolverError),
     #[error("{0}")]
-    UpdateActor(#[from] UpdateActorError),
+    UpdateLoop(#[from] UpdateLoopError),
 }
 
 macro_rules! internal_error {
@@ -45,8 +45,8 @@ impl ErrorCode for DumpActorError {
             DumpActorError::DumpAlreadyRunning => Code::DumpAlreadyInProgress,
             DumpActorError::DumpDoesNotExist(_) => Code::NotFound,
             DumpActorError::Internal(_) => Code::Internal,
-            DumpActorError::UuidResolver(e) => e.error_code(),
-            DumpActorError::UpdateActor(e) => e.error_code(),
+            DumpActorError::IndexResolver(e) => e.error_code(),
+            DumpActorError::UpdateLoop(e) => e.error_code(),
         }
     }
 }

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

@@ -1,8 +1,9 @@
 use std::path::Path;
+use std::sync::Arc;
 
 use tokio::sync::{mpsc, oneshot};
 
-use crate::index_controller::uuid_resolver::UuidResolverSender;
+use crate::index_controller::index_resolver::HardStateIndexResolver;
 
 use super::error::Result;
 use super::{DumpActor, DumpActorHandle, DumpInfo, DumpMsg};
@@ -32,7 +33,7 @@ impl DumpActorHandle for DumpActorHandleImpl {
 impl DumpActorHandleImpl {
     pub fn new(
         path: impl AsRef<Path>,
-        uuid_resolver: UuidResolverSender,
+        index_resolver: Arc<HardStateIndexResolver>,
         update: crate::index_controller::updates::UpdateSender,
         index_db_size: usize,
         update_db_size: usize,
@@ -40,7 +41,7 @@ impl DumpActorHandleImpl {
         let (sender, receiver) = mpsc::channel(10);
         let actor = DumpActor::new(
             receiver,
-            uuid_resolver,
+            index_resolver,
             update,
             path,
             index_db_size,

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

@@ -7,7 +7,7 @@ use milli::update::Setting;
 use serde::{Deserialize, Deserializer, Serialize};
 use uuid::Uuid;
 
-use crate::index_controller::uuid_resolver::store::HeedUuidStore;
+use crate::index_controller::index_resolver::uuid_store::HeedUuidStore;
 use crate::index_controller::{self, IndexMetadata};
 use crate::index_controller::{asc_ranking_rule, desc_ranking_rule};
 use crate::{

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

@@ -5,8 +5,8 @@ use log::info;
 use serde::{Deserialize, Serialize};
 
 use crate::index::Index;
+use crate::index_controller::index_resolver::uuid_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

@@ -1,5 +1,6 @@
 use std::fs::File;
 use std::path::{Path, PathBuf};
+use std::sync::Arc;
 
 use anyhow::Context;
 use chrono::{DateTime, Utc};
@@ -16,11 +17,10 @@ pub use actor::DumpActor;
 pub use handle_impl::*;
 pub use message::DumpMsg;
 
+use super::index_resolver::HardStateIndexResolver;
 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;
 
@@ -154,7 +154,7 @@ pub fn load_dump(
 
 struct DumpTask {
     path: PathBuf,
-    uuid_resolver: UuidResolverSender,
+    index_resolver: Arc<HardStateIndexResolver>,
     update_handle: UpdateSender,
     uid: String,
     update_db_size: usize,
@@ -177,9 +177,9 @@ impl DumpTask {
         let mut meta_file = File::create(&meta_path)?;
         serde_json::to_writer(&mut meta_file, &meta)?;
 
-        let uuids = UuidResolverMsg::dump(&self.uuid_resolver, temp_dump_path.clone()).await?;
+        let uuids = self.index_resolver.dump(temp_dump_path.clone()).await?;
 
-        UpdateMsg::dump(&self.update_handle, uuids, temp_dump_path.clone()).await?;
+        UpdateMsg::dump(&self.update_handle, uuids.into_iter().collect(), 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)?;