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

Update journal.go

Browse source
This commit is contained in:
oooLowNeoNooo 2025-10-01 18:45:09 +02:00 committed by GitHub
parent 057667151b
commit 201742c4b9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
triedb/pathdb/journal.go
View file

@ -97,12 +97,12 @@ func (db *Database) loadJournal(diskRoot common.Hash) (layer, error) {
// Load the disk layer from the journal // Load the disk layer from the journal
base, err := db.loadDiskLayer(r) base, err := db.loadDiskLayer(r)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("failed to load disk layer from journal: %w", err)
} }
// Load all the diff layers from the journal // Load all the diff layers from the journal
head, err := db.loadDiffLayer(base, r) head, err := db.loadDiffLayer(base, r)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("failed to load diff layers from journal: %w", err)
} }
log.Debug("Loaded layer journal", "diskroot", diskRoot, "diffhead", head.rootHash()) log.Debug("Loaded layer journal", "diskroot", diskRoot, "diffhead", head.rootHash())
return head, nil return head, nil
@ -202,12 +202,12 @@ func (db *Database) loadDiskLayer(r *rlp.Stream) (layer, error) {
// Resolve nodes cached in aggregated buffer // Resolve nodes cached in aggregated buffer
var nodes nodeSet var nodes nodeSet
if err := nodes.decode(r); err != nil { if err := nodes.decode(r); err != nil {
return nil, err return nil, fmt.Errorf("failed to decode nodes from journal: %w", err)
} }
// Resolve flat state sets in aggregated buffer // Resolve flat state sets in aggregated buffer
var states stateSet var states stateSet
if err := states.decode(r); err != nil { if err := states.decode(r); err != nil {
return nil, err return nil, fmt.Errorf("failed to decode states from journal: %w", err)
} }
return newDiskLayer(root, id, db, nil, nil, newBuffer(db.config.WriteBufferSize, &nodes, &states, id-stored), nil), nil return newDiskLayer(root, id, db, nil, nil, newBuffer(db.config.WriteBufferSize, &nodes, &states, id-stored), nil), nil
} }
@ -231,12 +231,12 @@ func (db *Database) loadDiffLayer(parent layer, r *rlp.Stream) (layer, error) {
// Read in-memory trie nodes from journal // Read in-memory trie nodes from journal
var nodes nodeSetWithOrigin var nodes nodeSetWithOrigin
if err := nodes.decode(r); err != nil { if err := nodes.decode(r); err != nil {
return nil, err return nil, fmt.Errorf("failed to decode nodes with origin from journal: %w", err)
} }
// Read flat states set (with original value attached) from journal // Read flat states set (with original value attached) from journal
var stateSet StateSetWithOrigin var stateSet StateSetWithOrigin
if err := stateSet.decode(r); err != nil { if err := stateSet.decode(r); err != nil {
return nil, err return nil, fmt.Errorf("failed to decode state set with origin from journal: %w", err)
} }
return db.loadDiffLayer(newDiffLayer(parent, root, parent.stateID()+1, block, &nodes, &stateSet), r) return db.loadDiffLayer(newDiffLayer(parent, root, parent.stateID()+1, block, &nodes, &stateSet), r)
} }