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

trie/trienode: minor optimization in nodeset merging

Browse source
This commit is contained in:
Martin Holst Swende 2024-10-03 15:18:18 +02:00
parent 3609881707
commit 5c4588667d
No known key found for this signature in database
GPG key ID: 683B438C05A5DDF0
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
trie/trienode/node.go
View file

@ -102,6 +102,8 @@ func (set *NodeSet) AddNode(path []byte, n *Node) {
set.Nodes[string(path)] = n set.Nodes[string(path)] = n
} }
// MergeSet mergest set with other. It assumes that the sets are disjunct, so
// that it does not need to deduplicate data (count deletes, dedup leaves etc).
func (set *NodeSet) MergeSet(other *NodeSet) error { func (set *NodeSet) MergeSet(other *NodeSet) error {
if set.Owner != other.Owner { if set.Owner != other.Owner {
return fmt.Errorf("nodesets belong to different owner are not mergeable %x-%x", set.Owner, other.Owner) return fmt.Errorf("nodesets belong to different owner are not mergeable %x-%x", set.Owner, other.Owner)
@ -109,22 +111,12 @@ func (set *NodeSet) MergeSet(other *NodeSet) error {
set.mu.Lock() set.mu.Lock()
defer set.mu.Unlock() defer set.mu.Unlock()
for path, node := range other.Nodes { for path, node := range other.Nodes {
prev, ok := set.Nodes[path]
if ok {
// overwrite happens, revoke the counter
if prev.IsDeleted() {
set.deletes -= 1
} else {
set.updates -= 1
}
}
if node.IsDeleted() {
set.deletes += 1
} else {
set.updates += 1
}
set.Nodes[path] = node set.Nodes[path] = node
} }
set.deletes += other.deletes
set.updates += other.updates
// Since we assume the sets are disjunct, we can safely append leaves
// like this without dedup.
set.Leaves = append(set.Leaves, other.Leaves...) set.Leaves = append(set.Leaves, other.Leaves...)
return nil return nil
} }