gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove accounts unwrap (#9063)

Browse Source 
automerge
This commit is contained in:
sakridge
2020-03-25 10:59:52 -07:00
committed by GitHub
parent bf4cdc091a
commit 4b0d4e9834
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
runtime/src/accounts_db.rs
View File

@ -1376,12 +1376,14 @@ impl AccountsDB {
let index = self.accounts_index.read().unwrap(); let index = self.accounts_index.read().unwrap();
let storage = self.storage.read().unwrap(); let storage = self.storage.read().unwrap();
for slot in dead_slots.iter() { for slot in dead_slots.iter() {
for store in storage.0.get(slot).unwrap().values() { if let Some(slot_storage) = storage.0.get(slot) {
for store in slot_storage.values() {
for account in store.accounts.accounts(0) { for account in store.accounts.accounts(0) {
index.unref_from_storage(&account.meta.pubkey); index.unref_from_storage(&account.meta.pubkey);
} }
} }
} }
}
drop(storage); drop(storage);
drop(index); drop(index);
measure.stop(); measure.stop();
@ -3373,4 +3375,12 @@ pub mod tests {
assert_load_account(&accounts, current_slot, pubkey2, old_lamport); assert_load_account(&accounts, current_slot, pubkey2, old_lamport);
assert_load_account(&accounts, current_slot, dummy_pubkey, dummy_lamport); assert_load_account(&accounts, current_slot, dummy_pubkey, dummy_lamport);
} }
#[test]
fn clean_dead_slots_empty() {
let accounts = AccountsDB::new_single();
let mut dead_slots = HashSet::new();
dead_slots.insert(10);
accounts.clean_dead_slots(&mut dead_slots);
}
} }