Skip to content

Refactor gather_possible_evictions to return Vec #8916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 5, 2025
Merged

Refactor gather_possible_evictions to return Vec #8916

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 10 additions & 13 deletions accounts-db/src/accounts_index/in_mem_accounts_index.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,16 +876,16 @@ impl<T: IndexValue, U: DiskIndexValue + From<T> + Into<T>> InMemAccountsIndex<T,
}
}

/// fill in `possible_evictions` from `iter` by checking age
/// Collect possible evictions from `iter` by checking age
/// Filter as much as possible and capture dirty flag
/// Skip entries with ref_count != 1 since they will be rejected later anyway
fn gather_possible_evictions<'a>(
iter: impl Iterator<Item = (&'a Pubkey, &'a Box<AccountMapEntry<T>>)>,
possible_evictions: &mut Vec<(Pubkey, /*is_dirty*/ bool)>,
startup: bool,
current_age: Age,
ages_flushing_now: Age,
) {
) -> Vec<(Pubkey, /*is_dirty*/ bool)> {
let mut possible_evictions = Vec::new();
for (k, v) in iter {
if !startup && current_age.wrapping_sub(v.age()) > ages_flushing_now {
// not planning to evict this item from memory within 'ages_flushing_now' ages
Expand All @@ -901,6 +901,7 @@ impl<T: IndexValue, U: DiskIndexValue + From<T> + Into<T>> InMemAccountsIndex<T,

possible_evictions.push((*k, v.dirty()));
}
possible_evictions
}

/// scan loop
Expand All @@ -915,19 +916,17 @@ impl<T: IndexValue, U: DiskIndexValue + From<T> + Into<T>> InMemAccountsIndex<T,
_flush_guard: &FlushGuard,
ages_flushing_now: Age,
) -> Vec<(Pubkey, /*is_dirty*/ bool)> {
let mut possible_evictions = Vec::new();
let m;
{
let (possible_evictions, m) = {
let map = self.map_internal.read().unwrap();
m = Measure::start("flush_scan"); // we don't care about lock time in this metric - bg threads can wait
Self::gather_possible_evictions(
let m = Measure::start("flush_scan"); // we don't care about lock time in this metric - bg threads can wait
let possible_evictions = Self::gather_possible_evictions(
map.iter(),
&mut possible_evictions,
startup,
current_age,
ages_flushing_now,
);
}
(possible_evictions, m)
};
Self::update_time_stat(&self.stats().flush_scan_us, m);

possible_evictions
Expand Down Expand Up @@ -1716,10 +1715,8 @@ mod tests {

for current_age in 0..=255 {
for ages_flushing_now in 0..=255 {
let mut possible_evictions = Vec::new();
InMemAccountsIndex::<u64, u64>::gather_possible_evictions(
let possible_evictions = InMemAccountsIndex::<u64, u64>::gather_possible_evictions(
map.iter(),
&mut possible_evictions,
startup,
current_age,
ages_flushing_now,
Expand Down
Loading