Rework the trie cache (paritytech#12982)

* Rework the trie cache * Align `state-machine` tests * Bump `schnellru` to 0.1.1 * Fix off-by-one * Align to review comments * Bump `ahash` to 0.8.2 * Bump `schnellru` to 0.2.0 * Bump `schnellru` to 0.2.1 * Remove unnecessary bound * Remove unnecessary loop when calculating maximum memory usage * Remove unnecessary `mut`s
ltfschoen · Feb 22, 2023 · c73275c · c73275c
1 parent 21f439c
commit c73275c
Show file tree

Hide file tree

Showing 9 changed files with 1,016 additions and 550 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/client/db/src/bench.rs b/client/db/src/bench.rs
@@ -110,7 +110,7 @@ impl<B: BlockT> BenchmarkingState<B> {
 			proof_recorder_root: Cell::new(root),
 			enable_tracking,
 			// Enable the cache, but do not sync anything to the shared state.
-			shared_trie_cache: SharedTrieCache::new(CacheSize::Maximum(0)),
+			shared_trie_cache: SharedTrieCache::new(CacheSize::new(0)),
 		};
 
 		state.add_whitelist_to_tracker();

diff --git a/client/db/src/lib.rs b/client/db/src/lib.rs
@@ -1243,7 +1243,7 @@ impl<Block: BlockT> Backend<Block> {
 			blocks_pruning: config.blocks_pruning,
 			genesis_state: RwLock::new(None),
 			shared_trie_cache: config.trie_cache_maximum_size.map(|maximum_size| {
-				SharedTrieCache::new(sp_trie::cache::CacheSize::Maximum(maximum_size))
+				SharedTrieCache::new(sp_trie::cache::CacheSize::new(maximum_size))
 			}),
 		};
 

diff --git a/client/finality-grandpa/Cargo.toml b/client/finality-grandpa/Cargo.toml
@@ -14,7 +14,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-ahash = "0.7.6"
+ahash = "0.8.2"
 array-bytes = "4.1"
 async-trait = "0.1.57"
 dyn-clone = "1.0"

diff --git a/client/network-gossip/Cargo.toml b/client/network-gossip/Cargo.toml
@@ -14,7 +14,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-ahash = "0.7.6"
+ahash = "0.8.2"
 futures = "0.3.21"
 futures-timer = "3.0.1"
 libp2p = "0.50.0"

diff --git a/primitives/state-machine/src/trie_backend.rs b/primitives/state-machine/src/trie_backend.rs
@@ -412,19 +412,19 @@ pub mod tests {
 			fn $name() {
 				let parameters = vec![
 					(StateVersion::V0, None, None),
-					(StateVersion::V0, Some(SharedCache::new(CacheSize::Unlimited)), None),
+					(StateVersion::V0, Some(SharedCache::new(CacheSize::unlimited())), None),
 					(StateVersion::V0, None, Some(Recorder::default())),
 					(
 						StateVersion::V0,
-						Some(SharedCache::new(CacheSize::Unlimited)),
+						Some(SharedCache::new(CacheSize::unlimited())),
 						Some(Recorder::default()),
 					),
 					(StateVersion::V1, None, None),
-					(StateVersion::V1, Some(SharedCache::new(CacheSize::Unlimited)), None),
+					(StateVersion::V1, Some(SharedCache::new(CacheSize::unlimited())), None),
 					(StateVersion::V1, None, Some(Recorder::default())),
 					(
 						StateVersion::V1,
-						Some(SharedCache::new(CacheSize::Unlimited)),
+						Some(SharedCache::new(CacheSize::unlimited())),
 						Some(Recorder::default()),
 					),
 				];
@@ -760,7 +760,7 @@ pub mod tests {
 			.clone()
 			.for_each(|i| assert_eq!(trie.storage(&[i]).unwrap().unwrap(), vec![i; size_content]));
 
-		for cache in [Some(SharedTrieCache::new(CacheSize::Unlimited)), None] {
+		for cache in [Some(SharedTrieCache::new(CacheSize::unlimited())), None] {
 			// Run multiple times to have a different cache conditions.
 			for i in 0..5 {
 				if let Some(cache) = &cache {
@@ -793,7 +793,7 @@ pub mod tests {
 		proof_record_works_with_iter_inner(StateVersion::V1);
 	}
 	fn proof_record_works_with_iter_inner(state_version: StateVersion) {
-		for cache in [Some(SharedTrieCache::new(CacheSize::Unlimited)), None] {
+		for cache in [Some(SharedTrieCache::new(CacheSize::unlimited())), None] {
 			// Run multiple times to have a different cache conditions.
 			for i in 0..5 {
 				if let Some(cache) = &cache {
@@ -870,7 +870,7 @@ pub mod tests {
 			assert_eq!(in_memory.child_storage(child_info_2, &[i]).unwrap().unwrap(), vec![i])
 		});
 
-		for cache in [Some(SharedTrieCache::new(CacheSize::Unlimited)), None] {
+		for cache in [Some(SharedTrieCache::new(CacheSize::unlimited())), None] {
 			// Run multiple times to have a different cache conditions.
 			for i in 0..5 {
 				eprintln!("Running with cache {}, iteration {}", cache.is_some(), i);
@@ -1002,7 +1002,7 @@ pub mod tests {
 			nodes
 		};
 
-		let cache = SharedTrieCache::<BlakeTwo256>::new(CacheSize::Unlimited);
+		let cache = SharedTrieCache::<BlakeTwo256>::new(CacheSize::unlimited());
 		{
 			let local_cache = cache.local_cache();
 			let mut trie_cache = local_cache.as_trie_db_cache(child_1_root);
@@ -1093,7 +1093,7 @@ pub mod tests {
 
 	#[test]
 	fn new_data_is_added_to_the_cache() {
-		let shared_cache = SharedTrieCache::new(CacheSize::Unlimited);
+		let shared_cache = SharedTrieCache::new(CacheSize::unlimited());
 		let new_data = vec![
 			(&b"new_data0"[..], Some(&b"0"[..])),
 			(&b"new_data1"[..], Some(&b"1"[..])),
@@ -1159,7 +1159,7 @@ pub mod tests {
 		assert_eq!(in_memory.child_storage(child_info_1, &key).unwrap().unwrap(), child_trie_1_val);
 		assert_eq!(in_memory.child_storage(child_info_2, &key).unwrap().unwrap(), child_trie_2_val);
 
-		for cache in [Some(SharedTrieCache::new(CacheSize::Unlimited)), None] {
+		for cache in [Some(SharedTrieCache::new(CacheSize::unlimited())), None] {
 			// Run multiple times to have a different cache conditions.
 			for i in 0..5 {
 				eprintln!("Running with cache {}, iteration {}", cache.is_some(), i);

diff --git a/primitives/trie/Cargo.toml b/primitives/trie/Cargo.toml
@@ -18,12 +18,11 @@ name = "bench"
 harness = false
 
 [dependencies]
-ahash = { version = "0.7.6", optional = true }
+ahash = { version = "0.8.2", optional = true }
 codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false }
 hashbrown = { version = "0.12.3", optional = true }
 hash-db = { version = "0.15.2", default-features = false }
 lazy_static = { version = "1.4.0", optional = true }
-lru = { version = "0.8.1", optional = true }
 memory-db = { version = "0.31.0", default-features = false }
 nohash-hasher = { version = "0.2.0", optional = true }
 parking_lot = { version = "0.12.1", optional = true }
@@ -34,6 +33,7 @@ trie-db = { version = "0.24.0", default-features = false }
 trie-root = { version = "0.17.0", default-features = false }
 sp-core = { version = "7.0.0", default-features = false, path = "../core" }
 sp-std = { version = "5.0.0", default-features = false, path = "../std" }
+schnellru = { version = "0.2.1", optional = true }
 
 [dev-dependencies]
 array-bytes = "4.1"
@@ -50,7 +50,7 @@ std = [
 	"hashbrown",
 	"hash-db/std",
 	"lazy_static",
-	"lru",
+	"schnellru",
 	"memory-db/std",
 	"nohash-hasher",
 	"parking_lot",