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

AcctIdx: get_internal allows not adding to in_mem (#20716)

Browse Source
This commit is contained in:
Jeff Washington (jwash)
2021-10-15 13:04:05 -05:00
committed by GitHub
parent bea181eba9
commit 9d62963240
1 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
runtime/src/in_mem_accounts_index.rs
View File

@@ -172,35 +172,41 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
/// lookup 'pubkey' in index (in mem or on disk) /// lookup 'pubkey' in index (in mem or on disk)
pub fn get(&self, pubkey: &K) -> Option<AccountMapEntry<T>> { pub fn get(&self, pubkey: &K) -> Option<AccountMapEntry<T>> {
self.get_internal(pubkey, |entry| entry.map(Arc::clone)) self.get_internal(pubkey, |entry| (true, entry.map(Arc::clone)))
} }
/// lookup 'pubkey' in index. /// lookup 'pubkey' in index (in_mem or disk).
/// call 'callback' whether found or not /// call 'callback' whether found or not
fn get_internal<RT>( pub(crate) fn get_internal<RT>(
&self, &self,
pubkey: &K, pubkey: &K,
callback: impl for<'a> FnOnce(Option<&Arc<AccountMapEntryInner<T>>>) -> RT, // return true if item should be added to in_mem cache
callback: impl for<'a> FnOnce(Option<&Arc<AccountMapEntryInner<T>>>) -> (bool, RT),
) -> RT { ) -> RT {
self.get_only_in_mem(pubkey, |entry| { self.get_only_in_mem(pubkey, |entry| {
if let Some(entry) = entry { if let Some(entry) = entry {
entry.set_age(self.storage.future_age_to_flush()); entry.set_age(self.storage.future_age_to_flush());
callback(Some(entry)) callback(Some(entry)).1
} else { } else {
// not in cache, look on disk // not in cache, look on disk
let stats = &self.stats(); let stats = &self.stats();
let disk_entry = self.load_account_entry_from_disk(pubkey); let disk_entry = self.load_account_entry_from_disk(pubkey);
if disk_entry.is_none() { if disk_entry.is_none() {
return callback(None); return callback(None).1;
} }
let disk_entry = disk_entry.unwrap(); let disk_entry = disk_entry.unwrap();
let mut map = self.map().write().unwrap(); let mut map = self.map().write().unwrap();
let entry = map.entry(*pubkey); let entry = map.entry(*pubkey);
match entry { match entry {
Entry::Occupied(occupied) => callback(Some(occupied.get())), Entry::Occupied(occupied) => callback(Some(occupied.get())).1,
Entry::Vacant(vacant) => { Entry::Vacant(vacant) => {
stats.insert_or_delete_mem(true, self.bin); let (add_to_cache, rt) = callback(Some(&disk_entry));
callback(Some(vacant.insert(disk_entry)))
if add_to_cache {
stats.insert_or_delete_mem(true, self.bin);
vacant.insert(disk_entry);
}
rt
} }
} }
} }
@@ -282,16 +288,24 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
user: impl for<'a> FnOnce(&mut RwLockWriteGuard<'a, SlotList<T>>) -> RT, user: impl for<'a> FnOnce(&mut RwLockWriteGuard<'a, SlotList<T>>) -> RT,
) -> Option<RT> { ) -> Option<RT> {
self.get_internal(pubkey, |entry| { self.get_internal(pubkey, |entry| {
entry.map(|entry| { (
let result = user(&mut entry.slot_list.write().unwrap()); true,
entry.set_dirty(true); entry.map(|entry| {
result let result = user(&mut entry.slot_list.write().unwrap());
}) entry.set_dirty(true);
result
}),
)
}) })
} }
pub fn unref(&self, pubkey: &Pubkey) { pub fn unref(&self, pubkey: &Pubkey) {
self.get_internal(pubkey, |entry| entry.map(|entry| entry.add_un_ref(false))); self.get_internal(pubkey, |entry| {
if let Some(entry) = entry {
entry.add_un_ref(false)
}
(true, ())
})
} }
pub fn upsert( pub fn upsert(