Skip to content

Test value inserted for preallocated entry instead of cloned value #8337

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
kskalski merged 1 commit into from
Oct 6, 2025
Merged

Test value inserted for preallocated entry instead of cloned value #8337

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
31 changes: 7 additions & 24 deletions accounts-db/src/accounts_index.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1736,8 +1736,7 @@ impl<T: IndexValue, U: DiskIndexValue + From<T> + Into<T>> AccountsIndex<T, U> {
pub mod tests {
use {
super::*,
crate::bucket_map_holder::{AtomicAge, BucketMapHolder},
account_map_entry::AccountMapEntryMeta,
crate::bucket_map_holder::BucketMapHolder,
secondary::DashMapSecondaryIndexEntry,
solana_account::{AccountSharedData, WritableAccount},
solana_pubkey::PUBKEY_BYTES,
Expand Down Expand Up @@ -1796,27 +1795,6 @@ pub mod tests {
)
}

impl<T: IndexValue> Clone for PreAllocatedAccountMapEntry<T> {
fn clone(&self) -> Self {
// clone the AccountMapEntryInner into a new Arc
match self {
PreAllocatedAccountMapEntry::Entry(entry) => {
let (slot, account_info) = entry.slot_list_read_lock()[0];
let meta = AccountMapEntryMeta {
dirty: AtomicBool::new(entry.dirty()),
age: AtomicAge::new(entry.age()),
};
PreAllocatedAccountMapEntry::Entry(Arc::new(AccountMapEntry::new(
SlotList::from([(slot, account_info)]),
entry.ref_count(),
meta,
)))
}
PreAllocatedAccountMapEntry::Raw(raw) => PreAllocatedAccountMapEntry::Raw(*raw),
}
}
}

#[test]
fn test_get_empty() {
let key = solana_pubkey::new_rand();
Expand Down Expand Up @@ -2407,7 +2385,6 @@ pub mod tests {
let new_entry =
PreAllocatedAccountMapEntry::new(slot, account_info, &index.storage.storage, false);
assert_eq!(0, account_maps_stats_len(&index));
assert_eq!((slot, account_info), new_entry.clone().into());

assert_eq!(0, account_maps_stats_len(&index));
let r_account_maps = index.get_bin(&key);
Expand All @@ -2423,6 +2400,12 @@ pub mod tests {
let mut ancestors = Ancestors::default();
assert!(!index.contains_with(&key, Some(&ancestors), None));
assert!(!index.contains_with(&key, None, None));
index.get_and_then(&key, |entry| {
let (stored_slot, value) = entry.unwrap().slot_list_read_lock()[0];
assert_eq!(stored_slot, slot);
assert_eq!(value, account_info);
(false, ())
});

let mut num = 0;
index
Expand Down
Loading