fix(l1): make function inner for InMemoryTrieDB #5199
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Lines of code reportTotal lines added: Detailed view |
Benchmark for bc435bbClick to view benchmark
|
Benchmark for 1b3c4fdClick to view benchmark
|
Benchmark for dc5c8e1Click to view benchmark
|
Benchmark for ac0e238Click to view benchmark
|
This reverts commit 6b665f8.
Benchmark for 35ca949Click to view benchmark
|
Benchmark for 9828dbaClick to view benchmark
|
Benchmark for 92f657cClick to view benchmark
|
JereSalo
changed the title
put_batch for TrieWrapper
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR refactors the trie cache synchronization mechanism to use RwLock instead of a Read-Copy-Update (RCU) pattern with Mutex. The key motivation is to improve concurrency by allowing multiple readers while maintaining write safety. Additionally, it implements the previously unimplemented put_batch method in TrieWrapper.
Key changes:
- Replaced
Arc<Mutex<Arc<TrieLayerCache>>>withArc<RwLock<TrieLayerCache>>to eliminate the double-Arc RCU pattern - Implemented
put_batchfunctionality inTrieWrapperwith proper state root management - Added a new
inner()method toInMemoryTrieDBfor exposing the internalNodeMap
Reviewed Changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| crates/storage/trie_db/layering.rs | Wrapped TrieWrapper fields in RwLock and implemented put_batch with state root computation and prefix application |
| crates/storage/store_db/rocksdb.rs | Refactored trie cache from RCU pattern to direct RwLock usage, simplified layer management code |
| crates/storage/store_db/in_memory.rs | Updated in-memory store to use RwLock for trie cache consistency with rocksdb implementation |
| crates/common/trie/db.rs | Added inner() accessor method to InMemoryTrieDB |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Contributor
Author
|
Maybe we don't want this, so I will address Copilot comments after we decide if we actually want this or not. Otherwise we may have to solve it in a different way. Edit: yep, I made a mistake, we didn't want this and it wasn't even necessary |
JereSalo
changed the title
put_batch for TrieWrapper
Benchmark for d28953eClick to view benchmark
|
Benchmark for 4fa4235Click to view benchmark
|
ilitteri
approved these changes
Nov 7, 2025
avilagaston9
approved these changes
Nov 7, 2025
Contributor
avilagaston9
left a comment
avilagaston9
left a comment
There was a problem hiding this comment.
Maybe it’s better to clarify in the comments that we need these methods for ethrex-replay
SDartayet
approved these changes
Nov 7, 2025
Contributor
Author
|
Benchmark for 78dfcafClick to view benchmark
|
xqft
pushed a commit
that referenced
this pull request
Nov 11, 2025
**Motivation** <!-- Why does this pull request exist? What are its goals? --> - Make necessary changes in order for ethrex-replay to work fine (we make use of these things there) **Description** - Added a method to `InMemoryTrieDB` to use it in ethrex-replay
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
Description
InMemoryTrieDBto use it in ethrex-replay