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

accounts default refactoring stragglers (#19097)

Browse Source
This commit is contained in:
Jeff Washington (jwash)
2021-08-06 12:36:42 -05:00
committed by GitHub
parent 397801a2d8
commit 41f4973f0d
3 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
runtime/benches/accounts.rs
View File

@ -95,7 +95,7 @@ fn test_accounts_squash(bencher: &mut Bencher) {
#[bench] #[bench]
fn test_accounts_hash_bank_hash(bencher: &mut Bencher) { fn test_accounts_hash_bank_hash(bencher: &mut Bencher) {
let accounts = Accounts::new_with_config( let accounts = Accounts::new_with_config_for_benches(
vec![PathBuf::from("bench_accounts_hash_internal")], vec![PathBuf::from("bench_accounts_hash_internal")],
&ClusterType::Development, &ClusterType::Development,
AccountSecondaryIndexes::default(), AccountSecondaryIndexes::default(),
@ -122,7 +122,7 @@ fn test_accounts_hash_bank_hash(bencher: &mut Bencher) {
#[bench] #[bench]
fn test_update_accounts_hash(bencher: &mut Bencher) { fn test_update_accounts_hash(bencher: &mut Bencher) {
solana_logger::setup(); solana_logger::setup();
let accounts = Accounts::new_with_config( let accounts = Accounts::new_with_config_for_benches(
vec![PathBuf::from("update_accounts_hash")], vec![PathBuf::from("update_accounts_hash")],
&ClusterType::Development, &ClusterType::Development,
AccountSecondaryIndexes::default(), AccountSecondaryIndexes::default(),
@ -140,7 +140,7 @@ fn test_update_accounts_hash(bencher: &mut Bencher) {
#[bench] #[bench]
fn test_accounts_delta_hash(bencher: &mut Bencher) { fn test_accounts_delta_hash(bencher: &mut Bencher) {
solana_logger::setup(); solana_logger::setup();
let accounts = Accounts::new_with_config( let accounts = Accounts::new_with_config_for_benches(
vec![PathBuf::from("accounts_delta_hash")], vec![PathBuf::from("accounts_delta_hash")],
&ClusterType::Development, &ClusterType::Development,
AccountSecondaryIndexes::default(), AccountSecondaryIndexes::default(),
@ -157,7 +157,7 @@ fn test_accounts_delta_hash(bencher: &mut Bencher) {
#[bench] #[bench]
fn bench_delete_dependencies(bencher: &mut Bencher) { fn bench_delete_dependencies(bencher: &mut Bencher) {
solana_logger::setup(); solana_logger::setup();
let accounts = Accounts::new_with_config( let accounts = Accounts::new_with_config_for_benches(
vec![PathBuf::from("accounts_delete_deps")], vec![PathBuf::from("accounts_delete_deps")],
&ClusterType::Development, &ClusterType::Development,
AccountSecondaryIndexes::default(), AccountSecondaryIndexes::default(),
@ -188,7 +188,7 @@ fn store_accounts_with_possible_contention<F: 'static>(
F: Fn(&Accounts, &[Pubkey]) + Send + Copy, F: Fn(&Accounts, &[Pubkey]) + Send + Copy,
{ {
let num_readers = 5; let num_readers = 5;
let accounts = Arc::new(Accounts::new_with_config( let accounts = Arc::new(Accounts::new_with_config_for_benches(
vec![ vec![
PathBuf::from(std::env::var("FARF_DIR").unwrap_or_else(|_| "farf".to_string())) PathBuf::from(std::env::var("FARF_DIR").unwrap_or_else(|_| "farf".to_string()))
.join(bench_name), .join(bench_name),
@ -324,7 +324,7 @@ fn bench_rwlock_hashmap_single_reader_with_n_writers(bencher: &mut Bencher) {
} }
fn setup_bench_dashmap_iter() -> (Arc<Accounts>, DashMap<Pubkey, (AccountSharedData, Hash)>) { fn setup_bench_dashmap_iter() -> (Arc<Accounts>, DashMap<Pubkey, (AccountSharedData, Hash)>) {
let accounts = Arc::new(Accounts::new_with_config( let accounts = Arc::new(Accounts::new_with_config_for_benches(
vec![ vec![
PathBuf::from(std::env::var("FARF_DIR").unwrap_or_else(|_| "farf".to_string())) PathBuf::from(std::env::var("FARF_DIR").unwrap_or_else(|_| "farf".to_string()))
.join("bench_dashmap_par_iter"), .join("bench_dashmap_par_iter"),
@ -382,7 +382,7 @@ fn bench_dashmap_iter(bencher: &mut Bencher) {
#[bench] #[bench]
fn bench_load_largest_accounts(b: &mut Bencher) { fn bench_load_largest_accounts(b: &mut Bencher) {
let accounts = Accounts::new_with_config( let accounts = Accounts::new_with_config_for_benches(
Vec::new(), Vec::new(),
&ClusterType::Development, &ClusterType::Development,
AccountSecondaryIndexes::default(), AccountSecondaryIndexes::default(),

17
runtime/src/accounts.rs
View File

@ -147,6 +147,23 @@ impl Accounts {
) )
} }
pub fn new_with_config_for_benches(
paths: Vec<PathBuf>,
cluster_type: &ClusterType,
account_indexes: AccountSecondaryIndexes,
caching_enabled: bool,
shrink_ratio: AccountShrinkThreshold,
) -> Self {
// will diverge
Self::new_with_config(
paths,
cluster_type,
account_indexes,
caching_enabled,
shrink_ratio,
)
}
pub fn new_with_config( pub fn new_with_config(
paths: Vec<PathBuf>, paths: Vec<PathBuf>,
cluster_type: &ClusterType, cluster_type: &ClusterType,

2
runtime/tests/accounts.rs
View File

@ -73,7 +73,7 @@ fn test_shrink_and_clean() {
fn test_bad_bank_hash() { fn test_bad_bank_hash() {
solana_logger::setup(); solana_logger::setup();
use solana_sdk::signature::{Keypair, Signer}; use solana_sdk::signature::{Keypair, Signer};
let db = AccountsDb::new(Vec::new(), &ClusterType::Development); let db = AccountsDb::new_for_tests(Vec::new(), &ClusterType::Development);
let some_slot: Slot = 0; let some_slot: Slot = 0;
let ancestors = Ancestors::from(vec![some_slot]); let ancestors = Ancestors::from(vec![some_slot]);