Move MemStore to tests directory

The in-memory metadastore is intended for testing purposes only.

Author: ekkolon

minikv-core/src/storage/mod.rs

@@ -42,56 +42,3 @@ pub trait MetadataStore: Send + Sync {
     /// Primarily used by `rebuild_all` to regenerate the database from scratch.
     fn delete_all(&self) -> Result<(), Error>;
 }
-
-/// In-memory `MetadataStore` backed by a `BTreeMap`.
-///
-/// Useful for unit and integration tests that do not require persistent storage.
-#[cfg(debug_assertions)]
-pub mod mem {
-    use super::*;
-    use std::collections::BTreeMap;
-    use std::sync::Mutex;
-
-    #[derive(Default)]
-    pub struct MemStore {
-        inner: Mutex<BTreeMap<Vec<u8>, Vec<u8>>>,
-    }
-
-    impl MetadataStore for MemStore {
-        fn get(&self, key: &[u8]) -> Result<Option<Vec<u8>>, Error> {
-            Ok(self.inner.lock().unwrap().get(key).cloned())
-        }
-
-        fn put(&self, key: &[u8], value: &[u8]) -> Result<(), Error> {
-            self.inner
-                .lock()
-                .unwrap()
-                .insert(key.to_vec(), value.to_vec());
-            Ok(())
-        }
-
-        fn delete(&self, key: &[u8]) -> Result<(), Error> {
-            self.inner.lock().unwrap().remove(key);
-            Ok(())
-        }
-
-        fn scan_prefix(&self, prefix: &[u8]) -> Result<Vec<KeyValuePair>, Error> {
-            let store = self.inner.lock().unwrap();
-            Ok(store
-                .iter()
-                .filter(|(k, _)| k.starts_with(prefix))
-                .map(|(k, v)| (k.clone(), v.clone()))
-                .collect())
-        }
-
-        fn scan_all(&self) -> Result<Vec<KeyValuePair>, Error> {
-            let store = self.inner.lock().unwrap();
-            Ok(store.iter().map(|(k, v)| (k.clone(), v.clone())).collect())
-        }
-
-        fn delete_all(&self) -> Result<(), Error> {
-            self.inner.lock().unwrap().clear();
-            Ok(())
-        }
-    }
-}

minikv-core/tests/rebalance.rs

@@ -8,18 +8,66 @@
 //! An in-memory `MemStore` is used as the metadata backend.
 
 use dashmap::DashMap;
+use minikv_core::Error;
+use minikv_core::KeyValuePair;
+use minikv_core::MetadataStore;
 use minikv_core::locking::KeyLock;
 use minikv_core::rebalance::rebalance_key;
 use minikv_core::replication::build_volume_client;
 use minikv_core::state::AppState;
-use minikv_core::storage::mem::MemStore;
 use minikv_core::volumes::needs_rebalance;
+use std::collections::BTreeMap;
 use std::collections::HashMap;
 use std::sync::Arc;
+use std::sync::Mutex;
 use std::time::Duration;
 use wiremock::matchers::method;
 use wiremock::{Mock, MockServer, ResponseTemplate};
 
+// In-memory `MetadataStore` backed by a `BTreeMap`.
+#[derive(Default)]
+pub struct MemStore {
+    inner: Mutex<BTreeMap<Vec<u8>, Vec<u8>>>,
+}
+
+impl MetadataStore for MemStore {
+    fn get(&self, key: &[u8]) -> Result<Option<Vec<u8>>, Error> {
+        Ok(self.inner.lock().unwrap().get(key).cloned())
+    }
+
+    fn put(&self, key: &[u8], value: &[u8]) -> Result<(), Error> {
+        self.inner
+            .lock()
+            .unwrap()
+            .insert(key.to_vec(), value.to_vec());
+        Ok(())
+    }
+
+    fn delete(&self, key: &[u8]) -> Result<(), Error> {
+        self.inner.lock().unwrap().remove(key);
+        Ok(())
+    }
+
+    fn scan_prefix(&self, prefix: &[u8]) -> Result<Vec<KeyValuePair>, Error> {
+        let store = self.inner.lock().unwrap();
+        Ok(store
+            .iter()
+            .filter(|(k, _)| k.starts_with(prefix))
+            .map(|(k, v)| (k.clone(), v.clone()))
+            .collect())
+    }
+
+    fn scan_all(&self) -> Result<Vec<KeyValuePair>, Error> {
+        let store = self.inner.lock().unwrap();
+        Ok(store.iter().map(|(k, v)| (k.clone(), v.clone())).collect())
+    }
+
+    fn delete_all(&self) -> Result<(), Error> {
+        self.inner.lock().unwrap().clear();
+        Ok(())
+    }
+}
+
 /// Build a test `AppState` backed by `MemStore` and pointing at `volumes`.
 fn make_state(volumes: Vec<String>) -> Arc<AppState> {
     let replicas = volumes.len().min(2);