Skip to content

Commit 7e4c12e

Browse files
committed
fix: use usize as bytes capacity
1 parent ec22ba3 commit 7e4c12e

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

src/common/cache/src/cache.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ pub trait Cache<K: Eq + Hash + MemSized, V: MemSized> {
7272

7373
fn items_capacity(&self) -> u64;
7474

75-
fn set_bytes_capacity(&mut self, capacity: u64);
75+
fn set_bytes_capacity(&mut self, capacity: usize);
7676

77-
fn set_items_capacity(&mut self, capacity: u64);
77+
fn set_items_capacity(&mut self, capacity: usize);
7878

7979
/// Returns the bytes size of all the key-value pairs in the cache.
8080
fn bytes_size(&self) -> u64;

src/common/cache/src/cache/lru.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -301,19 +301,18 @@ impl<K: Eq + Hash + MemSized, V: MemSized> Cache<K, V> for LruCache<K, V> {
301301
self.max_items as u64
302302
}
303303

304-
fn set_bytes_capacity(&mut self, capacity: u64) {
305-
// TODO refine this
306-
while self.bytes > self.max_bytes || self.map.len() > self.max_items {
304+
fn set_bytes_capacity(&mut self, max_bytes: usize) {
305+
while self.bytes > max_bytes || self.map.len() > self.max_items {
307306
self.pop_by_policy();
308307
}
309-
self.max_bytes = capacity as usize;
308+
self.max_bytes = max_bytes;
310309
}
311310

312-
fn set_items_capacity(&mut self, capacity: u64) {
313-
while self.bytes > self.max_bytes || self.map.len() > self.max_items {
311+
fn set_items_capacity(&mut self, max_items: usize) {
312+
while self.bytes > self.max_bytes || self.map.len() > max_items {
314313
self.pop_by_policy();
315314
}
316-
self.max_items = capacity as usize;
315+
self.max_items = max_items;
317316
}
318317

319318
/// Returns the bytes size of all the key-value pairs in the cache.

src/query/storages/common/cache/src/providers/memory_cache.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,12 @@ pub struct InMemoryLruCache<V: Into<CacheValue<V>>> {
3030
impl<V: Into<CacheValue<V>>> InMemoryLruCache<V> {
3131
pub fn set_bytes_capacity(&self, capacity: usize) {
3232
let mut cache = self.inner.write();
33-
// TODO no as please
34-
cache.set_bytes_capacity(capacity as u64);
33+
cache.set_bytes_capacity(capacity);
3534
}
3635

3736
pub fn set_items_capacity(&self, capacity: usize) {
3837
let mut cache = self.inner.write();
39-
// TODO no as please
40-
cache.set_items_capacity(capacity as u64);
38+
cache.set_items_capacity(capacity);
4139
}
4240
}
4341

0 commit comments

Comments
 (0)