Skip to content

Commit

Permalink
[TieredStorage] Make AccountOffset use u32 (solana-labs#34151)
Browse files Browse the repository at this point in the history
#### 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.
  • Loading branch information
yhchiang-sol committed Feb 13, 2024
1 parent 9dfef02 commit d9c2171
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions accounts-db/src/tiered_storage/hot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ impl HotStorageReader {
&self,
account_offset: AccountOffset,
) -> 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)
}

Expand Down Expand Up @@ -467,7 +467,7 @@ pub mod tests {
.iter()
.map(|meta| {
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 }
})
.collect();
Expand Down Expand Up @@ -534,7 +534,7 @@ pub mod tests {
let account_offset = hot_storage
.get_account_offset(IndexOffset(i as u32))
.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
.get_account_address(IndexOffset(i as u32))
Expand Down
8 changes: 4 additions & 4 deletions accounts-db/src/tiered_storage/index.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pub struct AccountIndexWriterEntry<'a> {
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
pub struct AccountOffset {
/// 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.
Expand Down Expand Up @@ -104,10 +104,10 @@ impl IndexBlockFormat {
let account_offset = footer.index_block_offset as usize
+ std::mem::size_of::<Pubkey>() * footer.account_entry_count 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 {
block: *block_offset as usize,
block: *block_offset,
})
}
}
Expand Down Expand Up @@ -169,7 +169,7 @@ mod tests {
let account_offset = indexer
.get_account_offset(&mmap, &footer, IndexOffset(i as u32))
.unwrap();
assert_eq!(index_entry.block_offset, account_offset.block as u32);
assert_eq!(index_entry.block_offset, account_offset.block);
let address = indexer
.get_account_address(&mmap, &footer, IndexOffset(i as u32))
.unwrap();
Expand Down

0 comments on commit d9c2171

Please sign in to comment.