Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

Commit

Permalink
Handle 0-lamport account in index generation (#19041) (#19160)
Browse files Browse the repository at this point in the history
* Handle 0-lamport account in index generation

* rename duplicate to dirty keys

Co-authored-by: Carl Lin <[email protected]>
(cherry picked from commit 5a4979f)

Co-authored-by: sakridge <[email protected]>
  • Loading branch information
mergify[bot] and sakridge authored Aug 11, 2021
1 parent c9f763e commit 03b9305
Showing 1 changed file with 21 additions and 16 deletions.
37 changes: 21 additions & 16 deletions runtime/src/accounts_index.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1388,39 +1388,44 @@ impl<T: 'static + Clone + IsCached + ZeroLamport + std::marker::Sync + std::mark
items.for_each(|(pubkey, account_info)| {
let bin = get_bin_pubkey(pubkey);
// this value is equivalent to what update() below would have created if we inserted a new item
let is_zero_lamport = account_info.is_zero_lamport();
let info = WriteAccountMapEntry::new_entry_after_update(slot, account_info);
binned[bin].1.push((*pubkey, info));
binned[bin].1.push((*pubkey, info, is_zero_lamport));
});
binned.retain(|x| !x.1.is_empty());

let insertion_time = AtomicU64::new(0);

let duplicate_keys = binned
let dirty_pubkeys = binned
.into_iter()
.map(|(pubkey_bin, items)| {
let mut _reclaims = SlotList::new();
let mut w_account_maps = self.account_maps[pubkey_bin].write().unwrap();
let mut insert_time = Measure::start("insert_into_primary_index"); // really should be in each loop
let mut duplicate_keys = Vec::with_capacity(items.len());
items.into_iter().for_each(|(pubkey, new_item)| {
let already_exists = self.insert_new_entry_if_missing_with_lock(
pubkey,
&mut w_account_maps,
new_item,
);
if let Some((mut w_account_entry, account_info, pubkey)) = already_exists {
w_account_entry.update(slot, account_info, &mut _reclaims);
duplicate_keys.push(pubkey);
}
});
let mut dirty_pubkeys = Vec::with_capacity(items.len());
items
.into_iter()
.for_each(|(pubkey, new_item, is_zero_lamport)| {
let already_exists = self.insert_new_entry_if_missing_with_lock(
pubkey,
&mut w_account_maps,
new_item,
);
if let Some((mut w_account_entry, account_info, pubkey)) = already_exists {
w_account_entry.update(slot, account_info, &mut _reclaims);
dirty_pubkeys.push(pubkey);
} else if is_zero_lamport {
dirty_pubkeys.push(pubkey);
}
});
insert_time.stop();
insertion_time.fetch_add(insert_time.as_us(), Ordering::Relaxed);
duplicate_keys
dirty_pubkeys
})
.flatten()
.collect::<Vec<_>>();

(duplicate_keys, insertion_time.load(Ordering::Relaxed))
(dirty_pubkeys, insertion_time.load(Ordering::Relaxed))
}

// Updates the given pubkey at the given slot with the new account information.
Expand Down

0 comments on commit 03b9305

Please sign in to comment.