fix(trie): sparse trie walk should be done in a sorted manner #12087
Conversation
This file contains 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
shekhirin
added
C-bug
shekhirin
changed the title
gakonst
reviewed
Oct 25, 2024
rkrasiuk
reviewed
Oct 28, 2024
crates/trie/sparse/src/trie.rs
Outdated
Comment on lines
669
to
688
| for bit in CHILD_INDEX_RANGE.rev() { | ||
| if state_mask.is_bit_set(bit) { | ||
| let mut child = path.clone(); | ||
| child.push_unchecked(bit); | ||
| branch_child_buf.push(child); | ||
| } | ||
| } | ||
|
|
||
| branch_value_stack_buf.clear(); | ||
| for child_path in &branch_child_buf { | ||
| branch_value_stack_buf.resize(branch_child_buf.len(), Default::default()); | ||
| let mut added_children = false; | ||
| for (i, child_path) in branch_child_buf.iter().enumerate() { | ||
| if rlp_node_stack.last().map_or(false, |e| &e.0 == child_path) { | ||
| let (_, child) = rlp_node_stack.pop().unwrap(); | ||
| branch_value_stack_buf.push(child); | ||
| branch_value_stack_buf[branch_child_buf.len() - i - 1] = child; | ||
| added_children = true; | ||
| } else { | ||
| debug_assert!(branch_value_stack_buf.is_empty()); | ||
| debug_assert!(!added_children); | ||
| path_stack.push(path); | ||
| path_stack.extend(branch_child_buf.drain(..)); | ||
| continue 'main |
There was a problem hiding this comment.
if children are pushed from 0 to f, then the first one to pop will be f and we will do lookups in a non-sorted order
reth/crates/trie/sparse/src/trie.rs
Lines 633 to 637 in 70e88b9
There was a problem hiding this comment.
didn't see ur reply 😅 , ye, makes sense
rkrasiuk
approved these changes
Oct 28, 2024
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.
Two fixes:
a..=fmeans poppingf..=a. We need to pushf..=aand popa..=fto make it a DFS search.