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

refactor complicated 'len' (#16777)

Browse Source
This commit is contained in:
Jeff Washington (jwash)
2021-04-23 13:36:49 -05:00
committed by GitHub
parent 04e6aebf35
commit dcf2d84b24
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
runtime/src/accounts_db.rs
View File

@ -3318,10 +3318,8 @@ impl AccountsDb {
let mut total_storage_find_us = 0; let mut total_storage_find_us = 0;
while infos.len() < accounts_and_meta_to_store.len() { while infos.len() < accounts_and_meta_to_store.len() {
let mut storage_find = Measure::start("storage_finder"); let mut storage_find = Measure::start("storage_finder");
let storage = storage_finder( let data_len = accounts_and_meta_to_store[infos.len()].1.data().len();
slot, let storage = storage_finder(slot, data_len + STORE_META_OVERHEAD);
accounts_and_meta_to_store[infos.len()].1.data().len() + STORE_META_OVERHEAD,
);
storage_find.stop(); storage_find.stop();
total_storage_find_us += storage_find.as_us(); total_storage_find_us += storage_find.as_us();
let mut append_accounts = Measure::start("append_accounts"); let mut append_accounts = Measure::start("append_accounts");
@ -3336,8 +3334,7 @@ impl AccountsDb {
storage.set_status(AccountStorageStatus::Full); storage.set_status(AccountStorageStatus::Full);
// See if an account overflows the append vecs in the slot. // See if an account overflows the append vecs in the slot.
let data_len = (accounts_and_meta_to_store[infos.len()].1.data().len() let data_len = (data_len + STORE_META_OVERHEAD) as u64;
+ STORE_META_OVERHEAD) as u64;
if !self.has_space_available(slot, data_len) { if !self.has_space_available(slot, data_len) {
let special_store_size = std::cmp::max(data_len * 2, self.file_size); let special_store_size = std::cmp::max(data_len * 2, self.file_size);
if self if self