Skip to content

Reimplement keys to not depend on put_range_in_cache #6919

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
HaoranYi merged 4 commits into from
Jul 14, 2025
Merged

Reimplement keys to not depend on put_range_in_cache #6919

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5d065a5
rework keys to not using put_range_in_memory
HaoranYi Jul 10, 2025
d354bb5
pr
HaoranYi Jul 11, 2025
a7666f9
Update accounts-db/src/accounts_index/in_mem_accounts_index.rs
HaoranYi Jul 12, 2025
b536657
Update accounts-db/src/accounts_index/in_mem_accounts_index.rs
HaoranYi Jul 12, 2025
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
18 changes: 13 additions & 5 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 @@ -253,11 +253,19 @@ impl<T: IndexValue, U: DiskIndexValue + From<T> + Into<T>> InMemAccountsIndex<T,
/// return all keys in this bin
pub fn keys(&self) -> Vec<Pubkey> {
Self::update_stat(&self.stats().keys, 1);
// easiest implementation is to load everything from disk into cache and return the keys
let evictions_guard = EvictionsGuard::lock(self);
self.put_range_in_cache(&None::<&RangeInclusive<Pubkey>>, &evictions_guard);
let keys = self.map_internal.read().unwrap().keys().cloned().collect();
keys

// Collect keys from the in-memory map first.
let mut keys: HashSet<_> = self.map_internal.read().unwrap().keys().cloned().collect();

// Next, collect keys from the disk.
if let Some(disk) = self.bucket.as_ref() {
let disk_keys = disk.keys();
keys.reserve(disk_keys.len());
for key in disk_keys {
keys.insert(key);
}
}
keys.into_iter().collect()
}

fn load_from_disk(&self, pubkey: &Pubkey) -> Option<(SlotList<U>, RefCount)> {
Expand Down
Loading