forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-26 06:36:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix onEvicted

Browse source
This commit is contained in:
Sina Mahmoodi 2025-04-16 12:49:25 +02:00 committed by lightclient
parent eb4e231434
commit d053edfd74
No known key found for this signature in database
GPG key ID: 657913021EF45A6A
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/lru/basiclru.go
View file

@ -60,12 +60,12 @@ func (c *BasicLRU[K, V]) Add(key K, value V) (evicted bool) {
var elem *listElem[K] var elem *listElem[K]
if c.Len() >= c.cap { if c.Len() >= c.cap {
elem = c.list.removeLast() elem = c.list.removeLast()
delete(c.items, elem.v)
evicted = true
if c.onEvicted != nil { if c.onEvicted != nil {
v := c.items[elem.v] v := c.items[elem.v]
c.onEvicted(elem.v, v.value) c.onEvicted(elem.v, v.value)
} }
delete(c.items, elem.v)
evicted = true
} else { } else {
elem = new(listElem[K]) elem = new(listElem[K])
} }

10
core/rawdb/eradb/eradb.go
View file

@ -62,12 +62,14 @@ func New(datadir string) (*EraDatabase, error) {
} }
db := &EraDatabase{datadir: datadir, cache: lru.NewCache[uint64, *era.Era](openFileLimit)} db := &EraDatabase{datadir: datadir, cache: lru.NewCache[uint64, *era.Era](openFileLimit)}
db.cache.OnEvicted(func(key uint64, value *era.Era) { db.cache.OnEvicted(func(key uint64, value *era.Era) {
if value == nil {
log.Warn("Era1 cache evicted nil value", "epoch", key)
return
}
// Close the era1 file when it is evicted from the cache // Close the era1 file when it is evicted from the cache
// to avoid leaks. // to avoid leaks.
if value != nil { if err := value.Close(); err != nil {
if err := value.Close(); err != nil { log.Warn("Error closing era1 file", "epoch", key, "err", err)
log.Warn("Error closing era1 file", "epoch", key, "err", err)
}
} }
}) })
log.Info("Opened erastore", "datadir", datadir) log.Info("Opened erastore", "datadir", datadir)