gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

snapshot: iteration and buffering optimizations

Browse Source
This commit is contained in:
Martin Holst Swende
2019-10-23 15:19:02 +02:00
committed by Péter Szilágyi
parent d7d81d7c12
commit cdf3f016df
5 changed files with 96 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/state/snapshot/difflayer_journal.go
View File

@ -17,6 +17,7 @@
package snapshot
import (
"bufio"
"fmt"
"io"
"os"
@ -105,12 +106,22 @@ func (dl *diffLayer) journal() (io.WriteCloser, error) {
}
writer = file
}
dl.lock.RLock()
defer dl.lock.RUnlock()
if dl.stale {
writer.Close()
return nil, ErrSnapshotStale
}
buf := bufio.NewWriter(writer)
// Everything below was journalled, persist this layer too
if err := rlp.Encode(writer, dl.number); err != nil {
if err := rlp.Encode(buf, dl.number); err != nil {
buf.Flush()
writer.Close()
return nil, err
}
if err := rlp.Encode(writer, dl.root); err != nil {
if err := rlp.Encode(buf, dl.root); err != nil {
buf.Flush()
writer.Close()
return nil, err
}
@ -118,7 +129,8 @@ func (dl *diffLayer) journal() (io.WriteCloser, error) {
for hash, blob := range dl.accountData {
accounts = append(accounts, journalAccount{Hash: hash, Blob: blob})
}
if err := rlp.Encode(writer, accounts); err != nil {
if err := rlp.Encode(buf, accounts); err != nil {
buf.Flush()
writer.Close()
return nil, err
}
@ -132,9 +144,11 @@ func (dl *diffLayer) journal() (io.WriteCloser, error) {
}
storage = append(storage, journalStorage{Hash: hash, Keys: keys, Vals: vals})
}
if err := rlp.Encode(writer, storage); err != nil {
if err := rlp.Encode(buf, storage); err != nil {
buf.Flush()
writer.Close()
return nil, err
}
buf.Flush()
return writer, nil
}