jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "feat: add geometry to database args" (#12164)

Browse Source
This commit is contained in:
Matthias Seitz
2024-10-29 13:58:57 +01:00
committed by GitHub
parent 4a8799f98b
commit 6f3600dc38
20 changed files with 16 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
book/cli/reth/db.md vendored
View File

@ -81,12 +81,6 @@ Database:
[possible values: true, false]
--db.max-size <MAX_SIZE>
Maximum database size (e.g., 4TB, 8MB)
--db.growth-step <GROWTH_STEP>
Database growth step (e.g., 4GB, 4KB)
--db.read-transaction-timeout <READ_TRANSACTION_TIMEOUT>
Read transaction timeout in seconds, 0 means no timeout

6
book/cli/reth/db/diff.md vendored
View File

@ -45,12 +45,6 @@ Database:
[possible values: true, false]
--db.max-size <MAX_SIZE>
Maximum database size (e.g., 4TB, 8MB)
--db.growth-step <GROWTH_STEP>
Database growth step (e.g., 4GB, 4KB)
--db.read-transaction-timeout <READ_TRANSACTION_TIMEOUT>
Read transaction timeout in seconds, 0 means no timeout

6
book/cli/reth/debug/build-block.md vendored
View File

@ -69,12 +69,6 @@ Database:
[possible values: true, false]
--db.max-size <MAX_SIZE>
Maximum database size (e.g., 4TB, 8MB)
--db.growth-step <GROWTH_STEP>
Database growth step (e.g., 4GB, 4KB)
--db.read-transaction-timeout <READ_TRANSACTION_TIMEOUT>
Read transaction timeout in seconds, 0 means no timeout

6
book/cli/reth/debug/execution.md vendored
View File

@ -69,12 +69,6 @@ Database:
[possible values: true, false]
--db.max-size <MAX_SIZE>
Maximum database size (e.g., 4TB, 8MB)
--db.growth-step <GROWTH_STEP>
Database growth step (e.g., 4GB, 4KB)
--db.read-transaction-timeout <READ_TRANSACTION_TIMEOUT>
Read transaction timeout in seconds, 0 means no timeout

6
book/cli/reth/debug/in-memory-merkle.md vendored
View File

@ -69,12 +69,6 @@ Database:
[possible values: true, false]
--db.max-size <MAX_SIZE>
Maximum database size (e.g., 4TB, 8MB)
--db.growth-step <GROWTH_STEP>
Database growth step (e.g., 4GB, 4KB)
--db.read-transaction-timeout <READ_TRANSACTION_TIMEOUT>
Read transaction timeout in seconds, 0 means no timeout

6
book/cli/reth/debug/merkle.md vendored
View File

@ -69,12 +69,6 @@ Database:
[possible values: true, false]
--db.max-size <MAX_SIZE>
Maximum database size (e.g., 4TB, 8MB)
--db.growth-step <GROWTH_STEP>
Database growth step (e.g., 4GB, 4KB)
--db.read-transaction-timeout <READ_TRANSACTION_TIMEOUT>
Read transaction timeout in seconds, 0 means no timeout

6
book/cli/reth/debug/replay-engine.md vendored
View File

@ -69,12 +69,6 @@ Database:
[possible values: true, false]
--db.max-size <MAX_SIZE>
Maximum database size (e.g., 4TB, 8MB)
--db.growth-step <GROWTH_STEP>
Database growth step (e.g., 4GB, 4KB)
--db.read-transaction-timeout <READ_TRANSACTION_TIMEOUT>
Read transaction timeout in seconds, 0 means no timeout

6
book/cli/reth/import.md vendored
View File

@ -69,12 +69,6 @@ Database:
[possible values: true, false]
--db.max-size <MAX_SIZE>
Maximum database size (e.g., 4TB, 8MB)
--db.growth-step <GROWTH_STEP>
Database growth step (e.g., 4GB, 4KB)
--db.read-transaction-timeout <READ_TRANSACTION_TIMEOUT>
Read transaction timeout in seconds, 0 means no timeout

6
book/cli/reth/init-state.md vendored
View File

@ -69,12 +69,6 @@ Database:
[possible values: true, false]
--db.max-size <MAX_SIZE>
Maximum database size (e.g., 4TB, 8MB)
--db.growth-step <GROWTH_STEP>
Database growth step (e.g., 4GB, 4KB)
--db.read-transaction-timeout <READ_TRANSACTION_TIMEOUT>
Read transaction timeout in seconds, 0 means no timeout

6
book/cli/reth/init.md vendored
View File

@ -69,12 +69,6 @@ Database:
[possible values: true, false]
--db.max-size <MAX_SIZE>
Maximum database size (e.g., 4TB, 8MB)
--db.growth-step <GROWTH_STEP>
Database growth step (e.g., 4GB, 4KB)
--db.read-transaction-timeout <READ_TRANSACTION_TIMEOUT>
Read transaction timeout in seconds, 0 means no timeout

6
book/cli/reth/node.md vendored
View File

@ -590,12 +590,6 @@ Database:
[possible values: true, false]
--db.max-size <MAX_SIZE>
Maximum database size (e.g., 4TB, 8MB)
--db.growth-step <GROWTH_STEP>
Database growth step (e.g., 4GB, 4KB)
--db.read-transaction-timeout <READ_TRANSACTION_TIMEOUT>
Read transaction timeout in seconds, 0 means no timeout

6
book/cli/reth/p2p.md vendored
View File

@ -247,12 +247,6 @@ Database:
[possible values: true, false]
--db.max-size <MAX_SIZE>
Maximum database size (e.g., 4TB, 8MB)
--db.growth-step <GROWTH_STEP>
Database growth step (e.g., 4GB, 4KB)
--db.read-transaction-timeout <READ_TRANSACTION_TIMEOUT>
Read transaction timeout in seconds, 0 means no timeout

6
book/cli/reth/prune.md vendored
View File

@ -69,12 +69,6 @@ Database:
[possible values: true, false]
--db.max-size <MAX_SIZE>
Maximum database size (e.g., 4TB, 8MB)
--db.growth-step <GROWTH_STEP>
Database growth step (e.g., 4GB, 4KB)
--db.read-transaction-timeout <READ_TRANSACTION_TIMEOUT>
Read transaction timeout in seconds, 0 means no timeout

6
book/cli/reth/recover/storage-tries.md vendored
View File

@ -69,12 +69,6 @@ Database:
[possible values: true, false]
--db.max-size <MAX_SIZE>
Maximum database size (e.g., 4TB, 8MB)
--db.growth-step <GROWTH_STEP>
Database growth step (e.g., 4GB, 4KB)
--db.read-transaction-timeout <READ_TRANSACTION_TIMEOUT>
Read transaction timeout in seconds, 0 means no timeout

6
book/cli/reth/stage/drop.md vendored
View File

@ -69,12 +69,6 @@ Database:
[possible values: true, false]
--db.max-size <MAX_SIZE>
Maximum database size (e.g., 4TB, 8MB)
--db.growth-step <GROWTH_STEP>
Database growth step (e.g., 4GB, 4KB)
--db.read-transaction-timeout <READ_TRANSACTION_TIMEOUT>
Read transaction timeout in seconds, 0 means no timeout

6
book/cli/reth/stage/dump.md vendored
View File

@ -76,12 +76,6 @@ Database:
[possible values: true, false]
--db.max-size <MAX_SIZE>
Maximum database size (e.g., 4TB, 8MB)
--db.growth-step <GROWTH_STEP>
Database growth step (e.g., 4GB, 4KB)
--db.read-transaction-timeout <READ_TRANSACTION_TIMEOUT>
Read transaction timeout in seconds, 0 means no timeout

6
book/cli/reth/stage/run.md vendored
View File

@ -69,12 +69,6 @@ Database:
[possible values: true, false]
--db.max-size <MAX_SIZE>
Maximum database size (e.g., 4TB, 8MB)
--db.growth-step <GROWTH_STEP>
Database growth step (e.g., 4GB, 4KB)
--db.read-transaction-timeout <READ_TRANSACTION_TIMEOUT>
Read transaction timeout in seconds, 0 means no timeout

6
book/cli/reth/stage/unwind.md vendored
View File

@ -74,12 +74,6 @@ Database:
[possible values: true, false]
--db.max-size <MAX_SIZE>
Maximum database size (e.g., 4TB, 8MB)
--db.growth-step <GROWTH_STEP>
Database growth step (e.g., 4GB, 4KB)
--db.read-transaction-timeout <READ_TRANSACTION_TIMEOUT>
Read transaction timeout in seconds, 0 means no timeout

183
crates/node/core/src/args/database.rs
View File

@ -1,6 +1,6 @@
//! clap [Args](clap::Args) for database configuration
use std::{fmt, str::FromStr, time::Duration};
use std::time::Duration;
use crate::version::default_client_version;
use clap::{
@ -22,12 +22,6 @@ pub struct DatabaseArgs {
/// NFS volume.
#[arg(long = "db.exclusive")]
pub exclusive: Option<bool>,
/// Maximum database size (e.g., 4TB, 8MB)
#[arg(long = "db.max-size", value_parser = parse_byte_size)]
pub max_size: Option<usize>,
/// Database growth step (e.g., 4GB, 4KB)
#[arg(long = "db.growth-step", value_parser = parse_byte_size)]
pub growth_step: Option<usize>,
/// Read transaction timeout in seconds, 0 means no timeout.
#[arg(long = "db.read-transaction-timeout")]
pub read_transaction_timeout: Option<u64>,
@ -39,9 +33,8 @@ impl DatabaseArgs {
self.get_database_args(default_client_version())
}
/// Returns the database arguments with configured log level, client version,
/// max read transaction duration, and geometry.
pub fn get_database_args(
/// Returns the database arguments with configured log level and given client version.
pub const fn get_database_args(
&self,
client_version: ClientVersion,
) -> reth_db::mdbx::DatabaseArguments {
@ -55,7 +48,6 @@ impl DatabaseArgs {
.with_log_level(self.log_level)
.with_exclusive(self.exclusive)
.with_max_read_transaction_duration(max_read_transaction_duration)
.with_geometry(self.max_size, self.growth_step)
}
}
@ -97,84 +89,10 @@ impl TypedValueParser for LogLevelValueParser {
Some(Box::new(values))
}
}
/// Size in bytes.
#[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
pub struct ByteSize(pub usize);
impl From<ByteSize> for usize {
fn from(s: ByteSize) -> Self {
s.0
}
}
impl FromStr for ByteSize {
type Err = String;
fn from_str(s: &str) -> Result<Self, Self::Err> {
let s = s.trim().to_uppercase();
let parts: Vec<&str> = s.split_whitespace().collect();
let (num_str, unit) = match parts.len() {
1 => {
let (num, unit) =
s.split_at(s.find(|c: char| c.is_alphabetic()).unwrap_or(s.len()));
(num, unit)
}
2 => (parts[0], parts[1]),
_ => {
return Err("Invalid format. Use '<number><unit>' or '<number> <unit>'.".to_string())
}
};
let num: usize = num_str.parse().map_err(|_| "Invalid number".to_string())?;
let multiplier = match unit {
"B" | "" => 1, // Assume bytes if no unit is specified
"KB" => 1024,
"MB" => 1024 * 1024,
"GB" => 1024 * 1024 * 1024,
"TB" => 1024 * 1024 * 1024 * 1024,
_ => return Err(format!("Invalid unit: {}. Use B, KB, MB, GB, or TB.", unit)),
};
Ok(Self(num * multiplier))
}
}
impl fmt::Display for ByteSize {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
const KB: usize = 1024;
const MB: usize = KB * 1024;
const GB: usize = MB * 1024;
const TB: usize = GB * 1024;
let (size, unit) = if self.0 >= TB {
(self.0 as f64 / TB as f64, "TB")
} else if self.0 >= GB {
(self.0 as f64 / GB as f64, "GB")
} else if self.0 >= MB {
(self.0 as f64 / MB as f64, "MB")
} else if self.0 >= KB {
(self.0 as f64 / KB as f64, "KB")
} else {
(self.0 as f64, "B")
};
write!(f, "{:.2}{}", size, unit)
}
}
/// Value parser function that supports various formats.
fn parse_byte_size(s: &str) -> Result<usize, String> {
s.parse::<ByteSize>().map(Into::into)
}
#[cfg(test)]
mod tests {
use super::*;
use clap::Parser;
use reth_db::mdbx::{GIGABYTE, KILOBYTE, MEGABYTE, TERABYTE};
/// A helper type to parse Args more easily
#[derive(Parser)]
@ -190,101 +108,6 @@ mod tests {
assert_eq!(args, default_args);
}
#[test]
fn test_command_parser_with_valid_max_size() {
let cmd = CommandParser::<DatabaseArgs>::try_parse_from([
"reth",
"--db.max-size",
"4398046511104",
])
.unwrap();
assert_eq!(cmd.args.max_size, Some(TERABYTE * 4));
}
#[test]
fn test_command_parser_with_invalid_max_size() {
let result =
CommandParser::<DatabaseArgs>::try_parse_from(["reth", "--db.max-size", "invalid"]);
assert!(result.is_err());
}
#[test]
fn test_command_parser_with_valid_growth_step() {
let cmd = CommandParser::<DatabaseArgs>::try_parse_from([
"reth",
"--db.growth-step",
"4294967296",
])
.unwrap();
assert_eq!(cmd.args.growth_step, Some(GIGABYTE * 4));
}
#[test]
fn test_command_parser_with_invalid_growth_step() {
let result =
CommandParser::<DatabaseArgs>::try_parse_from(["reth", "--db.growth-step", "invalid"]);
assert!(result.is_err());
}
#[test]
fn test_command_parser_with_valid_max_size_and_growth_step_from_str() {
let cmd = CommandParser::<DatabaseArgs>::try_parse_from([
"reth",
"--db.max-size",
"2TB",
"--db.growth-step",
"1GB",
])
.unwrap();
assert_eq!(cmd.args.max_size, Some(TERABYTE * 2));
assert_eq!(cmd.args.growth_step, Some(GIGABYTE));
let cmd = CommandParser::<DatabaseArgs>::try_parse_from([
"reth",
"--db.max-size",
"12MB",
"--db.growth-step",
"2KB",
])
.unwrap();
assert_eq!(cmd.args.max_size, Some(MEGABYTE * 12));
assert_eq!(cmd.args.growth_step, Some(KILOBYTE * 2));
// with spaces
let cmd = CommandParser::<DatabaseArgs>::try_parse_from([
"reth",
"--db.max-size",
"12 MB",
"--db.growth-step",
"2 KB",
])
.unwrap();
assert_eq!(cmd.args.max_size, Some(MEGABYTE * 12));
assert_eq!(cmd.args.growth_step, Some(KILOBYTE * 2));
let cmd = CommandParser::<DatabaseArgs>::try_parse_from([
"reth",
"--db.max-size",
"1073741824",
"--db.growth-step",
"1048576",
])
.unwrap();
assert_eq!(cmd.args.max_size, Some(GIGABYTE));
assert_eq!(cmd.args.growth_step, Some(MEGABYTE));
}
#[test]
fn test_command_parser_max_size_and_growth_step_from_str_invalid_unit() {
let result =
CommandParser::<DatabaseArgs>::try_parse_from(["reth", "--db.growth-step", "1 PB"]);
assert!(result.is_err());
let result =
CommandParser::<DatabaseArgs>::try_parse_from(["reth", "--db.max-size", "2PB"]);
assert!(result.is_err());
}
#[test]
fn test_possible_values() {
// Initialize the LogLevelValueParser

48
crates/storage/db/src/implementation/mdbx/mod.rs
View File

@ -23,7 +23,7 @@ use reth_libmdbx::{
use reth_storage_errors::db::LogLevel;
use reth_tracing::tracing::error;
use std::{
ops::{Deref, Range},
ops::Deref,
path::Path,
sync::Arc,
time::{SystemTime, UNIX_EPOCH},
@ -33,14 +33,8 @@ use tx::Tx;
pub mod cursor;
pub mod tx;
/// 1 KB in bytes
pub const KILOBYTE: usize = 1024;
/// 1 MB in bytes
pub const MEGABYTE: usize = KILOBYTE * 1024;
/// 1 GB in bytes
pub const GIGABYTE: usize = MEGABYTE * 1024;
/// 1 TB in bytes
pub const TERABYTE: usize = GIGABYTE * 1024;
const GIGABYTE: usize = 1024 * 1024 * 1024;
const TERABYTE: usize = GIGABYTE * 1024;
/// MDBX allows up to 32767 readers (`MDBX_READERS_LIMIT`), but we limit it to slightly below that
const DEFAULT_MAX_READERS: u64 = 32_000;
@ -70,8 +64,6 @@ impl DatabaseEnvKind {
pub struct DatabaseArguments {
/// Client version that accesses the database.
client_version: ClientVersion,
/// Database geometry settings.
geometry: Geometry<Range<usize>>,
/// Database log level. If [None], the default value is used.
log_level: Option<LogLevel>,
/// Maximum duration of a read transaction. If [None], the default value is used.
@ -101,37 +93,15 @@ pub struct DatabaseArguments {
impl DatabaseArguments {
/// Create new database arguments with given client version.
pub fn new(client_version: ClientVersion) -> Self {
pub const fn new(client_version: ClientVersion) -> Self {
Self {
client_version,
geometry: Geometry {
size: Some(0..(4 * TERABYTE)),
growth_step: Some(4 * GIGABYTE as isize),
shrink_threshold: Some(0),
page_size: Some(PageSize::Set(default_page_size())),
},
log_level: None,
max_read_transaction_duration: None,
exclusive: None,
}
}
/// Set the geometry.
///
/// # Arguments
///
/// * `max_size` - Maximum database size in bytes
/// * `growth_step` - Database growth step in bytes
pub fn with_geometry(mut self, max_size: Option<usize>, growth_step: Option<usize>) -> Self {
self.geometry = Geometry {
size: max_size.map(|size| 0..size),
growth_step: growth_step.map(|growth_step| growth_step as isize),
shrink_threshold: Some(0),
page_size: Some(PageSize::Set(default_page_size())),
};
self
}
/// Set the log level.
pub const fn with_log_level(mut self, log_level: Option<LogLevel>) -> Self {
self.log_level = log_level;
@ -308,7 +278,15 @@ impl DatabaseEnv {
// environment creation.
debug_assert!(Tables::ALL.len() <= 256, "number of tables exceed max dbs");
inner_env.set_max_dbs(256);
inner_env.set_geometry(args.geometry);
inner_env.set_geometry(Geometry {
// Maximum database size of 4 terabytes
size: Some(0..(4 * TERABYTE)),
// We grow the database in increments of 4 gigabytes
growth_step: Some(4 * GIGABYTE as isize),
// The database never shrinks
shrink_threshold: Some(0),
page_size: Some(PageSize::Set(default_page_size())),
});
fn is_current_process(id: u32) -> bool {
#[cfg(unix)]