mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-22 12:46:44 +00:00
triedb/pathdb: account shared
``` go test ./triedb/pathdb/ -bench BenchmarkAddNodes ``` > old ``` goos: linux goarch: amd64 pkg: github.com/ethereum/go-ethereum/triedb/pathdb cpu: AMD Ryzen 7 5700G with Radeon Graphics BenchmarkAddNodes/Small-100-accounts-10-nodes-16 3624 308151 ns/op 1138262 B/op 1236 allocs/op BenchmarkAddNodes/Medium-500-accounts-20-nodes-16 738 2216662 ns/op 10793841 B/op 10352 allocs/op BenchmarkAddNodes/Large-2000-accounts-40-nodes-16 44 27227664 ns/op 92272295 B/op 80897 allocs/op BenchmarkAddNodes/XLarge-5000-accounts-50-nodes-16 13 92061992 ns/op 328729686 B/op 252497 allocs/op PASS ok github.com/ethereum/go-ethereum/triedb/pathdb 20.772s ``` > new ``` goos: linux goarch: amd64 pkg: github.com/ethereum/go-ethereum/triedb/pathdb cpu: AMD Ryzen 7 5700G with Radeon Graphics BenchmarkAddNodes/Small-100-accounts-10-nodes-16 6706 232594 ns/op 673550 B/op 1215 allocs/op BenchmarkAddNodes/Medium-500-accounts-20-nodes-16 804 1292732 ns/op 5910825 B/op 10328 allocs/op BenchmarkAddNodes/Large-2000-accounts-40-nodes-16 60 20907603 ns/op 53871128 B/op 80873 allocs/op BenchmarkAddNodes/XLarge-5000-accounts-50-nodes-16 13 78489762 ns/op 208748856 B/op 252475 allocs/op PASS ok github.com/ethereum/go-ethereum/triedb/pathdb 19.420s ``` Signed-off-by: jsvisa <delweng@gmail.com>
This commit is contained in:
jsvisa
parent
c9cd48a8fb
commit
2a0b2f0511
2 changed files with 123 additions and 75 deletions
|
|
@ -27,8 +27,8 @@ import (
|
|||
"golang.org/x/sync/errgroup"
|
||||
)
|
||||
|
||||
// storageNodesShardCount is the number of shards used for storage nodes.
|
||||
const storageNodesShardCount = 16
|
||||
// trienodeShardCount is the number of shards used for trie nodes.
|
||||
const trienodeShardCount = 16
|
||||
|
||||
// storageKey returns a key for uniquely identifying the storage slot.
|
||||
func storageKey(accountHash common.Hash, slotHash common.Hash) [64]byte {
|
||||
|
|
@ -71,30 +71,31 @@ type lookup struct {
|
|||
storages map[[64]byte][]common.Hash
|
||||
|
||||
// accountNodes represents the mutation history for specific account
|
||||
// trie nodes. The key is the trie path of the node, and the value is a slice
|
||||
// trie nodes, distributed across 16 shards for efficiency.
|
||||
// The key is the trie path of the node, and the value is a slice
|
||||
// of **diff layer** IDs indicating where the account was modified,
|
||||
// with the order from oldest to newest.
|
||||
accountNodes map[string][]common.Hash
|
||||
accountNodes [trienodeShardCount]map[string][]common.Hash
|
||||
|
||||
// storageNodes represents the mutation history for specific storage
|
||||
// slot trie nodes, distributed across 16 shards for efficiency.
|
||||
// The key is the account address hash and the trie path of the node,
|
||||
// the value is a slice of **diff layer** IDs indicating where the
|
||||
// slot was modified, with the order from oldest to newest.
|
||||
storageNodes [storageNodesShardCount]map[trienodeKey][]common.Hash
|
||||
storageNodes [trienodeShardCount]map[trienodeKey][]common.Hash
|
||||
|
||||
// descendant is the callback indicating whether the layer with
|
||||
// given root is a descendant of the one specified by `ancestor`.
|
||||
descendant func(state common.Hash, ancestor common.Hash) bool
|
||||
}
|
||||
|
||||
// getStorageShardIndex returns the shard index for a given path
|
||||
func getStorageShardIndex(path string) int {
|
||||
// getNodeShardIndex returns the shard index for a given path
|
||||
func getNodeShardIndex(path string) int {
|
||||
if len(path) == 0 {
|
||||
return 0
|
||||
}
|
||||
// use the first char of the path to determine the shard index
|
||||
return int(path[0]) % storageNodesShardCount
|
||||
return int(path[0]) % trienodeShardCount
|
||||
}
|
||||
|
||||
// newLookup initializes the lookup structure.
|
||||
|
|
@ -108,14 +109,14 @@ func newLookup(head layer, descendant func(state common.Hash, ancestor common.Ha
|
|||
current = current.parentLayer()
|
||||
}
|
||||
l := &lookup{
|
||||
accounts: make(map[common.Hash][]common.Hash),
|
||||
storages: make(map[[64]byte][]common.Hash),
|
||||
accountNodes: make(map[string][]common.Hash),
|
||||
descendant: descendant,
|
||||
accounts: make(map[common.Hash][]common.Hash),
|
||||
storages: make(map[[64]byte][]common.Hash),
|
||||
descendant: descendant,
|
||||
}
|
||||
// Initialize all 16 storage node shards
|
||||
for i := 0; i < storageNodesShardCount; i++ {
|
||||
for i := 0; i < trienodeShardCount; i++ {
|
||||
l.storageNodes[i] = make(map[trienodeKey][]common.Hash)
|
||||
l.accountNodes[i] = make(map[string][]common.Hash)
|
||||
}
|
||||
|
||||
// Apply the diff layers from bottom to top
|
||||
|
|
@ -225,9 +226,10 @@ func (l *lookup) storageTip(accountHash common.Hash, slotHash common.Hash, state
|
|||
func (l *lookup) nodeTip(accountHash common.Hash, path string, stateID common.Hash, base common.Hash) common.Hash {
|
||||
var list []common.Hash
|
||||
if accountHash == (common.Hash{}) {
|
||||
list = l.accountNodes[path]
|
||||
shardIndex := getNodeShardIndex(path)
|
||||
list = l.accountNodes[shardIndex][path]
|
||||
} else {
|
||||
shardIndex := getStorageShardIndex(path) // Use only path for sharding
|
||||
shardIndex := getNodeShardIndex(path) // Use only path for sharding
|
||||
list = l.storageNodes[shardIndex][makeTrienodeKey(accountHash, path)]
|
||||
}
|
||||
for i := len(list) - 1; i >= 0; i-- {
|
||||
|
|
@ -297,14 +299,7 @@ func (l *lookup) addLayer(diff *diffLayer) {
|
|||
wg.Add(1)
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
for path := range diff.nodes.accountNodes {
|
||||
list, exists := l.accountNodes[path]
|
||||
if !exists {
|
||||
list = make([]common.Hash, 0, 16) // TODO(rjl493456442) use sync pool
|
||||
}
|
||||
list = append(list, state)
|
||||
l.accountNodes[path] = list
|
||||
}
|
||||
l.addAccountNodes(state, diff.nodes.accountNodes)
|
||||
}()
|
||||
|
||||
wg.Add(1)
|
||||
|
|
@ -335,43 +330,61 @@ func (l *lookup) addStorageNodes(state common.Hash, nodes map[common.Hash]map[st
|
|||
|
||||
var (
|
||||
wg sync.WaitGroup
|
||||
tasks = make([][]shardTask, storageNodesShardCount)
|
||||
tasks = make([][]shardTask, trienodeShardCount)
|
||||
)
|
||||
|
||||
// Pre-allocate work lists
|
||||
for accountHash, slots := range nodes {
|
||||
for path := range slots {
|
||||
shardIndex := getStorageShardIndex(path)
|
||||
shardIndex := getNodeShardIndex(path)
|
||||
tasks[shardIndex] = append(tasks[shardIndex], shardTask{
|
||||
accountHash: accountHash,
|
||||
path: path,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// Start all workers, each handling its own shard
|
||||
wg.Add(storageNodesShardCount)
|
||||
for shardIndex := 0; shardIndex < storageNodesShardCount; shardIndex++ {
|
||||
go func(shardIdx int) {
|
||||
for shardIdx := 0; shardIdx < trienodeShardCount; shardIdx++ {
|
||||
taskList := tasks[shardIdx]
|
||||
if len(taskList) == 0 {
|
||||
continue
|
||||
}
|
||||
wg.Add(1)
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
|
||||
taskList := tasks[shardIdx]
|
||||
if len(taskList) == 0 {
|
||||
return
|
||||
}
|
||||
|
||||
shard := l.storageNodes[shardIdx]
|
||||
for _, task := range taskList {
|
||||
key := makeTrienodeKey(task.accountHash, task.path)
|
||||
list, exists := shard[key]
|
||||
if !exists {
|
||||
list = make([]common.Hash, 0, 16) // TODO(rjl493456442) use sync pool
|
||||
}
|
||||
list = append(list, state)
|
||||
shard[key] = list
|
||||
shard[key] = append(shard[key], state)
|
||||
}
|
||||
}()
|
||||
}
|
||||
wg.Wait()
|
||||
}
|
||||
|
||||
}(shardIndex)
|
||||
func (l *lookup) addAccountNodes(state common.Hash, nodes map[string]*trienode.Node) {
|
||||
defer func(start time.Time) {
|
||||
lookupAddTrienodeLayerTimer.UpdateSince(start)
|
||||
}(time.Now())
|
||||
|
||||
var (
|
||||
wg sync.WaitGroup
|
||||
tasks = make([][]string, trienodeShardCount)
|
||||
)
|
||||
for path := range nodes {
|
||||
shardIndex := getNodeShardIndex(path)
|
||||
tasks[shardIndex] = append(tasks[shardIndex], path)
|
||||
}
|
||||
for shardIdx := 0; shardIdx < trienodeShardCount; shardIdx++ {
|
||||
taskList := tasks[shardIdx]
|
||||
if len(taskList) == 0 {
|
||||
continue
|
||||
}
|
||||
wg.Add(1)
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
shard := l.accountNodes[shardIdx]
|
||||
for _, path := range taskList {
|
||||
shard[path] = append(shard[path], state)
|
||||
}
|
||||
}()
|
||||
}
|
||||
wg.Wait()
|
||||
}
|
||||
|
|
@ -446,18 +459,7 @@ func (l *lookup) removeLayer(diff *diffLayer) error {
|
|||
})
|
||||
|
||||
eg.Go(func() error {
|
||||
for path := range diff.nodes.accountNodes {
|
||||
found, list := removeFromList(l.accountNodes[path], state)
|
||||
if !found {
|
||||
return fmt.Errorf("account lookup is not found, %x, state: %x", path, state)
|
||||
}
|
||||
if len(list) != 0 {
|
||||
l.accountNodes[path] = list
|
||||
} else {
|
||||
delete(l.accountNodes, path)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
return l.removeAccountNodes(state, diff.nodes.accountNodes)
|
||||
})
|
||||
|
||||
eg.Go(func() error {
|
||||
|
|
@ -473,29 +475,23 @@ func (l *lookup) removeStorageNodes(state common.Hash, nodes map[common.Hash]map
|
|||
|
||||
var (
|
||||
eg errgroup.Group
|
||||
tasks = make([][]shardTask, storageNodesShardCount)
|
||||
tasks = make([][]shardTask, trienodeShardCount)
|
||||
)
|
||||
|
||||
// Pre-allocate work lists
|
||||
for accountHash, slots := range nodes {
|
||||
for path := range slots {
|
||||
shardIndex := getStorageShardIndex(path)
|
||||
shardIndex := getNodeShardIndex(path)
|
||||
tasks[shardIndex] = append(tasks[shardIndex], shardTask{
|
||||
accountHash: accountHash,
|
||||
path: path,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// Start all workers, each handling its own shard
|
||||
for shardIndex := 0; shardIndex < storageNodesShardCount; shardIndex++ {
|
||||
shardIdx := shardIndex // Capture the variable
|
||||
for shardIdx := 0; shardIdx < trienodeShardCount; shardIdx++ {
|
||||
taskList := tasks[shardIdx]
|
||||
if len(taskList) == 0 {
|
||||
continue
|
||||
}
|
||||
eg.Go(func() error {
|
||||
taskList := tasks[shardIdx]
|
||||
if len(taskList) == 0 {
|
||||
return nil
|
||||
}
|
||||
|
||||
shard := l.storageNodes[shardIdx]
|
||||
for _, task := range taskList {
|
||||
key := makeTrienodeKey(task.accountHash, task.path)
|
||||
|
|
@ -514,3 +510,40 @@ func (l *lookup) removeStorageNodes(state common.Hash, nodes map[common.Hash]map
|
|||
}
|
||||
return eg.Wait()
|
||||
}
|
||||
|
||||
func (l *lookup) removeAccountNodes(state common.Hash, nodes map[string]*trienode.Node) error {
|
||||
defer func(start time.Time) {
|
||||
lookupRemoveTrienodeLayerTimer.UpdateSince(start)
|
||||
}(time.Now())
|
||||
|
||||
var (
|
||||
eg errgroup.Group
|
||||
tasks = make([][]string, trienodeShardCount)
|
||||
)
|
||||
for path := range nodes {
|
||||
shardIndex := getNodeShardIndex(path)
|
||||
tasks[shardIndex] = append(tasks[shardIndex], path)
|
||||
}
|
||||
for shardIdx := 0; shardIdx < trienodeShardCount; shardIdx++ {
|
||||
taskList := tasks[shardIdx]
|
||||
if len(taskList) == 0 {
|
||||
continue
|
||||
}
|
||||
eg.Go(func() error {
|
||||
shard := l.accountNodes[shardIdx]
|
||||
for _, path := range taskList {
|
||||
found, list := removeFromList(shard[path], state)
|
||||
if !found {
|
||||
return fmt.Errorf("account lookup is not found, %x, state: %x", path, state)
|
||||
}
|
||||
if len(list) != 0 {
|
||||
shard[path] = list
|
||||
} else {
|
||||
delete(shard, path)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
})
|
||||
}
|
||||
return eg.Wait()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,19 @@
|
|||
// Copyright 2025 The go-ethereum Authors
|
||||
// This file is part of the go-ethereum library.
|
||||
//
|
||||
// The go-ethereum library is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU Lesser General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// The go-ethereum library is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU Lesser General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Lesser General Public License
|
||||
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
package pathdb
|
||||
|
||||
import (
|
||||
|
|
@ -74,13 +90,12 @@ func BenchmarkAddNodes(b *testing.B) {
|
|||
b.Run(tc.name, func(b *testing.B) {
|
||||
storageNodes := generateRandomStorageNodes(tc.accountNodeCount, tc.nodesPerAccount)
|
||||
|
||||
lookup := &lookup{
|
||||
accountNodes: make(map[string][]common.Hash),
|
||||
}
|
||||
lookup := &lookup{}
|
||||
|
||||
// Initialize all 16 storage node shards
|
||||
for i := 0; i < storageNodesShardCount; i++ {
|
||||
for i := 0; i < trienodeShardCount; i++ {
|
||||
lookup.storageNodes[i] = make(map[trienodeKey][]common.Hash)
|
||||
lookup.accountNodes[i] = make(map[string][]common.Hash)
|
||||
}
|
||||
|
||||
var state common.Hash
|
||||
|
|
@ -91,7 +106,7 @@ func BenchmarkAddNodes(b *testing.B) {
|
|||
|
||||
for i := 0; i < b.N; i++ {
|
||||
// Reset the lookup instance for each benchmark iteration
|
||||
for j := 0; j < storageNodesShardCount; j++ {
|
||||
for j := 0; j < trienodeShardCount; j++ {
|
||||
lookup.storageNodes[j] = make(map[trienodeKey][]common.Hash)
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue