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

trie: add some attempt at concurrency

Browse source
This commit is contained in:
Péter Szilágyi 2024-05-10 11:05:26 +03:00
parent eae228f0d8
commit 7995342b3b
1 changed files with 50 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
trie/trie.go
View file

@ -22,12 +22,14 @@ import (
"errors"
"fmt"
"slices"
"sync"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/trie/trienode"
"github.com/ethereum/go-ethereum/triedb/database"
"golang.org/x/sync/errgroup"
)
// Trie is a Merkle Patricia Trie. Use New to create a trie that sits on
@ -303,13 +305,9 @@ func (t *Trie) getBatch(origNode node, keys [][]byte, pos int) ([][]byte, node,
}
case *fullNode:
var (
clone *fullNode
values = make([][]byte, 0, len(keys))
fail error
first int
)
for first < len(keys) {
// Split the keys into subsets groupped by fullnode child nibble
offsets := make([][2]int, 0, len(keys))
for first := 0; first < len(keys); {
last := len(keys)
for i, key := range keys[first+1:] {
if keys[first][pos] != key[pos] {
@ -317,19 +315,53 @@ func (t *Trie) getBatch(origNode node, keys [][]byte, pos int) ([][]byte, node,
break
}
}
results, newnode, didResolve, err := t.getBatch(n.Children[keys[first][pos]], keys[first:last], pos+1)
if err != nil && fail == nil {
fail = err
}
if err == nil && didResolve {
if clone == nil {
clone = n.copy()
}
clone.Children[keys[first][pos]] = newnode
}
values = append(values, results...)
offsets = append(offsets, [2]int{first, last})
first = last
}
// Resolve the subkeys sequentially or parallel based on how many there are
var (
values = make([][]byte, len(keys))
clone *fullNode
fail error
)
if len(offsets) < 8 {
for _, offset := range offsets {
results, newnode, didResolve, err := t.getBatch(n.Children[keys[offset[0]][pos]], keys[offset[0]:offset[1]], pos+1)
if err == nil && didResolve {
if clone == nil {
clone = n.copy()
}
clone.Children[keys[offset[0]][pos]] = newnode
}
copy(values[offset[0]:], results)
if err != nil && fail == nil {
fail = err
}
}
} else {
var (
workers errgroup.Group
lock sync.Mutex
)
for _, offset := range offsets {
offset := offset // Closure for the worker
workers.Go(func() error {
results, newnode, didResolve, err := t.getBatch(n.Children[keys[offset[0]][pos]], keys[offset[0]:offset[1]], pos+1)
if err == nil && didResolve {
lock.Lock()
if clone == nil {
clone = n.copy()
}
lock.Unlock()
clone.Children[keys[offset[0]][pos]] = newnode
}
copy(values[offset[0]:], results)
return err
})
fail = workers.Wait()
}
}
if clone != nil {
n = clone
}