diff options
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | src/db/sled_adapter.rs | 2 | ||||
| -rw-r--r-- | src/garage/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/garage/server.rs | 6 |
4 files changed, 6 insertions, 5 deletions
@@ -912,7 +912,6 @@ dependencies = [ "serde_bytes", "serde_json", "sha2", - "sled", "static_init", "structopt", "tokio", diff --git a/src/db/sled_adapter.rs b/src/db/sled_adapter.rs index b1da1c2b..cf69caba 100644 --- a/src/db/sled_adapter.rs +++ b/src/db/sled_adapter.rs @@ -12,6 +12,8 @@ use sled::transaction::{ use crate::{Db, Error, IDb, ITx, ITxFn, Result, TxError, TxFnResult, TxResult, Value, ValueIter}; +pub use sled; + impl From<sled::Error> for Error { fn from(e: sled::Error) -> Error { Error(format!("{}", e).into()) diff --git a/src/garage/Cargo.toml b/src/garage/Cargo.toml index d34a7fa4..eb643160 100644 --- a/src/garage/Cargo.toml +++ b/src/garage/Cargo.toml @@ -37,8 +37,6 @@ rand = "0.8" async-trait = "0.1.7" sodiumoxide = { version = "0.2.5-0", package = "kuska-sodiumoxide" } -sled = "0.34" - rmp-serde = "0.15" serde = { version = "1.0", default-features = false, features = ["derive", "rc"] } serde_bytes = "0.11" diff --git a/src/garage/server.rs b/src/garage/server.rs index 69f5d60c..9d148ee7 100644 --- a/src/garage/server.rs +++ b/src/garage/server.rs @@ -2,6 +2,8 @@ use std::path::PathBuf; use tokio::sync::watch; +use garage_db as db; + use garage_util::background::*; use garage_util::config::*; use garage_util::error::Error; @@ -32,13 +34,13 @@ pub async fn run_server(config_file: PathBuf) -> Result<(), Error> { info!("Opening database..."); let mut db_path = config.metadata_dir.clone(); db_path.push("db"); - let db = sled::Config::default() + let db = db::sled_adapter::sled::Config::default() .path(&db_path) .cache_capacity(config.sled_cache_capacity) .flush_every_ms(Some(config.sled_flush_every_ms)) .open() .expect("Unable to open sled DB"); - let db = garage_db::sled_adapter::SledDb::new(db); + let db = db::sled_adapter::SledDb::new(db); info!("Initializing background runner..."); let watch_cancel = netapp::util::watch_ctrl_c(); |