forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

trie: fix more path comparison

Browse source
This commit is contained in:
Gary Rong 2023-12-12 16:44:38 +08:00
parent bbc0c64074
commit 2e3e4ecda5
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
trie/iterator.go
View file

@ -135,7 +135,7 @@ type nodeIteratorState struct {
node node // Trie node being iterated node node // Trie node being iterated
parent common.Hash // Hash of the first full ancestor node (nil if current is the root) parent common.Hash // Hash of the first full ancestor node (nil if current is the root)
index int // Child to be processed next index int // Child to be processed next
pathlen int // Length of the path to this node pathlen int // Length of the path to the parent node
} }
type nodeIterator struct { type nodeIterator struct {
@ -304,6 +304,7 @@ func (it *nodeIterator) seek(prefix []byte) error {
// The path we're looking for is the hex encoded key without terminator. // The path we're looking for is the hex encoded key without terminator.
key := keybytesToHex(prefix) key := keybytesToHex(prefix)
key = key[:len(key)-1] key = key[:len(key)-1]
// Move forward until we're just before the closest match to key. // Move forward until we're just before the closest match to key.
for { for {
state, parentIndex, path, err := it.peekSeek(key) state, parentIndex, path, err := it.peekSeek(key)
@ -339,7 +340,6 @@ func (it *nodeIterator) peek(descend bool) (*nodeIteratorState, *int, []byte, er
// If we're skipping children, pop the current node first // If we're skipping children, pop the current node first
it.pop() it.pop()
} }
// Continue iteration to the next child // Continue iteration to the next child
for len(it.stack) > 0 { for len(it.stack) > 0 {
parent := it.stack[len(it.stack)-1] parent := it.stack[len(it.stack)-1]
@ -372,7 +372,6 @@ func (it *nodeIterator) peekSeek(seekKey []byte) (*nodeIteratorState, *int, []by
// If we're skipping children, pop the current node first // If we're skipping children, pop the current node first
it.pop() it.pop()
} }
// Continue iteration to the next child // Continue iteration to the next child
for len(it.stack) > 0 { for len(it.stack) > 0 {
parent := it.stack[len(it.stack)-1] parent := it.stack[len(it.stack)-1]
@ -453,12 +452,14 @@ func (it *nodeIterator) findChild(n *fullNode, index int, ancestor common.Hash)
if n.Children[index] != nil { if n.Children[index] != nil {
child = n.Children[index] child = n.Children[index]
hash, _ := child.cache() hash, _ := child.cache()
state = it.getFromPool() state = it.getFromPool()
state.hash = common.BytesToHash(hash) state.hash = common.BytesToHash(hash)
state.node = child state.node = child
state.parent = ancestor state.parent = ancestor
state.index = -1 state.index = -1
state.pathlen = len(path) state.pathlen = len(path)
childPath = append(childPath, path...) childPath = append(childPath, path...)
childPath = append(childPath, byte(index)) childPath = append(childPath, byte(index))
return child, state, childPath, index return child, state, childPath, index
@ -504,7 +505,7 @@ func (it *nodeIterator) nextChildAt(parent *nodeIteratorState, ancestor common.H
return parent, it.path, false return parent, it.path, false
} }
// If the child we found is already past the seek position, just return it. // If the child we found is already past the seek position, just return it.
if bytes.Compare(path, key) >= 0 { if reachedPath(path, key) {
parent.index = prevChildIndex(index) parent.index = prevChildIndex(index)
return state, path, true return state, path, true
} }
@ -513,7 +514,7 @@ func (it *nodeIterator) nextChildAt(parent *nodeIteratorState, ancestor common.H
nextChild, nextState, nextPath, nextIndex := it.findChild(n, nextChildIndex(index), ancestor) nextChild, nextState, nextPath, nextIndex := it.findChild(n, nextChildIndex(index), ancestor)
// If we run out of children, or skipped past the target, return the // If we run out of children, or skipped past the target, return the
// previous one // previous one
if nextChild == nil || bytes.Compare(nextPath, key) >= 0 { if nextChild == nil || reachedPath(nextPath, key) {
parent.index = prevChildIndex(index) parent.index = prevChildIndex(index)
return state, path, true return state, path, true
} }