status-im
/
op-geth
mirror of https://github.com/status-im/op-geth.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into poc-9

This commit is contained in:
obscuren 2015-03-05 17:46:40 +01:00
parent 377c8a13de 72bf02bf15
commit d44fe4ec62
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
trie/iterator.go
View File

@ -1,6 +1,8 @@
package trie package trie
import "bytes" import (
"bytes"
)
type Iterator struct { type Iterator struct {
trie *Trie trie *Trie
@ -10,22 +12,28 @@ type Iterator struct {
} }
func NewIterator(trie *Trie) *Iterator { func NewIterator(trie *Trie) *Iterator {
return &Iterator{trie: trie, Key: make([]byte, 32)} return &Iterator{trie: trie, Key: nil}
} }
func (self *Iterator) Next() bool { func (self *Iterator) Next() bool {
self.trie.mu.Lock() self.trie.mu.Lock()
defer self.trie.mu.Unlock() defer self.trie.mu.Unlock()
isIterStart := false
if self.Key == nil {
isIterStart = true
self.Key = make([]byte, 32)
}
key := RemTerm(CompactHexDecode(string(self.Key))) key := RemTerm(CompactHexDecode(string(self.Key)))
k := self.next(self.trie.root, key) k := self.next(self.trie.root, key, isIterStart)
self.Key = []byte(DecodeCompact(k)) self.Key = []byte(DecodeCompact(k))
return len(k) > 0 return len(k) > 0
} }
func (self *Iterator) next(node Node, key []byte) []byte { func (self *Iterator) next(node Node, key []byte, isIterStart bool) []byte {
if node == nil { if node == nil {
return nil return nil
} }
@ -33,7 +41,7 @@ func (self *Iterator) next(node Node, key []byte) []byte {
switch node := node.(type) { switch node := node.(type) {
case *FullNode: case *FullNode:
if len(key) > 0 { if len(key) > 0 {
k := self.next(node.branch(key[0]), key[1:]) k := self.next(node.branch(key[0]), key[1:], isIterStart)
if k != nil { if k != nil {
return append([]byte{key[0]}, k...) return append([]byte{key[0]}, k...)
} }
@ -54,7 +62,13 @@ func (self *Iterator) next(node Node, key []byte) []byte {
case *ShortNode: case *ShortNode:
k := RemTerm(node.Key()) k := RemTerm(node.Key())
if vnode, ok := node.Value().(*ValueNode); ok { if vnode, ok := node.Value().(*ValueNode); ok {
if bytes.Compare([]byte(k), key) > 0 { switch bytes.Compare([]byte(k), key) {
case 0:
if isIterStart {
self.Value = vnode.Val()
return k
}
case 1:
self.Value = vnode.Val() self.Value = vnode.Val()
return k return k
} }
@ -64,7 +78,7 @@ func (self *Iterator) next(node Node, key []byte) []byte {
var ret []byte var ret []byte
skey := key[len(k):] skey := key[len(k):]
if BeginsWith(key, k) { if BeginsWith(key, k) {
ret = self.next(cnode, skey) ret = self.next(cnode, skey, isIterStart)
} else if bytes.Compare(k, key[:len(k)]) > 0 { } else if bytes.Compare(k, key[:len(k)]) > 0 {
return self.key(node) return self.key(node)
} }

2
trie/trie_test.go
View File

@ -271,7 +271,7 @@ func TestLargeData(t *testing.T) {
trie := NewEmpty() trie := NewEmpty()
vals := make(map[string]*kv) vals := make(map[string]*kv)
for i := byte(1); i < 255; i++ { for i := byte(0); i < 255; i++ {
value := &kv{ethutil.LeftPadBytes([]byte{i}, 32), []byte{i}, false} value := &kv{ethutil.LeftPadBytes([]byte{i}, 32), []byte{i}, false}
value2 := &kv{ethutil.LeftPadBytes([]byte{10, i}, 32), []byte{i}, false} value2 := &kv{ethutil.LeftPadBytes([]byte{10, i}, 32), []byte{i}, false}
trie.Update(value.k, value.v) trie.Update(value.k, value.v)