plumbing for 'other_slot' in 'update_index' (solana-labs#23330)

jeffwashington · Mar 4, 2022 · a7e4dd2 · a7e4dd2
1 parent 2ae0790
commit a7e4dd2
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 4 deletions.
diff --git a/runtime/benches/accounts_index.rs b/runtime/benches/accounts_index.rs
@@ -26,6 +26,7 @@ fn bench_accounts_index(bencher: &mut Bencher) {
     for f in 0..NUM_FORKS {
         for pubkey in pubkeys.iter().take(NUM_PUBKEYS) {
             index.upsert(
+                f,
                 f,
                 pubkey,
                 &AccountSharedData::default(),
@@ -43,6 +44,7 @@ fn bench_accounts_index(bencher: &mut Bencher) {
         for _p in 0..NUM_PUBKEYS {
             let pubkey = thread_rng().gen_range(0, NUM_PUBKEYS);
             index.upsert(
+                fork,
                 fork,
                 &pubkeys[pubkey],
                 &AccountSharedData::default(),

diff --git a/runtime/src/accounts_db.rs b/runtime/src/accounts_db.rs
@@ -5976,6 +5976,7 @@ impl AccountsDb {
                     let pubkey_account = (accounts.pubkey(i), accounts.account(i));
                     let pubkey = pubkey_account.0;
                     self.accounts_index.upsert(
+                        slot,
                         slot,
                         pubkey,
                         pubkey_account.1,
@@ -11067,6 +11068,7 @@ pub mod tests {
         let info3 = AccountInfo::new(StorageLocation::AppendVec(3, 0), 0, 0);
         let mut reclaims = vec![];
         accounts_index.upsert(
+            0,
             0,
             &key0,
             &AccountSharedData::default(),
@@ -11076,6 +11078,7 @@ pub mod tests {
             UPSERT_PREVIOUS_SLOT_ENTRY_WAS_CACHED_FALSE,
         );
         accounts_index.upsert(
+            1,
             1,
             &key0,
             &AccountSharedData::default(),
@@ -11085,6 +11088,7 @@ pub mod tests {
             UPSERT_PREVIOUS_SLOT_ENTRY_WAS_CACHED_FALSE,
         );
         accounts_index.upsert(
+            1,
             1,
             &key1,
             &AccountSharedData::default(),
@@ -11094,6 +11098,7 @@ pub mod tests {
             UPSERT_PREVIOUS_SLOT_ENTRY_WAS_CACHED_FALSE,
         );
         accounts_index.upsert(
+            2,
             2,
             &key1,
             &AccountSharedData::default(),
@@ -11103,6 +11108,7 @@ pub mod tests {
             UPSERT_PREVIOUS_SLOT_ENTRY_WAS_CACHED_FALSE,
         );
         accounts_index.upsert(
+            2,
             2,
             &key2,
             &AccountSharedData::default(),
@@ -11112,6 +11118,7 @@ pub mod tests {
             UPSERT_PREVIOUS_SLOT_ENTRY_WAS_CACHED_FALSE,
         );
         accounts_index.upsert(
+            3,
             3,
             &key2,
             &AccountSharedData::default(),

diff --git a/runtime/src/accounts_index.rs b/runtime/src/accounts_index.rs
@@ -1751,7 +1751,8 @@ impl<T: IndexValue> AccountsIndex<T> {
     /// on return, the index's previous account info may be returned in 'reclaims' depending on 'previous_slot_entry_was_cached'
     pub fn upsert(
         &self,
-        slot: Slot,
+        new_slot: Slot,
+        _old_slot: Slot,
         pubkey: &Pubkey,
         account: &impl ReadableAccount,
         account_indexes: &AccountSecondaryIndexes,
@@ -1773,13 +1774,23 @@ impl<T: IndexValue> AccountsIndex<T> {
         //  - The secondary index is never consulted as primary source of truth for gets/stores.
         //  So, what the accounts_index sees alone is sufficient as a source of truth for other non-scan
         //  account operations.
-        let new_item =
-            PreAllocatedAccountMapEntry::new(slot, account_info, &self.storage.storage, store_raw);
+        let new_item = PreAllocatedAccountMapEntry::new(
+            new_slot,
+            account_info,
+            &self.storage.storage,
+            store_raw,
+        );
         let map = &self.account_maps[self.bin_calculator.bin_from_pubkey(pubkey)];
 
         {
             let r_account_maps = map.read().unwrap();
-            r_account_maps.upsert(pubkey, new_item, reclaims, previous_slot_entry_was_cached);
+            r_account_maps.upsert(
+                pubkey,
+                new_item,
+                None,
+                reclaims,
+                previous_slot_entry_was_cached,
+            );
         }
         self.update_secondary_indexes(pubkey, account, account_indexes);
     }
@@ -2868,6 +2879,7 @@ pub mod tests {
         let index = AccountsIndex::<bool>::default_for_tests();
         let mut gc = Vec::new();
         index.upsert(
+            0,
             0,
             &key.pubkey(),
             &AccountSharedData::default(),
@@ -3079,6 +3091,7 @@ pub mod tests {
         if upsert {
             // insert first entry for pubkey. This will use new_entry_after_update and not call update.
             index.upsert(
+                slot0,
                 slot0,
                 &key,
                 &AccountSharedData::default(),
@@ -3115,6 +3128,7 @@ pub mod tests {
         // insert second entry for pubkey. This will use update and NOT use new_entry_after_update.
         if upsert {
             index.upsert(
+                slot1,
                 slot1,
                 &key,
                 &AccountSharedData::default(),
@@ -3188,6 +3202,7 @@ pub mod tests {
         w_account_maps.upsert(
             &key.pubkey(),
             new_entry,
+            None,
             &mut SlotList::default(),
             UPSERT_PREVIOUS_SLOT_ENTRY_WAS_CACHED_FALSE,
         );
@@ -3227,6 +3242,7 @@ pub mod tests {
         let index = AccountsIndex::<bool>::default_for_tests();
         let mut gc = Vec::new();
         index.upsert(
+            0,
             0,
             &key.pubkey(),
             &AccountSharedData::default(),
@@ -3258,6 +3274,7 @@ pub mod tests {
         let index = AccountsIndex::<bool>::default_for_tests();
         let mut gc = Vec::new();
         index.upsert(
+            0,
             0,
             &key.pubkey(),
             &AccountSharedData::default(),
@@ -3298,6 +3315,7 @@ pub mod tests {
         let mut pubkeys: Vec<Pubkey> = std::iter::repeat_with(|| {
             let new_pubkey = solana_sdk::pubkey::new_rand();
             index.upsert(
+                root_slot,
                 root_slot,
                 &new_pubkey,
                 &AccountSharedData::default(),
@@ -3314,6 +3332,7 @@ pub mod tests {
         if num_pubkeys != 0 {
             pubkeys.push(Pubkey::default());
             index.upsert(
+                root_slot,
                 root_slot,
                 &Pubkey::default(),
                 &AccountSharedData::default(),
@@ -3456,6 +3475,7 @@ pub mod tests {
         assert!(iter.next().is_none());
         let mut gc = vec![];
         index.upsert(
+            0,
             0,
             &solana_sdk::pubkey::new_rand(),
             &AccountSharedData::default(),
@@ -3481,6 +3501,7 @@ pub mod tests {
         let index = AccountsIndex::<bool>::default_for_tests();
         let mut gc = Vec::new();
         index.upsert(
+            0,
             0,
             &key.pubkey(),
             &AccountSharedData::default(),
@@ -3595,6 +3616,7 @@ pub mod tests {
         let ancestors = vec![(0, 0)].into_iter().collect();
         let mut gc = Vec::new();
         index.upsert(
+            0,
             0,
             &key.pubkey(),
             &AccountSharedData::default(),
@@ -3612,6 +3634,7 @@ pub mod tests {
 
         let mut gc = Vec::new();
         index.upsert(
+            0,
             0,
             &key.pubkey(),
             &AccountSharedData::default(),
@@ -3635,6 +3658,7 @@ pub mod tests {
         let ancestors = vec![(0, 0)].into_iter().collect();
         let mut gc = Vec::new();
         index.upsert(
+            0,
             0,
             &key.pubkey(),
             &AccountSharedData::default(),
@@ -3645,6 +3669,7 @@ pub mod tests {
         );
         assert!(gc.is_empty());
         index.upsert(
+            1,
             1,
             &key.pubkey(),
             &AccountSharedData::default(),
@@ -3671,6 +3696,7 @@ pub mod tests {
         let index = AccountsIndex::<bool>::default_for_tests();
         let mut gc = Vec::new();
         index.upsert(
+            0,
             0,
             &key.pubkey(),
             &AccountSharedData::default(),
@@ -3681,6 +3707,7 @@ pub mod tests {
         );
         assert!(gc.is_empty());
         index.upsert(
+            1,
             1,
             &key.pubkey(),
             &AccountSharedData::default(),
@@ -3690,6 +3717,7 @@ pub mod tests {
             UPSERT_PREVIOUS_SLOT_ENTRY_WAS_CACHED_FALSE,
         );
         index.upsert(
+            2,
             2,
             &key.pubkey(),
             &AccountSharedData::default(),
@@ -3699,6 +3727,7 @@ pub mod tests {
             UPSERT_PREVIOUS_SLOT_ENTRY_WAS_CACHED_FALSE,
         );
         index.upsert(
+            3,
             3,
             &key.pubkey(),
             &AccountSharedData::default(),
@@ -3711,6 +3740,7 @@ pub mod tests {
         index.add_root(1, false);
         index.add_root(3, false);
         index.upsert(
+            4,
             4,
             &key.pubkey(),
             &AccountSharedData::default(),
@@ -3755,6 +3785,7 @@ pub mod tests {
         let mut gc = Vec::new();
         assert_eq!(0, account_maps_stats_len(&index));
         index.upsert(
+            1,
             1,
             &key.pubkey(),
             &AccountSharedData::default(),
@@ -3766,6 +3797,7 @@ pub mod tests {
         assert_eq!(1, account_maps_stats_len(&index));
 
         index.upsert(
+            1,
             1,
             &key.pubkey(),
             &AccountSharedData::default(),
@@ -3785,6 +3817,7 @@ pub mod tests {
 
         assert_eq!(1, account_maps_stats_len(&index));
         index.upsert(
+            1,
             1,
             &key.pubkey(),
             &AccountSharedData::default(),
@@ -3859,6 +3892,7 @@ pub mod tests {
         // Insert slots into secondary index
         for slot in &slots {
             index.upsert(
+                *slot,
                 *slot,
                 &account_key,
                 // Make sure these accounts are added to secondary index
@@ -4039,6 +4073,7 @@ pub mod tests {
 
         // Wrong program id
         index.upsert(
+            0,
             0,
             &account_key,
             &AccountSharedData::create(0, account_data.to_vec(), Pubkey::default(), false, 0),
@@ -4052,6 +4087,7 @@ pub mod tests {
 
         // Wrong account data size
         index.upsert(
+            0,
             0,
             &account_key,
             &AccountSharedData::create(0, account_data[1..].to_vec(), *token_id, false, 0),
@@ -4175,6 +4211,7 @@ pub mod tests {
 
         // First write one mint index
         index.upsert(
+            slot,
             slot,
             &account_key,
             &AccountSharedData::create(0, account_data1.to_vec(), *token_id, false, 0),
@@ -4186,6 +4223,7 @@ pub mod tests {
 
         // Now write a different mint index for the same account
         index.upsert(
+            slot,
             slot,
             &account_key,
             &AccountSharedData::create(0, account_data2.to_vec(), *token_id, false, 0),
@@ -4205,6 +4243,7 @@ pub mod tests {
         // If a later slot also introduces secondary_key1, then it should still exist in the index
         let later_slot = slot + 1;
         index.upsert(
+            later_slot,
             later_slot,
             &account_key,
             &AccountSharedData::create(0, account_data1.to_vec(), *token_id, false, 0),