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

pass &Pubkey through account storage, slot clean code to reduce copies (#16778)

Browse Source 
* &Pubkey

* use trait to pass &Hash or Hash

* use impl Borrow<Hash> instead of trait

* remove old code line commented out
This commit is contained in:
Jeff Washington (jwash)
2021-04-27 09:10:06 -05:00
committed by GitHub
parent 3b8d6b59fb
commit 81402ee7f5
3 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runtime/src/accounts_cache.rs
View File

@@ -6,6 +6,7 @@ use solana_sdk::{
pubkey::Pubkey,
};
use std::{
borrow::Borrow,
collections::BTreeSet,
ops::Deref,
sync::{
@@ -51,7 +52,7 @@ impl SlotCacheInner {
&self,
pubkey: &Pubkey,
account: AccountSharedData,
hash: Option<Hash>,
hash: Option<impl Borrow<Hash>>,
slot: Slot,
) -> CachedAccount {
if self.cache.contains_key(pubkey) {
@@ -64,7 +65,7 @@ impl SlotCacheInner {
}
let item = Arc::new(CachedAccountInner {
account,
hash: RwLock::new(hash),
hash: RwLock::new(hash.map(|h| *h.borrow())),
slot,
pubkey: *pubkey,
});
@@ -169,7 +170,7 @@ impl AccountsCache {
slot: Slot,
pubkey: &Pubkey,
account: AccountSharedData,
hash: Option<Hash>,
hash: Option<impl Borrow<Hash>>,
) -> CachedAccount {
let slot_cache = self.slot_cache(slot).unwrap_or_else(||
// DashMap entry.or_insert() returns a RefMut, essentially a write lock,
@@ -283,7 +284,7 @@ pub mod tests {
inserted_slot,
&Pubkey::new_unique(),
AccountSharedData::new(1, 0, &Pubkey::default()),
Some(Hash::default()),
Some(&Hash::default()),
);
// If the cache is told the size limit is 0, it should return the one slot
let removed = cache.remove_slots_le(0);
@@ -301,7 +302,7 @@ pub mod tests {
inserted_slot,
&Pubkey::new_unique(),
AccountSharedData::new(1, 0, &Pubkey::default()),
Some(Hash::default()),
Some(&Hash::default()),
);
// If the cache is told the size limit is 0, it should return nothing because there's only