gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove unused/incorrect DataBucket::bytes

Browse Source
This commit is contained in:
Brooks Prumo
2021-09-15 17:40:29 -05:00
committed by Jeff Washington (jwash)
parent 160e33edcc
commit 13acea95b8
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bucket_map/src/data_bucket.rs
View File

@ -47,7 +47,6 @@ pub struct BucketMapStats {
23 8,388,608 23 8,388,608
24 16,777,216 24 16,777,216
*/ */
// bytes = 2^DEFAULT_CAPACITY
const DEFAULT_CAPACITY_POW2: u8 = 5; const DEFAULT_CAPACITY_POW2: u8 = 5;
#[repr(C)] #[repr(C)]
@ -79,7 +78,6 @@ pub struct DataBucket {
mmap: MmapMut, mmap: MmapMut,
pub cell_size: u64, pub cell_size: u64,
pub capacity_pow2: u8, pub capacity_pow2: u8,
pub bytes: u64,
pub used: AtomicU64, pub used: AtomicU64,
pub stats: Arc<BucketStats>, pub stats: Arc<BucketStats>,
pub max_search: MaxSearch, pub max_search: MaxSearch,
@ -116,7 +114,6 @@ impl DataBucket {
used: AtomicU64::new(0), used: AtomicU64::new(0),
capacity_pow2, capacity_pow2,
stats, stats,
bytes: 1 << capacity_pow2,
max_search, max_search,
} }
} }
@ -339,10 +336,9 @@ impl DataBucket {
self.mmap = new_map; self.mmap = new_map;
self.path = new_file; self.path = new_file;
self.capacity_pow2 += increment; self.capacity_pow2 += increment;
self.bytes = 1 << self.capacity_pow2;
remove_file(old_file).unwrap(); remove_file(old_file).unwrap();
m.stop(); m.stop();
let sz = self.bytes; let sz = 1 << self.capacity_pow2;
{ {
let mut max = self.stats.max_size.lock().unwrap(); let mut max = self.stats.max_size.lock().unwrap();
*max = std::cmp::max(*max, sz); *max = std::cmp::max(*max, sz);
@ -351,6 +347,6 @@ impl DataBucket {
self.stats.resize_us.fetch_add(m.as_us(), Ordering::Relaxed); self.stats.resize_us.fetch_add(m.as_us(), Ordering::Relaxed);
} }
pub fn num_cells(&self) -> u64 { pub fn num_cells(&self) -> u64 {
self.bytes 1 << self.capacity_pow2
} }
} }