refactor: insert with interface allow return fetch value error (#79)

Signed-off-by: MrCroxx <mrcroxx@outlook.com>

foyer-storage/Cargo.toml

@@ -8,6 +8,7 @@ license = "Apache-2.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+anyhow = "1.0"
 async-channel = "1.8"
 async-trait = "0.1"
 bitflags = "2.3.1"

foyer-storage/src/error.rs

@@ -23,25 +23,31 @@ pub enum Error {
     #[error("channel full")]
     ChannelFull,
     #[error("event listener error: {0}")]
-    EventListener(#[from] Box<dyn std::error::Error + Send + Sync + 'static>),
+    EventListener(Box<dyn std::error::Error + Send + Sync + 'static>),
+    #[error("fetch value error: {0}")]
+    FetchValue(anyhow::Error),
     #[error("other error: {0}")]
-    Other(String),
+    Other(#[from] anyhow::Error),
 }
 
 impl Error {
     pub fn device(e: super::device::error::Error) -> Self {
         Self::Device(e)
     }
 
+    pub fn fetch_value(e: impl Into<anyhow::Error>) -> Self {
+        Self::Other(e.into())
+    }
+
+    pub fn other(e: impl Into<anyhow::Error>) -> Self {
+        Self::Other(e.into())
+    }
+
     pub fn event_listener(
         e: impl Into<Box<dyn std::error::Error + Send + Sync + 'static>>,
     ) -> Self {
         Self::EventListener(e.into())
     }
-
-    pub fn other(e: impl Into<Box<dyn std::error::Error>>) -> Self {
-        Self::Other(e.into().to_string())
-    }
 }
 
 pub type Result<T> = core::result::Result<T, Error>;

foyer-storage/src/store.rs

@@ -273,13 +273,13 @@ where
     #[tracing::instrument(skip(self, f))]
     pub async fn insert_with<F>(&self, key: K, f: F, weight: usize) -> Result<bool>
     where
-        F: Fn(&K) -> V,
+        F: Fn(&K) -> anyhow::Result<V>,
     {
         let mut writer = self.writer(key, weight);
         if !writer.judge() {
             return Ok(false);
         }
-        let value = f(&writer.key);
+        let value = f(&writer.key).map_err(Error::fetch_value)?;
         writer.finish(value).await
     }
 
@@ -292,20 +292,20 @@ where
     #[tracing::instrument(skip(self, f))]
     pub async fn insert_with_future<F>(&self, key: K, f: F, weight: usize) -> Result<bool>
     where
-        F: Fn(&K) -> Pin<Box<dyn Future<Output = V>>>,
+        F: Fn(&K) -> Pin<Box<dyn Future<Output = anyhow::Result<V>>>>,
     {
         let mut writer = self.writer(key, weight);
         if !writer.judge() {
             return Ok(false);
         }
-        let value = f(&writer.key).await;
+        let value = f(&writer.key).await.map_err(Error::fetch_value)?;
         writer.finish(value).await
     }
 
     #[tracing::instrument(skip(self, f))]
     pub async fn insert_if_not_exists_with<F>(&self, key: K, f: F, weight: usize) -> Result<bool>
     where
-        F: Fn(&K) -> V,
+        F: Fn(&K) -> anyhow::Result<V>,
     {
         if !self.exists(&key)? {
             return Ok(false);
@@ -321,7 +321,7 @@ where
         weight: usize,
     ) -> Result<bool>
     where
-        F: Fn(&K) -> Pin<Box<dyn Future<Output = V>>>,
+        F: Fn(&K) -> Pin<Box<dyn Future<Output = anyhow::Result<V>>>>,
     {
         if !self.exists(&key)? {
             return Ok(false);