forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

trie: commit into clean cache without reencoding node rlps

Browse source
This commit is contained in:
Péter Szilágyi 2019-03-21 10:16:00 +02:00
parent 132168c28f
commit ec8645abea
No known key found for this signature in database
GPG key ID: E9AE538CEDF8293D
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
trie/database.go
View file

@ -723,14 +723,25 @@ func (db *Database) commit(hash common.Hash, batch ethdb.Batch) error {
if !ok { if !ok {
return nil return nil
} }
// Commit all the children and then the current node too
for _, child := range node.childs() { for _, child := range node.childs() {
if err := db.commit(child, batch); err != nil { if err := db.commit(child, batch); err != nil {
return err return err
} }
} }
if err := batch.Put(hash[:], node.rlp()); err != nil { blob := node.rlp()
if err := batch.Put(hash[:], blob); err != nil {
return err return err
} }
// Move the flushed node into the clean cache to prevent insta-reloads. This
// move should really be done **after** flushing the batch. The issue is that
// the RLP of the data is lost at that point, requiring reencoding everything.
// By doing the move here we open a window of opportunity for failure **if**
// writing the data errors out, but at that point we might have bigger issues
// anyway.
if db.cleans != nil {
db.cleans.Set(string(hash[:]), blob)
}
// If we've reached an optimal batch size, commit and start over // If we've reached an optimal batch size, commit and start over
if batch.ValueSize() >= ethdb.IdealBatchSize { if batch.ValueSize() >= ethdb.IdealBatchSize {
if err := batch.Write(); err != nil { if err := batch.Write(); err != nil {
@ -769,11 +780,6 @@ func (db *Database) uncache(hash common.Hash) {
} }
delete(db.dirties, hash) delete(db.dirties, hash)
db.dirtiesSize -= common.StorageSize(common.HashLength + int(node.size)) db.dirtiesSize -= common.StorageSize(common.HashLength + int(node.size))
// Move the flushed node into the clean cache to prevent insta-reloads
if db.cleans != nil {
db.cleans.Set(string(hash[:]), node.rlp())
}
} }
// Size returns the current storage size of the memory cache in front of the // Size returns the current storage size of the memory cache in front of the