[TieredStorage] Make AccountOffset use u32 (#34151)

#### Problem
AccountOffset currently uses `usize`, which size is platform dependent.
We want a fixed size type that is consist to what we persist in the tiered-storage file.

#### Summary of Changes
This PR makes AccountOffset use u32.
This commit is contained in:
Yueh-Hsuan Chiang 2023-11-21 10:40:10 -08:00 committed by GitHub
parent db2444bd11
commit ecc067f7ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions

View File

@ -228,7 +228,7 @@ impl HotStorageReader {
&self, &self,
account_offset: AccountOffset, account_offset: AccountOffset,
) -> TieredStorageResult<&HotAccountMeta> { ) -> TieredStorageResult<&HotAccountMeta> {
let (meta, _) = get_type::<HotAccountMeta>(&self.mmap, account_offset.block)?; let (meta, _) = get_type::<HotAccountMeta>(&self.mmap, account_offset.block as usize)?;
Ok(meta) Ok(meta)
} }
@ -467,7 +467,7 @@ pub mod tests {
.iter() .iter()
.map(|meta| { .map(|meta| {
let prev_offset = current_offset; let prev_offset = current_offset;
current_offset += file.write_type(meta).unwrap(); current_offset += file.write_type(meta).unwrap() as u32;
AccountOffset { block: prev_offset } AccountOffset { block: prev_offset }
}) })
.collect(); .collect();
@ -534,7 +534,7 @@ pub mod tests {
let account_offset = hot_storage let account_offset = hot_storage
.get_account_offset(IndexOffset(i as u32)) .get_account_offset(IndexOffset(i as u32))
.unwrap(); .unwrap();
assert_eq!(account_offset.block as u32, index_writer_entry.block_offset); assert_eq!(account_offset.block, index_writer_entry.block_offset);
let account_address = hot_storage let account_address = hot_storage
.get_account_address(IndexOffset(i as u32)) .get_account_address(IndexOffset(i as u32))

View File

@ -23,7 +23,7 @@ pub struct AccountIndexWriterEntry<'a> {
#[derive(Clone, Copy, Debug, Eq, PartialEq)] #[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub struct AccountOffset { pub struct AccountOffset {
/// The offset to the accounts block that contains the account meta/data. /// The offset to the accounts block that contains the account meta/data.
pub block: usize, pub block: u32,
} }
/// The offset to an account/address entry in the accounts index block. /// The offset to an account/address entry in the accounts index block.
@ -104,10 +104,10 @@ impl IndexBlockFormat {
let account_offset = footer.index_block_offset as usize let account_offset = footer.index_block_offset as usize
+ std::mem::size_of::<Pubkey>() * footer.account_entry_count as usize + std::mem::size_of::<Pubkey>() * footer.account_entry_count as usize
+ std::mem::size_of::<u32>() * index_offset.0 as usize; + std::mem::size_of::<u32>() * index_offset.0 as usize;
let (block_offset, _) = get_type::<u32>(mmap, account_offset)?; let (block_offset, _) = get_type(mmap, account_offset)?;
Ok(AccountOffset { Ok(AccountOffset {
block: *block_offset as usize, block: *block_offset,
}) })
} }
} }
@ -169,7 +169,7 @@ mod tests {
let account_offset = indexer let account_offset = indexer
.get_account_offset(&mmap, &footer, IndexOffset(i as u32)) .get_account_offset(&mmap, &footer, IndexOffset(i as u32))
.unwrap(); .unwrap();
assert_eq!(index_entry.block_offset, account_offset.block as u32); assert_eq!(index_entry.block_offset, account_offset.block);
let address = indexer let address = indexer
.get_account_address(&mmap, &footer, IndexOffset(i as u32)) .get_account_address(&mmap, &footer, IndexOffset(i as u32))
.unwrap(); .unwrap();