Skip to content

Commit 11ec7fe

Browse files
Remove fastcache finalizer, not using fastcache
This upstream PR removed use of fastcache in favor of a size-bounded LRU cache ethereum/go-ethereum#26162
1 parent 5061259 commit 11ec7fe

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

core/state/database.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package state
1919
import (
2020
"errors"
2121
"fmt"
22-
"runtime"
2322

2423
"github.com/ethereum/go-ethereum/common"
2524
"github.com/ethereum/go-ethereum/common/lru"
@@ -143,7 +142,6 @@ func NewDatabaseWithConfig(db ethdb.Database, config *trie.Config) Database {
143142
codeCache: lru.NewSizeConstrainedCache[common.Hash, []byte](codeCacheSize),
144143
triedb: trie.NewDatabaseWithConfig(db, config),
145144
}
146-
runtime.SetFinalizer(cdb, (*cachingDB).finalizer)
147145
return cdb
148146
}
149147

@@ -155,7 +153,6 @@ func NewDatabaseWithNodeDB(db ethdb.Database, triedb *trie.Database) Database {
155153
codeCache: lru.NewSizeConstrainedCache[common.Hash, []byte](codeCacheSize),
156154
triedb: triedb,
157155
}
158-
runtime.SetFinalizer(cdb, (*cachingDB).finalizer)
159156
return cdb
160157
}
161158

@@ -175,11 +172,6 @@ func (db *cachingDB) OpenTrie(root common.Hash) (Trie, error) {
175172
return tr, nil
176173
}
177174

178-
// fastcache chunks are not mannaged by GC.
179-
func (db *cachingDB) finalizer() {
180-
db.codeCache.Reset()
181-
}
182-
183175
// OpenStorageTrie opens the storage trie of an account.
184176
func (db *cachingDB) OpenStorageTrie(stateRoot common.Hash, addrHash, root common.Hash) (Trie, error) {
185177
tr, err := trie.NewStateTrie(trie.StorageTrieID(stateRoot, addrHash, root), db.triedb)

0 commit comments

Comments
 (0)