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

simplify AccountsToCombine.accounts_keep_slots (#30246)

This commit is contained in:
Jeff Washington (jwash) 2023-02-10 15:53:03 -06:00 committed by GitHub
parent a46ba32e9a
commit 51d354defb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
runtime/src/ancient_append_vecs.rs
View File

@ -346,7 +346,7 @@ impl AccountsDb {
// there are accounts with ref_count > 1. This means this account must remain IN this slot. // there are accounts with ref_count > 1. This means this account must remain IN this slot.
// The same account could exist in a newer or older slot. Moving this account across slots could result // The same account could exist in a newer or older slot. Moving this account across slots could result
// in this alive version of the account now being in a slot OLDER than the non-alive instances. // in this alive version of the account now being in a slot OLDER than the non-alive instances.
accounts_keep_slots.insert(info.slot, (std::mem::take(many_refs), *info)); accounts_keep_slots.insert(info.slot, std::mem::take(many_refs));
} else { } else {
// No alive accounts in this slot have a ref_count > 1. So, ALL alive accounts in this slot can be written to any other slot // No alive accounts in this slot have a ref_count > 1. So, ALL alive accounts in this slot can be written to any other slot
// we find convenient. There is NO other instance of any account to conflict with. // we find convenient. There is NO other instance of any account to conflict with.
@ -419,7 +419,7 @@ struct AccountsToCombine<'a> {
/// to any slot. /// to any slot.
/// We want to keep the ref_count > 1 accounts by themselves, expecting the multiple ref_counts will be resolved /// We want to keep the ref_count > 1 accounts by themselves, expecting the multiple ref_counts will be resolved
/// soon and we can clean the duplicates up (which maybe THIS one). /// soon and we can clean the duplicates up (which maybe THIS one).
accounts_keep_slots: HashMap<Slot, (AliveAccounts<'a>, &'a SlotInfo)>, accounts_keep_slots: HashMap<Slot, AliveAccounts<'a>>,
/// all the rest of alive accounts that can move slots and should be combined /// all the rest of alive accounts that can move slots and should be combined
/// This includes all accounts with ref_count = 1 from the slots in 'accounts_keep_slots' /// This includes all accounts with ref_count = 1 from the slots in 'accounts_keep_slots'
accounts_to_combine: Vec<ShrinkCollect<'a, ShrinkCollectAliveSeparatedByRefs<'a>>>, accounts_to_combine: Vec<ShrinkCollect<'a, ShrinkCollectAliveSeparatedByRefs<'a>>>,
@ -695,10 +695,7 @@ pub mod tests {
let (db, _storages, _slots, _infos) = get_sample_storages(0, None); let (db, _storages, _slots, _infos) = get_sample_storages(0, None);
let mut write_ancient_accounts = WriteAncientAccounts::default(); let mut write_ancient_accounts = WriteAncientAccounts::default();
db.write_ancient_accounts_to_same_slot_multiple_refs( db.write_ancient_accounts_to_same_slot_multiple_refs(
AccountsToCombine::default() AccountsToCombine::default().accounts_keep_slots.values(),
.accounts_keep_slots
.iter()
.map(|(_slot, (info, _slot_info))| info),
&mut write_ancient_accounts, &mut write_ancient_accounts,
); );
assert!(write_ancient_accounts.shrinks_in_progress.is_empty()); assert!(write_ancient_accounts.shrinks_in_progress.is_empty());
@ -1075,10 +1072,7 @@ pub mod tests {
// test write_ancient_accounts_to_same_slot_multiple_refs since we built interesting 'AccountsToCombine' // test write_ancient_accounts_to_same_slot_multiple_refs since we built interesting 'AccountsToCombine'
let mut write_ancient_accounts = WriteAncientAccounts::default(); let mut write_ancient_accounts = WriteAncientAccounts::default();
db.write_ancient_accounts_to_same_slot_multiple_refs( db.write_ancient_accounts_to_same_slot_multiple_refs(
accounts_to_combine accounts_to_combine.accounts_keep_slots.values(),
.accounts_keep_slots
.iter()
.map(|(_slot, (info, _slot_info))| info),
&mut write_ancient_accounts, &mut write_ancient_accounts,
); );
if two_refs { if two_refs {
@ -1185,7 +1179,6 @@ pub mod tests {
.accounts_keep_slots .accounts_keep_slots
.get(&slot1) .get(&slot1)
.unwrap() .unwrap()
.0
.accounts .accounts
.iter() .iter()
.map(|meta| meta.pubkey()) .map(|meta| meta.pubkey())
@ -1222,10 +1215,7 @@ pub mod tests {
// test write_ancient_accounts_to_same_slot_multiple_refs since we built interesting 'AccountsToCombine' // test write_ancient_accounts_to_same_slot_multiple_refs since we built interesting 'AccountsToCombine'
let mut write_ancient_accounts = WriteAncientAccounts::default(); let mut write_ancient_accounts = WriteAncientAccounts::default();
db.write_ancient_accounts_to_same_slot_multiple_refs( db.write_ancient_accounts_to_same_slot_multiple_refs(
accounts_to_combine accounts_to_combine.accounts_keep_slots.values(),
.accounts_keep_slots
.iter()
.map(|(_slot, (info, _slot_info))| info),
&mut write_ancient_accounts, &mut write_ancient_accounts,
); );
assert_eq!(write_ancient_accounts.shrinks_in_progress.len(), num_slots); assert_eq!(write_ancient_accounts.shrinks_in_progress.len(), num_slots);