Fix legacy NoSuchKey bugs

Signed-off-by: Ryan Levick <[email protected]>

Author: rylev

crates/key-value-redis/src/lib.rs

@@ -55,13 +55,7 @@ struct RedisStore {
 impl Store for RedisStore {
     async fn get(&self, key: &str) -> Result<Option<Vec<u8>>, Error> {
         let mut conn = self.connection.lock().await;
-        let result: Vec<u8> = conn.get(key).await.map_err(log_error)?;
-
-        if result.is_empty() {
-            Ok(None)
-        } else {
-            Ok(Some(result))
-        }
+        conn.get(key).await.map_err(log_error)
     }
 
     async fn set(&self, key: &str, value: &[u8]) -> Result<(), Error> {

crates/key-value/src/lib.rs

@@ -140,7 +140,7 @@ impl key_value::HostStore for KeyValueDispatch {
 
 pub fn log_error(err: impl std::fmt::Debug) -> Error {
     tracing::warn!("key-value error: {err:?}");
-    Error::Io(format!("{err:?}"))
+    Error::Other(format!("{err:?}"))
 }
 
 use spin_world::v1::key_value::Error as LegacyError;
@@ -150,7 +150,7 @@ fn to_legacy_error(value: key_value::Error) -> LegacyError {
         Error::StoreTableFull => LegacyError::StoreTableFull,
         Error::NoSuchStore => LegacyError::NoSuchStore,
         Error::AccessDenied => LegacyError::AccessDenied,
-        Error::Io(s) => LegacyError::Io(s),
+        Error::Other(s) => LegacyError::Io(s),
     }
 }
 
@@ -166,7 +166,7 @@ impl spin_world::v1::key_value::Host for KeyValueDispatch {
         let result = <Self as key_value::HostStore>::get(self, this, key).await?;
         Ok(result
             .map_err(to_legacy_error)
-            .map(|v| v.unwrap_or_default()))
+            .and_then(|v| v.ok_or(LegacyError::NoSuchKey)))
     }
 
     async fn set(

crates/key-value/src/util.rs

@@ -123,7 +123,7 @@ impl CachingStoreState {
             if let Some(previous_task) = previous_task {
                 previous_task
                     .await
-                    .map_err(|e| Error::Io(format!("{e:?}")))??
+                    .map_err(|e| Error::Other(format!("{e:?}")))??
             }
 
             task.await
@@ -134,7 +134,7 @@ impl CachingStoreState {
         if let Some(previous_task) = self.previous_task.take() {
             previous_task
                 .await
-                .map_err(|e| Error::Io(format!("{e:?}")))??
+                .map_err(|e| Error::Other(format!("{e:?}")))??
         }
 
         Ok(())

wit/preview2/key-value.wit

@@ -42,6 +42,6 @@ interface key-value {
     access-denied,
 
     /// Some implementation-specific error has occurred (e.g. I/O)
-    io(string)
+    other(string)
   }
 }