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

chore: use asref path for open db (#13998)

Browse Source
This commit is contained in:
Matthias Seitz
2025-01-27 12:14:38 +01:00
committed by GitHub
parent 6342162826
commit 79a5217c07
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -6778,7 +6778,6 @@ dependencies = [
"metrics",
"page_size",
"parking_lot",
"paste",
"pprof",
"proptest",
"reth-db-api",

4
crates/storage/db/Cargo.toml
View File

@ -15,7 +15,7 @@ workspace = true
# reth
reth-db-api.workspace = true
reth-primitives = { workspace = true, features = ["reth-codec"] }
reth-primitives-traits = { workspace = true, features = ["serde", "reth-codec"] }
reth-primitives-traits = { workspace = true, features = ["reth-codec"] }
reth-fs-util.workspace = true
reth-storage-errors.workspace = true
reth-nippy-jar.workspace = true
@ -73,8 +73,6 @@ criterion.workspace = true
arbitrary = { workspace = true, features = ["derive"] }
proptest.workspace = true
paste.workspace = true
assert_matches.workspace = true
[features]

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

@ -50,7 +50,7 @@ const DEFAULT_MAX_READERS: u64 = 32_000;
const MAX_SAFE_READER_SPACE: usize = 10 * GIGABYTE;
/// Environment used when opening a MDBX environment. RO/RW.
#[derive(Debug)]
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub enum DatabaseEnvKind {
/// Read-only MDBX environment.
RO,

18
crates/storage/db/src/mdbx.rs
View File

@ -1,4 +1,4 @@
//! Bindings for [MDBX](https://libmdbx.dqdkfa.ru/).
//! Helper functions for initializing and opening a database.
use crate::{is_database_empty, TableSet, Tables};
use eyre::Context;
@ -48,16 +48,24 @@ pub fn init_db_for<P: AsRef<Path>, TS: TableSet>(
}
/// Opens up an existing database. Read only mode. It doesn't create it or create tables if missing.
pub fn open_db_read_only(path: &Path, args: DatabaseArguments) -> eyre::Result<DatabaseEnv> {
pub fn open_db_read_only(
path: impl AsRef<Path>,
args: DatabaseArguments,
) -> eyre::Result<DatabaseEnv> {
let path = path.as_ref();
DatabaseEnv::open(path, DatabaseEnvKind::RO, args)
.with_context(|| format!("Could not open database at path: {}", path.display()))
}
/// Opens up an existing database. Read/Write mode with `WriteMap` enabled. It doesn't create it or
/// create tables if missing.
pub fn open_db(path: &Path, args: DatabaseArguments) -> eyre::Result<DatabaseEnv> {
let db = DatabaseEnv::open(path, DatabaseEnvKind::RW, args.clone())
pub fn open_db(path: impl AsRef<Path>, args: DatabaseArguments) -> eyre::Result<DatabaseEnv> {
fn open(path: &Path, args: DatabaseArguments) -> eyre::Result<DatabaseEnv> {
let client_version = args.client_version().clone();
let db = DatabaseEnv::open(path, DatabaseEnvKind::RW, args)
.with_context(|| format!("Could not open database at path: {}", path.display()))?;
db.record_client_version(args.client_version().clone())?;
db.record_client_version(client_version)?;
Ok(db)
}
open(path.as_ref(), args)
}