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

disk index: remove Option on read_value (#31023)

This commit is contained in:
Jeff Washington (jwash) 2023-04-03 13:36:58 -05:00 committed by GitHub
parent ef6b6793dd
commit 7edef94088
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bucket_map/src/bucket.rs
View File

@ -151,11 +151,11 @@ impl<'b, T: Clone + Copy + 'static> Bucket<T> {
let ix = IndexEntryPlaceInBucket::new(ii); let ix = IndexEntryPlaceInBucket::new(ii);
let key = ix.key(&self.index); let key = ix.key(&self.index);
if range.map(|r| r.contains(key)).unwrap_or(true) { if range.map(|r| r.contains(key)).unwrap_or(true) {
let val = ix.read_value(&self.index, &self.data); let (v, ref_count) = ix.read_value(&self.index, &self.data);
result.push(BucketItem { result.push(BucketItem {
pubkey: *key, pubkey: *key,
ref_count: ix.ref_count(&self.index), ref_count,
slot_list: val.map(|(v, _ref_count)| v.to_vec()).unwrap_or_default(), slot_list: v.to_vec(),
}); });
} }
} }
@ -264,7 +264,7 @@ impl<'b, T: Clone + Copy + 'static> Bucket<T> {
pub fn read_value(&self, key: &Pubkey) -> Option<(&[T], RefCount)> { pub fn read_value(&self, key: &Pubkey) -> Option<(&[T], RefCount)> {
//debug!("READ_VALUE: {:?}", key); //debug!("READ_VALUE: {:?}", key);
let (elem, _) = self.find_index_entry(key)?; let (elem, _) = self.find_index_entry(key)?;
elem.read_value(&self.index, &self.data) Some(elem.read_value(&self.index, &self.data))
} }
pub fn try_write( pub fn try_write(

10
bucket_map/src/index_entry.rs
View File

@ -281,17 +281,17 @@ impl<T: Copy> IndexEntryPlaceInBucket<T> {
index_entry.set_slot_count_enum_value(value); index_entry.set_slot_count_enum_value(value);
} }
pub fn ref_count(&self, index_bucket: &BucketStorage<IndexBucket<T>>) -> RefCount { fn ref_count(&self, index_bucket: &BucketStorage<IndexBucket<T>>) -> RefCount {
let index_entry = index_bucket.get::<IndexEntry<T>>(self.ix); let index_entry = index_bucket.get::<IndexEntry<T>>(self.ix);
index_entry.packed_ref_count.ref_count() index_entry.packed_ref_count.ref_count()
} }
pub fn read_value<'a>( pub(crate) fn read_value<'a>(
&self, &self,
index_bucket: &'a BucketStorage<IndexBucket<T>>, index_bucket: &'a BucketStorage<IndexBucket<T>>,
data_buckets: &'a [BucketStorage<DataBucket>], data_buckets: &'a [BucketStorage<DataBucket>],
) -> Option<(&'a [T], RefCount)> { ) -> (&'a [T], RefCount) {
Some(( (
match self.get_slot_count_enum(index_bucket) { match self.get_slot_count_enum(index_bucket) {
OccupiedEnum::ZeroSlots => { OccupiedEnum::ZeroSlots => {
// num_slots is 0. This means we don't have an actual allocation. // num_slots is 0. This means we don't have an actual allocation.
@ -315,7 +315,7 @@ impl<T: Copy> IndexEntryPlaceInBucket<T> {
} }
}, },
self.ref_count(index_bucket), self.ref_count(index_bucket),
)) )
} }
pub fn new(ix: u64) -> Self { pub fn new(ix: u64) -> Self {