Merge branch 'sled-fix' into 'master'

Sled fixes

See merge request famedly/conduit!125
This commit is contained in:
Timo Kösters 2021-07-15 15:38:40 +00:00
commit 8e2d6f7e43
2 changed files with 3 additions and 3 deletions

View file

@ -77,14 +77,14 @@ lru-cache = "0.1.2"
rusqlite = { version = "0.25.3", optional = true, features = ["bundled"] } rusqlite = { version = "0.25.3", optional = true, features = ["bundled"] }
parking_lot = { version = "0.11.1", optional = true } parking_lot = { version = "0.11.1", optional = true }
crossbeam = { version = "0.8.1", optional = true } crossbeam = { version = "0.8.1", optional = true }
num_cpus = { version = "1.13.0", optional = true } num_cpus = "1.13.0"
[features] [features]
default = ["conduit_bin", "backend_sqlite"] default = ["conduit_bin", "backend_sqlite"]
backend_sled = ["sled"] backend_sled = ["sled"]
backend_rocksdb = ["rocksdb"] backend_rocksdb = ["rocksdb"]
backend_sqlite = ["sqlite"] backend_sqlite = ["sqlite"]
sqlite = ["rusqlite", "parking_lot", "crossbeam", "num_cpus", "tokio/signal"] sqlite = ["rusqlite", "parking_lot", "crossbeam", "tokio/signal"]
conduit_bin = [] # TODO: add rocket to this when it is optional conduit_bin = [] # TODO: add rocket to this when it is optional
[[bin]] [[bin]]

View file

@ -14,7 +14,7 @@ impl DatabaseEngine for Engine {
Ok(Arc::new(Engine( Ok(Arc::new(Engine(
sled::Config::default() sled::Config::default()
.path(&config.database_path) .path(&config.database_path)
.cache_capacity((config.db_cache_capacity_mb * 1024 * 1024) as u64) .cache_capacity((config.db_cache_capacity_mb * 1024.0 * 1024.0) as u64)
.use_compression(true) .use_compression(true)
.open()?, .open()?,
))) )))