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

[TieredStorage] Improve TieredAccountMeta API's readability (#32338) 

#### Problem
In TieredAccountMeta, it uses `data` and `account_data` to refer to
the data associated with the account, and this could be confusing.

#### Summary of Changes
This PR makes TieredAccountMeta only use `account_data` to refer
to the data associated with the account.
This commit is contained in:
Yueh-Hsuan Chiang 2023-07-01 01:55:13 +08:00 committed by GitHub
parent 9b405b21ff
commit 806d79a643
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
runtime/src/tiered_storage/hot.rs
View File

@ -87,7 +87,7 @@ impl TieredAccountMeta for HotAccountMeta {
} }
/// A builder function that initializes the account data size. /// A builder function that initializes the account data size.
fn with_data_size(self, _data_size: u64) -> Self { fn with_account_data_size(self, _account_data_size: u64) -> Self {
// Hot meta does not store its data size as it derives its data length // Hot meta does not store its data size as it derives its data length
// by comparing the offets of two consecutive account meta entries. // by comparing the offets of two consecutive account meta entries.
self self
@ -176,7 +176,7 @@ impl TieredAccountMeta for HotAccountMeta {
/// Returns the length of the data associated to this account based on the /// Returns the length of the data associated to this account based on the
/// specified account block. /// specified account block.
fn data_len(&self, account_block: &[u8]) -> usize { fn account_data_size(&self, account_block: &[u8]) -> usize {
self.optional_fields_offset(account_block) self.optional_fields_offset(account_block)
.saturating_sub(self.account_data_padding() as usize) .saturating_sub(self.account_data_padding() as usize)
} }
@ -184,7 +184,7 @@ impl TieredAccountMeta for HotAccountMeta {
/// Returns the data associated to this account based on the specified /// Returns the data associated to this account based on the specified
/// account block. /// account block.
fn account_data<'a>(&self, account_block: &'a [u8]) -> &'a [u8] { fn account_data<'a>(&self, account_block: &'a [u8]) -> &'a [u8] {
&account_block[..self.data_len(account_block)] &account_block[..self.account_data_size(account_block)]
} }
} }
@ -324,7 +324,7 @@ pub mod tests {
.len() .len()
.saturating_sub(AccountMetaOptionalFields::size_from_flags(&flags)) .saturating_sub(AccountMetaOptionalFields::size_from_flags(&flags))
); );
assert_eq!(account_data.len(), meta.data_len(account_block)); assert_eq!(account_data.len(), meta.account_data_size(account_block));
assert_eq!(account_data, meta.account_data(account_block)); assert_eq!(account_data, meta.account_data(account_block));
assert_eq!(meta.rent_epoch(account_block), optional_fields.rent_epoch); assert_eq!(meta.rent_epoch(account_block), optional_fields.rent_epoch);
assert_eq!( assert_eq!(

4
runtime/src/tiered_storage/meta.rs
View File

@ -39,7 +39,7 @@ pub trait TieredAccountMeta: Sized {
/// A builder function that initializes the account data size. /// A builder function that initializes the account data size.
/// The size here represents the logical data size without compression. /// The size here represents the logical data size without compression.
fn with_data_size(self, data_size: u64) -> Self; fn with_account_data_size(self, account_data_size: u64) -> Self;
/// A builder function that initializes the AccountMetaFlags of the current /// A builder function that initializes the AccountMetaFlags of the current
/// meta. /// meta.
@ -88,7 +88,7 @@ pub trait TieredAccountMeta: Sized {
/// Returns the length of the data associated to this account based on the /// Returns the length of the data associated to this account based on the
/// specified account block. /// specified account block.
fn data_len(&self, _account_block: &[u8]) -> usize { fn account_data_size(&self, _account_block: &[u8]) -> usize {
unimplemented!(); unimplemented!();
} }