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

accounts hash sort_slot_storage_scan sorts in place (#32810)

This commit is contained in:
Jeff Washington (jwash) 2023-08-14 07:47:33 -07:00 committed by GitHub
parent e0de0685cb
commit 9212ac347c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
accounts-db/src/accounts_db.rs
View File

@ -2406,10 +2406,10 @@ impl<'a> AppendVecScan for ScanState<'a> {
self.init_accum(self.range);
self.accum[self.pubkey_to_bin_index].push(source_item);
}
fn scanning_complete(self) -> BinnedHashData {
let (result, timing) = AccountsDb::sort_slot_storage_scan(self.accum);
fn scanning_complete(mut self) -> BinnedHashData {
let timing = AccountsDb::sort_slot_storage_scan(&mut self.accum);
self.sort_time.fetch_add(timing, Ordering::Relaxed);
result
self.accum
}
}
@ -7566,24 +7566,17 @@ impl AccountsDb {
Ok(result)
}
fn sort_slot_storage_scan(accum: BinnedHashData) -> (BinnedHashData, u64) {
fn sort_slot_storage_scan(accum: &mut BinnedHashData) -> u64 {
let time = AtomicU64::new(0);
(
accum
.into_iter()
.map(|mut items| {
let mut sort_time = Measure::start("sort");
{
// sort_by vs unstable because slot and write_version are already in order
items.sort_by(AccountsHasher::compare_two_hash_entries);
}
sort_time.stop();
time.fetch_add(sort_time.as_us(), Ordering::Relaxed);
items
})
.collect(),
time.load(Ordering::Relaxed),
)
accum.iter_mut().for_each(|items| {
let mut sort_time = Measure::start("sort");
// sort_by vs unstable because slot and write_version are already in order
items.sort_by(AccountsHasher::compare_two_hash_entries);
sort_time.stop();
time.fetch_add(sort_time.as_us(), Ordering::Relaxed);
});
time.load(Ordering::Relaxed)
}
/// normal code path returns the common cache path