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

create remove_if_slot_list_empty to define accounts index behavior (#19581)

This commit is contained in:
Jeff Washington (jwash) 2021-09-02 16:54:37 -05:00 committed by GitHub
parent 0571962776
commit 2874f6b0a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
runtime/src/accounts_index.rs
View File

@ -1233,10 +1233,7 @@ impl<T: IsCached> AccountsIndex<T> {
if !dead_keys.is_empty() {
for key in dead_keys.iter() {
let mut w_index = self.get_account_maps_write_lock(key);
if let Entry::Occupied(index_entry) = w_index.entry(**key) {
if index_entry.get().slot_list.read().unwrap().is_empty() {
index_entry.remove();
if self.remove_if_slot_list_empty(key, &mut w_index) {
// Note it's only safe to remove all the entries for this key
// because we have the lock for this key's entry in the AccountsIndex,
// so no other thread is also updating the index
@ -1245,6 +1242,21 @@ impl<T: IsCached> AccountsIndex<T> {
}
}
}
// If the slot list for pubkey exists in the index and is empty, remove the index entry for pubkey and return true.
// Return false otherwise.
fn remove_if_slot_list_empty(
&self,
pubkey: &Pubkey,
lock: &mut AccountMapsWriteLock<T>,
) -> bool {
if let Entry::Occupied(index_entry) = lock.entry(*pubkey) {
if index_entry.get().slot_list.read().unwrap().is_empty() {
index_entry.remove();
return true;
}
}
false
}
/// call func with every pubkey and index visible from a given set of ancestors