github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-02-19 03:04:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor(db): make Tx::inner field private with accessor (#21490)

Browse Source 
Co-authored-by: Amp <amp@ampcode.com>
This commit is contained in:
Matthias Seitz
2026-01-27 23:06:41 +01:00
committed by GitHub
parent f12acf17e6
commit aa5b12af44
7 changed files with 43 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/cli/commands/src/db/list.rs
View File

@@ -101,8 +101,8 @@ impl<N: NodeTypes> TableViewer<()> for ListTableViewer<'_, N> {
// We may be using the tui for a long time
tx.disable_long_read_transaction_safety();
let table_db = tx.inner.open_db(Some(self.args.table.name())).wrap_err("Could not open db.")?;
let stats = tx.inner.db_stat(table_db.dbi()).wrap_err(format!("Could not find table: {}", self.args.table.name()))?;
let table_db = tx.inner().open_db(Some(self.args.table.name())).wrap_err("Could not open db.")?;
let stats = tx.inner().db_stat(table_db.dbi()).wrap_err(format!("Could not find table: {}", self.args.table.name()))?;
let total_entries = stats.entries();
let final_entry_idx = total_entries.saturating_sub(1);
if self.args.skip > final_entry_idx {

8
crates/cli/commands/src/db/stats.rs
View File

@@ -92,10 +92,10 @@ impl Command {
db_tables.sort();
let mut total_size = 0;
for db_table in db_tables {
let table_db = tx.inner.open_db(Some(db_table)).wrap_err("Could not open db.")?;
let table_db = tx.inner().open_db(Some(db_table)).wrap_err("Could not open db.")?;
let stats = tx
.inner
.inner()
.db_stat(table_db.dbi())
.wrap_err(format!("Could not find table: {db_table}"))?;
@@ -136,9 +136,9 @@ impl Command {
.add_cell(Cell::new(human_bytes(total_size as f64)));
table.add_row(row);
let freelist = tx.inner.env().freelist()?;
let freelist = tx.inner().env().freelist()?;
let pagesize =
tx.inner.db_stat(mdbx::Database::freelist_db().dbi())?.page_size() as usize;
tx.inner().db_stat(mdbx::Database::freelist_db().dbi())?.page_size() as usize;
let freelist_size = freelist * pagesize;
let mut row = Row::new();

12
crates/storage/db/benches/criterion.rs
View File

@@ -137,7 +137,8 @@ where
for (k, _, v, _) in input {
crsr.append(k, &v).expect("submit");
}
tx.inner.commit().unwrap()
drop(crsr);
tx.commit().unwrap()
},
)
});
@@ -157,8 +158,8 @@ where
let (k, _, v, _) = input.get(index).unwrap().clone();
crsr.insert(k, &v).expect("submit");
}
tx.inner.commit().unwrap()
drop(crsr);
tx.commit().unwrap()
},
)
});
@@ -219,7 +220,8 @@ where
for (k, _, v, _) in input {
crsr.append_dup(k, v).expect("submit");
}
tx.inner.commit().unwrap()
drop(crsr);
tx.commit().unwrap()
},
)
});
@@ -239,7 +241,7 @@ where
let (k, _, v, _) = input.get(index).unwrap().clone();
tx.put::<T>(k, v).unwrap();
}
tx.inner.commit().unwrap();
tx.commit().unwrap()
},
)
});

52
crates/storage/db/benches/hash_keys.rs
View File

