Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Perf

### 2025-10-30

= Add bloom filters to snapshot layers [#5112](https://github.com/lambdaclass/ethrex/pull/5112)

### 2025-10-28

- Batch BlobsBundle::validate [#4993](https://github.com/lambdaclass/ethrex/pull/4993)
Expand Down
13 changes: 13 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions crates/l2/tee/quote-gen/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crates/storage/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ rocksdb = { workspace = true, optional = true }
rustc-hash.workspace = true
tokio = { workspace = true, optional = true, features = ["rt"] }
bincode = "1.3.3"
fastbloom = "0.14.0"

[features]
default = []
Expand Down
46 changes: 43 additions & 3 deletions crates/storage/trie_db/layering.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,45 @@ struct TrieLayer {
id: usize,
}

#[derive(Clone, Debug, Default)]
#[derive(Clone, Debug)]
pub struct TrieLayerCache {
/// Monotonically increasing ID for layers, starting at 1.
/// TODO: this implementation panics on overflow
last_id: usize,
layers: FxHashMap<H256, Arc<TrieLayer>>,
/// Global bloom that accrues all layer blooms.
///
/// The bloom filter is used to avoid looking up all layers when the given path doesn't exist in any
/// layer, thus going directly to the database.
bloom: fastbloom::BloomFilter,
}

impl Default for TrieLayerCache {
fn default() -> Self {
Self {
// todo: tune this
bloom: fastbloom::BloomFilter::with_num_bits(8192).expected_items(128 * 512),
last_id: 0,
layers: Default::default(),
}
}
}

impl TrieLayerCache {
pub fn get(&self, state_root: H256, key: Nibbles) -> Option<Vec<u8>> {
let key = key.as_ref();

// Fast check to know if any layer may contains the given key.
// We can only be certain it doesn't exist, but if it returns true it may or not exist (false positive).
if !self.bloom.contains(key) {
// TrieWrapper goes to db when returning None.
return None;
}

let mut current_state_root = state_root;

while let Some(layer) = self.layers.get(&current_state_root) {
if let Some(value) = layer.nodes.get(key.as_ref()) {
if let Some(value) = layer.nodes.get(key) {
return Some(value.clone());
}
current_state_root = layer.parent;
Expand Down Expand Up @@ -70,9 +96,13 @@ impl TrieLayerCache {
return;
}

// add this new bloom to the global one.
self.bloom
.insert_all(key_values.iter().map(|x| x.0.as_ref()));

let nodes: FxHashMap<Vec<u8>, Vec<u8>> = key_values
.into_iter()
.map(|(path, node)| (path.into_vec(), node))
.map(|(path, value)| (path.into_vec(), value))
.collect();

self.last_id += 1;
Expand All @@ -84,6 +114,15 @@ impl TrieLayerCache {
self.layers.insert(state_root, Arc::new(entry));
}

/// Rebuilds the global bloom filter accruing all current existing layers.
pub fn rebuild_bloom(&mut self) {
self.bloom.clear();

for entry in self.layers.values() {
self.bloom.insert_all(entry.nodes.iter().map(|x| x.0));
}
}

pub fn commit(&mut self, state_root: H256) -> Option<Vec<(Vec<u8>, Vec<u8>)>> {
let layer = match Arc::try_unwrap(self.layers.remove(&state_root)?) {
Ok(layer) => layer,
Expand All @@ -93,6 +132,7 @@ impl TrieLayerCache {
let parent_nodes = self.commit(layer.parent);
// older layers are useless
self.layers.retain(|_, item| item.id > layer.id);
self.rebuild_bloom(); // layers removed, rebuild global bloom filter.
Some(
parent_nodes
.unwrap_or_default()
Expand Down
13 changes: 13 additions & 0 deletions tooling/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading