From b80cf357a0751fcb594d29c56509d2c6912066c8 Mon Sep 17 00:00:00 2001
From: Changgyoo Park <wvwwvwwv@me.com>
Date: Thu, 11 Jul 2024 13:29:30 +0200
Subject: [PATCH 1/2] Add SccIndexTable

---
 src/adapters/mod.rs |  4 +--
 src/adapters/scc.rs | 88 ++++++++++++++++++++++++++++++++++++---------
 src/bench.rs        |  1 +
 3 files changed, 74 insertions(+), 19 deletions(-)

diff --git a/src/adapters/mod.rs b/src/adapters/mod.rs
index 43b686e..af5fa2b 100644
--- a/src/adapters/mod.rs
+++ b/src/adapters/mod.rs
@@ -1,8 +1,8 @@
 pub use self::{
     btreemap::ParkingLotRwLockBTreeMapTable, btreemap::StdRwLockBTreeMapTable,
     chashmap::CHashMapTable, contrie::ContrieTable, crossbeam_skiplist::CrossbeamSkipMapTable,
-    dashmap::DashMapTable, evmap::EvmapTable, flurry::FlurryTable, scc::SccMapTable,
-    std::ParkingLotRwLockStdHashMapTable, std::StdRwLockStdHashMapTable,
+    dashmap::DashMapTable, evmap::EvmapTable, flurry::FlurryTable, scc::SccIndexTable,
+    scc::SccMapTable, std::ParkingLotRwLockStdHashMapTable, std::StdRwLockStdHashMapTable,
 };
 
 mod btreemap;
diff --git a/src/adapters/scc.rs b/src/adapters/scc.rs
index 7c26889..f59c4ff 100644
--- a/src/adapters/scc.rs
+++ b/src/adapters/scc.rs
@@ -1,25 +1,26 @@
+use bustle::*;
 use std::hash::{BuildHasher, Hash};
 use std::sync::Arc;
 
 use super::Value;
-use bustle::*;
-use scc::hash_map::{Entry, HashMap};
 
 #[derive(Clone)]
-pub struct SccMapTable<K, H>(Arc<HashMap<K, Value, H>>)
-where
-    K: Eq + Hash,
-    H: BuildHasher;
+pub struct SccMapTable<K: Eq + Hash + Sync + 'static, H: BuildHasher + 'static>(
+    Arc<scc::HashMap<K, Value, H>>,
+);
 
 impl<K, H> Collection for SccMapTable<K, H>
 where
