change Guards

Author: marvin-j97

src/blob_tree/mod.rs

@@ -29,6 +29,7 @@ use std::{
     sync::{Arc, MutexGuard},
 };
 
+/// Iterator value guard
 pub struct Guard {
     tree: crate::BlobTree,
     version: Version,
@@ -39,7 +40,7 @@ impl IterGuard for Guard {
     fn into_inner_if(
         self,
         pred: impl Fn(&UserKey) -> bool,
-    ) -> crate::Result<Option<crate::KvPair>> {
+    ) -> crate::Result<(UserKey, Option<UserValue>)> {
         let kv = self.kv?;
 
         if pred(&kv.key.user_key) {
@@ -51,9 +52,9 @@ impl IterGuard for Guard {
                 &self.version,
                 kv,
             )
-            .map(Some)
+            .map(|(k, v)| (k, Some(v)))
         } else {
-            Ok(None)
+            Ok((kv.key.user_key, None))
         }
     }
 

src/iter_guard.rs

@@ -14,7 +14,10 @@ pub trait IterGuard {
     /// # Errors
     ///
     /// Will return `Err` if an IO error occurs.
-    fn into_inner_if(self, pred: impl Fn(&UserKey) -> bool) -> crate::Result<Option<KvPair>>;
+    fn into_inner_if(
+        self,
+        pred: impl Fn(&UserKey) -> bool,
+    ) -> crate::Result<(UserKey, Option<UserValue>)>;
 
     /// Accesses the key-value pair.
     ///

src/lib.rs

@@ -162,14 +162,15 @@ pub type KvPair = (UserKey, UserValue);
 
 #[doc(hidden)]
 pub use {
-    blob_tree::handle::BlobIndirection,
+    blob_tree::{handle::BlobIndirection, Guard as BlobGuard},
     checksum::Checksum,
     key_range::KeyRange,
     merge::BoxedIterator,
     slice::Builder,
     table::{GlobalTableId, Table, TableId},
     tree::ingest::Ingestion,
     tree::inner::TreeId,
+    tree::Guard as StandardGuard,
     value::InternalValue,
 };
 

src/tree/mod.rs

@@ -33,16 +33,20 @@ use std::{
 #[cfg(feature = "metrics")]
 use crate::metrics::Metrics;
 
+/// Iterator value guard
 pub struct Guard(crate::Result<(UserKey, UserValue)>);
 
 impl IterGuard for Guard {
-    fn into_inner_if(self, pred: impl Fn(&UserKey) -> bool) -> crate::Result<Option<KvPair>> {
+    fn into_inner_if(
+        self,
+        pred: impl Fn(&UserKey) -> bool,
+    ) -> crate::Result<(UserKey, Option<UserValue>)> {
         let (k, v) = self.0?;
 
         if pred(&k) {
-            Ok(Some((k, v)))
+            Ok((k, Some(v)))
         } else {
-            Ok(None)
+            Ok((k, None))
         }
     }