cerc-io/go-ethereum
18
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases 66 Wiki Activity

Patch for concurrent iterator & others (onto v1.11.6) #386

Closed
roysc wants to merge 1565 commits from v1.11.6-statediff-v5 into master
pull from: v1.11.6-statediff-v5
merge into: cerc-io:master
Conversation 0 Commits 1565 Files Changed 1471 +7 -3
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 57a65f00c9 - Show all commits

10
trie/database.go
View File

@ -662,8 +662,9 @@ func (db *Database) Commit(node common.Hash, report bool, callback func(common.H
// Uncache any leftovers in the last batch // Uncache any leftovers in the last batch
db.lock.Lock() db.lock.Lock()
defer db.lock.Unlock() defer db.lock.Unlock()
if err := batch.Replay(uncacher); err != nil {
batch.Replay(uncacher) return err
}
batch.Reset() batch.Reset()
// Reset the storage counters and bumped metrics // Reset the storage counters and bumped metrics
@ -711,9 +712,12 @@ func (db *Database) commit(hash common.Hash, batch ethdb.Batch, uncacher *cleane
return err return err
} }
db.lock.Lock() db.lock.Lock()
batch.Replay(uncacher) err := batch.Replay(uncacher)
batch.Reset() batch.Reset()
db.lock.Unlock() db.lock.Unlock()
if err != nil {
return err
}
} }
return nil return nil
} }