rework to keep all slot storages together

Author: jeffwashington

runtime/src/accounts_db.rs

@@ -4103,7 +4103,7 @@ impl AccountsDb {
 
     /// Scan through all the account storage in parallel
     fn scan_account_storage_no_bank<F, B>(
-        snapshot_storages: &[&Arc<AccountStorageEntry>],
+        snapshot_storages: &[&Vec<Arc<AccountStorageEntry>>],
         scan_func: F,
     ) -> Vec<B>
     where
@@ -4115,18 +4115,20 @@ impl AccountsDb {
         const MAX_ITEMS_PER_CHUNK: usize = 5_000;
         snapshot_storages
             .par_chunks(MAX_ITEMS_PER_CHUNK)
-            .map(|storages: &[&Arc<AccountStorageEntry>]| {
+            .map(|storages: &[&Vec<Arc<AccountStorageEntry>>]| {
                 let mut retval = B::default();
 
-                for storage in storages {
-                    let accounts = storage.accounts.accounts(0);
-                    accounts.into_iter().for_each(|stored_account| {
-                        scan_func(
-                            LoadedAccount::Stored(stored_account),
-                            &mut retval,
-                            storage.slot(),
-                        )
-                    });
+                for sub_storages in storages {
+                    for storage in *sub_storages {
+                        let accounts = storage.accounts.accounts(0);
+                        accounts.into_iter().for_each(|stored_account| {
+                            scan_func(
+                                LoadedAccount::Stored(stored_account),
+                                &mut retval,
+                                storage.slot(),
+                            )
+                        });
+                    }
                 }
                 retval
             })
@@ -4179,7 +4181,7 @@ impl AccountsDb {
     }
 
     fn scan_snapshot_stores(
-        storage: &[&Arc<AccountStorageEntry>],
+        storage: &[&Vec<Arc<AccountStorageEntry>>],
         mut stats: &mut crate::accounts_hash::HashStats,
         bins: usize,
         bin_range: &Range<usize>,
@@ -4228,13 +4230,17 @@ impl AccountsDb {
         result
     }
 
-    fn sort_storages(storages: &[SnapshotStorage]) -> Vec<&Arc<AccountStorageEntry>> {
+    fn sort_storages(storages: &[SnapshotStorage]) -> Vec<&Vec<Arc<AccountStorageEntry>>> {
         let mut m1 = Measure::start("");
         let mut result = storages
             .iter()
-            .flatten()
-            .map(|item| (item.slot(), item))
-            .collect::<Vec<(Slot, &Arc<AccountStorageEntry>)>>();
+            .map(|item| {
+                (
+                    item.first().map(|item| item.slot()).unwrap_or_default(),
+                    item,
+                )
+            })
+            .collect::<Vec<_>>();
         m1.stop();
         error!("storage_sort_us: {}", m1.as_us());
         result.par_sort_unstable_by(|a, b| a.0.cmp(&b.0));
@@ -5661,7 +5667,7 @@ pub mod tests {
         ancestors
     }
 
-    fn empty_storages<'a>() -> Vec<&'a Arc<AccountStorageEntry>> {
+    fn empty_storages<'a>() -> Vec<&'a Vec<Arc<AccountStorageEntry>>> {
         vec![]
     }
 
@@ -5792,8 +5798,8 @@ pub mod tests {
         (storages, raw_expected)
     }
 
-    fn get_storage_refs(input: &[SnapshotStorage]) -> Vec<&Arc<AccountStorageEntry>> {
-        input.iter().map(|inner| inner.iter()).flatten().collect()
+    fn get_storage_refs(input: &[SnapshotStorage]) -> Vec<&Vec<Arc<AccountStorageEntry>>> {
+        input.iter().collect()
     }
 
     #[test]