gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove unused is_startup (#19561)

Browse Source
This commit is contained in:
Jeff Washington (jwash)
2021-09-01 18:39:00 -05:00
committed by GitHub
parent ed1d66153e
commit ed2c071fe1
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
runtime/src/accounts_db.rs
View File

@ -2226,7 +2226,7 @@ impl AccountsDb {
); );
} }
fn do_shrink_slot_stores<'a, I>(&'a self, slot: Slot, stores: I, _is_startup: bool) -> usize fn do_shrink_slot_stores<'a, I>(&'a self, slot: Slot, stores: I) -> usize
where where
I: Iterator<Item = &'a Arc<AccountStorageEntry>>, I: Iterator<Item = &'a Arc<AccountStorageEntry>>,
{ {
@ -2503,7 +2503,7 @@ impl AccountsDb {
// Reads all accounts in given slot's AppendVecs and filter only to alive, // Reads all accounts in given slot's AppendVecs and filter only to alive,
// then create a minimum AppendVec filled with the alive. // then create a minimum AppendVec filled with the alive.
fn shrink_slot_forced(&self, slot: Slot, is_startup: bool) -> usize { fn shrink_slot_forced(&self, slot: Slot) -> usize {
debug!("shrink_slot_forced: slot: {}", slot); debug!("shrink_slot_forced: slot: {}", slot);
if let Some(stores_lock) = self.storage.get_slot_stores(slot) { if let Some(stores_lock) = self.storage.get_slot_stores(slot) {
@ -2512,7 +2512,7 @@ impl AccountsDb {
if !Self::is_shrinking_productive(slot, &stores) { if !Self::is_shrinking_productive(slot, &stores) {
return 0; return 0;
} }
self.do_shrink_slot_stores(slot, stores.iter(), is_startup) self.do_shrink_slot_stores(slot, stores.iter())
} else { } else {
0 0
} }
@ -2640,7 +2640,7 @@ impl AccountsDb {
.into_par_iter() .into_par_iter()
.map(|(slot, slot_shrink_candidates)| { .map(|(slot, slot_shrink_candidates)| {
let mut measure = Measure::start("shrink_candidate_slots-ms"); let mut measure = Measure::start("shrink_candidate_slots-ms");
self.do_shrink_slot_stores(slot, slot_shrink_candidates.values(), false); self.do_shrink_slot_stores(slot, slot_shrink_candidates.values());
measure.stop(); measure.stop();
inc_new_counter_info!("shrink_candidate_slots-ms", measure.as_ms() as usize); inc_new_counter_info!("shrink_candidate_slots-ms", measure.as_ms() as usize);
slot_shrink_candidates.len() slot_shrink_candidates.len()
@ -2676,7 +2676,7 @@ impl AccountsDb {
slots.chunks(OUTER_CHUNK_SIZE).for_each(|chunk| { slots.chunks(OUTER_CHUNK_SIZE).for_each(|chunk| {
chunk.par_chunks(inner_chunk_size).for_each(|slots| { chunk.par_chunks(inner_chunk_size).for_each(|slots| {
for slot in slots { for slot in slots {
self.shrink_slot_forced(*slot, is_startup); self.shrink_slot_forced(*slot);
} }
}); });
if self.dirty_stores.len() > DIRTY_STORES_CLEANING_THRESHOLD { if self.dirty_stores.len() > DIRTY_STORES_CLEANING_THRESHOLD {
@ -2686,7 +2686,7 @@ impl AccountsDb {
} else { } else {
for slot in self.all_slots_in_storage() { for slot in self.all_slots_in_storage() {
if self.caching_enabled { if self.caching_enabled {
self.shrink_slot_forced(slot, false); self.shrink_slot_forced(slot);
} else { } else {
self.do_shrink_slot_forced_v1(slot); self.do_shrink_slot_forced_v1(slot);
} }
@ -6548,7 +6548,7 @@ impl AccountsDb {
); );
} }
self.do_shrink_slot_stores(slot, stores.iter(), false) self.do_shrink_slot_stores(slot, stores.iter())
} else { } else {
0 0
} }