From d76e95e8fc9d39fcab36e43fcd6f971c556782d8 Mon Sep 17 00:00:00 2001
From: Jonathan de Jong <jonathan@automatia.nl>
Date: Thu, 15 Jul 2021 13:47:21 +0200
Subject: [PATCH] use existing db cache size
---
src/database.rs | 6 ------
src/database/abstraction/sled.rs | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/src/database.rs b/src/database.rs
index 85beee80f..c39f0fbd3 100644
--- a/src/database.rs
+++ b/src/database.rs
@@ -45,8 +45,6 @@ pub struct Config {
database_path: String,
#[serde(default = "default_db_cache_capacity_mb")]
db_cache_capacity_mb: f64,
- #[serde(default = "default_sled_cache_capacity_bytes")]
- sled_cache_capacity_bytes: u64,
#[serde(default = "default_sqlite_read_pool_size")]
sqlite_read_pool_size: usize,
#[serde(default = "true_fn")]
@@ -111,10 +109,6 @@ fn default_db_cache_capacity_mb() -> f64 {
200.0
}
-fn default_sled_cache_capacity_bytes() -> u64 {
- 1024 * 1024 * 1024
-}
-
fn default_sqlite_read_pool_size() -> usize {
num_cpus::get().max(1)
}
diff --git a/src/database/abstraction/sled.rs b/src/database/abstraction/sled.rs
index 1aa631fea..12e027513 100644
--- a/src/database/abstraction/sled.rs
+++ b/src/database/abstraction/sled.rs
@@ -14,7 +14,7 @@ fn open(config: &Config) -> Result<Arc<Self>> {
Ok(Arc::new(Engine(
sled::Config::default()
.path(&config.database_path)
- .cache_capacity(config.sled_cache_capacity_bytes)
+ .cache_capacity((config.db_cache_capacity_mb * 1024.0 * 1024.0) as u64)
.use_compression(true)
.open()?,
)))
--
GitLab