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

Convert tuple into dedup result struct (#33450) 

convert tupe into dedup result struct

Co-authored-by: HaoranYi <haoran.yi@solana.com>
This commit is contained in:
HaoranYi 2023-09-29 21:12:50 -05:00 committed by GitHub
parent d5195921a9
commit bb19ebed49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
accounts-db/src/accounts_hash.rs
View File

@ -781,47 +781,44 @@ impl<'a> AccountsHasher<'a> {
// b. lamports // b. lamports
let _guard = self.active_stats.activate(ActiveStatItem::HashDeDup); let _guard = self.active_stats.activate(ActiveStatItem::HashDeDup);
#[derive(Default)]
struct DedupResult {
hashes_files: Vec<AccountHashesFile>,
hashes_count: usize,
lamports_sum: u64,
}
let mut zeros = Measure::start("eliminate zeros"); let mut zeros = Measure::start("eliminate zeros");
let (hashes, hash_total, lamports_total) = (0..max_bin) let DedupResult {
hashes_files: hashes,
hashes_count: hash_total,
lamports_sum: lamports_total,
} = (0..max_bin)
.into_par_iter() .into_par_iter()
.fold( .fold(DedupResult::default, |mut accum, bin| {
|| { let (hashes_file, lamports_bin) =
( self.de_dup_accounts_in_parallel(sorted_data_by_pubkey, bin, max_bin, stats);
/*hashes files*/ Vec::with_capacity(max_bin),
/*hashes count*/ 0_usize, accum.lamports_sum = accum
/*lamports sum*/ 0_u64, .lamports_sum
) .checked_add(lamports_bin)
}, .expect("summing capitalization cannot overflow");
|mut accum, bin| { accum.hashes_count += hashes_file.count();
let (hashes_file, lamports_bin) = self.de_dup_accounts_in_parallel( accum.hashes_files.push(hashes_file);
sorted_data_by_pubkey, accum
bin, })
max_bin,
stats,
);
accum.2 = accum
.2
.checked_add(lamports_bin)
.expect("summing capitalization cannot overflow");
accum.1 += hashes_file.count();
accum.0.push(hashes_file);
accum
},
)
.reduce( .reduce(
|| { || DedupResult {
( hashes_files: Vec::with_capacity(max_bin),
/*hashes files*/ Vec::with_capacity(max_bin), ..Default::default()
/*hashes count*/ 0,
/*lamports sum*/ 0,
)
}, },
|mut a, mut b| { |mut a, mut b| {
a.2 = a.lamports_sum = a
a.2.checked_add(b.2) .lamports_sum
.expect("summing capitalization cannot overflow"); .checked_add(b.lamports_sum)
a.1 += b.1; .expect("summing capitalization cannot overflow");
a.0.append(&mut b.0); a.hashes_count += b.hashes_count;
a.hashes_files.append(&mut b.hashes_files);
a a
}, },
); );