integrate milli errors

meilisearch-http/src/index_controller/index_actor/actor.rs

@@ -268,9 +268,7 @@ impl<S: IndexStore + Sync + Send> IndexActor<S> {
                 }
                 let mut builder = UpdateBuilder::new(0).settings(&mut txn, &index);
                 builder.set_primary_key(primary_key);
-                builder
-                    .execute(|_, _| ())
-                    .map_err(|e| IndexActorError::Internal(Box::new(e)))?;
+                builder.execute(|_, _| ())?;
                 let meta = IndexMeta::new_txn(&index, &txn)?;
                 txn.commit()?;
                 Ok(meta)
@@ -340,13 +338,9 @@ impl<S: IndexStore + Sync + Send> IndexActor<S> {
 
             Ok(IndexStats {
                 size: index.size(),
-                number_of_documents: index
-                    .number_of_documents(&rtxn)
-                    .map_err(|e| IndexActorError::Internal(Box::new(e)))?,
+                number_of_documents: index.number_of_documents(&rtxn)?,
                 is_indexing: None,
-                fields_distribution: index
-                    .fields_distribution(&rtxn)
-                    .map_err(|e| IndexActorError::Internal(e.into()))?,
+                fields_distribution: index.fields_distribution(&rtxn)?,
             })
         })
         .await?

meilisearch-http/src/index_controller/index_actor/error.rs

@@ -1,6 +1,6 @@
 use meilisearch_error::{Code, ErrorCode};
 
-use crate::index::error::IndexError;
+use crate::{error::MilliError, index::error::IndexError};
 
 pub type Result<T> = std::result::Result<T, IndexActorError>;
 
@@ -16,6 +16,8 @@ pub enum IndexActorError {
     ExistingPrimaryKey,
     #[error("Internal Index Error: {0}")]
     Internal(Box<dyn std::error::Error + Send + Sync + 'static>),
+    #[error("{0}")]
+    Milli(#[from] milli::Error),
 }
 
 macro_rules! internal_error {
@@ -40,6 +42,7 @@ impl ErrorCode for IndexActorError {
             IndexActorError::UnexistingIndex => Code::IndexNotFound,
             IndexActorError::ExistingPrimaryKey => Code::PrimaryKeyAlreadyPresent,
             IndexActorError::Internal(_) => Code::Internal,
+            IndexActorError::Milli(e) => MilliError(e).error_code(),
         }
     }
 }

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

@@ -17,8 +17,6 @@ use crate::index::{Checked, Document, Index, SearchQuery, SearchResult, Settings
 use crate::index_controller::{Failed, IndexStats, Processed, Processing};
 use error::Result;
 
-use self::error::IndexActorError;
-
 use super::IndexSettings;
 
 mod actor;
@@ -42,12 +40,8 @@ impl IndexMeta {
     }
 
     fn new_txn(index: &Index, txn: &heed::RoTxn) -> Result<Self> {
-        let created_at = index
-            .created_at(&txn)
-            .map_err(|e| IndexActorError::Internal(Box::new(e)))?;
-        let updated_at = index
-            .updated_at(&txn)
-            .map_err(|e| IndexActorError::Internal(Box::new(e)))?;
+        let created_at = index.created_at(&txn)?;
+        let updated_at = index.updated_at(&txn)?;
         let primary_key = index.primary_key(&txn)?.map(String::from);
         Ok(Self {
             created_at,

meilisearch-http/src/index_controller/index_actor/store.rs

@@ -61,8 +61,7 @@ impl IndexStore for MapIndexStore {
 
                 let mut builder = UpdateBuilder::new(0).settings(&mut txn, &index);
                 builder.set_primary_key(primary_key);
-                builder.execute(|_, _| ())
-                    .map_err(|e| IndexActorError::Internal(Box::new(e)))?;
+                builder.execute(|_, _| ())?;
 
                 txn.commit()?;
             }