forked from cerc-io/plugeth
trie: fix two issues in trie iterator (#24539)
* trie: fix memory leak in trie iterator In the trie iterator, live nodes are tracked in a stack while iterating. Popped node states should be explictly set to nil in order to get garbage-collected. * trie: fix empty trie iterator
This commit is contained in:
parent
c3701b265e
commit
fb2ae8e995
@ -154,8 +154,11 @@ func (e seekError) Error() string {
|
||||
}
|
||||
|
||||
func newNodeIterator(trie *Trie, start []byte) NodeIterator {
|
||||
if trie.Hash() == emptyState {
|
||||
return new(nodeIterator)
|
||||
if trie.Hash() == emptyRoot {
|
||||
return &nodeIterator{
|
||||
trie: trie,
|
||||
err: errIteratorEnd,
|
||||
}
|
||||
}
|
||||
it := &nodeIterator{trie: trie}
|
||||
it.err = it.seek(start)
|
||||
@ -425,7 +428,7 @@ func findChild(n *fullNode, index int, path []byte, ancestor common.Hash) (node,
|
||||
func (it *nodeIterator) nextChild(parent *nodeIteratorState, ancestor common.Hash) (*nodeIteratorState, []byte, bool) {
|
||||
switch node := parent.node.(type) {
|
||||
case *fullNode:
|
||||
//Full node, move to the first non-nil child.
|
||||
// Full node, move to the first non-nil child.
|
||||
if child, state, path, index := findChild(node, parent.index+1, it.path, ancestor); child != nil {
|
||||
parent.index = index - 1
|
||||
return state, path, true
|
||||
@ -503,8 +506,9 @@ func (it *nodeIterator) push(state *nodeIteratorState, parentIndex *int, path []
|
||||
}
|
||||
|
||||
func (it *nodeIterator) pop() {
|
||||
parent := it.stack[len(it.stack)-1]
|
||||
it.path = it.path[:parent.pathlen]
|
||||
last := it.stack[len(it.stack)-1]
|
||||
it.path = it.path[:last.pathlen]
|
||||
it.stack[len(it.stack)-1] = nil
|
||||
it.stack = it.stack[:len(it.stack)-1]
|
||||
}
|
||||
|
||||
|
@ -29,6 +29,19 @@ import (
|
||||
"github.com/ethereum/go-ethereum/ethdb/memorydb"
|
||||
)
|
||||
|
||||
func TestEmptyIterator(t *testing.T) {
|
||||
trie := newEmpty()
|
||||
iter := trie.NodeIterator(nil)
|
||||
|
||||
seen := make(map[string]struct{})
|
||||
for iter.Next(true) {
|
||||
seen[string(iter.Path())] = struct{}{}
|
||||
}
|
||||
if len(seen) != 0 {
|
||||
t.Fatal("Unexpected trie node iterated")
|
||||
}
|
||||
}
|
||||
|
||||
func TestIterator(t *testing.T) {
|
||||
trie := newEmpty()
|
||||
vals := []struct{ k, v string }{
|
||||
|
Loading…
Reference in New Issue
Block a user