166 fix delete (#167)

* fix delete * update changelog * Update CHANGELOG.md
qoollo · Apr 27, 2022 · 593c2fc · 593c2fc
1 parent a51a10a
commit 593c2fc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ Pearl changelog
 #### Changed
 
 #### Fixed
+- Fix delete with no active blob set (#167)
 
 #### Updated
 

diff --git a/src/storage/core.rs b/src/storage/core.rs
@@ -682,7 +682,7 @@ where
                 ErrorKind::Bincode(_) => true,
                 ErrorKind::Validation { kind, cause: _ } => {
                     !matches!(kind, ValidationErrorKind::BlobVersion)
-                },
+                }
                 _ => false,
             };
         }
@@ -873,12 +873,14 @@ where
 
     async fn mark_all_as_deleted_active(&self, key: &K) -> Result<u64> {
         let mut safe = self.inner.safe.write().await;
-        let active_blob = safe
-            .active_blob
-            .as_deref_mut()
-            .ok_or_else(Error::active_blob_not_set)?;
-        let count = active_blob.mark_all_as_deleted(key).await?.unwrap_or(0);
-        debug!("{} deleted from active blob", count);
+        let active_blob = safe.active_blob.as_deref_mut();
+        let count = if let Some(active_blob) = active_blob {
+            let count = active_blob.mark_all_as_deleted(key).await?.unwrap_or(0);
+            debug!("{} deleted from active blob", count);
+            count
+        } else {
+            0
+        };
         Ok(count)
     }
 }