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

trie: address comments

Browse source
This commit is contained in:
Gary Rong 2023-09-20 15:21:14 +08:00
parent a9be8e653a
commit 3d5732b4ea
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
trie/sync.go
View file

@ -370,8 +370,6 @@ func (s *Sync) Commit(dbw ethdb.Batch) error {
owner, inner := ResolvePath([]byte(path)) owner, inner := ResolvePath([]byte(path))
rawdb.DeleteTrieNode(dbw, owner, inner, common.Hash{} /* unused */, s.scheme) rawdb.DeleteTrieNode(dbw, owner, inner, common.Hash{} /* unused */, s.scheme)
} }
deletionGauge.Inc(int64(len(s.membatch.deletes)))
for hash, value := range s.membatch.codes { for hash, value := range s.membatch.codes {
rawdb.WriteCode(dbw, hash, value) rawdb.WriteCode(dbw, hash, value)
} }
@ -452,6 +450,10 @@ func (s *Sync) children(req *nodeRequest, object node) ([]*nodeRequest, error) {
// range of this internal path on disk. This would break the // range of this internal path on disk. This would break the
// guarantee for state healing. // guarantee for state healing.
// //
// While it's possible for this shortNode to overwrite a previously
// existing full node, the other branches of the fullNode can be
// retained as they remain untouched and complete.
//
// This step is only necessary for path mode, as there is no deletion // This step is only necessary for path mode, as there is no deletion
// in hash mode at all. // in hash mode at all.
if _, ok := node.Val.(hashNode); ok && s.scheme == rawdb.PathScheme { if _, ok := node.Val.(hashNode); ok && s.scheme == rawdb.PathScheme {
@ -464,6 +466,7 @@ func (s *Sync) children(req *nodeRequest, object node) ([]*nodeRequest, error) {
// overall performance. FIX IT(rjl493456442) // overall performance. FIX IT(rjl493456442)
if rawdb.HasTrieNodeInPath(s.database, owner, append(inner, key[:i]...)) { if rawdb.HasTrieNodeInPath(s.database, owner, append(inner, key[:i]...)) {
req.deletes = append(req.deletes, key[:i]) req.deletes = append(req.deletes, key[:i])
deletionGauge.Inc(1)
log.Info("Detected dangling node", "owner", owner, "path", append(inner, key[:i]...)) log.Info("Detected dangling node", "owner", owner, "path", append(inner, key[:i]...))
} }
} }