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

special case for common case of 1 storage on append vec scan (#25414)

This commit is contained in:
Jeff Washington (jwash) 2022-05-20 17:36:30 -05:00 committed by GitHub
parent 527b4ac76c
commit f584b249dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
runtime/src/accounts_db.rs
View File

@ -5714,10 +5714,16 @@ impl AccountsDb {
F: Fn(LoadedAccount, &mut B, Slot) + Send + Sync, F: Fn(LoadedAccount, &mut B, Slot) + Send + Sync,
B: Send + Default, B: Send + Default,
{ {
// we have to call the scan_func in order of write_version within a slot if there are multiple storages per slot
let mut len = storages.len(); let mut len = storages.len();
if len == 1 {
// only 1 storage, so no need to interleave between multiple storages based on write_version
AppendVecAccountsIter::new(&storages[0].accounts)
.for_each(|account| scan_func(LoadedAccount::Stored(account), retval, slot));
} else {
// we have to call the scan_func in order of write_version within a slot if there are multiple storages per slot
let mut progress = Vec::with_capacity(len); let mut progress = Vec::with_capacity(len);
let mut current = Vec::with_capacity(len); let mut current =
Vec::<(StoredMetaWriteVersion, Option<StoredAccountMeta<'_>>)>::with_capacity(len);
for storage in storages { for storage in storages {
let mut iterator = AppendVecAccountsIter::new(&storage.accounts); let mut iterator = AppendVecAccountsIter::new(&storage.accounts);
if let Some(item) = iterator if let Some(item) = iterator
@ -5737,12 +5743,13 @@ impl AccountsDb {
min = *item; min = *item;
} }
} }
let mut account = (0, None); let mut account: (StoredMetaWriteVersion, Option<StoredAccountMeta<'_>>) =
(0, None);
std::mem::swap(&mut account, &mut current[min_index]); std::mem::swap(&mut account, &mut current[min_index]);
scan_func(LoadedAccount::Stored(account.1.unwrap()), retval, slot); scan_func(LoadedAccount::Stored(account.1.unwrap()), retval, slot);
let next = progress[min_index] let next = progress[min_index].next().map(|stored_account| {
.next() (stored_account.meta.write_version, Some(stored_account))
.map(|stored_account| (stored_account.meta.write_version, Some(stored_account))); });
match next { match next {
Some(item) => { Some(item) => {
current[min_index] = item; current[min_index] = item;
@ -5755,6 +5762,7 @@ impl AccountsDb {
} }
} }
} }
}
fn update_old_slot_stats( fn update_old_slot_stats(
&self, &self,