blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

shrink_collect takes a single append vec (#29523)

This commit is contained in:
Jeff Washington (jwash) 2023-01-09 15:33:21 -06:00 committed by GitHub
parent 3aa0a005f9
commit 3234af41a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
runtime/src/accounts_db.rs
View File

@ -3710,22 +3710,19 @@ impl AccountsDb {
/// shared code for shrinking normal slots and combining into ancient append vecs
/// note 'stored_accounts' is passed by ref so we can return references to data within it, avoiding self-references
fn shrink_collect<'a: 'b, 'b, I>(
fn shrink_collect<'a: 'b, 'b>(
&'a self,
stores: I,
store: &'a Arc<AccountStorageEntry>,
stored_accounts: &'b mut Vec<FoundStoredAccount<'b>>,
stats: &ShrinkStats,
) -> ShrinkCollect<'b>
where
I: Iterator<Item = &'a Arc<AccountStorageEntry>>,
{
) -> ShrinkCollect<'b> {
let (
GetUniqueAccountsResult {
stored_accounts: stored_accounts_temp,
original_bytes,
},
storage_read_elapsed,
) = measure!(self.get_unique_accounts_from_storages(stores));
) = measure!(self.get_unique_accounts_from_storages(std::iter::once(store)));
stats
.storage_read_elapsed
.fetch_add(storage_read_elapsed.as_us(), Ordering::Relaxed);
@ -3832,11 +3829,7 @@ impl AccountsDb {
fn do_shrink_slot_store(&self, slot: Slot, store: &Arc<AccountStorageEntry>) -> usize {
let mut stored_accounts = Vec::default();
debug!("do_shrink_slot_store: slot: {}", slot);
let shrink_collect = self.shrink_collect(
std::iter::once(store),
&mut stored_accounts,
&self.shrink_stats,
);
let shrink_collect = self.shrink_collect(store, &mut stored_accounts, &self.shrink_stats);
// This shouldn't happen if alive_bytes/approx_stored_count are accurate
if Self::should_not_shrink(
@ -4418,7 +4411,7 @@ impl AccountsDb {
) {
let mut stored_accounts = Vec::default();
let shrink_collect = self.shrink_collect(
std::iter::once(old_storage),
old_storage,
&mut stored_accounts,
&self.shrink_ancient_stats.shrink_stats,
);
@ -17014,7 +17007,7 @@ pub mod tests {
let storage = db.get_storage_for_slot(slot5).unwrap();
let mut stored_accounts = Vec::default();
let shrink_collect = db.shrink_collect(
std::iter::once(&storage),
&storage,
&mut stored_accounts,
&ShrinkStats::default(),
);