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

Use helper for count() in accountsDB (#14953) (#14956)

Browse Source 
(cherry picked from commit 63c44bd690)

Co-authored-by: sakridge <sakridge@gmail.com>
This commit is contained in:
mergify[bot]
2021-01-31 18:23:01 -08:00
committed by GitHub
parent de37795ca1
commit 512a193674
1 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
runtime/src/accounts_db.rs
View File

@ -298,7 +298,7 @@ impl AccountStorage {
fn slot_store_count(&self, slot: Slot, store_id: AppendVecId) -> Option<usize> { fn slot_store_count(&self, slot: Slot, store_id: AppendVecId) -> Option<usize> {
self.get_account_storage_entry(slot, store_id) self.get_account_storage_entry(slot, store_id)
.map(|store| store.count_and_status.read().unwrap().0) .map(|store| store.count())
} }
fn all_slots(&self) -> Vec<Slot> { fn all_slots(&self) -> Vec<Slot> {
@ -2418,14 +2418,7 @@ impl AccountsDB {
pub fn alive_account_count_in_slot(&self, slot: Slot) -> usize { pub fn alive_account_count_in_slot(&self, slot: Slot) -> usize {
self.storage self.storage
.get_slot_stores(slot) .get_slot_stores(slot)
.map(|storages| { .map(|storages| storages.read().unwrap().values().map(|s| s.count()).sum())
storages
.read()
.unwrap()
.values()
.map(|s| s.count_and_status.read().unwrap().0)
.sum()
})
.unwrap_or(0) .unwrap_or(0)
} }
@ -2547,7 +2540,7 @@ impl AccountsDB {
if slot_stores.len() <= self.min_num_stores { if slot_stores.len() <= self.min_num_stores {
let mut total_accounts = 0; let mut total_accounts = 0;
for store in slot_stores.values() { for store in slot_stores.values() {
total_accounts += store.count_and_status.read().unwrap().0; total_accounts += store.count();
} }
// Create more stores so that when scanning the storage all CPUs have work // Create more stores so that when scanning the storage all CPUs have work
@ -4558,12 +4551,7 @@ impl AccountsDB {
// Should be default at this point // Should be default at this point
assert_eq!(store.alive_bytes(), 0); assert_eq!(store.alive_bytes(), 0);
if let Some((stored_size, count)) = stored_sizes_and_counts.get(&id) { if let Some((stored_size, count)) = stored_sizes_and_counts.get(&id) {
trace!( trace!("id: {} setting count: {} cur: {}", id, count, store.count(),);
"id: {} setting count: {} cur: {}",
id,
count,
store.count_and_status.read().unwrap().0
);
store.count_and_status.write().unwrap().0 = *count; store.count_and_status.write().unwrap().0 = *count;
store.alive_bytes.store(*stored_size, Ordering::SeqCst); store.alive_bytes.store(*stored_size, Ordering::SeqCst);
} else { } else {