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

accounts_db calls AccountsDb::new(bins) (#19068)

Browse Source
This commit is contained in:
Jeff Washington (jwash)
2021-08-05 11:15:26 -05:00
committed by GitHub
parent 40914de811
commit 5cf28689e6
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/src/accounts_db.rs
View File

@ -1352,7 +1352,7 @@ impl Default for AccountsDb {
let mut bank_hashes = HashMap::new(); let mut bank_hashes = HashMap::new();
bank_hashes.insert(0, BankHashInfo::default()); bank_hashes.insert(0, BankHashInfo::default());
AccountsDb { AccountsDb {
accounts_index: AccountsIndex::default(), accounts_index: AccountsIndex::new(crate::accounts_index::BINS_DEFAULT),
storage: AccountStorage::default(), storage: AccountStorage::default(),
accounts_cache: AccountsCache::default(), accounts_cache: AccountsCache::default(),
sender_bg_hasher: None, sender_bg_hasher: None,

10
runtime/src/accounts_index.rs
View File

@ -32,7 +32,7 @@ use std::{
use thiserror::Error; use thiserror::Error;
pub const ITER_BATCH_SIZE: usize = 1000; pub const ITER_BATCH_SIZE: usize = 1000;
const BINS_DEFAULT: usize = 16; pub const BINS_DEFAULT: usize = 16;
const BINS_FOR_TESTING: usize = BINS_DEFAULT; const BINS_FOR_TESTING: usize = BINS_DEFAULT;
pub type ScanResult<T> = Result<T, ScanError>; pub type ScanResult<T> = Result<T, ScanError>;
pub type SlotList<T> = Vec<(Slot, T)>; pub type SlotList<T> = Vec<(Slot, T)>;
@ -759,7 +759,7 @@ impl<
Self::new(BINS_FOR_TESTING) Self::new(BINS_FOR_TESTING)
} }
fn new(bins: usize) -> Self { pub fn new(bins: usize) -> Self {
let (account_maps, bin_calculator) = Self::allocate_accounts_index(bins); let (account_maps, bin_calculator) = Self::allocate_accounts_index(bins);
Self { Self {
account_maps, account_maps,
@ -3987,4 +3987,10 @@ pub mod tests {
assert_eq!(iter.start_bin(), bins - 1); // start at highest possible pubkey, so bins - 1 assert_eq!(iter.start_bin(), bins - 1); // start at highest possible pubkey, so bins - 1
assert_eq!(iter.end_bin_inclusive(), bins - 1); assert_eq!(iter.end_bin_inclusive(), bins - 1);
} }
#[test]
#[should_panic(expected = "bins.is_power_of_two()")]
fn test_illegal_bins() {
AccountsIndex::<bool>::new(3);
}
} }