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

core/state/snapshot: address comment from martin

Browse source
This commit is contained in:
Gary Rong 2024-11-26 13:53:12 +08:00
parent 7880adbe1a
commit 492d8f476c
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/state/snapshot/journal.go
View file

@ -34,8 +34,9 @@ import (
) )
const ( const (
journalInitVersion uint64 = 0 // initial version journalV0 uint64 = 0 // initial version
journalCurrentVersion uint64 = 1 // current version, with destruct flag (in diff layers) removed journalV1 uint64 = 1 // current version, with destruct flag (in diff layers) removed
journalCurrentVersion = journalV1
) )
// journalGenerator is a disk layer entry containing the generator progress marker. // journalGenerator is a disk layer entry containing the generator progress marker.
@ -291,7 +292,7 @@ func iterateJournal(db ethdb.KeyValueReader, callback journalCallback) error {
log.Warn("Failed to resolve the journal version", "error", err) log.Warn("Failed to resolve the journal version", "error", err)
return errors.New("failed to resolve journal version") return errors.New("failed to resolve journal version")
} }
if version != journalInitVersion && version != journalCurrentVersion { if version != journalV0 && version != journalCurrentVersion {
log.Warn("Discarded journal with wrong version", "required", journalCurrentVersion, "got", version) log.Warn("Discarded journal with wrong version", "required", journalCurrentVersion, "got", version)
return errors.New("wrong journal version") return errors.New("wrong journal version")
} }
@ -342,13 +343,13 @@ func iterateJournal(db ethdb.KeyValueReader, callback journalCallback) error {
// This approach minimizes snapshot regeneration for Geth nodes upgrading from a // This approach minimizes snapshot regeneration for Geth nodes upgrading from a
// legacy version that are already synced. The workaround can be safely removed // legacy version that are already synced. The workaround can be safely removed
// after the next hard fork. // after the next hard fork.
if version == journalInitVersion { if version == journalV0 {
var destructs []journalDestruct var destructs []journalDestruct
if err := r.Decode(&destructs); err != nil { if err := r.Decode(&destructs); err != nil {
return fmt.Errorf("load diff destructs: %v", err) return fmt.Errorf("load diff destructs: %v", err)
} }
if len(destructs) > 0 { if len(destructs) > 0 {
log.Warn("Incompatible legacy journal detected", "version", journalInitVersion) log.Warn("Incompatible legacy journal detected", "version", journalV0)
return fmt.Errorf("incompatible legacy journal detected") return fmt.Errorf("incompatible legacy journal detected")
} }
} }