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

extract map to map() (#19883)

Browse Source
This commit is contained in:
Jeff Washington (jwash)
2021-09-14 23:08:17 -05:00
committed by GitHub
parent 4ff50519ff
commit 691bea8776
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
runtime/src/in_mem_accounts_index.rs
View File

@ -18,7 +18,7 @@ type K = Pubkey;
#[derive(Debug)] #[derive(Debug)]
pub struct InMemAccountsIndex<T: IndexValue> { pub struct InMemAccountsIndex<T: IndexValue> {
// backing store // backing store
map: RwLock<HashMap<Pubkey, AccountMapEntry<T>>>, map_internal: RwLock<HashMap<Pubkey, AccountMapEntry<T>>>,
storage: Arc<BucketMapHolder<T>>, storage: Arc<BucketMapHolder<T>>,
bin: usize, bin: usize,
} }
@ -26,12 +26,16 @@ pub struct InMemAccountsIndex<T: IndexValue> {
impl<T: IndexValue> InMemAccountsIndex<T> { impl<T: IndexValue> InMemAccountsIndex<T> {
pub fn new(storage: &AccountsIndexStorage<T>, bin: usize) -> Self { pub fn new(storage: &AccountsIndexStorage<T>, bin: usize) -> Self {
Self { Self {
map: RwLock::default(), map_internal: RwLock::default(),
storage: storage.storage().clone(), storage: storage.storage().clone(),
bin, bin,
} }
} }
fn map(&self) -> &RwLock<HashMap<Pubkey, AccountMapEntry<T>>> {
&self.map_internal
}
pub fn new_bucket_map_holder() -> Arc<BucketMapHolder<T>> { pub fn new_bucket_map_holder() -> Arc<BucketMapHolder<T>> {
Arc::new(BucketMapHolder::new()) Arc::new(BucketMapHolder::new())
} }
@ -41,7 +45,7 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
R: RangeBounds<Pubkey> + std::fmt::Debug, R: RangeBounds<Pubkey> + std::fmt::Debug,
{ {
Self::update_stat(&self.stats().items, 1); Self::update_stat(&self.stats().items, 1);
let map = self.map.read().unwrap(); let map = self.map().read().unwrap();
let mut result = Vec::with_capacity(map.len()); let mut result = Vec::with_capacity(map.len());
map.iter().for_each(|(k, v)| { map.iter().for_each(|(k, v)| {
if range.map(|range| range.contains(k)).unwrap_or(true) { if range.map(|range| range.contains(k)).unwrap_or(true) {
@ -53,12 +57,12 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
pub fn keys(&self) -> Vec<Pubkey> { pub fn keys(&self) -> Vec<Pubkey> {
Self::update_stat(&self.stats().keys, 1); Self::update_stat(&self.stats().keys, 1);
self.map.read().unwrap().keys().cloned().collect() self.map().read().unwrap().keys().cloned().collect()
} }
pub fn get(&self, key: &K) -> Option<AccountMapEntry<T>> { pub fn get(&self, key: &K) -> Option<AccountMapEntry<T>> {
let m = Measure::start("get"); let m = Measure::start("get");
let result = self.map.read().unwrap().get(key).cloned(); let result = self.map().read().unwrap().get(key).cloned();
let stats = self.stats(); let stats = self.stats();
let (count, time) = if result.is_some() { let (count, time) = if result.is_some() {
(&stats.gets_from_mem, &stats.get_mem_us) (&stats.gets_from_mem, &stats.get_mem_us)
@ -74,7 +78,7 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
// Return false otherwise. // Return false otherwise.
pub fn remove_if_slot_list_empty(&mut self, pubkey: Pubkey) -> bool { pub fn remove_if_slot_list_empty(&mut self, pubkey: Pubkey) -> bool {
let m = Measure::start("entry"); let m = Measure::start("entry");
let mut map = self.map.write().unwrap(); let mut map = self.map().write().unwrap();
let entry = map.entry(pubkey); let entry = map.entry(pubkey);
let stats = &self.storage.stats; let stats = &self.storage.stats;
let (count, time) = if matches!(entry, Entry::Occupied(_)) { let (count, time) = if matches!(entry, Entry::Occupied(_)) {
@ -103,7 +107,7 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
previous_slot_entry_was_cached: bool, previous_slot_entry_was_cached: bool,
) { ) {
let m = Measure::start("entry"); let m = Measure::start("entry");
let mut map = self.map.write().unwrap(); let mut map = self.map().write().unwrap();
let entry = map.entry(*pubkey); let entry = map.entry(*pubkey);
let stats = &self.storage.stats; let stats = &self.storage.stats;
let (count, time) = if matches!(entry, Entry::Occupied(_)) { let (count, time) = if matches!(entry, Entry::Occupied(_)) {
@ -197,7 +201,7 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
reclaims: &mut SlotList<T>, reclaims: &mut SlotList<T>,
previous_slot_entry_was_cached: bool, previous_slot_entry_was_cached: bool,
) -> bool { ) -> bool {
if let Some(current) = self.map.read().unwrap().get(pubkey) { if let Some(current) = self.map().read().unwrap().get(pubkey) {
Self::lock_and_update_slot_list( Self::lock_and_update_slot_list(
current, current,
new_value, new_value,
@ -211,7 +215,7 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
} }
pub fn len(&self) -> usize { pub fn len(&self) -> usize {
self.map.read().unwrap().len() self.map().read().unwrap().len()
} }
pub fn is_empty(&self) -> bool { pub fn is_empty(&self) -> bool {
@ -226,7 +230,7 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
new_entry: AccountMapEntry<T>, new_entry: AccountMapEntry<T>,
) -> Option<(WriteAccountMapEntry<T>, T, Pubkey)> { ) -> Option<(WriteAccountMapEntry<T>, T, Pubkey)> {
let m = Measure::start("entry"); let m = Measure::start("entry");
let mut map = self.map.write().unwrap(); let mut map = self.map().write().unwrap();
let entry = map.entry(pubkey); let entry = map.entry(pubkey);
let stats = &self.storage.stats; let stats = &self.storage.stats;
let (count, time) = if matches!(entry, Entry::Occupied(_)) { let (count, time) = if matches!(entry, Entry::Occupied(_)) {