add key

Author: tickbh

Cargo.toml

@@ -32,6 +32,6 @@ opt-level = 3
 debug = true
 
 [features]
-default = ["hashbrown", "ttl"]
+default = ["ttl"]
 hashbrown = []
 ttl = []

examples/zset.rs

@@ -1,7 +1,27 @@
-use algorithm::ZSet;
+use std::borrow::Borrow;
+
+use algorithm::{KeyRef, KeyWrapper, ZSet};
 fn main() {
     let mut val = ZSet::new();
-    val.add_or_update("key", 1);
-    assert_eq!(val.len(), 1);
-    println!("ok!!!!!!!!!!");
+    
+    // let wrap = KeyWrapper::from_ref(&"bb");
+    // let key_ref = KeyRef::new(&"bb");
+    // println!("aaaaaaaaaaaaaa = {}",  wrap.eq(key_ref.borrow()));
+    
+    // val.add_or_update(11, 10);
+    // val.add_or_update(22, 12);
+    // assert_eq!(val.score(&22), 12);
+    // assert_eq!(val.len(), 2);
+    // assert_eq!(val.rank(&22), 0);
+    // val.add_or_update(22, 9);
+    // assert_eq!(val.rank(&22), 1);
+    // assert_eq!(val.len(), 2);
+    // val.add_or_update("aa", 10);
+    val.add_or_update("xxx", 12);
+    assert_eq!(val.score(&"xxx"), 12);
+    assert_eq!(val.len(), 2);
+    assert_eq!(val.rank(&"bb"), 0);
+    val.add_or_update("bb", 9);
+    assert_eq!(val.rank(&"bb"), 1);
+    assert_eq!(val.len(), 2);
 }

src/key.rs

@@ -1,3 +1,4 @@
+use std::any::{type_name, TypeId};
 use std::borrow::Borrow;
 use std::hash::Hash;
 use std::ptr;
@@ -71,7 +72,10 @@ impl<Q: ?Sized + Hash> Hash for KeyWrapper<Q> {
 
 impl<Q: ?Sized + PartialEq> PartialEq for KeyWrapper<Q> {
     fn eq(&self, other: &Self) -> bool {
-        (self.0).eq(&other.0)
+        println!("aaa = {}", (self.0).eq(&other.0));
+        println!("aaabbb = {}", (&self.0).eq(&other.0));
+        println!("aaabbbccccc = {}", self.0 == other.0);
+        (&self.0).eq(&other.0)
     }
 }
 
@@ -83,6 +87,7 @@ where
     Q: ?Sized,
 {
     fn borrow(&self) -> &KeyWrapper<Q> {
+        println!("tttttttt = {} vv = {}", type_name::<K>(), type_name::<Q>());
         let key = unsafe { &*self.k }.borrow();
         KeyWrapper::from_ref(key)
     }

src/map/zset.rs

@@ -4,7 +4,7 @@ use std::{
     mem, usize,
 };
 
-use hashbrown::HashMap;
+use std::collections::HashMap;
 
 use crate::{KeyRef, KeyWrapper, SkipList, SkipNode};
 
@@ -41,6 +41,23 @@ impl<K: Hash> PartialOrd for Context<K> {
     }
 }
 
+/// 一种可排序的Set类型
+///
+/// # Examples
+///
+/// ```
+/// use algorithm::ZSet;
+/// fn main() {
+///     let mut val = ZSet::new();
+///     val.add_or_update("aa", 10);
+///     val.add_or_update("bb", 12);
+///     assert_eq!(val.len(), 2);
+///     assert_eq!(val.rank(&"bb"), 0);
+///     val.add_or_update("bb", 9);
+///     assert_eq!(val.rank(&"bb"), 1);
+///     assert_eq!(val.len(), 2);
+/// }
+/// ```
 pub struct ZSet<K: Hash + Eq> {
     max_count: usize,
     reverse: bool,
@@ -125,6 +142,7 @@ impl<K: Hash + Eq> ZSet<K> {
 
         let key_ref = KeyRef::new(unsafe { &*context.key.as_ptr() });
 
+
         if let Some(v) = self.dict.remove(&key_ref) {
             let ret = self.zsl.update(unsafe { &(*v).score }, context);
             self.dict.insert(key_ref, ret);