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

Collect uncleaned pubkeys from all slots (#16786) 

While working on another issue (#16580), the list of uncleaned pubkeys
returned from `remove_uncleaned_slots_and_collect_pubkeys_up_to_slot()`
did not include unrooted slots.  This meant that during cleaning,
unrooted slots would not have their pubkeys cleaned up properly.

Now, return all uncleaned pubkeys, regardless if the slot is rooted or
not.  Additionally, update the tests to have unrooted slots to ensure
this behavior.

This is part two of PR #16879, and originally based on PR #15106.
This commit is contained in:
Brooks Prumo 2021-04-28 10:57:42 -05:00 committed by GitHub
parent 0aecc6033a
commit 77f1ffd84b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
runtime/src/accounts_db.rs
View File

@ -1479,25 +1479,18 @@ impl AccountsDb {
/// Remove `slots` from `uncleaned_pubkeys` and collect all pubkeys /// Remove `slots` from `uncleaned_pubkeys` and collect all pubkeys
/// ///
/// For each slot in the list of slots, remove it from the `uncleaned_pubkeys` Map and collect /// For each slot in the list of uncleaned slots, remove it from the `uncleaned_pubkeys` Map
/// all the pubkeys from root slots to return. /// and collect all the pubkeys to return.
fn remove_uncleaned_slots_and_collect_pubkeys( fn remove_uncleaned_slots_and_collect_pubkeys(
&self, &self,
uncleaned_slots: Vec<Slot>, uncleaned_slots: Vec<Slot>,
) -> Vec<Vec<Pubkey>> { ) -> Vec<Vec<Pubkey>> {
uncleaned_slots uncleaned_slots
.into_iter() .into_iter()
.filter_map(|slot| { .filter_map(|uncleaned_slot| {
let maybe_slot_keys = self.uncleaned_pubkeys.remove(&slot); self.uncleaned_pubkeys
if self.accounts_index.is_root(slot) { .remove(&uncleaned_slot)
// Safe to unwrap on rooted slots since this is called from clean_accounts .map(|(_removed_slot, removed_pubkeys)| removed_pubkeys)
// and only clean_accounts operates on rooted slots. purge_slots only
// operates on uncleaned_pubkeys
let (_slot, keys) = maybe_slot_keys.expect("Root slot should exist");
Some(keys)
} else {
None
}
}) })
.collect() .collect()
} }
@ -10173,7 +10166,7 @@ pub mod tests {
db.store_uncached(slot3, &[(&pubkey3, &account3)]); db.store_uncached(slot3, &[(&pubkey3, &account3)]);
db.add_root(slot1); db.add_root(slot1);
db.add_root(slot2); // slot 2 is _not_ a root on purpose
db.add_root(slot3); db.add_root(slot3);
db.uncleaned_pubkeys.insert(slot1, vec![pubkey1]); db.uncleaned_pubkeys.insert(slot1, vec![pubkey1]);
@ -10230,7 +10223,7 @@ pub mod tests {
db.store_uncached(slot2, &[(&pubkey2, &account2)]); db.store_uncached(slot2, &[(&pubkey2, &account2)]);
db.store_uncached(slot3, &[(&pubkey3, &account3)]); db.store_uncached(slot3, &[(&pubkey3, &account3)]);
db.add_root(slot1); // slot 1 is _not_ a root on purpose
db.add_root(slot2); db.add_root(slot2);
db.add_root(slot3); db.add_root(slot3);