remove anyhow refs & implement missing errors

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

@@ -1,13 +1,11 @@
 use std::fs::File;
 use std::path::{Path, PathBuf};
 
-use anyhow::Context;
 use chrono::{DateTime, Utc};
-use log::{error, info, warn};
+use log::{info, warn};
 #[cfg(test)]
 use mockall::automock;
 use serde::{Deserialize, Serialize};
-use thiserror::Error;
 use tokio::fs::create_dir_all;
 
 use loaders::v1::MetadataV1;
@@ -18,39 +16,28 @@ pub use handle_impl::*;
 pub use message::DumpMsg;
 
 use super::{update_actor::UpdateActorHandle, uuid_resolver::UuidResolverHandle};
+use crate::index_controller::dump_actor::error::DumpActorError;
 use crate::{helpers::compression, option::IndexerOpts};
+use error::Result;
 
 mod actor;
 mod handle_impl;
 mod loaders;
 mod message;
+pub mod error;
 
 const META_FILE_NAME: &str = "metadata.json";
 
-pub type DumpResult<T> = std::result::Result<T, DumpError>;
-
-#[derive(Error, Debug)]
-pub enum DumpError {
-    #[error("error with index: {0}")]
-    Error(#[from] anyhow::Error),
-    #[error("Heed error: {0}")]
-    HeedError(#[from] heed::Error),
-    #[error("dump already running")]
-    DumpAlreadyRunning,
-    #[error("dump `{0}` does not exist")]
-    DumpDoesNotExist(String),
-}
-
 #[async_trait::async_trait]
 #[cfg_attr(test, automock)]
 pub trait DumpActorHandle {
     /// Start the creation of a dump
     /// Implementation: [handle_impl::DumpActorHandleImpl::create_dump]
-    async fn create_dump(&self) -> DumpResult<DumpInfo>;
+    async fn create_dump(&self) -> Result<DumpInfo>;
 
     /// Return the status of an already created dump
     /// Implementation: [handle_impl::DumpActorHandleImpl::dump_status]
-    async fn dump_info(&self, uid: String) -> DumpResult<DumpInfo>;
+    async fn dump_info(&self, uid: String) -> Result<DumpInfo>;
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -120,7 +107,7 @@ pub fn load_dump(
     index_db_size: usize,
     update_db_size: usize,
     indexer_opts: &IndexerOpts,
-) -> anyhow::Result<()> {
+) -> std::result::Result<(), Box<dyn std::error::Error>> {
     let tmp_src = tempfile::tempdir_in(".")?;
     let tmp_src_path = tmp_src.path();
 
@@ -133,7 +120,9 @@ pub fn load_dump(
     let dst_dir = dst_path
         .as_ref()
         .parent()
-        .with_context(|| format!("Invalid db path: {}", dst_path.as_ref().display()))?;
+        // TODO
+        //.with_context(|| format!("Invalid db path: {}", dst_path.as_ref().display()))?;
+        .unwrap();
 
     let tmp_dst = tempfile::tempdir_in(dst_dir)?;
 
@@ -175,7 +164,7 @@ where
     U: UuidResolverHandle + Send + Sync + Clone + 'static,
     P: UpdateActorHandle + Send + Sync + Clone + 'static,
 {
-    async fn run(self) -> anyhow::Result<()> {
+    async fn run(self) -> Result<()> {
         info!("Performing dump.");
 
         create_dir_all(&self.path).await?;
@@ -196,9 +185,10 @@ where
             .dump(uuids, temp_dump_path.clone())
             .await?;
 
-        let dump_path = tokio::task::spawn_blocking(move || -> anyhow::Result<PathBuf> {
+        let dump_path = tokio::task::spawn_blocking(move || -> Result<PathBuf> {
             let temp_dump_file = tempfile::NamedTempFile::new_in(&self.path)?;
-            compression::to_tar_gz(temp_dump_path, temp_dump_file.path())?;
+            compression::to_tar_gz(temp_dump_path, temp_dump_file.path())
+                .map_err(|e| DumpActorError::Internal(e))?;
 
             let dump_path = self.path.join(self.uid).with_extension("dump");
             temp_dump_file.persist(&dump_path)?;