github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-04-30 03:01:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor(trie): simplify arena clear with drain and remove all_subtries (#22940)

Browse Source
This commit is contained in:
Sergei Shulepov
2026-03-11 23:11:08 +07:00
committed by GitHub
parent bb55687f98
commit 074daf8a8f
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
crates/trie/sparse/src/arena/mod.rs
View File

@@ -523,14 +523,6 @@ impl ArenaParallelSparseTrie {
self
}
/// Returns the arena indexes of all [`ArenaSparseNode::Subtrie`] nodes in the upper arena.
fn all_subtries(&self) -> SmallVec<[Index; 16]> {
self.upper_arena
.iter()
.filter_map(|(idx, node)| matches!(node, ArenaSparseNode::Subtrie(_)).then_some(idx))
.collect()
}
/// Takes a cleared [`ArenaSparseSubtrie`] from the pool (or creates a new one) and
/// pre-allocates a root slot with a placeholder. The caller must overwrite
/// `subtrie.arena[subtrie.root]` before use.
@@ -2335,15 +2327,12 @@ impl SparseTrie for ArenaParallelSparseTrie {
#[instrument(level = "trace", target = TRACE_TARGET, skip_all)]
fn clear(&mut self) {
for idx in self.all_subtries() {
if let ArenaSparseNode::Subtrie(mut subtrie) =
self.upper_arena.remove(idx).expect("subtrie exists in arena")
{
for (_, node) in self.upper_arena.drain() {
if let ArenaSparseNode::Subtrie(mut subtrie) = node {
subtrie.clear();
self.cleared_subtries.push(*subtrie);
}
}
self.upper_arena.clear();
self.root = self.upper_arena.insert(ArenaSparseNode::EmptyRoot);
if let Some(updates) = self.updates.as_mut() {
updates.clear()