Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: use cache first when get StorageTrie/Trie #10

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

fix: use cache first when get StorageTrie/Trie #10

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7655b97
fix: use cache first when get StorageTrie/Trie
krish-nr Sep 22, 2023
f7c0ed0
Merge branch 'develop' into fix_trie_cache
krish-nr Oct 19, 2023
e3e99de
Merge branch 'develop' into fix_trie_cache
owen-reorg Jan 5, 2024
ea76cd9
update: use Copy() & update LRU cache
krish-nr Jan 5, 2024
27216fe
Merge remote-tracking branch 'origin/fix_trie_cache' into fix_trie_cache
krish-nr Jan 5, 2024
100d7ff
Merge branch 'develop' into fix_trie_cache
owen-reorg Jan 5, 2024
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
18 changes: 18 additions & 0 deletions core/state/database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,13 @@ func (db *cachingDB) purgeLoop() {

// OpenTrie opens the main account trie at a specific root hash.
func (db *cachingDB) OpenTrie(root common.Hash) (Trie, error) {
//try cache first
if db.accountTrieCache != nil {
if tr, ok := db.accountTrieCache.Get(root); ok {
return tr.(*trie.SecureTrie), nil
krish-nr marked this conversation as resolved.
Show resolved Hide resolved
}
}

tr, err := trie.NewStateTrie(trie.StateTrieID(root), db.triedb)
if err != nil {
return nil, err
Expand All @@ -247,6 +254,17 @@ func (db *cachingDB) OpenTrie(root common.Hash) (Trie, error) {

// OpenStorageTrie opens the storage trie of an account.
func (db *cachingDB) OpenStorageTrie(stateRoot common.Hash, addrHash, root common.Hash) (Trie, error) {
// try cache first
if db.storageTrieCache != nil {
if tries, exist := db.storageTrieCache.Get(addrHash); exist {
for _, triePair := range tries {
if triePair != nil && triePair.root == root {
return triePair.trie.(*trie.SecureTrie).Copy(), nil
}
}
}
}

tr, err := trie.NewStateTrie(trie.StorageTrieID(stateRoot, addrHash, root), db.triedb)
if err != nil {
return nil, err
Expand Down
Loading