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

hash calc eliminate zero refactor get_item (#21036)

This commit is contained in:
Jeff Washington (jwash) 2021-11-08 20:27:48 +00:00 committed by GitHub
parent c2754b8a51
commit 5827cf4c51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
runtime/src/accounts_hash.rs
View File

@ -556,7 +556,7 @@ impl AccountsHash {
first_items: &'a mut Vec<(Pubkey, usize)>,
pubkey_division: &'b [Vec<Vec<CalculateHashIntermediate>>],
indexes: &'a mut Vec<usize>,
) -> (bool, &'b CalculateHashIntermediate) {
) -> &'b CalculateHashIntermediate {
let first_item = first_items[min_index];
let key = &first_item.0;
let division_index = first_item.1;
@ -576,15 +576,12 @@ impl AccountsHash {
break;
}
(
if index >= bin.len() {
first_items.remove(min_index); // stop looking in this vector - we exhausted it
true
} else {
false
}, // this is the last item with this pubkey
&bin[index - 1],
)
if index >= bin.len() {
first_items.remove(min_index); // stop looking in this vector - we exhausted it
}
// this is the previous first item that was requested
&bin[index - 1]
}
// go through: [..][pubkey_bin][..] and return hashes and lamport sum
@ -648,7 +645,7 @@ impl AccountsHash {
min_index = first_item_index;
}
// get the min item, add lamports, get hash
let (_, item) = Self::get_item(
let item = Self::get_item(
min_index,
pubkey_bin,
&mut first_items,
@ -667,16 +664,13 @@ impl AccountsHash {
// reverse this list because get_item can remove first_items[*i] when *i is exhausted
// and that would mess up subsequent *i values
duplicate_pubkey_indexes.iter().rev().for_each(|i| {
let (exhausted, _) = Self::get_item(
Self::get_item(
*i,
pubkey_bin,
&mut first_items,
pubkey_division,
&mut indexes,
);
if exhausted {
min_index -= 1;
}
});
duplicate_pubkey_indexes.clear();
}