Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/cli/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,7 @@ where

config.database = DatabaseConfig::Path {
path: config.in_chain_config_dir(DEFAULT_DB_CONFIG_PATH).expect("We provided a base_path."),
cache_size: cli.database_cache_size,
cache_size: Some(cli.database_cache_size),
};
config.state_cache_size = cli.state_cache_size;

Expand Down
4 changes: 2 additions & 2 deletions client/cli/src/params.rs
Original file line number Diff line number Diff line change
Expand Up @@ -385,8 +385,8 @@ pub struct RunCmd {
pub light: bool,

/// Limit the memory the database cache can use.
#[structopt(long = "db-cache", value_name = "MiB")]
pub database_cache_size: Option<u32>,
#[structopt(long = "db-cache", value_name = "MiB", default_value = "1024")]
pub database_cache_size: u32,

/// Specify the state cache size.
#[structopt(long = "state-cache-size", value_name = "Bytes", default_value = "67108864")]
Expand Down
4 changes: 2 additions & 2 deletions client/db/src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,8 @@ pub fn open_database(
let mut db_config = DatabaseConfig::with_columns(Some(NUM_COLUMNS));

if let Some(cache_size) = cache_size {
let state_col_budget = (*cache_size as f64 * 0.7) as usize;
let other_col_budget = cache_size - state_col_budget;
let state_col_budget = (*cache_size as f64 * 0.9) as usize;
let other_col_budget = (cache_size - state_col_budget) / (NUM_COLUMNS as usize - 1);

let mut memory_budget = std::collections::HashMap::new();
for i in 0..NUM_COLUMNS {
Expand Down