From 9b3a92a8646c84ac7e23bfdb84ba60d727e2b0ce Mon Sep 17 00:00:00 2001 From: brooks Date: Thu, 7 Sep 2023 10:38:03 -0400 Subject: [PATCH] Transient accounts hash cache dir is unnecessary --- accounts-db/src/accounts_db.rs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/accounts-db/src/accounts_db.rs b/accounts-db/src/accounts_db.rs index 2468fe82385496..dc210bee6c77e0 100644 --- a/accounts-db/src/accounts_db.rs +++ b/accounts-db/src/accounts_db.rs @@ -97,7 +97,6 @@ use { borrow::{Borrow, Cow}, boxed::Box, collections::{hash_map, BTreeSet, HashMap, HashSet}, - fs, hash::{Hash as StdHash, Hasher as StdHasher}, io::Result as IoResult, ops::{Range, RangeBounds}, @@ -1494,7 +1493,6 @@ pub struct AccountsDb { base_working_temp_dir: Option, accounts_hash_cache_path: PathBuf, - transient_accounts_hash_cache_path: PathBuf, pub shrink_paths: RwLock>>, @@ -2499,7 +2497,6 @@ impl AccountsDb { paths: vec![], base_working_path, base_working_temp_dir, - transient_accounts_hash_cache_path: accounts_hash_cache_path.join("transient"), accounts_hash_cache_path, shrink_paths: RwLock::new(None), temp_paths: None, @@ -7735,7 +7732,7 @@ impl AccountsDb { let accounts_hash_cache_path = self.accounts_hash_cache_path.clone(); let scan_and_hash = || { let (cache_hash_data, cache_hash_data_us) = measure_us!(Self::get_cache_hash_data( - accounts_hash_cache_path, + accounts_hash_cache_path.clone(), config, kind, slot @@ -7747,8 +7744,6 @@ impl AccountsDb { end: PUBKEY_BINS_FOR_CALCULATING_HASHES, }; - fs::create_dir_all(&self.transient_accounts_hash_cache_path) - .expect("create transient accounts hash cache dir"); let accounts_hasher = AccountsHasher { filler_account_suffix: if self.filler_accounts_config.count > 0 { self.filler_account_suffix @@ -7756,7 +7751,7 @@ impl AccountsDb { None }, zero_lamport_accounts: kind.zero_lamport_accounts(), - dir_for_temp_cache_files: self.transient_accounts_hash_cache_path.clone(), + dir_for_temp_cache_files: accounts_hash_cache_path, active_stats: &self.active_stats, };