blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

clean up types on account index generation (#19105)

This commit is contained in:
Jeff Washington (jwash) 2021-08-09 17:29:36 -05:00 committed by GitHub
parent db40cb41b2
commit c56bccdf32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
runtime/src/accounts_db.rs
View File

@ -1344,8 +1344,13 @@ impl<'a> ReadableAccount for StoredAccountMeta<'a> {
} }
} }
type GenerateIndexAccountsMap<'a> = struct IndexAccountMapEntry<'a> {
HashMap<Pubkey, (StoredMetaWriteVersion, AppendVecId, StoredAccountMeta<'a>)>; pub write_version: StoredMetaWriteVersion,
pub store_id: AppendVecId,
pub stored_account: StoredAccountMeta<'a>,
}
type GenerateIndexAccountsMap<'a> = HashMap<Pubkey, IndexAccountMapEntry<'a>>;
impl AccountsDb { impl AccountsDb {
pub fn default_for_tests() -> Self { pub fn default_for_tests() -> Self {
@ -5864,12 +5869,20 @@ impl AccountsDb {
let this_version = stored_account.meta.write_version; let this_version = stored_account.meta.write_version;
match accounts_map.entry(stored_account.meta.pubkey) { match accounts_map.entry(stored_account.meta.pubkey) {
std::collections::hash_map::Entry::Vacant(entry) => { std::collections::hash_map::Entry::Vacant(entry) => {
entry.insert((this_version, storage.append_vec_id(), stored_account)); entry.insert(IndexAccountMapEntry {
write_version: this_version,
store_id: storage.append_vec_id(),
stored_account,
});
} }
std::collections::hash_map::Entry::Occupied(mut entry) => { std::collections::hash_map::Entry::Occupied(mut entry) => {
let occupied_version = entry.get().0; let occupied_version = entry.get().write_version;
if occupied_version < this_version { if occupied_version < this_version {
entry.insert((this_version, storage.append_vec_id(), stored_account)); entry.insert(IndexAccountMapEntry {
write_version: this_version,
store_id: storage.append_vec_id(),
stored_account,
});
} else { } else {
assert!(occupied_version != this_version); assert!(occupied_version != this_version);
} }
@ -5892,9 +5905,15 @@ impl AccountsDb {
let secondary = !self.account_indexes.is_empty(); let secondary = !self.account_indexes.is_empty();
let len = accounts_map.len(); let len = accounts_map.len();
let items = accounts_map let items = accounts_map.into_iter().map(
.into_iter() |(
.map(|(pubkey, (_, store_id, stored_account))| { pubkey,
IndexAccountMapEntry {
write_version: _write_version,
store_id,
stored_account,
},
)| {
if secondary { if secondary {
self.accounts_index.update_secondary_indexes( self.accounts_index.update_secondary_indexes(
&pubkey, &pubkey,
@ -5913,7 +5932,8 @@ impl AccountsDb {
lamports: stored_account.account_meta.lamports, lamports: stored_account.account_meta.lamports,
}, },
) )
}); },
);
let (dirty_pubkeys, insert_us) = self let (dirty_pubkeys, insert_us) = self
.accounts_index .accounts_index
@ -5983,10 +6003,13 @@ impl AccountsDb {
if slot2 == slot { if slot2 == slot {
count += 1; count += 1;
let ai = AccountInfo { let ai = AccountInfo {
store_id: account_info.1, store_id: account_info.store_id,
offset: account_info.2.offset, offset: account_info.stored_account.offset,
stored_size: account_info.2.stored_size, stored_size: account_info.stored_account.stored_size,
lamports: account_info.2.account_meta.lamports, lamports: account_info
.stored_account
.account_meta
.lamports,
}; };
assert_eq!(&ai, account_info2); assert_eq!(&ai, account_info2);
} }