blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Avoids copying hashes when computing merkle root (#29225)

This commit is contained in:
Brooks Prumo 2022-12-13 10:20:14 -05:00 committed by GitHub
parent e1c6de9ef4
commit bcbf3374fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/src/accounts_db.rs
View File

@ -10496,7 +10496,7 @@ pub mod tests {
let (storages, raw_expected) = sample_storages_and_accounts(&db); let (storages, raw_expected) = sample_storages_and_accounts(&db);
let expected_hash = let expected_hash =
AccountsHasher::compute_merkle_root_loop(raw_expected.clone(), MERKLE_FANOUT, |item| { AccountsHasher::compute_merkle_root_loop(raw_expected.clone(), MERKLE_FANOUT, |item| {
item.hash &item.hash
}); });
let sum = raw_expected.iter().map(|item| item.lamports).sum(); let sum = raw_expected.iter().map(|item| item.lamports).sum();
let result = db let result = db

8
runtime/src/accounts_hash.rs
View File

@ -538,12 +538,12 @@ impl AccountsHasher {
} }
pub fn compute_merkle_root(hashes: Vec<(Pubkey, Hash)>, fanout: usize) -> Hash { pub fn compute_merkle_root(hashes: Vec<(Pubkey, Hash)>, fanout: usize) -> Hash {
Self::compute_merkle_root_loop(hashes, fanout, |t| t.1) Self::compute_merkle_root_loop(hashes, fanout, |t| &t.1)
} }
// this function avoids an infinite recursion compiler error // this function avoids an infinite recursion compiler error
pub fn compute_merkle_root_recurse(hashes: Vec<Hash>, fanout: usize) -> Hash { pub fn compute_merkle_root_recurse(hashes: Vec<Hash>, fanout: usize) -> Hash {
Self::compute_merkle_root_loop(hashes, fanout, |t: &Hash| *t) Self::compute_merkle_root_loop(hashes, fanout, |t| t)
} }
pub fn div_ceil(x: usize, y: usize) -> usize { pub fn div_ceil(x: usize, y: usize) -> usize {
@ -558,7 +558,7 @@ impl AccountsHasher {
// Using extractor allows us to avoid an unnecessary array copy on the first iteration. // Using extractor allows us to avoid an unnecessary array copy on the first iteration.
pub fn compute_merkle_root_loop<T, F>(hashes: Vec<T>, fanout: usize, extractor: F) -> Hash pub fn compute_merkle_root_loop<T, F>(hashes: Vec<T>, fanout: usize, extractor: F) -> Hash
where where
F: Fn(&T) -> Hash + std::marker::Sync, F: Fn(&T) -> &Hash + std::marker::Sync,
T: std::marker::Sync, T: std::marker::Sync,
{ {
if hashes.is_empty() { if hashes.is_empty() {
@ -806,7 +806,7 @@ impl AccountsHasher {
pub fn accumulate_account_hashes(mut hashes: Vec<(Pubkey, Hash)>) -> Hash { pub fn accumulate_account_hashes(mut hashes: Vec<(Pubkey, Hash)>) -> Hash {
Self::sort_hashes_by_pubkey(&mut hashes); Self::sort_hashes_by_pubkey(&mut hashes);
Self::compute_merkle_root_loop(hashes, MERKLE_FANOUT, |i| i.1) Self::compute_merkle_root_loop(hashes, MERKLE_FANOUT, |i| &i.1)
} }
pub fn sort_hashes_by_pubkey(hashes: &mut Vec<(Pubkey, Hash)>) { pub fn sort_hashes_by_pubkey(hashes: &mut Vec<(Pubkey, Hash)>) {