Skip to content

trie: optimize compactToHex and cleanup encoding logic #33364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
therainisme wants to merge 1 commit into
base: master
Choose a base branch
from
+35 −14
Open

trie: optimize compactToHex and cleanup encoding logic #33364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 29 additions & 12 deletions trie/encoding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,22 +83,39 @@ func compactToHex(compact []byte) []byte {
if len(compact) == 0 {
return compact
}
base := keybytesToHex(compact)
// delete terminator flag
if base[0] < 2 {
base = base[:len(base)-1]
}
// apply odd flag
chop := 2 - base[0]&1
return base[chop:]
baseLen := len(compact) * 2
first := compact[0]
// Add terminator length if it's a leaf (flag >= 2)
if first>>4 >= 2 {
baseLen += 1
}
// Calculate chop: 2 if even (flag&1 == 0), 1 if odd (flag&1 == 1)
chop := 2 - int(first>>4&1)

hex := make([]byte, baseLen-chop)

idx := 0
if chop == 1 {
hex[0] = first & 0x0f
idx = 1
}
for i := 1; i < len(compact); i++ {
hex[idx] = compact[i] >> 4
hex[idx+1] = compact[i] & 0x0f
idx += 2
}
if first>>4 >= 2 {
hex[len(hex)-1] = 16
}
return hex
}

func keybytesToHex(str []byte) []byte {
l := len(str)*2 + 1
var nibbles = make([]byte, l)
for i, b := range str {
nibbles[i*2] = b / 16
nibbles[i*2+1] = b % 16
nibbles[i*2] = b >> 4
nibbles[i*2+1] = b & 0x0f
}
nibbles[l-1] = 16
return nibbles
Expand All @@ -110,8 +127,8 @@ func keybytesToHex(str []byte) []byte {
func writeHexKey(dst []byte, key []byte) []byte {
_ = dst[2*len(key)-1]
for i, b := range key {
dst[i*2] = b / 16
dst[i*2+1] = b % 16
dst[i*2] = b >> 4
dst[i*2+1] = b & 0x0f
}
return dst[:2*len(key)]
}
Expand Down
8 changes: 6 additions & 2 deletions trie/trie.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ import (
"golang.org/x/sync/errgroup"
)

// maxUnhashedNodesForSingleThread is the threshold of unhashed nodes to trigger
// parallel hashing or committing.
const maxUnhashedNodesForSingleThread = 100

// Trie represents a Merkle Patricia Trie. Use New to create a trie that operates
// on top of a node database. During a commit operation, the trie collects all
// modified nodes into a set for return. After committing, the trie becomes
Expand Down Expand Up @@ -760,7 +764,7 @@ func (t *Trie) Commit(collectLeaf bool) (common.Hash, *trienode.NodeSet) {
nodes.AddNode(path, trienode.NewDeletedWithPrev(t.prevalueTracer.Get(path)))
}
// If the number of changes is below 100, we let one thread handle it
t.root = newCommitter(nodes, t.prevalueTracer, collectLeaf).Commit(t.root, t.uncommitted > 100)
t.root = newCommitter(nodes, t.prevalueTracer, collectLeaf).Commit(t.root, t.uncommitted > maxUnhashedNodesForSingleThread)
t.uncommitted = 0
return rootHash, nodes
}
Expand All @@ -771,7 +775,7 @@ func (t *Trie) hashRoot() []byte {
return types.EmptyRootHash.Bytes()
}
// If the number of changes is below 100, we let one thread handle it
h := newHasher(t.unhashed >= 100)
h := newHasher(t.unhashed >= maxUnhashedNodesForSingleThread)
defer func() {
returnHasherToPool(h)
t.unhashed = 0
Expand Down