codex suggestions

Author: roberto-bayardo

storage/src/index/ordered.rs

@@ -6,7 +6,7 @@
 
 use crate::{
     index::{
-        storage::{Cursor as CursorImpl, ImmutableCursor, IndexEntry, Record},
+        storage::{insert_front, Cursor as CursorImpl, ImmutableCursor, IndexEntry, Record},
         Cursor as CursorTrait, Ordered, Unordered,
     },
     translator::Translator,
@@ -245,16 +245,11 @@ impl<T: Translator, V: Eq + Send + Sync> Unordered for Index<T, V> {
         }
     }
 
-    fn insert(&mut self, key: &[u8], mut value: V) {
+    fn insert(&mut self, key: &[u8], value: V) {
         let k = self.translator.transform(key);
         match self.map.entry(k) {
             BTreeEntry::Occupied(mut entry) => {
-                let record = entry.get_mut();
-                std::mem::swap(&mut record.value, &mut value);
-                record.next = Some(Box::new(Record {
-                    value,
-                    next: record.next.take(),
-                }));
+                insert_front(entry.get_mut(), value);
                 self.items.inc();
             }
             BTreeEntry::Vacant(entry) => {

storage/src/index/storage.rs

@@ -18,6 +18,14 @@ pub(super) struct Record<V: Eq + Send + Sync> {
     pub(super) next: Option<Box<Self>>,
 }
 
+pub(super) fn insert_front<V: Eq + Send + Sync>(record: &mut Record<V>, mut value: V) {
+    std::mem::swap(&mut record.value, &mut value);
+    record.next = Some(Box::new(Record {
+        value,
+        next: record.next.take(),
+    }));
+}
+
 pub(super) trait IndexEntry<V: Eq + Send + Sync>: Send + Sync {
     fn get_mut(&mut self) -> &mut Record<V>;
     fn remove(self);
@@ -167,6 +175,7 @@ impl<V: Eq + Send + Sync, E: IndexEntry<V>> CursorTrait for Cursor<'_, V, E> {
                 let entry_record = self.entry.as_mut().unwrap().get_mut();
                 entry_record.value = v;
                 entry_record.next = None;
+                self.prev = None;
                 self.current = Some(Self::record_ptr(entry_record));
                 self.state = State::Done;
             }
@@ -182,6 +191,7 @@ impl<V: Eq + Send + Sync, E: IndexEntry<V>> CursorTrait for Cursor<'_, V, E> {
                     }));
                     Self::record_ptr(last_record.next.as_deref_mut().unwrap())
                 };
+                self.prev = last;
                 self.current = Some(inserted);
                 self.state = State::Done;
             }

storage/src/index/unordered.rs

@@ -4,7 +4,7 @@
 
 use crate::{
     index::{
-        storage::{Cursor as CursorImpl, ImmutableCursor, IndexEntry, Record},
+        storage::{insert_front, Cursor as CursorImpl, ImmutableCursor, IndexEntry, Record},
         Cursor as CursorTrait, Unordered,
     },
     translator::Translator,
@@ -165,16 +165,11 @@ impl<T: Translator, V: Eq + Send + Sync> Unordered for Index<T, V> {
         }
     }
 
-    fn insert(&mut self, key: &[u8], mut v: V) {
+    fn insert(&mut self, key: &[u8], v: V) {
         let k = self.translator.transform(key);
         match self.map.entry(k) {
             Entry::Occupied(mut entry) => {
-                let record = entry.get_mut();
-                std::mem::swap(&mut record.value, &mut v);
-                record.next = Some(Box::new(Record {
-                    value: v,
-                    next: record.next.take(),
-                }));
+                insert_front(entry.get_mut(), v);
                 self.items.inc();
             }
             Entry::Vacant(entry) => {