Skip to content
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.

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

Revert "perf: move common_prefix_len out of loop" #5043

Merged
merged 1 commit into from
Oct 16, 2023
Merged
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
2 changes: 1 addition & 1 deletion crates/primitives/src/trie/hash_builder/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@ impl HashBuilder {

tracing::debug!(target: "trie::hash_builder", ?current, ?succeeding, "updating merkle tree");

let common_prefix_len = succeeding.common_prefix_length(&current);
let mut i = 0;
loop {
let span = tracing::span!(
Expand All @@ -198,6 +197,7 @@ impl HashBuilder {
let preceding_exists = !self.groups.is_empty();
let preceding_len: usize = self.groups.len().saturating_sub(1);

let common_prefix_len = succeeding.common_prefix_length(&current);
let len = std::cmp::max(preceding_len, common_prefix_len);
assert!(len < current.len());

Expand Down