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

refactor reconstruct_accountsdb_from_fields (#17987) (#18100)

Browse Source 
(cherry picked from commit ae82e4e25b)

Co-authored-by: Jeff Washington (jwash) <75863576+jeffwashington@users.noreply.github.com>
This commit is contained in:
mergify[bot]
2021-06-21 15:14:45 -05:00
committed by GitHub
parent 71c49bc8cd
commit c676b7a473
1 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
runtime/src/serde_snapshot.rs
View File

@ -35,7 +35,7 @@ use {
std::{
collections::{HashMap, HashSet},
io::{self, BufReader, BufWriter, Read, Write},
path::PathBuf,
path::{Path, PathBuf},
result::Result,
sync::{atomic::Ordering, Arc, RwLock},
},
@ -287,6 +287,24 @@ where
Ok(bank)
}
fn reconstruct_single_storage<E>(
slot: &Slot,
append_vec_path: &Path,
storage_entry: &E,
new_slot_storage: &mut HashMap<AppendVecId, Arc<AccountStorageEntry>>,
) -> Result<(), Error>
where
E: SerializableStorage,
{
let (accounts, num_accounts) =
AppendVec::new_from_file(append_vec_path, storage_entry.current_len())?;
let u_storage_entry =
AccountStorageEntry::new_existing(*slot, storage_entry.id(), accounts, num_accounts);
new_slot_storage.insert(storage_entry.id(), Arc::new(u_storage_entry));
Ok(())
}
fn reconstruct_accountsdb_from_fields<E>(
accounts_db_fields: AccountsDbFields<E>,
account_paths: &[PathBuf],
@ -333,16 +351,12 @@ where
)
})?;
let (accounts, num_accounts) =
AppendVec::new_from_file(append_vec_path, storage_entry.current_len())?;
let u_storage_entry = AccountStorageEntry::new_existing(
*slot,
storage_entry.id(),
accounts,
num_accounts,
);
new_slot_storage.insert(storage_entry.id(), Arc::new(u_storage_entry));
reconstruct_single_storage(
&slot,
append_vec_path,
storage_entry,
&mut new_slot_storage,
)?;
}
Ok((*slot, new_slot_storage))
})