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

core/filtermaps: use Range iterator

Browse source
This commit is contained in:
Felix Lange 2025-03-14 16:59:56 +01:00
parent 1363a69abe
commit 90297009c1
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/filtermaps/map_renderer.go
View file

@ -401,7 +401,7 @@ func (r *mapRenderer) writeFinishedMaps(pauseCb func() bool) error {
mapIndices []uint32 mapIndices []uint32
rows []FilterRow rows []FilterRow
) )
for mapIndex := r.finished.First(); mapIndex < r.finished.AfterLast(); mapIndex++ { for mapIndex := range r.finished.Iter() {
row := r.finishedMaps[mapIndex].filterMap[rowIndex] row := r.finishedMaps[mapIndex].filterMap[rowIndex]
if fm, _ := r.f.filterMapCache.Get(mapIndex); fm != nil && row.Equal(fm[rowIndex]) { if fm, _ := r.f.filterMapCache.Get(mapIndex); fm != nil && row.Equal(fm[rowIndex]) {
continue continue
@ -426,7 +426,7 @@ func (r *mapRenderer) writeFinishedMaps(pauseCb func() bool) error {
// update filter map cache // update filter map cache
if newRange.maps.AfterLast() == r.finished.AfterLast() { if newRange.maps.AfterLast() == r.finished.AfterLast() {
// head updated; cache new head maps and remove future entries // head updated; cache new head maps and remove future entries
for mapIndex := r.finished.First(); mapIndex < r.finished.AfterLast(); mapIndex++ { for mapIndex := range r.finished.Iter() {
r.f.filterMapCache.Add(mapIndex, r.finishedMaps[mapIndex].filterMap) r.f.filterMapCache.Add(mapIndex, r.finishedMaps[mapIndex].filterMap)
} }
for mapIndex := r.finished.AfterLast(); mapIndex < oldRange.maps.AfterLast(); mapIndex++ { for mapIndex := r.finished.AfterLast(); mapIndex < oldRange.maps.AfterLast(); mapIndex++ {
@ -435,13 +435,13 @@ func (r *mapRenderer) writeFinishedMaps(pauseCb func() bool) error {
} else { } else {
// head not updated; do not cache maps during tail rendering because we // head not updated; do not cache maps during tail rendering because we
// need head maps to be available in the cache // need head maps to be available in the cache
for mapIndex := r.finished.First(); mapIndex < r.finished.AfterLast(); mapIndex++ { for mapIndex := range r.finished.Iter() {
r.f.filterMapCache.Remove(mapIndex) r.f.filterMapCache.Remove(mapIndex)
} }
} }
// add or update block pointers // add or update block pointers
blockNumber := r.finishedMaps[r.finished.First()].firstBlock() blockNumber := r.finishedMaps[r.finished.First()].firstBlock()
for mapIndex := r.finished.First(); mapIndex < r.finished.AfterLast(); mapIndex++ { for mapIndex := range r.finished.Iter() {
renderedMap := r.finishedMaps[mapIndex] renderedMap := r.finishedMaps[mapIndex]
r.f.storeLastBlockOfMap(batch, mapIndex, renderedMap.lastBlock, renderedMap.lastBlockId) r.f.storeLastBlockOfMap(batch, mapIndex, renderedMap.lastBlock, renderedMap.lastBlockId)
checkWriteCnt() checkWriteCnt()