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

Inlines AccountsDb::remove_bank_hash_infos() (#31454)

This commit is contained in:
Brooks 2023-05-03 10:42:16 -04:00 committed by GitHub
parent 1438d9ef08
commit a9515e9269
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
runtime/src/accounts_db.rs
View File

@ -4658,10 +4658,14 @@ impl AccountsDb {
&self, &self,
dropped_roots: impl Iterator<Item = Slot>, dropped_roots: impl Iterator<Item = Slot>,
) { ) {
let mut accounts_delta_hashes = self.accounts_delta_hashes.lock().unwrap();
let mut bank_hash_stats = self.bank_hash_stats.lock().unwrap();
dropped_roots.for_each(|slot| { dropped_roots.for_each(|slot| {
self.accounts_index self.accounts_index
.clean_dead_slot(slot, &mut AccountsIndexRootsStats::default()); .clean_dead_slot(slot, &mut AccountsIndexRootsStats::default());
self.remove_bank_hash_info(&slot); accounts_delta_hashes.remove(&slot);
bank_hash_stats.remove(&slot);
// the storage has been removed from this slot and recycled or dropped // the storage has been removed from this slot and recycled or dropped
assert!(self.storage.remove(&slot, false).is_none()); assert!(self.storage.remove(&slot, false).is_none());
}); });
@ -7953,28 +7957,6 @@ impl AccountsDb {
self.bank_hash_stats.lock().unwrap().get(&slot).cloned() self.bank_hash_stats.lock().unwrap().get(&slot).cloned()
} }
/// Remove "bank hash info" for `slot`
///
/// This fn removes the accounts delta hash, accounts hash, and bank hash stats for `slot` from
/// their respective maps.
fn remove_bank_hash_info(&self, slot: &Slot) {
self.remove_bank_hash_infos(std::iter::once(slot));
}
/// Remove "bank hash info" for `slots`
///
/// This fn removes the accounts delta hash and bank hash stats for `slots` from
/// their respective maps.
fn remove_bank_hash_infos<'s>(&self, slots: impl IntoIterator<Item = &'s Slot>) {
let mut accounts_delta_hashes = self.accounts_delta_hashes.lock().unwrap();
let mut bank_hash_stats = self.bank_hash_stats.lock().unwrap();
for slot in slots {
accounts_delta_hashes.remove(slot);
bank_hash_stats.remove(slot);
}
}
fn update_index<'a, T: ReadableAccount + Sync>( fn update_index<'a, T: ReadableAccount + Sync>(
&self, &self,
infos: Vec<AccountInfo>, infos: Vec<AccountInfo>,
@ -8186,7 +8168,16 @@ impl AccountsDb {
purged_stored_account_slots, purged_stored_account_slots,
pubkeys_removed_from_accounts_index, pubkeys_removed_from_accounts_index,
); );
self.remove_bank_hash_infos(dead_slots_iter);
let mut accounts_delta_hashes = self.accounts_delta_hashes.lock().unwrap();
let mut bank_hash_stats = self.bank_hash_stats.lock().unwrap();
for slot in dead_slots_iter {
accounts_delta_hashes.remove(slot);
bank_hash_stats.remove(slot);
}
drop(accounts_delta_hashes);
drop(bank_hash_stats);
measure.stop(); measure.stop();
inc_new_counter_info!("remove_dead_slots_metadata-ms", measure.as_ms() as usize); inc_new_counter_info!("remove_dead_slots_metadata-ms", measure.as_ms() as usize);
} }