Refactor interfaces to use more moves, remove log_reader_reverse

1 files changed, 6 insertions, 26 deletions

diff --git a/log_db/src/memtable_secondary.rs b/log_db/src/memtable_secondary.rs
index dc161c8..cd6c252 100644
--- a/log_db/src/memtable_secondary.rs
+++ b/log_db/src/memtable_secondary.rs
@@ -19,14 +19,13 @@ impl SecondaryMemtable {
         }
     }
 
-    pub fn set(&mut self, key: &IndexableValue, value: &LogKey) {
-        match self.records.get_mut(key) {
+    pub fn set(&mut self, key: IndexableValue, value: LogKey) {
+        match self.records.get_mut(&key) {
             Some(set) => {
-                set.insert(value.clone());
+                set.insert(value);
             }
             None => {
-                self.records
-                    .insert(key.clone(), LogKeySet::new_with_initial(&value));
+                self.records.insert(key, LogKeySet::new_with_initial(value));
             }
         };
     }
@@ -38,11 +37,6 @@ impl SecondaryMemtable {
         }
     }
 
-    // Remove all log keys associated with the given key
-    pub fn remove_all(&mut self, key: &IndexableValue) -> Option<LogKeySet> {
-        self.records.remove(key)
-    }
-
     // Remove a single log key associated with the given key. Returns `true`
     // if the log key existed and was removed, `false` otherwise.
     pub fn remove(&mut self, key: &IndexableValue, log_key: &LogKey) -> bool {
@@ -62,24 +56,10 @@ impl SecondaryMemtable {
         }
     }
 
-    // Remove all log keys associated with the given log key
-    // Note: This is a linear time operation, prefer using the `remove` method
-    // if you know the secondary key associated with the log key.
-    pub fn scan_remove(&mut self, log_key: &LogKey) -> u64 {
-        let mut removed = 0;
-        self.records.iter_mut().for_each(|(_, set)| {
-            if let Ok(_) = set.remove(&log_key) {
-                removed += 1;
-            }
-        });
-
-        removed
-    }
-
-    pub fn range<B: RangeBounds<IndexableValue>>(&self, range: B) -> Vec<LogKey> {
+    pub fn range<B: RangeBounds<IndexableValue>>(&self, range: B) -> Vec<&LogKey> {
         let mut keys = Vec::new();
         for (_, set) in self.records.range(range) {
-            keys.extend(set.log_keys().iter().cloned());
+            keys.extend(set.log_keys().iter());
         }
         keys
     }