Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Rework the trie cache #12982

Merged
paritytech-processbot merged 14 commits into from
Jan 26, 2023
Merged

Rework the trie cache #12982

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f41d1e4
Rework the trie cache
koute Dec 20, 2022
06b7aaa
Align `state-machine` tests
koute Dec 20, 2022
6c64b66
Bump `schnellru` to 0.1.1
koute Dec 20, 2022
6727c1b
Fix off-by-one
koute Dec 20, 2022
95a9550
Align to review comments
koute Jan 10, 2023
add6312
Bump `ahash` to 0.8.2
koute Jan 10, 2023
01569b2
Merge remote-tracking branch 'origin/master' into master_trie_cache_r…
koute Jan 10, 2023
dba6fcd
Bump `schnellru` to 0.2.0
koute Jan 13, 2023
27807a0
Merge remote-tracking branch 'origin/master' into master_trie_cache_r…
koute Jan 13, 2023
5dd58f9
Bump `schnellru` to 0.2.1
koute Jan 25, 2023
6d088c4
Merge remote-tracking branch 'origin/master' into master_trie_cache_r…
koute Jan 25, 2023
d2203a2
Remove unnecessary bound
koute Jan 25, 2023
223bc9b
Remove unnecessary loop when calculating maximum memory usage
koute Jan 25, 2023
d1557da
Remove unnecessary `mut`s
koute Jan 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 43 additions & 14 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client/db/src/bench.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion client/db/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1169,7 +1169,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))
}),
};

Expand Down
4 changes: 2 additions & 2 deletions primitives/trie/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
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 }
Expand All @@ -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.1", optional = true }

[dev-dependencies]
array-bytes = "4.1"
Expand All @@ -50,7 +50,7 @@ std = [
"hashbrown",
"hash-db/std",
"lazy_static",
"lru",
"schnellru",
"memory-db/std",
"nohash-hasher",
"parking_lot",
Expand Down
Loading