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

New nodes map with capacity

Browse source
This commit is contained in:
maskpp 2024-05-04 10:19:06 +08:00
parent 86a1f0c394
commit d8f21c5a36
6 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/state/statedb.go
View file

@ -947,7 +947,7 @@ func (s *StateDB) fastDeleteStorage(addrHash common.Hash, root common.Hash) (com
var ( var (
size common.StorageSize size common.StorageSize
nodes = trienode.NewNodeSet(addrHash) nodes = trienode.NewNodeSet(addrHash, 0)
slots = make(map[common.Hash][]byte) slots = make(map[common.Hash][]byte)
) )
stack := trie.NewStackTrie(func(path []byte, hash common.Hash, blob []byte) { stack := trie.NewStackTrie(func(path []byte, hash common.Hash, blob []byte) {
@ -989,7 +989,7 @@ func (s *StateDB) slowDeleteStorage(addr common.Address, addrHash common.Hash, r
} }
var ( var (
size common.StorageSize size common.StorageSize
nodes = trienode.NewNodeSet(addrHash) nodes = trienode.NewNodeSet(addrHash, 0)
slots = make(map[common.Hash][]byte) slots = make(map[common.Hash][]byte)
) )
for it.Next(true) { for it.Next(true) {

4
trie/trie.go
View file

@ -622,7 +622,7 @@ func (t *Trie) Commit(collectLeaf bool) (common.Hash, *trienode.NodeSet, error)
if len(paths) == 0 { if len(paths) == 0 {
return types.EmptyRootHash, nil, nil // case (a) return types.EmptyRootHash, nil, nil // case (a)
} }
nodes := trienode.NewNodeSet(t.owner) nodes := trienode.NewNodeSet(t.owner, len(paths))
for _, path := range paths { for _, path := range paths {
nodes.AddNode([]byte(path), trienode.NewDeleted()) nodes.AddNode([]byte(path), trienode.NewDeleted())
} }
@ -640,7 +640,7 @@ func (t *Trie) Commit(collectLeaf bool) (common.Hash, *trienode.NodeSet, error)
t.root = hashedNode t.root = hashedNode
return rootHash, nil, nil return rootHash, nil, nil
} }
nodes := trienode.NewNodeSet(t.owner) nodes := trienode.NewNodeSet(t.owner, len(t.tracer.deletedNodes()))
for _, path := range t.tracer.deletedNodes() { for _, path := range t.tracer.deletedNodes() {
nodes.AddNode([]byte(path), trienode.NewDeleted()) nodes.AddNode([]byte(path), trienode.NewDeleted())
} }

6
trie/trienode/node.go
View file

@ -68,10 +68,10 @@ type NodeSet struct {
// NewNodeSet initializes a node set. The owner is zero for the account trie and // NewNodeSet initializes a node set. The owner is zero for the account trie and
// the owning account address hash for storage tries. // the owning account address hash for storage tries.
func NewNodeSet(owner common.Hash) *NodeSet { func NewNodeSet(owner common.Hash, capacity int) *NodeSet {
return &NodeSet{ return &NodeSet{
Owner: owner, Owner: owner,
Nodes: make(map[string]*Node), Nodes: make(map[string]*Node, capacity),
} }
} }
@ -186,7 +186,7 @@ func (set *MergedNodeSet) Merge(other *NodeSet) error {
// Flatten returns a two-dimensional map for internal nodes. // Flatten returns a two-dimensional map for internal nodes.
func (set *MergedNodeSet) Flatten() map[common.Hash]map[string]*Node { func (set *MergedNodeSet) Flatten() map[common.Hash]map[string]*Node {
nodes := make(map[common.Hash]map[string]*Node) nodes := make(map[common.Hash]map[string]*Node, len(set.Sets))
for owner, set := range set.Sets { for owner, set := range set.Sets {
nodes[owner] = set.Nodes nodes[owner] = set.Nodes
} }

6
trie/trienode/node_test.go
View file

@ -34,8 +34,8 @@ func BenchmarkMerge(b *testing.B) {
} }
func benchmarkMerge(b *testing.B, count int) { func benchmarkMerge(b *testing.B, count int) {
x := NewNodeSet(common.Hash{}) x := NewNodeSet(common.Hash{}, count)
y := NewNodeSet(common.Hash{}) y := NewNodeSet(common.Hash{}, count)
addNode := func(s *NodeSet) { addNode := func(s *NodeSet) {
path := make([]byte, 4) path := make([]byte, 4)
rand.Read(path) rand.Read(path)
@ -52,7 +52,7 @@ func benchmarkMerge(b *testing.B, count int) {
b.ResetTimer() b.ResetTimer()
for i := 0; i < b.N; i++ { for i := 0; i < b.N; i++ {
// Store set x into a backup // Store set x into a backup
z := NewNodeSet(common.Hash{}) z := NewNodeSet(common.Hash{}, len(x.Nodes))
z.Merge(common.Hash{}, x.Nodes) z.Merge(common.Hash{}, x.Nodes)
// Merge y into x // Merge y into x
x.Merge(common.Hash{}, y.Nodes) x.Merge(common.Hash{}, y.Nodes)

2
trie/verkle.go
View file

@ -226,7 +226,7 @@ func (t *VerkleTrie) Commit(_ bool) (common.Hash, *trienode.NodeSet, error) {
if err != nil { if err != nil {
return common.Hash{}, nil, fmt.Errorf("serializing tree nodes: %s", err) return common.Hash{}, nil, fmt.Errorf("serializing tree nodes: %s", err)
} }
nodeset := trienode.NewNodeSet(common.Hash{}) nodeset := trienode.NewNodeSet(common.Hash{}, len(nodes))
for _, node := range nodes { for _, node := range nodes {
// hash parameter is not used in pathdb // hash parameter is not used in pathdb
nodeset.AddNode(node.Path, trienode.New(common.Hash{}, node.SerializedBytes)) nodeset.AddNode(node.Path, trienode.New(common.Hash{}, node.SerializedBytes))

2
triedb/pathdb/testutils.go
View file

@ -83,7 +83,7 @@ func (h *testHasher) Delete(key []byte) error {
func (h *testHasher) Commit(collectLeaf bool) (common.Hash, *trienode.NodeSet, error) { func (h *testHasher) Commit(collectLeaf bool) (common.Hash, *trienode.NodeSet, error) {
var ( var (
nodes = make(map[common.Hash][]byte) nodes = make(map[common.Hash][]byte)
set = trienode.NewNodeSet(h.owner) set = trienode.NewNodeSet(h.owner, len(h.dirties))
) )
for hash, val := range h.cleans { for hash, val := range h.cleans {
nodes[hash] = val nodes[hash] = val