fix lfu to hash

tickbh · Jun 17, 2024 · 281410b · 281410b
1 parent 9e700fb
commit 281410b
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 17 deletions.
diff --git a/src/cache/arc.rs b/src/cache/arc.rs
@@ -53,6 +53,12 @@ pub struct ArcCache<K, V, S> {
     cap: usize,
 }
 
+impl<K: Hash + Eq, V> Default for ArcCache<K, V, DefaultHasher> {
+    fn default() -> Self {
+        ArcCache::new(100 )
+    }
+}
+
 impl<K: Hash + Eq, V> ArcCache<K, V, DefaultHasher> {
     /// 因为存在四个数组, 所以实际的容量为这个的4倍
     pub fn new(cap: usize) -> Self {

diff --git a/src/cache/lfu.rs b/src/cache/lfu.rs
@@ -20,7 +20,7 @@ use std::{
     ptr::NonNull,
 };
 
-use crate::{HashMap, HashSet, DefaultHasher};
+use crate::{DefaultHasher, HashMap, LruCache};
 use lazy_static::lazy_static;
 
 use super::{KeyRef, KeyWrapper};
@@ -118,7 +118,7 @@ impl<K, V> LfuEntry<K, V> {
 /// ```
 pub struct LfuCache<K, V, S> {
     map: HashMap<KeyRef<K>, NonNull<LfuEntry<K, V>>, S>,
-    times_map: HashMap<u8, HashSet<KeyRef<K>>>,
+    times_map: HashMap<u8, LruCache<KeyRef<K>, (), DefaultHasher>>,
     cap: usize,
     max_freq: u8,
     min_freq: u8,
@@ -402,7 +402,8 @@ impl<K: Hash + Eq, V, S: BuildHasher> LfuCache<K, V, S> {
             self.times_map
                 .entry(freq)
                 .or_default()
-                .insert((*entry).key_ref());
+                .reserve(1)
+                .insert((*entry).key_ref(), ());
 
             self.check_reduce();
         }
@@ -427,7 +428,8 @@ impl<K: Hash + Eq, V, S: BuildHasher> LfuCache<K, V, S> {
                         self.times_map
                             .entry(next)
                             .or_default()
-                            .insert((*node).key_ref());
+                            .reserve(1)
+                            .insert((*node).key_ref(), ());
                     }
                 }
             }
@@ -833,14 +835,15 @@ impl<K: Hash + Eq, V, S: BuildHasher> LfuCache<K, V, S> {
         }
     }
 
-    fn _pop_one(keys: &mut HashSet<KeyRef<K>>) -> Option<KeyRef<K>> {
-        let k = if let Some(k) = keys.iter().next() {
-            KeyRef { k: k.k }
-        } else {
-            return None;
-        };
-        keys.remove(&k);
-        Some(k)
+    fn _pop_one(keys: &mut LruCache<KeyRef<K>, (), DefaultHasher>) -> Option<KeyRef<K>> {
+        keys.pop().map(|(k, _)| k)
+        // let k = if let Some(k) = keys.iter().next() {
+        //     KeyRef { k: k.k }
+        // } else {
+        //     return None;
+        // };
+        // keys.remove(&k);
+        // Some(k)
     }
 }
 
@@ -941,7 +944,7 @@ impl<'a, K: Hash + Eq, V, S: BuildHasher> Iterator for Iter<'a, K, V, S> {
                 if let Some(s) = self.base.times_map.get(&i) {
                     if s.len() != 0 {
                         self.now_freq = i.saturating_sub(1);
-                        self.now_keys = Some(s.iter().map(|s| KeyRef { k: s.k }).collect());
+                        self.now_keys = Some(s.iter().map(|s| KeyRef { k: s.0.k }).collect());
                         break;
                     }
                 }
@@ -980,7 +983,7 @@ impl<'a, K: Hash + Eq, V, S: BuildHasher> DoubleEndedIterator for Iter<'a, K, V,
                 if let Some(s) = self.base.times_map.get(&i) {
                     if s.len() != 0 {
                         self.now_freq = i.saturating_sub(1);
-                        self.now_keys = Some(s.iter().map(|s| KeyRef { k: s.k }).collect());
+                        self.now_keys = Some(s.iter().map(|s| KeyRef { k: s.0.k }).collect());
                         break;
                     }
                 }
@@ -1035,7 +1038,7 @@ impl<'a, K: Hash + Eq, V, S: BuildHasher> Iterator for IterMut<'a, K, V, S> {
                 if let Some(s) = self.base.times_map.get(&i) {
                     if s.len() != 0 {
                         self.now_freq = i.saturating_sub(1);
-                        self.now_keys = Some(s.iter().map(|s| KeyRef { k: s.k }).collect());
+                        self.now_keys = Some(s.iter().map(|s| KeyRef { k: s.0.k }).collect());
                         break;
                     }
                 }
@@ -1074,7 +1077,7 @@ impl<'a, K: Hash + Eq, V, S: BuildHasher> DoubleEndedIterator for IterMut<'a, K,
                 if let Some(s) = self.base.times_map.get(&i) {
                     if s.len() != 0 {
                         self.now_freq = i.saturating_sub(1);
-                        self.now_keys = Some(s.iter().map(|s| KeyRef { k: s.k }).collect());
+                        self.now_keys = Some(s.iter().map(|s| KeyRef { k: s.0.k }).collect());
                         break;
                     }
                 }

diff --git a/src/cache/lru.rs b/src/cache/lru.rs
@@ -80,6 +80,12 @@ pub struct LruCache<K, V, S> {
     tail: *mut LruEntry<K, V>,
 }
 
+impl<K: Hash + Eq, V> Default for LruCache<K, V, DefaultHasher> {
+    fn default() -> Self {
+        LruCache::new(100 )
+    }
+}
+
 impl<K: Hash + Eq, V> LruCache<K, V, DefaultHasher> {
     pub fn new(cap: usize) -> Self {
         LruCache::with_hasher(cap, DefaultHasher::default())
@@ -167,8 +173,9 @@ impl<K, V, S> LruCache<K, V, S> {
     }
 
     /// 扩展当前容量
-    pub fn reserve(&mut self, additional: usize) {
+    pub fn reserve(&mut self, additional: usize) -> &mut Self {
         self.cap += additional;
+        self
     }
 
     /// 遍历当前的所有值

diff --git a/src/cache/lruk.rs b/src/cache/lruk.rs
@@ -88,6 +88,12 @@ pub struct LruKCache<K, V, S> {
     lru_count: usize,
 }
 
+impl<K: Hash + Eq, V> Default for LruKCache<K, V, DefaultHasher> {
+    fn default() -> Self {
+        LruKCache::new(100 )
+    }
+}
+
 impl<K: Hash + Eq, V> LruKCache<K, V, DefaultHasher> {
     pub fn new(cap: usize) -> Self {
         LruKCache::with_hasher(cap, DEFAULT_TIMESK, DefaultHasher::default())