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

use Vec::drain instead of option/take (#26852)

This commit is contained in:
Jeff Washington (jwash) 2022-07-31 21:04:15 -05:00 committed by GitHub
parent 2fc888d864
commit ebabc53cee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
runtime/src/in_mem_accounts_index.rs
View File

@ -77,9 +77,9 @@ struct StartupInfo<T: IndexValue> {
/// result from scanning in-mem index during flush
struct FlushScanResult<T> {
/// pubkeys whose age indicates they may be evicted now, pending further checks.
evictions_age_possible: Vec<(Pubkey, Option<AccountMapEntry<T>>)>,
evictions_age_possible: Vec<(Pubkey, AccountMapEntry<T>)>,
/// pubkeys chosen to evict based on random eviction
evictions_random: Vec<(Pubkey, Option<AccountMapEntry<T>>)>,
evictions_random: Vec<(Pubkey, AccountMapEntry<T>)>,
}
impl<T: IndexValue> InMemAccountsIndex<T> {
@ -992,7 +992,7 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
} else {
&mut evictions_age_possible
}
.push((*k, Some(Arc::clone(v))));
.push((*k, Arc::clone(v)));
}
}
Self::update_time_stat(&self.stats().flush_scan_us, m);
@ -1104,8 +1104,7 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
(false, &mut evictions_age_possible),
(true, &mut evictions_random),
] {
for (k, v) in check_for_eviction_and_dirty {
let v = v.take().unwrap();
for (k, v) in check_for_eviction_and_dirty.drain(..) {
let mut slot_list = None;
if !is_random {
let mut mse = Measure::start("flush_should_evict");
@ -1120,7 +1119,7 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
mse.stop();
flush_should_evict_us += mse.as_us();
if evict_for_age {
evictions_age.push(*k);
evictions_age.push(k);
} else {
// not evicting, so don't write, even if dirty
continue;
@ -1142,7 +1141,7 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
let slot_list = slot_list
.take()
.unwrap_or_else(|| v.slot_list.read().unwrap());
disk.try_write(k, (&slot_list, v.ref_count()))
disk.try_write(&k, (&slot_list, v.ref_count()))
};
match disk_resize {
Ok(_) => {