-    K: Send + Sync + From<u64> + Copy + 'static + Hash + Eq + std::fmt::Debug,
-    H: BuildHasher + Default + Send + Sync + 'static + Clone,
+    K: Send + Sync + From<u64> + Copy + Hash + Ord + 'static,
+    H: BuildHasher + Default + Send + Sync + Clone + 'static,
 {
     type Handle = Self;
 
     fn with_capacity(capacity: usize) -> Self {
-        Self(Arc::new(HashMap::with_capacity_and_hasher(
+        for _ in 0..4096 {
+            drop(scc::ebr::Guard::new());
+        }
+        Self(Arc::new(scc::HashMap::with_capacity_and_hasher(
             capacity,
             H::default(),
         )))
@@ -32,13 +33,13 @@ where
 
 impl<K, H> CollectionHandle for SccMapTable<K, H>
 where
-    K: Send + Sync + From<u64> + Copy + 'static + Hash + Eq + std::fmt::Debug,
-    H: BuildHasher + Default + Send + Sync + 'static + Clone,
+    K: Send + Sync + From<u64> + Copy + Hash + Ord + 'static,
+    H: BuildHasher + Default + Send + Sync + Clone + 'static,
 {
     type Key = K;
 
     fn get(&mut self, key: &Self::Key) -> bool {
-        self.0.read(key, |_, v| *v).is_some()
+        self.0.read(key, |_, _| ()).is_some()
     }
 
     fn insert(&mut self, key: &Self::Key) -> bool {
@@ -50,12 +51,65 @@ where
     }
 
     fn update(&mut self, key: &Self::Key) -> bool {
-        match self.0.entry(*key) {
-            Entry::Occupied(mut v) => {
-                *v.get_mut() += 1;
-                true
+        self.0.update(key, |_, v| *v += 1).is_some()
+    }
+}
+
+#[derive(Clone)]
+pub struct SccIndexTable<K: Clone + Eq + Hash + Sync + 'static, H: BuildHasher + 'static>(
+    Arc<scc::HashIndex<K, Value, H>>,
+);
+
+impl<K, H> Collection for SccIndexTable<K, H>
+where
+    K: Send + Sync + From<u64> + Copy + Hash + Ord + 'static,
+    H: BuildHasher + Default + Send + Sync + Clone + 'static,
+{
+    type Handle = Self;
+
+    fn with_capacity(capacity: usize) -> Self {
+        for _ in 0..4096 {
+            drop(scc::ebr::Guard::new());
+        }
+        Self(Arc::new(scc::HashIndex::with_capacity_and_hasher(
+            capacity,
+            H::default(),
+        )))
+    }
+
+    fn pin(&self) -> Self::Handle {
+        self.clone()
+    }
+}
+
+impl<K, H> CollectionHandle for SccIndexTable<K, H>
+where
+    K: Send + Sync + From<u64> + Copy + Hash + Ord + 'static,
+    H: BuildHasher + Default + Send + Sync + Clone + 'static,
+{
+    type Key = K;
+
+    fn get(&mut self, key: &Self::Key) -> bool {
+        self.0.peek_with(key, |_, _| ()).is_some()
+    }
+
+    fn insert(&mut self, key: &Self::Key) -> bool {
+        self.0.insert(*key, 0).is_ok()
+    }
+
+    fn remove(&mut self, key: &Self::Key) -> bool {
+        self.0.remove(key)
+    }
+
+    fn update(&mut self, key: &Self::Key) -> bool {
+        if let scc::hash_index::Entry::Occupied(mut o) = self.0.entry(*key) {
+            unsafe {
+                let val = o.get_mut();
+                *val += 1;
             }
-            Entry::Vacant(_) => false,
+            true
+        } else {
+            false
         }
     }
 }
diff --git a/src/bench.rs b/src/bench.rs
index 7f7541e..a9a549c 100644
--- a/src/bench.rs
+++ b/src/bench.rs
@@ -121,6 +121,7 @@ where
     case::<EvmapTable<u64, H>>("Evmap", options, h);
     case::<ContrieTable<u64, H>>("Contrie", options, h);
     case::<SccMapTable<u64, H>>("SccMap", options, h);
+    case::<SccMapTable<u64, H>>("SccIndex", options, h);
 }
 
 pub fn bench(options: &Options) {

From 63852031efa730859f05e28639b64556548c4560 Mon Sep 17 00:00:00 2001
From: Changgyoo Park <wvwwvwwv@me.com>
Date: Thu, 11 Jul 2024 13:32:28 +0200
Subject: [PATCH 2/2] Cleanup

---
 src/adapters/scc.rs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/adapters/scc.rs b/src/adapters/scc.rs
index f59c4ff..0af4e3f 100644
--- a/src/adapters/scc.rs
+++ b/src/adapters/scc.rs
@@ -17,9 +17,6 @@ where
     type Handle = Self;
 
     fn with_capacity(capacity: usize) -> Self {
-        for _ in 0..4096 {
-            drop(scc::ebr::Guard::new());
-        }
         Self(Arc::new(scc::HashMap::with_capacity_and_hasher(
             capacity,
             H::default(),
@@ -68,9 +65,6 @@ where
     type Handle = Self;
 
     fn with_capacity(capacity: usize) -> Self {
-        for _ in 0..4096 {
-            drop(scc::ebr::Guard::new());
-        }
         Self(Arc::new(scc::HashIndex::with_capacity_and_hasher(
             capacity,
             H::default(),