@@ -16,10 +16,9 @@ use reth_db_api::{
cursor::DbCursorRW,
database::Database,
table::{Table, TableRow},
transaction::DbTxMut,
transaction::{DbTx, DbTxMut},
};
use reth_fs_util as fs;
use std::hint::black_box;
mod utils;
use utils::*;
@@ -178,17 +177,13 @@ fn append<T>(db: DatabaseEnv, input: Vec<(<T as Table>::Key, <T as Table>::Value
where
T: Table,
{
{
let tx = db.tx_mut().expect("tx");
let mut crsr = tx.cursor_write::<T>().expect("cursor");
black_box({
for (k, v) in input {
crsr.append(k, &v).expect("submit");
}
tx.inner.commit().unwrap()
});
let tx = db.tx_mut().expect("tx");
let mut crsr = tx.cursor_write::<T>().expect("cursor");
for (k, v) in input {
crsr.append(k, &v).expect("submit");
}
drop(crsr);
tx.commit().unwrap();
db
}
@@ -196,17 +191,13 @@ fn insert<T>(db: DatabaseEnv, input: Vec<(<T as Table>::Key, <T as Table>::Value
where
T: Table,
{
{
let tx = db.tx_mut().expect("tx");
let mut crsr = tx.cursor_write::<T>().expect("cursor");
black_box({
for (k, v) in input {
crsr.insert(k, &v).expect("submit");
}
tx.inner.commit().unwrap()
});
let tx = db.tx_mut().expect("tx");
let mut crsr = tx.cursor_write::<T>().expect("cursor");
for (k, v) in input {
crsr.insert(k, &v).expect("submit");
}
drop(crsr);
tx.commit().unwrap();
db
}
@@ -214,16 +205,11 @@ fn put<T>(db: DatabaseEnv, input: Vec<(<T as Table>::Key, <T as Table>::Value)>)
where
T: Table,
{
{
let tx = db.tx_mut().expect("tx");
black_box({
for (k, v) in input {
tx.put::<T>(k, v).expect("submit");
}
tx.inner.commit().unwrap()
});
let tx = db.tx_mut().expect("tx");
for (k, v) in input {
tx.put::<T>(k, v).expect("submit");
}
tx.commit().unwrap();
db
}
@@ -243,11 +229,11 @@ where
T: Table,
{
db.view(|tx| {
let table_db = tx.inner.open_db(Some(T::NAME)).map_err(|_| "Could not open db.").unwrap();
let table_db = tx.inner().open_db(Some(T::NAME)).map_err(|_| "Could not open db.").unwrap();
println!(
"{:?}\n",
tx.inner
tx.inner()
.db_stat(table_db.dbi())
.map_err(|_| format!("Could not find table: {}", T::NAME))
.map(|stats| {

4
crates/storage/db/benches/utils.rs
View File

@@ -5,7 +5,7 @@ use alloy_primitives::Bytes;
use reth_db::{test_utils::create_test_rw_db_with_path, DatabaseEnv};
use reth_db_api::{
table::{Compress, Encode, Table, TableRow},
transaction::DbTxMut,
transaction::{DbTx, DbTxMut},
Database,
};
use reth_fs_util as fs;
@@ -68,7 +68,7 @@ where
for (k, _, v, _) in pair.clone() {
tx.put::<T>(k, v).expect("submit");
}
tx.inner.commit().unwrap();
tx.commit().unwrap();
}
db.into_inner_db()

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

@@ -274,10 +274,11 @@ impl DatabaseMetrics for DatabaseEnv {
let _ = self
.view(|tx| {
for table in Tables::ALL.iter().map(Tables::name) {
let table_db = tx.inner.open_db(Some(table)).wrap_err("Could not open db.")?;
let table_db =
tx.inner().open_db(Some(table)).wrap_err("Could not open db.")?;
let stats = tx
.inner
.inner()
.db_stat(table_db.dbi())
.wrap_err(format!("Could not find table: {table}"))?;

7
crates/storage/db/src/implementation/mdbx/tx.rs
View File

@@ -30,7 +30,7 @@ const LONG_TRANSACTION_DURATION: Duration = Duration::from_secs(60);
#[derive(Debug)]
pub struct Tx<K: TransactionKind> {
/// Libmdbx-sys transaction.
pub inner: Transaction<K>,
inner: Transaction<K>,
/// Cached MDBX DBIs for reuse.
dbis: Arc<HashMap<&'static str, MDBX_dbi>>,
@@ -62,6 +62,11 @@ impl<K: TransactionKind> Tx<K> {
Ok(Self { inner, dbis, metrics_handler })
}
/// Returns a reference to the inner libmdbx transaction.
pub const fn inner(&self) -> &Transaction<K> {
&self.inner
}
/// Gets this transaction ID.
pub fn id(&self) -> reth_libmdbx::Result<u64> {
self.metrics_handler.as_ref().map_or_else(|| self.inner.id(), |handler| Ok(handler.txn_id))