Skip to content

perf(persistence): improve write batch for HashedPostState & TrieUpdatesSorted #19739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mediocregopher merged 4 commits into from
Nov 17, 2025
Merged

perf(persistence): improve write batch for HashedPostState & TrieUpdatesSorted #19739

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a260533
feat: improve persistence write batch for hashpoststate
duyquang6 Nov 14, 2025
59cd2aa
fix: lint
duyquang6 Nov 14, 2025
82eec04
fix: nit
duyquang6 Nov 14, 2025
6b71deb
feat: improve write batch trie updates
duyquang6 Nov 14, 2025
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
23 changes: 17 additions & 6 deletions crates/storage/provider/src/providers/database/provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ use reth_trie::{
TrieCursorIter,
},
updates::{StorageTrieUpdatesSorted, TrieUpdatesSorted},
HashedPostStateSorted, StoredNibbles, StoredNibblesSubKey, TrieChangeSetsEntry,
HashedPostState, HashedPostStateSorted, StoredNibbles, StoredNibblesSubKey,
TrieChangeSetsEntry,
};
use reth_trie_db::{
DatabaseAccountTrieCursor, DatabaseStorageTrieCursor, DatabaseTrieCursorFactory,
Expand Down Expand Up @@ -305,13 +306,16 @@ impl<TX: DbTx + DbTxMut + 'static, N: NodeTypesForProvider> DatabaseProvider<TX,

debug!(target: "providers::db", block_count = %blocks.len(), "Writing blocks and execution data to storage");

let mut aggregated_hashed_state = HashedPostState::default();
let mut aggregated_trie_updates_sorted = TrieUpdatesSorted::default();

// TODO: Do performant / batched writes for each type of object
// instead of a loop over all blocks,
// meaning:
// * blocks
// * state
// * hashed state
// * trie updates (cannot naively extend, need helper)
// * hashed state (already done)
// * trie updates sorted (already done)
// * indices (already done basically)
// Insert the blocks
for ExecutedBlock { recovered_block, execution_output, hashed_state, trie_updates } in
Expand All @@ -324,15 +328,22 @@ impl<TX: DbTx + DbTxMut + 'static, N: NodeTypesForProvider> DatabaseProvider<TX,
// Must be written after blocks because of the receipt lookup.
self.write_state(&execution_output, OriginalValuesKnown::No)?;

// insert hashes and intermediate merkle nodes
self.write_hashed_state(&Arc::unwrap_or_clone(hashed_state).into_sorted())?;
aggregated_hashed_state.extend(Arc::unwrap_or_clone(hashed_state));

// sort trie updates and insert changesets
let trie_updates_sorted = (*trie_updates).clone().into_sorted();
self.write_trie_changesets(block_number, &trie_updates_sorted, None)?;
self.write_trie_updates_sorted(&trie_updates_sorted)?;
aggregated_trie_updates_sorted.extend_ref(&trie_updates_sorted);
}

// batch insert hashes
if !aggregated_hashed_state.is_empty() {
self.write_hashed_state(&aggregated_hashed_state.into_sorted())?;
}

// batch write trie updates sorted
self.write_trie_updates_sorted(&aggregated_trie_updates_sorted)?;

// update history indices
self.update_history_indices(first_number..=last_block_number)?;

Expand Down
Loading