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

remove AccountStorage::is_empty() (#29548)

This commit is contained in:
Jeff Washington (jwash) 2023-01-06 08:51:25 -06:00 committed by GitHub
parent b030a96321
commit 272e5a05f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
runtime/src/account_storage.rs
View File

@ -46,13 +46,6 @@ impl AccountStorage {
self.map.iter().map(|iter_item| *iter_item.key()).collect()
}
/// returns true if there are no append vecs for 'slot'
pub(crate) fn is_empty(&self, slot: Slot) -> bool {
self.get_slot_stores(slot)
.map(|storages| storages.read().unwrap().is_empty())
.unwrap_or(true)
}
/// returns true if there is an entry in the map for 'slot', but it contains no append vec
#[cfg(test)]
pub(crate) fn is_empty_entry(&self, slot: Slot) -> bool {

8
runtime/src/accounts_db.rs
View File

@ -8783,7 +8783,7 @@ impl AccountsDb {
.take(per_pass)
.collect::<Vec<_>>();
roots_in_this_pass.into_par_iter().for_each(|slot| {
if self.storage.is_empty(*slot) {
if self.storage.get_slot_storage_entry(*slot).is_none() {
return;
}
@ -14297,7 +14297,7 @@ pub mod tests {
db.store_cached((0, &[(&other_account_key, &slot0_account)][..]), None);
db.add_root(0);
db.flush_accounts_cache(true, None);
assert!(!db.storage.is_empty(0));
assert!(db.storage.get_slot_storage_entry(0).is_some());
// Store into slot 1, a dummy slot that will be dead and purged before flush
db.store_cached(
@ -16424,7 +16424,7 @@ pub mod tests {
let existing_store = db.create_and_insert_store(slot, size, "test");
let old_id = existing_store.append_vec_id();
let dead_storages = db.mark_dirty_dead_stores(slot, add_dirty_stores, None);
assert!(db.storage.is_empty(slot));
assert!(db.storage.get_slot_storage_entry(slot).is_none());
assert_eq!(dead_storages.len(), 1);
assert_eq!(dead_storages.first().unwrap().append_vec_id(), old_id);
if add_dirty_stores {
@ -16451,7 +16451,7 @@ pub mod tests {
let shrink_in_progress = db.get_store_for_shrink(slot, 100);
let dead_storages =
db.mark_dirty_dead_stores(slot, add_dirty_stores, Some(shrink_in_progress));
assert!(!db.storage.is_empty(slot));
assert!(db.storage.get_slot_storage_entry(slot).is_some());
assert_eq!(dead_storages.len(), 1);
assert_eq!(dead_storages.first().unwrap().append_vec_id(), old_id);
if add_dirty_stores {