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

add AccountsIndex AccountMapsReadLock type (#17365)

This commit is contained in:
Jeff Washington (jwash) 2021-05-21 10:02:14 -05:00 committed by GitHub
parent 2f55547d37
commit 8143ee5502
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
runtime/src/accounts_index.rs
View File

@ -113,10 +113,10 @@ impl<T> AccountMapEntryInner<T> {
}
}
pub enum AccountIndexGetResult<'a, T: 'static, U> {
pub enum AccountIndexGetResult<'a, T: 'static> {
Found(ReadAccountMapEntry<T>, usize),
NotFoundOnFork,
Missing(std::sync::RwLockReadGuard<'a, AccountMap<U, AccountMapEntry<T>>>),
Missing(AccountMapsReadLock<'a, T>),
}
#[self_referencing]
@ -509,6 +509,7 @@ pub trait ZeroLamport {
type MapType<T> = AccountMap<Pubkey, AccountMapEntry<T>>;
type AccountMapsWriteLock<'a, T> = RwLockWriteGuard<'a, AccountMap<Pubkey, AccountMapEntry<T>>>;
type AccountMapsReadLock<'a, T> = RwLockReadGuard<'a, AccountMap<Pubkey, AccountMapEntry<T>>>;
#[derive(Debug)]
pub struct AccountsIndex<T> {
@ -1084,7 +1085,7 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
pubkey: &Pubkey,
ancestors: Option<&Ancestors>,
max_root: Option<Slot>,
) -> AccountIndexGetResult<'_, T, Pubkey> {
) -> AccountIndexGetResult<'_, T> {
let read_lock = self.account_maps.read().unwrap();
let account = read_lock
.get(pubkey)
@ -1550,7 +1551,7 @@ pub mod tests {
}
}
impl<'a, T: 'static, U> AccountIndexGetResult<'a, T, U> {
impl<'a, T: 'static> AccountIndexGetResult<'a, T> {
pub fn unwrap(self) -> (ReadAccountMapEntry<T>, usize) {
match self {
AccountIndexGetResult::Found(lock, size) => (lock, size),