Commit WIP.

Author: gz

src/trace/persistent/cursor.rs

@@ -86,8 +86,6 @@ where
     B::Val: Ord + Encode + Decode,
     B::R: Encode + Decode,
 {
-    type Storage = PersistentTrace<B>;
-
     #[inline]
     fn key_valid(&self) -> bool {
         self.cur_key_weight.is_some()
@@ -116,6 +114,10 @@ where
         unimplemented!()
     }
 
+    fn map_times_through<L: FnMut(&B::Time, &B::R)>(&mut self, logic: L, upper: &B::Time) {
+        unimplemented!()
+    }
+
     #[inline]
     fn weight(&mut self) -> B::R
     where
@@ -145,6 +147,11 @@ where
         }
     }
 
+    /// Returns the last key in the cursor or `None` if the cursor is empty.
+    fn last_key(&mut self) -> Option<&B::Key> {
+        None
+    }
+
     #[inline]
     fn seek_key(&mut self, key: &B::Key) {
         self.valid = true;
@@ -187,16 +194,6 @@ where
     #[inline]
     fn seek_val(&mut self, val: &B::Val) {}
 
-    #[inline]
-    fn values<'a>(&mut self, vals: &mut Vec<(&'a B::Val, B::R)>)
-    where
-        's: 'a,
-    {
-        // It's technically ok to call this on a batch with value type `()`, but
-        // shouldn't happen in practice.
-        unimplemented!();
-    }
-
     #[inline]
     fn rewind_keys(&mut self) {
         self.cursor_upper_bound = None;

src/trace/persistent/tests.rs

@@ -181,12 +181,13 @@ fn keys<K: Arbitrary + Clone>(range: Range<usize>) -> impl Strategy<Value = Vec<
     prop::collection::vec(any::<K>(), range)
 }
 
-/* Does a random cursor walk test for a generic Batch `B`.
+// Does a random cursor walk test for a generic Batch `B`.
+/*
 fn random_cursor_walk<B>(
     mut ks: Vec<(B::Key, B::Val, B::R)>,
     ops: Vec<CursorAction<B::Key, B::Val>>,
 ) where
-    B: Batch + 'static,
+    B: Batch<Item = (<B as BatchReader>::Key, <B as BatchReader>::Val)> + 'static,
     B::Key: Arbitrary + Ord + Clone + Encode + Decode,
     B::Val: Arbitrary + Ord + Clone + Encode + Decode,
     B::R: Arbitrary + Ord + Clone + MonoidValue + Encode + Decode,
@@ -199,7 +200,7 @@ fn random_cursor_walk<B>(
     // Instantiate a regular OrdZSet
     let mut batch_builder = B::Builder::new(B::Time::default());
     for (key, val, r) in ks.iter() {
-        batch_builder.push((key.clone(), val.clone(), r.clone()));
+        batch_builder.push(((key.clone(), val.clone()), r.clone()));
     }
     let batch = batch_builder.done();
 
@@ -300,7 +301,7 @@ fn random_cursor_walk<B>(
             }
         }
     }
-}*/
+} */
 
 proptest! {
     // Verify that our [`Cursor`] implementation for the persistent [`OrdZSet`]
@@ -313,7 +314,7 @@ proptest! {
         // Instantiate a regular OrdZSet
         let mut zset_builder = OrdZSetBuilder::new(());
         for key in ks.iter() {
-            zset_builder.push((key.clone(), (), 0));
+            zset_builder.push((key.clone(), 0));
         }
         let zset = zset_builder.done();
 
@@ -407,10 +408,10 @@ proptest! {
 #[test]
 fn ordzset_insert_simple() {
     let mut zset_builder = ord::zset_batch::OrdZSetBuilder::new(());
-    zset_builder.push((1, (), 9));
-    zset_builder.push((2, (), 4));
-    zset_builder.push((3, (), 8));
-    zset_builder.push((4, (), 4));
+    zset_builder.push((1, 9));
+    zset_builder.push((2, 4));
+    zset_builder.push((3, 8));
+    zset_builder.push((4, 4));
     let zset = zset_builder.done();
     println!("ZSET: {}", zset);
 
@@ -428,11 +429,11 @@ fn ordzset_insert_simple() {
 #[test]
 fn val_insert_simple() {
     let mut val_builder = ord::val_batch::OrdValBuilder::new(4);
-    val_builder.push((1, 10, 9));
-    val_builder.push((1, 12, 12));
-    val_builder.push((2, 11, 7));
-    val_builder.push((3, 12, 8));
-    val_builder.push((4, 13, 9));
+    val_builder.push(((1, 10), 9));
+    val_builder.push(((1, 12), 12));
+    val_builder.push(((2, 11), 7));
+    val_builder.push(((3, 12), 8));
+    val_builder.push(((4, 13), 9));
     let vset = val_builder.done();
     //println!("vset: {:?}", vset);
 
@@ -442,11 +443,11 @@ fn val_insert_simple() {
     println!("SPINE: {}", spine);
 
     let mut val_builder = ord::val_batch::OrdValBuilder::new(99);
-    val_builder.push((1, 10, 108));
-    val_builder.push((1, 12, 12));
-    val_builder.push((2, 11, 7));
-    val_builder.push((3, 12, 8));
-    val_builder.push((4, 13, 9));
+    val_builder.push(((1, 10), 108));
+    val_builder.push(((1, 12), 12));
+    val_builder.push(((2, 11), 7));
+    val_builder.push(((3, 12), 8));
+    val_builder.push(((4, 13), 9));
     let vset = val_builder.done();
     println!("vset: {:?}", vset);
 

src/trace/persistent/trace.rs

@@ -144,6 +144,12 @@ where
 
     type Cursor<'s> = PersistentTraceCursor<'s, B>;
 
+    /// The number of keys in the batch.
+    fn key_count(&self) -> usize {
+        self.keys
+    }
+
+    /// The number of updates in the batch.
     fn len(&self) -> usize {
         self.keys
     }