ecstore update ec/disk/error

crates/filemeta/src/error.rs

@@ -1,12 +1,15 @@
 pub type Result<T> = core::result::Result<T, Error>;
 
-#[derive(thiserror::Error, Debug, Clone)]
+#[derive(thiserror::Error, Debug)]
 pub enum Error {
     #[error("File not found")]
     FileNotFound,
     #[error("File version not found")]
     FileVersionNotFound,
 
+    #[error("Volume not found")]
+    VolumeNotFound,
+
     #[error("File corrupt")]
     FileCorrupt,
 
@@ -16,8 +19,11 @@ pub enum Error {
     #[error("Method not allowed")]
     MethodNotAllowed,
 
+    #[error("Unexpected error")]
+    Unexpected,
+
     #[error("I/O error: {0}")]
-    Io(String),
+    Io(std::io::Error),
 
     #[error("rmp serde decode error: {0}")]
     RmpSerdeDecode(String),
@@ -64,7 +70,8 @@ impl PartialEq for Error {
             (Error::MethodNotAllowed, Error::MethodNotAllowed) => true,
             (Error::FileNotFound, Error::FileNotFound) => true,
             (Error::FileVersionNotFound, Error::FileVersionNotFound) => true,
-            (Error::Io(e1), Error::Io(e2)) => e1 == e2,
+            (Error::VolumeNotFound, Error::VolumeNotFound) => true,
+            (Error::Io(e1), Error::Io(e2)) => e1.kind() == e2.kind() && e1.to_string() == e2.to_string(),
             (Error::RmpSerdeDecode(e1), Error::RmpSerdeDecode(e2)) => e1 == e2,
             (Error::RmpSerdeEncode(e1), Error::RmpSerdeEncode(e2)) => e1 == e2,
             (Error::RmpDecodeValueRead(e1), Error::RmpDecodeValueRead(e2)) => e1 == e2,
@@ -72,14 +79,39 @@ impl PartialEq for Error {
             (Error::RmpDecodeNumValueRead(e1), Error::RmpDecodeNumValueRead(e2)) => e1 == e2,
             (Error::TimeComponentRange(e1), Error::TimeComponentRange(e2)) => e1 == e2,
             (Error::UuidParse(e1), Error::UuidParse(e2)) => e1 == e2,
+            (Error::Unexpected, Error::Unexpected) => true,
             (a, b) => a.to_string() == b.to_string(),
         }
     }
 }
 
+impl Clone for Error {
+    fn clone(&self) -> Self {
+        match self {
+            Error::FileNotFound => Error::FileNotFound,
+            Error::FileVersionNotFound => Error::FileVersionNotFound,
+            Error::FileCorrupt => Error::FileCorrupt,
+            Error::DoneForNow => Error::DoneForNow,
+            Error::MethodNotAllowed => Error::MethodNotAllowed,
+            Error::VolumeNotFound => Error::VolumeNotFound,
+            Error::Io(e) => Error::Io(std::io::Error::new(e.kind(), e.to_string())),
+            Error::RmpSerdeDecode(s) => Error::RmpSerdeDecode(s.clone()),
+            Error::RmpSerdeEncode(s) => Error::RmpSerdeEncode(s.clone()),
+            Error::FromUtf8(s) => Error::FromUtf8(s.clone()),
+            Error::RmpDecodeValueRead(s) => Error::RmpDecodeValueRead(s.clone()),
+            Error::RmpEncodeValueWrite(s) => Error::RmpEncodeValueWrite(s.clone()),
+            Error::RmpDecodeNumValueRead(s) => Error::RmpDecodeNumValueRead(s.clone()),
+            Error::RmpDecodeMarkerRead(s) => Error::RmpDecodeMarkerRead(s.clone()),
+            Error::TimeComponentRange(s) => Error::TimeComponentRange(s.clone()),
+            Error::UuidParse(s) => Error::UuidParse(s.clone()),
+            Error::Unexpected => Error::Unexpected,
+        }
+    }
+}
+
 impl From<std::io::Error> for Error {
     fn from(e: std::io::Error) -> Self {
-        Error::Io(e.to_string())
+        Error::Io(e)
     }
 }
 

crates/filemeta/src/lib.rs

@@ -7,6 +7,7 @@ mod metacache;
 
 pub mod test_data;
 
+pub use error::*;
 pub use fileinfo::*;
 pub use filemeta::*;
 pub use filemeta_inline::*;

crates/filemeta/src/metacache.rs

@@ -732,7 +732,7 @@ impl<R: AsyncRead + Unpin> MetacacheReader<R> {
     }
 }
 
-pub type UpdateFn<T> = Box<dyn Fn() -> Pin<Box<dyn Future<Output = Result<T>> + Send>> + Send + Sync + 'static>;
+pub type UpdateFn<T> = Box<dyn Fn() -> Pin<Box<dyn Future<Output = std::io::Result<T>> + Send>> + Send + Sync + 'static>;
 
 #[derive(Clone, Debug, Default)]
 pub struct Opts {
@@ -763,7 +763,7 @@ impl<T: Clone + Debug + Send + 'static> Cache<T> {
     }
 
     #[allow(unsafe_code)]
-    pub async fn get(self: Arc<Self>) -> Result<T> {
+    pub async fn get(self: Arc<Self>) -> std::io::Result<T> {
         let v_ptr = self.val.load(AtomicOrdering::SeqCst);
         let v = if v_ptr.is_null() {
             None
@@ -816,7 +816,7 @@ impl<T: Clone + Debug + Send + 'static> Cache<T> {
         }
     }
 
-    async fn update(&self) -> Result<()> {
+    async fn update(&self) -> std::io::Result<()> {
         match (self.update_fn)().await {
             Ok(val) => {
                 self.val.store(Box::into_raw(Box::new(val)), AtomicOrdering::SeqCst);