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

get_snapshot_storages removes call to AccountStorage.get (#29466)

This commit is contained in:
Jeff Washington (jwash) 2023-01-03 11:15:07 -06:00 committed by GitHub
parent 9d15ead873
commit 102dc08378
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
runtime/src/account_storage.rs
View File

@ -5,7 +5,7 @@ use {
dashmap::DashMap,
solana_sdk::clock::Slot,
std::{
collections::{hash_map::RandomState, HashMap},
collections::HashMap,
sync::{Arc, RwLock},
},
};
@ -65,14 +65,6 @@ impl AccountStorage {
self.map.iter()
}
pub(crate) fn get(
&self,
slot: &Slot,
) -> Option<dashmap::mapref::one::Ref<'_, Slot, SlotStores, RandomState>> {
self.map.get(slot)
}
/// insert 'store' into 'map' at 'slot'
pub(crate) fn insert(&self, slot: Slot, store: Arc<AccountStorageEntry>) {
let slot_storages: SlotStores = self.get_slot_stores(slot).unwrap_or_else(||
// DashMap entry.or_insert() returns a RefMut, essentially a write lock,

39
runtime/src/accounts_db.rs
View File

@ -8533,8 +8533,12 @@ impl AccountsDb {
let slots = self
.storage
.iter()
.map(|k| *k.key() as Slot)
.filter(|slot| requested_slots.contains(slot))
.filter_map(|entry| {
let slot = *entry.key() as Slot;
requested_slots
.contains(&slot)
.then_some((slot, Arc::clone(entry.value())))
})
.collect::<Vec<_>>();
m.stop();
let mut m2 = Measure::start("filter");
@ -8546,29 +8550,24 @@ impl AccountsDb {
.map(|slots| {
slots
.iter()
.filter_map(|slot| {
.filter_map(|(slot, storages)| {
if self.accounts_index.is_alive_root(*slot)
|| ancestors
.map(|ancestors| ancestors.contains_key(slot))
.unwrap_or_default()
{
self.storage.get(slot).map_or_else(
|| None,
|item| {
let storages = item
.read()
.unwrap()
.values()
.filter(|x| x.has_accounts())
.cloned()
.collect::<Vec<_>>();
if !storages.is_empty() {
Some((storages, *slot))
} else {
None
}
},
)
let storages = storages
.read()
.unwrap()
.values()
.filter(|x| x.has_accounts())
.cloned()
.collect::<Vec<_>>();
if !storages.is_empty() {
Some((storages, *slot))
} else {
None
}
} else {
None
}