add sled cache_capacity back

This commit is contained in:
Jonathan de Jong 2021-07-15 13:29:08 +02:00
parent f7ecf83ac3
commit 661101c9ae
3 changed files with 9 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

@ -45,6 +45,8 @@ pub struct Config {
database_path: String, database_path: String,
#[serde(default = "default_db_cache_capacity_mb")] #[serde(default = "default_db_cache_capacity_mb")]
db_cache_capacity_mb: f64, db_cache_capacity_mb: f64,
#[serde(default = "default_sled_cache_capacity_bytes")]
sled_cache_capacity_bytes: u64,
#[serde(default = "default_sqlite_read_pool_size")] #[serde(default = "default_sqlite_read_pool_size")]
sqlite_read_pool_size: usize, sqlite_read_pool_size: usize,
#[serde(default = "true_fn")] #[serde(default = "true_fn")]
@ -109,6 +111,10 @@ fn default_db_cache_capacity_mb() -> f64 {
200.0 200.0
} }
fn default_sled_cache_capacity_bytes() -> u64 {
1024 * 1024 * 1024
}
fn default_sqlite_read_pool_size() -> usize { fn default_sqlite_read_pool_size() -> usize {
num_cpus::get().max(1) num_cpus::get().max(1)
} }

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.sled_cache_capacity_bytes)
.use_compression(true) .use_compression(true)
.open()?, .open()?,
))) )))