From e06e33bee499875c276689995a804da013179efe Mon Sep 17 00:00:00 2001 From: dbr Date: Thu, 29 Apr 2021 00:20:13 +1000 Subject: [PATCH] Remove kv storage backend Now uses sqlite by default --- Cargo.lock | 30 +- taskchampion/Cargo.toml | 1 - taskchampion/src/storage/config.rs | 4 +- taskchampion/src/storage/kv.rs | 683 ----------------------------- taskchampion/src/storage/mod.rs | 3 +- 5 files changed, 7 insertions(+), 714 deletions(-) delete mode 100644 taskchampion/src/storage/kv.rs diff --git a/Cargo.lock b/Cargo.lock index bdd220039..8777c807b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1167,7 +1167,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb79e59d356a5ae85b13990bbb3649a293d64df1ca6e7890822076186527a9f7" dependencies = [ - "lmdb-rkv 0.12.3", + "lmdb-rkv", "rmp-serde", "serde", "thiserror", @@ -1231,19 +1231,7 @@ dependencies = [ "bitflags", "byteorder", "libc", - "lmdb-rkv-sys 0.9.6", -] - -[[package]] -name = "lmdb-rkv" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447a296f7aca299cfbb50f4e4f3d49451549af655fb7215d7f8c0c3d64bad42b" -dependencies = [ - "bitflags", - "byteorder", - "libc", - "lmdb-rkv-sys 0.11.0", + "lmdb-rkv-sys", ] [[package]] @@ -1257,17 +1245,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "lmdb-rkv-sys" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b27470ac25167b3afdfb6af8fcd3bc1be67de50ffbdaf4073378cfded6ae24a5" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - [[package]] name = "lock_api" version = "0.4.3" @@ -1921,7 +1898,9 @@ dependencies = [ "hashlink", "libsqlite3-sys", "memchr", + "serde_json", "smallvec", + "uuid", ] [[package]] @@ -2207,7 +2186,6 @@ dependencies = [ "anyhow", "chrono", "kv", - "lmdb-rkv 0.14.0", "log", "proptest", "rusqlite", diff --git a/taskchampion/Cargo.toml b/taskchampion/Cargo.toml index e5a1ab801..196c2a7d8 100644 --- a/taskchampion/Cargo.toml +++ b/taskchampion/Cargo.toml @@ -18,7 +18,6 @@ chrono = { version = "^0.4.10", features = ["serde"] } anyhow = "1.0" thiserror = "1.0" kv = {version = "^0.10.0", features = ["msgpack-value"]} -lmdb-rkv = {version = "^0.14.0"} ureq = "^2.1.0" log = "^0.4.14" tindercrypt = { version = "^0.2.2", default-features = false } diff --git a/taskchampion/src/storage/config.rs b/taskchampion/src/storage/config.rs index 773baa035..a802e4a09 100644 --- a/taskchampion/src/storage/config.rs +++ b/taskchampion/src/storage/config.rs @@ -1,4 +1,4 @@ -use super::{InMemoryStorage, KvStorage, Storage}; +use super::{InMemoryStorage, SqliteStorage, Storage}; use std::path::PathBuf; /// The configuration required for a replica's storage. @@ -15,7 +15,7 @@ pub enum StorageConfig { impl StorageConfig { pub fn into_storage(self) -> anyhow::Result> { Ok(match self { - StorageConfig::OnDisk { taskdb_dir } => Box::new(KvStorage::new(taskdb_dir)?), + StorageConfig::OnDisk { taskdb_dir } => Box::new(SqliteStorage::new(taskdb_dir)?), StorageConfig::InMemory => Box::new(InMemoryStorage::new()), }) } diff --git a/taskchampion/src/storage/kv.rs b/taskchampion/src/storage/kv.rs deleted file mode 100644 index e65e31dfa..000000000 --- a/taskchampion/src/storage/kv.rs +++ /dev/null @@ -1,683 +0,0 @@ -use crate::storage::{Operation, Storage, StorageTxn, TaskMap, VersionId, DEFAULT_BASE_VERSION}; -use crate::utils::Key; -use kv::msgpack::Msgpack; -use kv::{Bucket, Config, Error, Integer, Serde, Store, ValueBuf}; -use std::path::Path; -use uuid::Uuid; - -/// KvStorage is an on-disk storage backend which uses LMDB via the `kv` crate. -pub struct KvStorage<'t> { - store: Store, - tasks_bucket: Bucket<'t, Key, ValueBuf>>, - numbers_bucket: Bucket<'t, Integer, ValueBuf>>, - uuids_bucket: Bucket<'t, Integer, ValueBuf>>, - operations_bucket: Bucket<'t, Integer, ValueBuf>>, - working_set_bucket: Bucket<'t, Integer, ValueBuf>>, -} - -const BASE_VERSION: u64 = 1; -const NEXT_OPERATION: u64 = 2; -const NEXT_WORKING_SET_INDEX: u64 = 3; - -impl<'t> KvStorage<'t> { - pub fn new>(directory: P) -> anyhow::Result> { - let mut config = Config::default(directory); - config.bucket("tasks", None); - config.bucket("numbers", None); - config.bucket("uuids", None); - config.bucket("operations", None); - config.bucket("working_set", None); - let store = Store::new(config)?; - - // tasks are stored indexed by uuid - let tasks_bucket = store.bucket::>>(Some("tasks"))?; - - // this bucket contains various u64s, indexed by constants above - let numbers_bucket = store.int_bucket::>>(Some("numbers"))?; - - // this bucket contains various Uuids, indexed by constants above - let uuids_bucket = store.int_bucket::>>(Some("uuids"))?; - - // this bucket contains operations, numbered consecutively; the NEXT_OPERATION number gives - // the index of the next operation to insert - let operations_bucket = - store.int_bucket::>>(Some("operations"))?; - - // this bucket contains operations, numbered consecutively; the NEXT_WORKING_SET_INDEX - // number gives the index of the next operation to insert - let working_set_bucket = - store.int_bucket::>>(Some("working_set"))?; - - Ok(KvStorage { - store, - tasks_bucket, - numbers_bucket, - uuids_bucket, - operations_bucket, - working_set_bucket, - }) - } -} - -impl<'t> Storage for KvStorage<'t> { - fn txn<'a>(&'a mut self) -> anyhow::Result> { - Ok(Box::new(Txn { - storage: self, - txn: Some(self.store.write_txn()?), - })) - } -} - -struct Txn<'t> { - storage: &'t KvStorage<'t>, - txn: Option>, -} - -impl<'t> Txn<'t> { - // get the underlying kv Txn - fn kvtxn(&mut self) -> &mut kv::Txn<'t> { - if let Some(ref mut txn) = self.txn { - txn - } else { - panic!("cannot use transaction after commit"); - } - } - - // Access to buckets - fn tasks_bucket(&self) -> &'t Bucket<'t, Key, ValueBuf>> { - &self.storage.tasks_bucket - } - fn numbers_bucket(&self) -> &'t Bucket<'t, Integer, ValueBuf>> { - &self.storage.numbers_bucket - } - fn uuids_bucket(&self) -> &'t Bucket<'t, Integer, ValueBuf>> { - &self.storage.uuids_bucket - } - fn operations_bucket(&self) -> &'t Bucket<'t, Integer, ValueBuf>> { - &self.storage.operations_bucket - } - fn working_set_bucket(&self) -> &'t Bucket<'t, Integer, ValueBuf>> { - &self.storage.working_set_bucket - } -} - -impl<'t> StorageTxn for Txn<'t> { - fn get_task(&mut self, uuid: Uuid) -> anyhow::Result> { - let bucket = self.tasks_bucket(); - let buf = match self.kvtxn().get(bucket, uuid.into()) { - Ok(buf) => buf, - Err(Error::NotFound) => return Ok(None), - Err(e) => return Err(e.into()), - }; - let value = buf.inner()?.to_serde(); - Ok(Some(value)) - } - - fn create_task(&mut self, uuid: Uuid) -> anyhow::Result { - let bucket = self.tasks_bucket(); - let kvtxn = self.kvtxn(); - match kvtxn.get(bucket, uuid.into()) { - Err(Error::NotFound) => { - kvtxn.set(bucket, uuid.into(), Msgpack::to_value_buf(TaskMap::new())?)?; - Ok(true) - } - Err(e) => Err(e.into()), - Ok(_) => Ok(false), - } - } - - fn set_task(&mut self, uuid: Uuid, task: TaskMap) -> anyhow::Result<()> { - let bucket = self.tasks_bucket(); - let kvtxn = self.kvtxn(); - kvtxn.set(bucket, uuid.into(), Msgpack::to_value_buf(task)?)?; - Ok(()) - } - - fn delete_task(&mut self, uuid: Uuid) -> anyhow::Result { - let bucket = self.tasks_bucket(); - let kvtxn = self.kvtxn(); - match kvtxn.del(bucket, uuid.into()) { - Err(Error::NotFound) => Ok(false), - Err(e) => Err(e.into()), - Ok(_) => Ok(true), - } - } - - fn all_tasks(&mut self) -> anyhow::Result> { - let bucket = self.tasks_bucket(); - let kvtxn = self.kvtxn(); - let all_tasks: Result, Error> = kvtxn - .read_cursor(bucket)? - .iter() - .map(|(k, v)| Ok((k.into(), v.inner()?.to_serde()))) - .collect(); - Ok(all_tasks?) - } - - fn all_task_uuids(&mut self) -> anyhow::Result> { - let bucket = self.tasks_bucket(); - let kvtxn = self.kvtxn(); - Ok(kvtxn - .read_cursor(bucket)? - .iter() - .map(|(k, _)| k.into()) - .collect()) - } - - fn base_version(&mut self) -> anyhow::Result { - let bucket = self.uuids_bucket(); - let base_version = match self.kvtxn().get(bucket, BASE_VERSION.into()) { - Ok(buf) => buf, - Err(Error::NotFound) => return Ok(DEFAULT_BASE_VERSION), - Err(e) => return Err(e.into()), - } - .inner()? - .to_serde(); - Ok(base_version as VersionId) - } - - fn set_base_version(&mut self, version: VersionId) -> anyhow::Result<()> { - let uuids_bucket = self.uuids_bucket(); - let kvtxn = self.kvtxn(); - - kvtxn.set( - uuids_bucket, - BASE_VERSION.into(), - Msgpack::to_value_buf(version as Uuid)?, - )?; - Ok(()) - } - - fn operations(&mut self) -> anyhow::Result> { - let bucket = self.operations_bucket(); - let kvtxn = self.kvtxn(); - let all_ops: Result, Error> = kvtxn - .read_cursor(bucket)? - .iter() - .map(|(i, v)| Ok((i.into(), v.inner()?.to_serde()))) - .collect(); - let mut all_ops = all_ops?; - // sort by key.. - all_ops.sort_by(|a, b| a.0.cmp(&b.0)); - // and return the values.. - Ok(all_ops.iter().map(|(_, v)| v.clone()).collect()) - } - - fn add_operation(&mut self, op: Operation) -> anyhow::Result<()> { - let numbers_bucket = self.numbers_bucket(); - let operations_bucket = self.operations_bucket(); - let kvtxn = self.kvtxn(); - - let next_op = match kvtxn.get(numbers_bucket, NEXT_OPERATION.into()) { - Ok(buf) => buf.inner()?.to_serde(), - Err(Error::NotFound) => 0, - Err(e) => return Err(e.into()), - }; - - kvtxn.set( - operations_bucket, - next_op.into(), - Msgpack::to_value_buf(op)?, - )?; - kvtxn.set( - numbers_bucket, - NEXT_OPERATION.into(), - Msgpack::to_value_buf(next_op + 1)?, - )?; - Ok(()) - } - - fn set_operations(&mut self, ops: Vec) -> anyhow::Result<()> { - let numbers_bucket = self.numbers_bucket(); - let operations_bucket = self.operations_bucket(); - let kvtxn = self.kvtxn(); - - kvtxn.clear_db(operations_bucket)?; - - let mut i = 0u64; - for op in ops { - kvtxn.set(operations_bucket, i.into(), Msgpack::to_value_buf(op)?)?; - i += 1; - } - - kvtxn.set( - numbers_bucket, - NEXT_OPERATION.into(), - Msgpack::to_value_buf(i)?, - )?; - - Ok(()) - } - - fn get_working_set(&mut self) -> anyhow::Result>> { - let working_set_bucket = self.working_set_bucket(); - let numbers_bucket = self.numbers_bucket(); - let kvtxn = self.kvtxn(); - - let next_index = match kvtxn.get(numbers_bucket, NEXT_WORKING_SET_INDEX.into()) { - Ok(buf) => buf.inner()?.to_serde(), - Err(Error::NotFound) => 1, - Err(e) => return Err(e.into()), - }; - - let mut res = Vec::with_capacity(next_index as usize); - for _ in 0..next_index { - res.push(None) - } - - for (i, u) in kvtxn.read_cursor(working_set_bucket)?.iter() { - let i: u64 = i.into(); - res[i as usize] = Some(u.inner()?.to_serde()); - } - Ok(res) - } - - fn add_to_working_set(&mut self, uuid: Uuid) -> anyhow::Result { - let working_set_bucket = self.working_set_bucket(); - let numbers_bucket = self.numbers_bucket(); - let kvtxn = self.kvtxn(); - - let next_index = match kvtxn.get(numbers_bucket, NEXT_WORKING_SET_INDEX.into()) { - Ok(buf) => buf.inner()?.to_serde(), - Err(Error::NotFound) => 1, - Err(e) => return Err(e.into()), - }; - - kvtxn.set( - working_set_bucket, - next_index.into(), - Msgpack::to_value_buf(uuid)?, - )?; - kvtxn.set( - numbers_bucket, - NEXT_WORKING_SET_INDEX.into(), - Msgpack::to_value_buf(next_index + 1)?, - )?; - Ok(next_index as usize) - } - - fn set_working_set_item(&mut self, index: usize, uuid: Option) -> anyhow::Result<()> { - let working_set_bucket = self.working_set_bucket(); - let numbers_bucket = self.numbers_bucket(); - let kvtxn = self.kvtxn(); - let index = index as u64; - - let next_index = match kvtxn.get(numbers_bucket, NEXT_WORKING_SET_INDEX.into()) { - Ok(buf) => buf.inner()?.to_serde(), - Err(Error::NotFound) => 1, - Err(e) => return Err(e.into()), - }; - - if index >= next_index { - anyhow::bail!("Index {} is not in the working set", index); - } - - if let Some(uuid) = uuid { - kvtxn.set( - working_set_bucket, - index.into(), - Msgpack::to_value_buf(uuid)?, - )?; - } else { - kvtxn.del(working_set_bucket, index.into())?; - } - - Ok(()) - } - - fn clear_working_set(&mut self) -> anyhow::Result<()> { - let working_set_bucket = self.working_set_bucket(); - let numbers_bucket = self.numbers_bucket(); - let kvtxn = self.kvtxn(); - - kvtxn.clear_db(working_set_bucket)?; - kvtxn.set( - numbers_bucket, - NEXT_WORKING_SET_INDEX.into(), - Msgpack::to_value_buf(1)?, - )?; - - Ok(()) - } - - fn commit(&mut self) -> anyhow::Result<()> { - if let Some(kvtxn) = self.txn.take() { - kvtxn.commit()?; - } else { - panic!("transaction already committed"); - } - Ok(()) - } -} - -#[cfg(test)] -mod test { - use super::*; - use crate::storage::taskmap_with; - use tempfile::TempDir; - - #[test] - fn test_create() -> anyhow::Result<()> { - let tmp_dir = TempDir::new()?; - let mut storage = KvStorage::new(&tmp_dir.path())?; - let uuid = Uuid::new_v4(); - { - let mut txn = storage.txn()?; - assert!(txn.create_task(uuid)?); - txn.commit()?; - } - { - let mut txn = storage.txn()?; - let task = txn.get_task(uuid)?; - assert_eq!(task, Some(taskmap_with(vec![]))); - } - Ok(()) - } - - #[test] - fn test_create_exists() -> anyhow::Result<()> { - let tmp_dir = TempDir::new()?; - let mut storage = KvStorage::new(&tmp_dir.path())?; - let uuid = Uuid::new_v4(); - { - let mut txn = storage.txn()?; - assert!(txn.create_task(uuid)?); - txn.commit()?; - } - { - let mut txn = storage.txn()?; - assert!(!txn.create_task(uuid)?); - txn.commit()?; - } - Ok(()) - } - - #[test] - fn test_get_missing() -> anyhow::Result<()> { - let tmp_dir = TempDir::new()?; - let mut storage = KvStorage::new(&tmp_dir.path())?; - let uuid = Uuid::new_v4(); - { - let mut txn = storage.txn()?; - let task = txn.get_task(uuid)?; - assert_eq!(task, None); - } - Ok(()) - } - - #[test] - fn test_set_task() -> anyhow::Result<()> { - let tmp_dir = TempDir::new()?; - let mut storage = KvStorage::new(&tmp_dir.path())?; - let uuid = Uuid::new_v4(); - { - let mut txn = storage.txn()?; - txn.set_task(uuid, taskmap_with(vec![("k".to_string(), "v".to_string())]))?; - txn.commit()?; - } - { - let mut txn = storage.txn()?; - let task = txn.get_task(uuid)?; - assert_eq!( - task, - Some(taskmap_with(vec![("k".to_string(), "v".to_string())])) - ); - } - Ok(()) - } - - #[test] - fn test_delete_task_missing() -> anyhow::Result<()> { - let tmp_dir = TempDir::new()?; - let mut storage = KvStorage::new(&tmp_dir.path())?; - let uuid = Uuid::new_v4(); - { - let mut txn = storage.txn()?; - assert!(!txn.delete_task(uuid)?); - } - Ok(()) - } - - #[test] - fn test_delete_task_exists() -> anyhow::Result<()> { - let tmp_dir = TempDir::new()?; - let mut storage = KvStorage::new(&tmp_dir.path())?; - let uuid = Uuid::new_v4(); - { - let mut txn = storage.txn()?; - assert!(txn.create_task(uuid)?); - txn.commit()?; - } - { - let mut txn = storage.txn()?; - assert!(txn.delete_task(uuid)?); - } - Ok(()) - } - - #[test] - fn test_all_tasks_empty() -> anyhow::Result<()> { - let tmp_dir = TempDir::new()?; - let mut storage = KvStorage::new(&tmp_dir.path())?; - { - let mut txn = storage.txn()?; - let tasks = txn.all_tasks()?; - assert_eq!(tasks, vec![]); - } - Ok(()) - } - - #[test] - fn test_all_tasks_and_uuids() -> anyhow::Result<()> { - let tmp_dir = TempDir::new()?; - let mut storage = KvStorage::new(&tmp_dir.path())?; - let uuid1 = Uuid::new_v4(); - let uuid2 = Uuid::new_v4(); - { - let mut txn = storage.txn()?; - assert!(txn.create_task(uuid1.clone())?); - txn.set_task( - uuid1.clone(), - taskmap_with(vec![("num".to_string(), "1".to_string())]), - )?; - assert!(txn.create_task(uuid2.clone())?); - txn.set_task( - uuid2.clone(), - taskmap_with(vec![("num".to_string(), "2".to_string())]), - )?; - txn.commit()?; - } - { - let mut txn = storage.txn()?; - let mut tasks = txn.all_tasks()?; - - // order is nondeterministic, so sort by uuid - tasks.sort_by(|a, b| a.0.cmp(&b.0)); - - let mut exp = vec![ - ( - uuid1.clone(), - taskmap_with(vec![("num".to_string(), "1".to_string())]), - ), - ( - uuid2.clone(), - taskmap_with(vec![("num".to_string(), "2".to_string())]), - ), - ]; - exp.sort_by(|a, b| a.0.cmp(&b.0)); - - assert_eq!(tasks, exp); - } - { - let mut txn = storage.txn()?; - let mut uuids = txn.all_task_uuids()?; - uuids.sort(); - - let mut exp = vec![uuid1.clone(), uuid2.clone()]; - exp.sort(); - - assert_eq!(uuids, exp); - } - Ok(()) - } - - #[test] - fn test_base_version_default() -> anyhow::Result<()> { - let tmp_dir = TempDir::new()?; - let mut storage = KvStorage::new(&tmp_dir.path())?; - { - let mut txn = storage.txn()?; - assert_eq!(txn.base_version()?, DEFAULT_BASE_VERSION); - } - Ok(()) - } - - #[test] - fn test_base_version_setting() -> anyhow::Result<()> { - let tmp_dir = TempDir::new()?; - let mut storage = KvStorage::new(&tmp_dir.path())?; - let u = Uuid::new_v4(); - { - let mut txn = storage.txn()?; - txn.set_base_version(u)?; - txn.commit()?; - } - { - let mut txn = storage.txn()?; - assert_eq!(txn.base_version()?, u); - } - Ok(()) - } - - #[test] - fn test_operations() -> anyhow::Result<()> { - let tmp_dir = TempDir::new()?; - let mut storage = KvStorage::new(&tmp_dir.path())?; - let uuid1 = Uuid::new_v4(); - let uuid2 = Uuid::new_v4(); - let uuid3 = Uuid::new_v4(); - - // create some operations - { - let mut txn = storage.txn()?; - txn.add_operation(Operation::Create { uuid: uuid1 })?; - txn.add_operation(Operation::Create { uuid: uuid2 })?; - txn.commit()?; - } - - // read them back - { - let mut txn = storage.txn()?; - let ops = txn.operations()?; - assert_eq!( - ops, - vec![ - Operation::Create { uuid: uuid1 }, - Operation::Create { uuid: uuid2 }, - ] - ); - } - - // set them to a different bunch - { - let mut txn = storage.txn()?; - txn.set_operations(vec![ - Operation::Delete { uuid: uuid2 }, - Operation::Delete { uuid: uuid1 }, - ])?; - txn.commit()?; - } - - // create some more operations (to test adding operations after clearing) - { - let mut txn = storage.txn()?; - txn.add_operation(Operation::Create { uuid: uuid3 })?; - txn.add_operation(Operation::Delete { uuid: uuid3 })?; - txn.commit()?; - } - - // read them back - { - let mut txn = storage.txn()?; - let ops = txn.operations()?; - assert_eq!( - ops, - vec![ - Operation::Delete { uuid: uuid2 }, - Operation::Delete { uuid: uuid1 }, - Operation::Create { uuid: uuid3 }, - Operation::Delete { uuid: uuid3 }, - ] - ); - } - Ok(()) - } - - #[test] - fn get_working_set_empty() -> anyhow::Result<()> { - let tmp_dir = TempDir::new()?; - let mut storage = KvStorage::new(&tmp_dir.path())?; - - { - let mut txn = storage.txn()?; - let ws = txn.get_working_set()?; - assert_eq!(ws, vec![None]); - } - - Ok(()) - } - - #[test] - fn add_to_working_set() -> anyhow::Result<()> { - let tmp_dir = TempDir::new()?; - let mut storage = KvStorage::new(&tmp_dir.path())?; - let uuid1 = Uuid::new_v4(); - let uuid2 = Uuid::new_v4(); - - { - let mut txn = storage.txn()?; - txn.add_to_working_set(uuid1)?; - txn.add_to_working_set(uuid2)?; - txn.commit()?; - } - - { - let mut txn = storage.txn()?; - let ws = txn.get_working_set()?; - assert_eq!(ws, vec![None, Some(uuid1), Some(uuid2)]); - } - - Ok(()) - } - - #[test] - fn clear_working_set() -> anyhow::Result<()> { - let tmp_dir = TempDir::new()?; - let mut storage = KvStorage::new(&tmp_dir.path())?; - let uuid1 = Uuid::new_v4(); - let uuid2 = Uuid::new_v4(); - - { - let mut txn = storage.txn()?; - txn.add_to_working_set(uuid1)?; - txn.add_to_working_set(uuid2)?; - txn.commit()?; - } - - { - let mut txn = storage.txn()?; - txn.clear_working_set()?; - txn.add_to_working_set(uuid2)?; - txn.add_to_working_set(uuid1)?; - txn.commit()?; - } - - { - let mut txn = storage.txn()?; - let ws = txn.get_working_set()?; - assert_eq!(ws, vec![None, Some(uuid2), Some(uuid1)]); - } - - Ok(()) - } -} diff --git a/taskchampion/src/storage/mod.rs b/taskchampion/src/storage/mod.rs index a4c430b94..7520950e0 100644 --- a/taskchampion/src/storage/mod.rs +++ b/taskchampion/src/storage/mod.rs @@ -11,13 +11,12 @@ use uuid::Uuid; mod config; mod inmemory; -mod kv; mod operation; mod sqlite; -pub use self::kv::KvStorage; pub use config::StorageConfig; pub use inmemory::InMemoryStorage; +pub use sqlite::SqliteStorage; pub use operation::Operation;