Browse Source

Remove get_stored_account_meta_callback (#8676)

Rory Harris 4 weeks ago
parent
commit
9ba46d9eff
2 changed files with 4 additions and 22 deletions
  1. 4 4
      accounts-db/benches/append_vec.rs
  2. 0 18
      accounts-db/src/accounts_file.rs

+ 4 - 4
accounts-db/benches/append_vec.rs

@@ -78,7 +78,7 @@ fn append_vec_sequential_read(bencher: &mut Bencher, storage_access: StorageAcce
     bencher.iter(|| {
     bencher.iter(|| {
         let (sample, pos) = indexes.pop().unwrap();
         let (sample, pos) = indexes.pop().unwrap();
         println!("reading pos {sample} {pos}");
         println!("reading pos {sample} {pos}");
-        vec.get_stored_account_meta_callback(pos, |account| {
+        vec.get_stored_account_callback(pos, |account| {
             let (_pubkey, test) = create_test_account(sample);
             let (_pubkey, test) = create_test_account(sample);
             assert_eq!(account.data(), test.data());
             assert_eq!(account.data(), test.data());
             indexes.push((sample, pos));
             indexes.push((sample, pos));
@@ -104,7 +104,7 @@ fn append_vec_random_read(bencher: &mut Bencher, storage_access: StorageAccess)
     bencher.iter(|| {
     bencher.iter(|| {
         let random_index: usize = thread_rng().gen_range(0..indexes.len());
         let random_index: usize = thread_rng().gen_range(0..indexes.len());
         let (sample, pos) = &indexes[random_index];
         let (sample, pos) = &indexes[random_index];
-        vec.get_stored_account_meta_callback(*pos, |account| {
+        vec.get_stored_account_callback(*pos, |account| {
             let (_pubkey, test) = create_test_account(*sample);
             let (_pubkey, test) = create_test_account(*sample);
             assert_eq!(account.data(), test.data());
             assert_eq!(account.data(), test.data());
         });
         });
@@ -148,7 +148,7 @@ fn append_vec_concurrent_append_read(bencher: &mut Bencher, storage_access: Stor
         let len = indexes.lock().unwrap().len();
         let len = indexes.lock().unwrap().len();
         let random_index: usize = thread_rng().gen_range(0..len);
         let random_index: usize = thread_rng().gen_range(0..len);
         let (sample, pos) = *indexes.lock().unwrap().get(random_index).unwrap();
         let (sample, pos) = *indexes.lock().unwrap().get(random_index).unwrap();
-        vec.get_stored_account_meta_callback(pos, |account| {
+        vec.get_stored_account_callback(pos, |account| {
             let (_pubkey, test) = create_test_account(sample);
             let (_pubkey, test) = create_test_account(sample);
             assert_eq!(account.data(), test.data());
             assert_eq!(account.data(), test.data());
         });
         });
@@ -187,7 +187,7 @@ fn append_vec_concurrent_read_append(bencher: &mut Bencher, storage_access: Stor
             .unwrap()
             .unwrap()
             .get(random_index.checked_rem(len).unwrap())
             .get(random_index.checked_rem(len).unwrap())
             .unwrap();
             .unwrap();
-        vec1.get_stored_account_meta_callback(pos, |account| {
+        vec1.get_stored_account_callback(pos, |account| {
             let (_pubkey, test) = create_test_account(sample);
             let (_pubkey, test) = create_test_account(sample);
             assert_eq!(account.data(), test.data());
             assert_eq!(account.data(), test.data());
         });
         });

+ 0 - 18
accounts-db/src/accounts_file.rs

@@ -207,24 +207,6 @@ impl AccountsFile {
         }
         }
     }
     }
 
 
-    /// calls `callback` with the account located at the specified index offset.
-    ///
-    /// Prefer get_stored_account_callback() when possible, as it does not contain file format
-    /// implementation details, and thus potentially can read less and be faster.
-    #[cfg(feature = "dev-context-only-utils")]
-    pub fn get_stored_account_meta_callback<Ret>(
-        &self,
-        offset: usize,
-        callback: impl for<'local> FnMut(StoredAccountMeta<'local>) -> Ret,
-    ) -> Option<Ret> {
-        match self {
-            Self::AppendVec(av) => av.get_stored_account_meta_callback(offset, callback),
-            Self::TieredStorage(_) => {
-                unimplemented!("StoredAccountMeta is only implemented for AppendVec")
-            }
-        }
-    }
-
     /// return an `AccountSharedData` for an account at `offset`, if any.  Otherwise return None.
     /// return an `AccountSharedData` for an account at `offset`, if any.  Otherwise return None.
     pub(crate) fn get_account_shared_data(&self, offset: usize) -> Option<AccountSharedData> {
     pub(crate) fn get_account_shared_data(&self, offset: usize) -> Option<AccountSharedData> {
         match self {
         match self {