Remove tangle LRU cache (#771)

* Bogo eviction * Decrement cache size * Replace Hashmap with Vec * Bring back allow eviction * Insert before allowing eviction * Abstract partitions away (#2) * move partitions to their own type * drop guards manually * remove interned methods * remove unused methods * add safety guarantees * Re-add Cargo.lock * Remove unused test functions * Remove some hooks relics * traverse the table until we can evict something * retry eviction * remove unused import * improve eviction logs * decrease the number of partitions * add number of partitions to the tangle config * avoid zero partitions * fix clippy lints * Nits * Config nits * move max retries to a constant * Revert to match Co-authored-by: Christian Poveda <31802960+pvdrz@users.noreply.github.com> Co-authored-by: Christian Poveda <christian.poveda@iota.org>
iotaledger · Oct 15, 2021 · e0b9ad3 · e0b9ad3
1 parent ac794b4
commit e0b9ad3
Show file tree

Hide file tree

Showing 6 changed files with 195 additions and 131 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bee-tangle/Cargo.toml b/bee-tangle/Cargo.toml
@@ -18,11 +18,9 @@ bee-storage = { version = "0.9.0", path = "../bee-storage/bee-storage" }
 
 async-trait = "0.1.51"
 bitflags = "1.2.1"
-dashmap = "4.0.2"
 futures = "0.3.17"
 hashbrown = "0.11.2"
 log = "0.4.14"
-lru = "0.7.0"
 rand = "0.8.4"
 ref-cast = "1.0.6"
 serde = { version = "1.0.130", features = [ "derive" ] }

diff --git a/bee-tangle/src/config.rs b/bee-tangle/src/config.rs
@@ -3,24 +3,30 @@
 
 use serde::Deserialize;
 
+use std::num::NonZeroUsize;
+
 const DEFAULT_BELOW_MAX_DEPTH: u32 = 15;
+// SAFETY: initialised with a non-zero value.
+const DEFAULT_NUM_PARTITIONS: NonZeroUsize = unsafe { NonZeroUsize::new_unchecked(16) };
 
 /// A builder type for a tangle configuration.
 #[derive(Default, Deserialize)]
 pub struct TangleConfigBuilder {
     below_max_depth: Option<u32>,
+    num_partitions: Option<NonZeroUsize>,
 }
 
 impl TangleConfigBuilder {
-    /// Create a new `TangleConfigBuilder`.
+    /// Create a new [`TangleConfigBuilder`].
     pub fn new() -> Self {
         Self::default()
     }
 
-    /// Finish building tangle configuration, to create a `TangleConfig`.
+    /// Finish building tangle configuration, to create a [`TangleConfig`].
     pub fn finish(self) -> TangleConfig {
         TangleConfig {
             below_max_depth: self.below_max_depth.unwrap_or(DEFAULT_BELOW_MAX_DEPTH),
+            num_partitions: self.num_partitions.unwrap_or(DEFAULT_NUM_PARTITIONS),
         }
     }
 }
@@ -29,10 +35,11 @@ impl TangleConfigBuilder {
 #[derive(Clone)]
 pub struct TangleConfig {
     below_max_depth: u32,
+    num_partitions: NonZeroUsize,
 }
 
 impl TangleConfig {
-    /// Begin building a new `TangleConfig`.
+    /// Begin building a new [`TangleConfig`].
     pub fn build() -> TangleConfigBuilder {
         TangleConfigBuilder::new()
     }
@@ -41,4 +48,9 @@ impl TangleConfig {
     pub fn below_max_depth(&self) -> u32 {
         self.below_max_depth
     }
+
+    /// Get the value of `num_partitions`.
+    pub fn num_partitions(&self) -> NonZeroUsize {
+        self.num_partitions
+    }
 }
diff --git a/bee-tangle/src/lib.rs b/bee-tangle/src/lib.rs
@@ -33,6 +33,7 @@ pub mod urts;
 mod conflict;
 mod vec_set;
 mod vertex;
+mod vertices;
 
 pub use conflict::ConflictReason;
 pub use tangle::Tangle;