Add compaction and fix issues + concurrency tests

freenet · Nov 8, 2023 · 92ec60b · 92ec60b
1 parent 55ab087
commit 92ec60b
Show file tree

Hide file tree

Showing 6 changed files with 392 additions and 85 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
@@ -16,7 +16,6 @@ path = "src/bin/freenet.rs"
 anyhow = "1"
 asynchronous-codec = "0.6"
 async-trait = "0.1"
-arrayvec = { workspace = true }
 axum = { version = "0.6", default-features = false, features = ["ws", "tower-log", "matched-path", "headers", "query", "http1"] }
 bincode = "1"
 blake3 = { workspace = true }
@@ -33,6 +32,7 @@ dashmap = "^5.5"
 delegate = "0.10"
 directories = "5"
 either = { workspace = true , features = ["serde"] }
+fs4 = "0.7"
 futures = "0.3.21"
 libp2p = { version = "0.52.3", features = [
     "autonat",

diff --git a/crates/core/src/ring.rs b/crates/core/src/ring.rs
@@ -694,7 +694,7 @@ impl Ring {
                 live_tx = self
                     .acquire_new(
                         ideal_location,
-                        &missing.values().collect::<ArrayVec<_, { 5120 / 80 }>>(),
+                        &missing.values().collect::<Vec<_>>(),
                         &notifier,
                         self.max_connections - open_connections,
                     )
@@ -738,7 +738,7 @@ impl Ring {
                 live_tx = self
                     .acquire_new(
                         ideal_location,
-                        &missing.values().collect::<ArrayVec<_, { 5120 / 80 }>>(),
+                        &missing.values().collect::<Vec<_>>(),
                         &notifier,
                         should_swap.len(),
                     )

diff --git a/crates/core/src/runtime/contract_store.rs b/crates/core/src/runtime/contract_store.rs
@@ -98,7 +98,7 @@ impl ContractStore {
             return result;
         }
 
-        self.key_to_code_part.get(&key.id()).and_then(|key| {
+        self.key_to_code_part.get(key.id()).and_then(|key| {
             let code_hash = key.value().1;
             let path = code_hash.encode();
             let key_path = self.contracts_dir.join(path).with_extension("wasm");
@@ -161,7 +161,7 @@ impl ContractStore {
         Self::insert(
             &mut self.index_file,
             &mut self.key_to_code_part,
-            key.id(),
+            *key.id(),
             *code_hash,
         )?;
 
@@ -188,7 +188,7 @@ impl ContractStore {
                 RuntimeInnerError::UnwrapContract
             })?,
         };
-        if let Some((_, (offset, _))) = self.key_to_code_part.remove(&key.id()) {
+        if let Some((_, (offset, _))) = self.key_to_code_part.remove(key.id()) {
             Self::remove(KEY_FILE_PATH.get().expect("infallible"), offset)?;
         }
         let key_path = self
@@ -200,7 +200,7 @@ impl ContractStore {
     }
 
     pub fn code_hash_from_key(&self, key: &ContractKey) -> Option<CodeHash> {
-        self.key_to_code_part.get(&key.id()).map(|r| r.value().1)
+        self.key_to_code_part.get(key.id()).map(|r| r.value().1)
     }
 }