Skip to content

G
Geth-Modification
Commit db4aaedc authored by obscuren's avatar obscuren
Browse files
Options

Moved ptrie => trie. Removed old trie

parent 982c812e
Hide whitespace changes
Inline Side-by-side
Showing with 457 additions and 1643 deletions
core/types/derive_sha.go
View file @ db4aaedc
...@@ -3,7 +3,7 @@ package types ...@@ -3,7 +3,7 @@ package types
import ( import (
"github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/ptrie" "github.com/ethereum/go-ethereum/trie"
) )
type DerivableList interface { type DerivableList interface {
...@@ -13,7 +13,7 @@ type DerivableList interface { ...@@ -13,7 +13,7 @@ type DerivableList interface {
func DeriveSha(list DerivableList) []byte { func DeriveSha(list DerivableList) []byte {
db, _ := ethdb.NewMemDatabase() db, _ := ethdb.NewMemDatabase()
trie := ptrie.New(nil, db) trie := trie.New(nil, db)
for i := 0; i < list.Len(); i++ { for i := 0; i < list.Len(); i++ {
trie.Update(ethutil.Encode(i), list.GetRlp(i)) trie.Update(ethutil.Encode(i), list.GetRlp(i))
} }
......
ptrie/iterator.go deleted 100644 → 0
View file @ 982c812e
package ptrie
import (
"bytes"
"github.com/ethereum/go-ethereum/trie"
)
type Iterator struct {
trie *Trie
Key []byte
Value []byte
}
func NewIterator(trie *Trie) *Iterator {
return &Iterator{trie: trie, Key: make([]byte, 32)}
}
func (self *Iterator) Next() bool {
self.trie.mu.Lock()
defer self.trie.mu.Unlock()
key := trie.RemTerm(trie.CompactHexDecode(string(self.Key)))
k := self.next(self.trie.root, key)
self.Key = []byte(trie.DecodeCompact(k))
return len(k) > 0
}
func (self *Iterator) next(node Node, key []byte) []byte {
if node == nil {
return nil
}
switch node := node.(type) {
case *FullNode:
if len(key) > 0 {
k := self.next(node.branch(key[0]), key[1:])
if k != nil {
return append([]byte{key[0]}, k...)
}
}
var r byte
if len(key) > 0 {
r = key[0] + 1
}
for i := r; i < 16; i++ {
k := self.key(node.branch(byte(i)))
if k != nil {
return append([]byte{i}, k...)
}
}
case *ShortNode:
k := trie.RemTerm(node.Key())
if vnode, ok := node.Value().(*ValueNode); ok {
if bytes.Compare([]byte(k), key) > 0 {
self.Value = vnode.Val()
return k
}
} else {
cnode := node.Value()
var ret []byte
skey := key[len(k):]
if trie.BeginsWith(key, k) {
ret = self.next(cnode, skey)
} else if bytes.Compare(k, key[:len(k)]) > 0 {
ret = self.key(node)
}
if ret != nil {
return append(k, ret...)
}
}
}
return nil
}
func (self *Iterator) key(node Node) []byte {
switch node := node.(type) {
case *ShortNode:
// Leaf node
if vnode, ok := node.Value().(*ValueNode); ok {
k := trie.RemTerm(node.Key())
self.Value = vnode.Val()
return k
} else {
k := trie.RemTerm(node.Key())
return append(k, self.key(node.Value())...)
}
case *FullNode:
if node.Value() != nil {
self.Value = node.Value().(*ValueNode).Val()
return []byte{16}
}
for i := 0; i < 16; i++ {
k := self.key(node.branch(byte(i)))
if k != nil {
return append([]byte{byte(i)}, k...)
}
}
}
return nil
}
ptrie/trie.go deleted 100644 → 0
View file @ 982c812e
package ptrie
import (
"bytes"
"container/list"
"fmt"
"sync"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/trie"
)
func ParanoiaCheck(t1 *Trie, backend Backend) (bool, *Trie) {
t2 := New(nil, backend)
it := t1.Iterator()
for it.Next() {
t2.Update(it.Key, it.Value)
}
return bytes.Equal(t2.Hash(), t1.Hash()), t2
}
type Trie struct {
mu sync.Mutex
root Node
roothash []byte
cache *Cache
revisions *list.List
}
func New(root []byte, backend Backend) *Trie {
trie := &Trie{}
trie.revisions = list.New()
trie.roothash = root
trie.cache = NewCache(backend)
if root != nil {
value := ethutil.NewValueFromBytes(trie.cache.Get(root))
trie.root = trie.mknode(value)
}
return trie
}
func (self *Trie) Iterator() *Iterator {
return NewIterator(self)
}
func (self *Trie) Copy() *Trie {
return New(self.roothash, self.cache.backend)
}
// Legacy support
func (self *Trie) Root() []byte { return self.Hash() }
func (self *Trie) Hash() []byte {
var hash []byte
if self.root != nil {
t := self.root.Hash()
if byts, ok := t.([]byte); ok && len(byts) > 0 {
hash = byts
} else {
hash = crypto.Sha3(ethutil.Encode(self.root.RlpData()))
}
} else {
hash = crypto.Sha3(ethutil.Encode(""))
}
if !bytes.Equal(hash, self.roothash) {
self.revisions.PushBack(self.roothash)
self.roothash = hash
}
return hash
}
func (self *Trie) Commit() {
self.mu.Lock()
defer self.mu.Unlock()
// Hash first
self.Hash()
self.cache.Flush()
}
// Reset should only be called if the trie has been hashed
func (self *Trie) Reset() {
self.mu.Lock()
defer self.mu.Unlock()
self.cache.Reset()
if self.revisions.Len() > 0 {
revision := self.revisions.Remove(self.revisions.Back()).([]byte)
self.roothash = revision
}
value := ethutil.NewValueFromBytes(self.cache.Get(self.roothash))
self.root = self.mknode(value)
}
func (self *Trie) UpdateString(key, value string) Node { return self.Update([]byte(key), []byte(value)) }
func (self *Trie) Update(key, value []byte) Node {
self.mu.Lock()
defer self.mu.Unlock()
k := trie.CompactHexDecode(string(key))
if len(value) != 0 {
self.root = self.insert(self.root, k, &ValueNode{self, value})
} else {
self.root = self.delete(self.root, k)
}
return self.root
}
func (self *Trie) GetString(key string) []byte { return self.Get([]byte(key)) }
func (self *Trie) Get(key []byte) []byte {
self.mu.Lock()
defer self.mu.Unlock()
k := trie.CompactHexDecode(string(key))
n := self.get(self.root, k)
if n != nil {
return n.(*ValueNode).Val()
}
return nil
}
func (self *Trie) DeleteString(key string) Node { return self.Delete([]byte(key)) }
func (self *Trie) Delete(key []byte) Node {
self.mu.Lock()
defer self.mu.Unlock()
k := trie.CompactHexDecode(string(key))
self.root = self.delete(self.root, k)
return self.root
}
func (self *Trie) insert(node Node, key []byte, value Node) Node {
if len(key) == 0 {
return value
}
if node == nil {
return NewShortNode(self, key, value)
}
switch node := node.(type) {
case *ShortNode:
k := node.Key()
cnode := node.Value()
if bytes.Equal(k, key) {
return NewShortNode(self, key, value)
}
var n Node
matchlength := trie.MatchingNibbleLength(key, k)
if matchlength == len(k) {
n = self.insert(cnode, key[matchlength:], value)
} else {
pnode := self.insert(nil, k[matchlength+1:], cnode)
nnode := self.insert(nil, key[matchlength+1:], value)
fulln := NewFullNode(self)
fulln.set(k[matchlength], pnode)
fulln.set(key[matchlength], nnode)
n = fulln
}
if matchlength == 0 {
return n
}
return NewShortNode(self, key[:matchlength], n)
case *FullNode:
cpy := node.Copy().(*FullNode)
cpy.set(key[0], self.insert(node.branch(key[0]), key[1:], value))
return cpy
default:
panic(fmt.Sprintf("%T: invalid node: %v", node, node))
}
}
func (self *Trie) get(node Node, key []byte) Node {
if len(key) == 0 {
return node
}
if node == nil {
return nil
}
switch node := node.(type) {
case *ShortNode:
k := node.Key()
cnode := node.Value()
if len(key) >= len(k) && bytes.Equal(k, key[:len(k)]) {
return self.get(cnode, key[len(k):])
}
return nil
case *FullNode:
return self.get(node.branch(key[0]), key[1:])
default:
panic(fmt.Sprintf("%T: invalid node: %v", node, node))
}
}
func (self *Trie) delete(node Node, key []byte) Node {
if len(key) == 0 && node == nil {
return nil
}
switch node := node.(type) {
case *ShortNode:
k := node.Key()
cnode := node.Value()
if bytes.Equal(key, k) {
return nil
} else if bytes.Equal(key[:len(k)], k) {
child := self.delete(cnode, key[len(k):])
var n Node
switch child := child.(type) {
case *ShortNode:
nkey := append(k, child.Key()...)
n = NewShortNode(self, nkey, child.Value())
case *FullNode:
sn := NewShortNode(self, node.Key(), child)
sn.key = node.key
n = sn
}
return n
} else {
return node
}
case *FullNode:
n := node.Copy().(*FullNode)
n.set(key[0], self.delete(n.branch(key[0]), key[1:]))
pos := -1
for i := 0; i < 17; i++ {
if n.branch(byte(i)) != nil {
if pos == -1 {
pos = i
} else {
pos = -2
}
}
}
var nnode Node
if pos == 16 {
nnode = NewShortNode(self, []byte{16}, n.branch(byte(pos)))
} else if pos >= 0 {
cnode := n.branch(byte(pos))
switch cnode := cnode.(type) {
case *ShortNode:
// Stitch keys
k := append([]byte{byte(pos)}, cnode.Key()...)
nnode = NewShortNode(self, k, cnode.Value())
case *FullNode:
nnode = NewShortNode(self, []byte{byte(pos)}, n.branch(byte(pos)))
}
} else {
nnode = n
}
return nnode
case nil:
return nil
default:
panic(fmt.Sprintf("%T: invalid node: %v (%v)", node, node, key))
}
}
// casting functions and cache storing
func (self *Trie) mknode(value *ethutil.Value) Node {
l := value.Len()
switch l {
case 0:
return nil
case 2:
// A value node may consists of 2 bytes.
if value.Get(0).Len() != 0 {
return NewShortNode(self, trie.CompactDecode(string(value.Get(0).Bytes())), self.mknode(value.Get(1)))
}
case 17:
fnode := NewFullNode(self)
for i := 0; i < l; i++ {
fnode.set(byte(i), self.mknode(value.Get(i)))
}
return fnode
case 32:
return &HashNode{value.Bytes()}
}
return &ValueNode{self, value.Bytes()}
}
func (self *Trie) trans(node Node) Node {
switch node := node.(type) {
case *HashNode:
value := ethutil.NewValueFromBytes(self.cache.Get(node.key))
return self.mknode(value)
default:
return node
}
}
func (self *Trie) store(node Node) interface{} {
data := ethutil.Encode(node)
if len(data) >= 32 {
key := crypto.Sha3(data)
self.cache.Put(key, data)
return key
}
return node.RlpData()
}
func (self *Trie) PrintRoot() {
fmt.Println(self.root)
}
ptrie/trie_test.go deleted 100644 → 0
View file @ 982c812e
package ptrie
import (
"bytes"
"fmt"
"testing"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethutil"
)
type Db map[string][]byte
func (self Db) Get(k []byte) ([]byte, error) { return self[string(k)], nil }
func (self Db) Put(k, v []byte) { self[string(k)] = v }
// Used for testing
func NewEmpty() *Trie {
return New(nil, make(Db))
}
func TestEmptyTrie(t *testing.T) {
trie := NewEmpty()
res := trie.Hash()
exp := crypto.Sha3(ethutil.Encode(""))
if !bytes.Equal(res, exp) {
t.Errorf("expected %x got %x", exp, res)
}
}
func TestInsert(t *testing.T) {
trie := NewEmpty()
trie.UpdateString("doe", "reindeer")
trie.UpdateString("dog", "puppy")
trie.UpdateString("dogglesworth", "cat")
exp := ethutil.Hex2Bytes("8aad789dff2f538bca5d8ea56e8abe10f4c7ba3a5dea95fea4cd6e7c3a1168d3")
root := trie.Hash()
if !bytes.Equal(root, exp) {
t.Errorf("exp %x got %x", exp, root)
}
trie = NewEmpty()
trie.UpdateString("A", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
exp = ethutil.Hex2Bytes("d23786fb4a010da3ce639d66d5e904a11dbc02746d1ce25029e53290cabf28ab")
root = trie.Hash()
if !bytes.Equal(root, exp) {
t.Errorf("exp %x got %x", exp, root)
}
}
func TestGet(t *testing.T) {
trie := NewEmpty()
trie.UpdateString("doe", "reindeer")
trie.UpdateString("dog", "puppy")
trie.UpdateString("dogglesworth", "cat")
res := trie.GetString("dog")
if !bytes.Equal(res, []byte("puppy")) {
t.Errorf("expected puppy got %x", res)
}
unknown := trie.GetString("unknown")
if unknown != nil {
t.Errorf("expected nil got %x", unknown)
}
}
func TestDelete(t *testing.T) {
trie := NewEmpty()
vals := []struct{ k, v string }{
{"do", "verb"},
{"ether", "wookiedoo"},
{"horse", "stallion"},
{"shaman", "horse"},
{"doge", "coin"},
{"ether", ""},
{"dog", "puppy"},
{"shaman", ""},
}
for _, val := range vals {
if val.v != "" {
trie.UpdateString(val.k, val.v)
} else {
trie.DeleteString(val.k)
}
}
hash := trie.Hash()
exp := ethutil.Hex2Bytes("5991bb8c6514148a29db676a14ac506cd2cd5775ace63c30a4fe457715e9ac84")
if !bytes.Equal(hash, exp) {
t.Errorf("expected %x got %x", exp, hash)
}
}
func TestEmptyValues(t *testing.T) {
trie := NewEmpty()
vals := []struct{ k, v string }{
{"do", "verb"},
{"ether", "wookiedoo"},
{"horse", "stallion"},
{"shaman", "horse"},
{"doge", "coin"},
{"ether", ""},
{"dog", "puppy"},
{"shaman", ""},
}
for _, val := range vals {
trie.UpdateString(val.k, val.v)
}
hash := trie.Hash()
exp := ethutil.Hex2Bytes("5991bb8c6514148a29db676a14ac506cd2cd5775ace63c30a4fe457715e9ac84")
if !bytes.Equal(hash, exp) {
t.Errorf("expected %x got %x", exp, hash)
}
}
func TestReplication(t *testing.T) {
trie := NewEmpty()
vals := []struct{ k, v string }{
{"do", "verb"},
{"ether", "wookiedoo"},
{"horse", "stallion"},
{"shaman", "horse"},
{"doge", "coin"},
{"ether", ""},
{"dog", "puppy"},
{"shaman", ""},
{"somethingveryoddindeedthis is", "myothernodedata"},
}
for _, val := range vals {
trie.UpdateString(val.k, val.v)
}
trie.Commit()
trie2 := New(trie.roothash, trie.cache.backend)
if string(trie2.GetString("horse")) != "stallion" {
t.Error("expected to have horse => stallion")
}
hash := trie2.Hash()
exp := trie.Hash()
if !bytes.Equal(hash, exp) {
t.Errorf("root failure. expected %x got %x", exp, hash)
}
}
func TestReset(t *testing.T) {
trie := NewEmpty()
vals := []struct{ k, v string }{
{"do", "verb"},
{"ether", "wookiedoo"},
{"horse", "stallion"},
}
for _, val := range vals {
trie.UpdateString(val.k, val.v)
}
trie.Commit()
before := ethutil.CopyBytes(trie.roothash)
trie.UpdateString("should", "revert")
trie.Hash()
// Should have no effect
trie.Hash()
trie.Hash()
// ###
trie.Reset()
after := ethutil.CopyBytes(trie.roothash)
if !bytes.Equal(before, after) {
t.Errorf("expected roots to be equal. %x - %x", before, after)
}
}
func TestParanoia(t *testing.T) {
t.Skip()
trie := NewEmpty()
vals := []struct{ k, v string }{
{"do", "verb"},
{"ether", "wookiedoo"},
{"horse", "stallion"},
{"shaman", "horse"},
{"doge", "coin"},
{"ether", ""},
{"dog", "puppy"},
{"shaman", ""},
{"somethingveryoddindeedthis is", "myothernodedata"},
}
for _, val := range vals {
trie.UpdateString(val.k, val.v)
}
trie.Commit()
ok, t2 := ParanoiaCheck(trie, trie.cache.backend)
if !ok {
t.Errorf("trie paranoia check failed %x %x", trie.roothash, t2.roothash)
}
}
// Not an actual test
func TestOutput(t *testing.T) {
t.Skip()
base := "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
trie := NewEmpty()
for i := 0; i < 50; i++ {
trie.UpdateString(fmt.Sprintf("%s%d", base, i), "valueeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee")
}
fmt.Println("############################## FULL ################################")
fmt.Println(trie.root)
trie.Commit()
fmt.Println("############################## SMALL ################################")
trie2 := New(trie.roothash, trie.cache.backend)
trie2.GetString(base + "20")
fmt.Println(trie2.root)
}
func BenchmarkGets(b *testing.B) {
trie := NewEmpty()
vals := []struct{ k, v string }{
{"do", "verb"},
{"ether", "wookiedoo"},
{"horse", "stallion"},
{"shaman", "horse"},
{"doge", "coin"},
{"ether", ""},
{"dog", "puppy"},
{"shaman", ""},
{"somethingveryoddindeedthis is", "myothernodedata"},
}
for _, val := range vals {
trie.UpdateString(val.k, val.v)
}
b.ResetTimer()
for i := 0; i < b.N; i++ {
trie.Get([]byte("horse"))
}
}
func BenchmarkUpdate(b *testing.B) {
trie := NewEmpty()
b.ResetTimer()
for i := 0; i < b.N; i++ {
trie.UpdateString(fmt.Sprintf("aaaaaaaaa%d", i), "value")
}
trie.Hash()
}
state/state_object.go
View file @ db4aaedc
...@@ -6,7 +6,7 @@ import ( ...@@ -6,7 +6,7 @@ import (
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/ptrie" "github.com/ethereum/go-ethereum/trie"
) )
type Code []byte type Code []byte
...@@ -152,7 +152,7 @@ func (self *StateObject) Sync() { ...@@ -152,7 +152,7 @@ func (self *StateObject) Sync() {
} }
/* /*
valid, t2 := ptrie.ParanoiaCheck(self.State.trie, ethutil.Config.Db) valid, t2 := trie.ParanoiaCheck(self.State.trie, ethutil.Config.Db)
if !valid { if !valid {
statelogger.Infof("Warn: PARANOIA: Different state storage root during copy %x vs %x\n", self.State.Root(), t2.Root()) statelogger.Infof("Warn: PARANOIA: Different state storage root during copy %x vs %x\n", self.State.Root(), t2.Root())
...@@ -273,7 +273,7 @@ func (c *StateObject) Init() Code { ...@@ -273,7 +273,7 @@ func (c *StateObject) Init() Code {
return c.InitCode return c.InitCode
} }
func (self *StateObject) Trie() *ptrie.Trie { func (self *StateObject) Trie() *trie.Trie {
return self.State.trie return self.State.trie
} }
......
state/statedb.go
View file @ db4aaedc
...@@ -6,7 +6,7 @@ import ( ...@@ -6,7 +6,7 @@ import (
"github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/ptrie" "github.com/ethereum/go-ethereum/trie"
) )
var statelogger = logger.NewLogger("STATE") var statelogger = logger.NewLogger("STATE")
...@@ -18,7 +18,7 @@ var statelogger = logger.NewLogger("STATE") ...@@ -18,7 +18,7 @@ var statelogger = logger.NewLogger("STATE")
// * Accounts // * Accounts
type StateDB struct { type StateDB struct {
db ethutil.Database db ethutil.Database
trie *ptrie.Trie trie *trie.Trie
stateObjects map[string]*StateObject stateObjects map[string]*StateObject
...@@ -30,9 +30,8 @@ type StateDB struct { ...@@ -30,9 +30,8 @@ type StateDB struct {
} }
// Create a new state from a given trie // Create a new state from a given trie
//func New(trie *ptrie.Trie) *StateDB {
func New(root []byte, db ethutil.Database) *StateDB { func New(root []byte, db ethutil.Database) *StateDB {
trie := ptrie.New(root, db) trie := trie.New(root, db)
return &StateDB{db: db, trie: trie, stateObjects: make(map[string]*StateObject), manifest: NewManifest(), refund: make(map[string]*big.Int)} return &StateDB{db: db, trie: trie, stateObjects: make(map[string]*StateObject), manifest: NewManifest(), refund: make(map[string]*big.Int)}
} }
...@@ -308,7 +307,7 @@ func (self *StateDB) Update(gasUsed *big.Int) { ...@@ -308,7 +307,7 @@ func (self *StateDB) Update(gasUsed *big.Int) {
// FIXME trie delete is broken // FIXME trie delete is broken
if deleted { if deleted {
valid, t2 := ptrie.ParanoiaCheck(self.trie, self.db) valid, t2 := trie.ParanoiaCheck(self.trie, self.db)
if !valid { if !valid {
statelogger.Infof("Warn: PARANOIA: Different state root during copy %x vs %x\n", self.trie.Root(), t2.Root()) statelogger.Infof("Warn: PARANOIA: Different state root during copy %x vs %x\n", self.trie.Root(), t2.Root())
......
tests/helper/trie.go
View file @ db4aaedc
package helper package helper
import "github.com/ethereum/go-ethereum/ptrie" import "github.com/ethereum/go-ethereum/trie"
type MemDatabase struct { type MemDatabase struct {
db map[string][]byte db map[string][]byte
...@@ -24,8 +24,8 @@ func (db *MemDatabase) Print() {} ...@@ -24,8 +24,8 @@ func (db *MemDatabase) Print() {}
func (db *MemDatabase) Close() {} func (db *MemDatabase) Close() {}
func (db *MemDatabase) LastKnownTD() []byte { return nil } func (db *MemDatabase) LastKnownTD() []byte { return nil }
func NewTrie() *ptrie.Trie { func NewTrie() *trie.Trie {
db, _ := NewMemDatabase() db, _ := NewMemDatabase()
return ptrie.New(nil, db) return trie.New(nil, db)
} }
ptrie/cache.go → trie/cache.go
View file @ db4aaedc
package ptrie package trie
type Backend interface { type Backend interface {
Get([]byte) ([]byte, error) Get([]byte) ([]byte, error)
......
ptrie/fullnode.go → trie/fullnode.go
View file @ db4aaedc
package ptrie package trie
import "fmt" import "fmt"
......
ptrie/hashnode.go → trie/hashnode.go
View file @ db4aaedc
package ptrie package trie
type HashNode struct { type HashNode struct {
key []byte key []byte
......
trie/iterator.go
View file @ db4aaedc
package trie package trie
/* import "bytes"
import (
"bytes"
"github.com/ethereum/go-ethereum/ethutil"
)
type NodeType byte
const (
EmptyNode NodeType = iota
BranchNode
LeafNode
ExtNode
)
func getType(node *ethutil.Value) NodeType {
if node.Len() == 0 {
return EmptyNode
}
if node.Len() == 2 {
k := CompactDecode(node.Get(0).Str())
if HasTerm(k) {
return LeafNode
}
return ExtNode
}
return BranchNode
}
type Iterator struct { type Iterator struct {
Path [][]byte
trie *Trie trie *Trie
Key []byte Key []byte
Value *ethutil.Value Value []byte
} }
func NewIterator(trie *Trie) *Iterator { func NewIterator(trie *Trie) *Iterator {
return &Iterator{trie: trie} return &Iterator{trie: trie, Key: make([]byte, 32)}
} }
func (self *Iterator) key(node *ethutil.Value, path [][]byte) []byte { func (self *Iterator) Next() bool {
switch getType(node) { self.trie.mu.Lock()
case LeafNode: defer self.trie.mu.Unlock()
k := RemTerm(CompactDecode(node.Get(0).Str()))
self.Path = append(path, k) key := RemTerm(CompactHexDecode(string(self.Key)))
self.Value = node.Get(1) k := self.next(self.trie.root, key)
return k self.Key = []byte(DecodeCompact(k))
case BranchNode:
if node.Get(16).Len() > 0 {
return []byte{16}
}
for i := byte(0); i < 16; i++ { return len(k) > 0
o := self.key(self.trie.getNode(node.Get(int(i)).Raw()), append(path, []byte{i}))
if o != nil {
return append([]byte{i}, o...)
}
}
case ExtNode:
currKey := node.Get(0).Bytes()
return self.key(self.trie.getNode(node.Get(1).Raw()), append(path, currKey))
}
return nil
} }
func (self *Iterator) next(node *ethutil.Value, key []byte, path [][]byte) []byte { func (self *Iterator) next(node Node, key []byte) []byte {
switch typ := getType(node); typ { if node == nil {
case EmptyNode:
return nil return nil
case BranchNode: }
if len(key) > 0 {
subNode := self.trie.getNode(node.Get(int(key[0])).Raw())
o := self.next(subNode, key[1:], append(path, key[:1])) switch node := node.(type) {
if o != nil { case *FullNode:
return append([]byte{key[0]}, o...) if len(key) > 0 {
k := self.next(node.branch(key[0]), key[1:])
if k != nil {
return append([]byte{key[0]}, k...)
} }
} }
var r byte = 0 var r byte
if len(key) > 0 { if len(key) > 0 {
r = key[0] + 1 r = key[0] + 1
} }
for i := r; i < 16; i++ { for i := r; i < 16; i++ {
subNode := self.trie.getNode(node.Get(int(i)).Raw()) k := self.key(node.branch(byte(i)))
o := self.key(subNode, append(path, []byte{i})) if k != nil {
if o != nil { return append([]byte{i}, k...)
return append([]byte{i}, o...)
} }
} }
case LeafNode, ExtNode:
k := RemTerm(CompactDecode(node.Get(0).Str()))
if typ == LeafNode {
if bytes.Compare([]byte(k), []byte(key)) > 0 {
self.Value = node.Get(1)
self.Path = append(path, k)
case *ShortNode:
k := RemTerm(node.Key())
if vnode, ok := node.Value().(*ValueNode); ok {
if bytes.Compare([]byte(k), key) > 0 {
self.Value = vnode.Val()
return k return k
} }
} else { } else {
subNode := self.trie.getNode(node.Get(1).Raw()) cnode := node.Value()
subKey := key[len(k):]
var ret []byte var ret []byte
skey := key[len(k):]
if BeginsWith(key, k) { if BeginsWith(key, k) {
ret = self.next(subNode, subKey, append(path, k)) ret = self.next(cnode, skey)
} else if bytes.Compare(k, key[:len(k)]) > 0 { } else if bytes.Compare(k, key[:len(k)]) > 0 {
ret = self.key(node, append(path, k)) ret = self.key(node)
} else {
ret = nil
} }
if ret != nil { if ret != nil {
...@@ -130,16 +79,33 @@ func (self *Iterator) next(node *ethutil.Value, key []byte, path [][]byte) []byt ...@@ -130,16 +79,33 @@ func (self *Iterator) next(node *ethutil.Value, key []byte, path [][]byte) []byt
return nil return nil
} }
// Get the next in keys func (self *Iterator) key(node Node) []byte {
func (self *Iterator) Next(key string) []byte { switch node := node.(type) {
self.trie.mut.Lock() case *ShortNode:
defer self.trie.mut.Unlock() // Leaf node
if vnode, ok := node.Value().(*ValueNode); ok {
k := RemTerm(node.Key())
self.Value = vnode.Val()
k := RemTerm(CompactHexDecode(key)) return k
n := self.next(self.trie.getNode(self.trie.Root), k, nil) } else {
k := RemTerm(node.Key())
return append(k, self.key(node.Value())...)
}
case *FullNode:
if node.Value() != nil {
self.Value = node.Value().(*ValueNode).Val()
self.Key = []byte(DecodeCompact(n)) return []byte{16}
}
return self.Key for i := 0; i < 16; i++ {
k := self.key(node.branch(byte(i)))
if k != nil {
return append([]byte{byte(i)}, k...)
}
}
}
return nil
} }
*/
ptrie/iterator_test.go → trie/iterator_test.go
View file @ db4aaedc
package ptrie package trie
import "testing" import "testing"
......
trie/main_test.go deleted 100644 → 0
View file @ 982c812e
package trie
import (
"testing"
checker "gopkg.in/check.v1"
)
func Test(t *testing.T) { checker.TestingT(t) }
ptrie/node.go → trie/node.go
View file @ db4aaedc
package ptrie package trie
import "fmt" import "fmt"
......
ptrie/shortnode.go → trie/shortnode.go
View file @ db4aaedc
package ptrie package trie
import "github.com/ethereum/go-ethereum/trie"
type ShortNode struct { type ShortNode struct {
trie *Trie trie *Trie
...@@ -9,7 +7,7 @@ type ShortNode struct { ...@@ -9,7 +7,7 @@ type ShortNode struct {
} }
func NewShortNode(t *Trie, key []byte, value Node) *ShortNode { func NewShortNode(t *Trie, key []byte, value Node) *ShortNode {
return &ShortNode{t, []byte(trie.CompactEncode(key)), value} return &ShortNode{t, []byte(CompactEncode(key)), value}
} }
func (self *ShortNode) Value() Node { func (self *ShortNode) Value() Node {
self.value = self.trie.trans(self.value) self.value = self.trie.trans(self.value)
...@@ -27,5 +25,5 @@ func (self *ShortNode) Hash() interface{} { ...@@ -27,5 +25,5 @@ func (self *ShortNode) Hash() interface{} {
} }
func (self *ShortNode) Key() []byte { func (self *ShortNode) Key() []byte {
return trie.CompactDecode(string(self.key)) return CompactDecode(string(self.key))
} }
trie/trie.go
View file @ db4aaedc
package trie package trie
/*
import ( import (
"bytes" "bytes"
"container/list"
"fmt" "fmt"
"sync" "sync"
...@@ -10,618 +10,325 @@ import ( ...@@ -10,618 +10,325 @@ import (
"github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/ethutil"
) )
func ParanoiaCheck(t1 *Trie) (bool, *Trie) { func ParanoiaCheck(t1 *Trie, backend Backend) (bool, *Trie) {
t2 := New(ethutil.Config.Db, "") t2 := New(nil, backend)
t1.NewIterator().Each(func(key string, v *ethutil.Value) { it := t1.Iterator()
t2.Update(key, v.Str()) for it.Next() {
}) t2.Update(it.Key, it.Value)
}
return bytes.Compare(t2.GetRoot(), t1.GetRoot()) == 0, t2
}
func (s *Cache) Len() int {
return len(s.nodes)
}
// TODO
// A StateObject is an object that has a state root
// This is goig to be the object for the second level caching (the caching of object which have a state such as contracts)
type StateObject interface {
State() *Trie
Sync()
Undo()
}
type Node struct {
Key []byte
Value *ethutil.Value
Dirty bool
}
func NewNode(key []byte, val *ethutil.Value, dirty bool) *Node {
return &Node{Key: key, Value: val, Dirty: dirty}
}
func (n *Node) Copy() *Node { return bytes.Equal(t2.Hash(), t1.Hash()), t2
return NewNode(n.Key, n.Value, n.Dirty)
} }
type Cache struct { type Trie struct {
nodes map[string]*Node mu sync.Mutex
db ethutil.Database root Node
IsDirty bool roothash []byte
} cache *Cache
func NewCache(db ethutil.Database) *Cache { revisions *list.List
return &Cache{db: db, nodes: make(map[string]*Node)}
} }
func (cache *Cache) PutValue(v interface{}, force bool) interface{} { func New(root []byte, backend Backend) *Trie {
value := ethutil.NewValue(v) trie := &Trie{}
trie.revisions = list.New()
enc := value.Encode() trie.roothash = root
if len(enc) >= 32 || force { trie.cache = NewCache(backend)
sha := crypto.Sha3(enc)
cache.nodes[string(sha)] = NewNode(sha, value, true)
cache.IsDirty = true
return sha if root != nil {
value := ethutil.NewValueFromBytes(trie.cache.Get(root))
trie.root = trie.mknode(value)
} }
return v return trie
}
func (cache *Cache) Put(v interface{}) interface{} {
return cache.PutValue(v, false)
} }
func (cache *Cache) Get(key []byte) *ethutil.Value { func (self *Trie) Iterator() *Iterator {
// First check if the key is the cache return NewIterator(self)
if cache.nodes[string(key)] != nil {
return cache.nodes[string(key)].Value
}
// Get the key of the database instead and cache it
data, _ := cache.db.Get(key)
// Create the cached value
value := ethutil.NewValueFromBytes(data)
defer func() {
if r := recover(); r != nil {
fmt.Println("RECOVER GET", cache, cache.nodes)
panic("bye")
}
}()
// Create caching node
cache.nodes[string(key)] = NewNode(key, value, true)
return value
} }
func (cache *Cache) Delete(key []byte) { func (self *Trie) Copy() *Trie {
delete(cache.nodes, string(key)) return New(self.roothash, self.cache.backend)
cache.db.Delete(key)
} }
func (cache *Cache) Commit() { // Legacy support
// Don't try to commit if it isn't dirty func (self *Trie) Root() []byte { return self.Hash() }
if !cache.IsDirty { func (self *Trie) Hash() []byte {
return var hash []byte
} if self.root != nil {
t := self.root.Hash()
for key, node := range cache.nodes { if byts, ok := t.([]byte); ok && len(byts) > 0 {
if node.Dirty { hash = byts
cache.db.Put([]byte(key), node.Value.Encode()) } else {
node.Dirty = false hash = crypto.Sha3(ethutil.Encode(self.root.RlpData()))
} }
} else {
hash = crypto.Sha3(ethutil.Encode(""))
} }
cache.IsDirty = false
// If the nodes grows beyond the 200 entries we simple empty it
// FIXME come up with something better
if len(cache.nodes) > 200 {
cache.nodes = make(map[string]*Node)
}
}
func (cache *Cache) Undo() { if !bytes.Equal(hash, self.roothash) {
for key, node := range cache.nodes { self.revisions.PushBack(self.roothash)
if node.Dirty { self.roothash = hash
delete(cache.nodes, key)
}
} }
cache.IsDirty = false
}
// A (modified) Radix Trie implementation. The Trie implements return hash
// a caching mechanism and will used cached values if they are
// present. If a node is not present in the cache it will try to
// fetch it from the database and store the cached value.
// Please note that the data isn't persisted unless `Sync` is
// explicitly called.
type Trie struct {
mut sync.RWMutex
prevRoot interface{}
Root interface{}
//db Database
cache *Cache
} }
func (self *Trie) Commit() {
self.mu.Lock()
defer self.mu.Unlock()
func copyRoot(root interface{}) interface{} { // Hash first
var prevRootCopy interface{} self.Hash()
if b, ok := root.([]byte); ok {
prevRootCopy = ethutil.CopyBytes(b)
} else {
prevRootCopy = root
}
return prevRootCopy self.cache.Flush()
} }
func New(db ethutil.Database, Root interface{}) *Trie { // Reset should only be called if the trie has been hashed
// Make absolute sure the root is copied func (self *Trie) Reset() {
r := copyRoot(Root) self.mu.Lock()
p := copyRoot(Root) defer self.mu.Unlock()
trie := &Trie{cache: NewCache(db), Root: r, prevRoot: p} self.cache.Reset()
trie.setRoot(Root)
return trie if self.revisions.Len() > 0 {
} revision := self.revisions.Remove(self.revisions.Back()).([]byte)
self.roothash = revision
func (self *Trie) setRoot(root interface{}) {
switch t := root.(type) {
case string:
//if t == "" {
// root = crypto.Sha3(ethutil.Encode(""))
//}
self.Root = []byte(t)
case []byte:
self.Root = root
default:
self.Root = self.cache.PutValue(root, true)
} }
value := ethutil.NewValueFromBytes(self.cache.Get(self.roothash))
self.root = self.mknode(value)
} }
func (t *Trie) Update(key, value string) { func (self *Trie) UpdateString(key, value string) Node { return self.Update([]byte(key), []byte(value)) }
t.mut.Lock() func (self *Trie) Update(key, value []byte) Node {
defer t.mut.Unlock() self.mu.Lock()
defer self.mu.Unlock()
k := CompactHexDecode(key) k := CompactHexDecode(string(key))
var root interface{} if len(value) != 0 {
if value != "" { self.root = self.insert(self.root, k, &ValueNode{self, value})
root = t.UpdateState(t.Root, k, value)
} else { } else {
root = t.deleteState(t.Root, k) self.root = self.delete(self.root, k)
} }
t.setRoot(root)
}
func (t *Trie) Get(key string) string {
t.mut.Lock()
defer t.mut.Unlock()
k := CompactHexDecode(key)
c := ethutil.NewValue(t.getState(t.Root, k))
return c.Str() return self.root
} }
func (t *Trie) Delete(key string) { func (self *Trie) GetString(key string) []byte { return self.Get([]byte(key)) }
t.mut.Lock() func (self *Trie) Get(key []byte) []byte {
defer t.mut.Unlock() self.mu.Lock()
defer self.mu.Unlock()
k := CompactHexDecode(key)
root := t.deleteState(t.Root, k)
t.setRoot(root)
}
func (self *Trie) GetRoot() []byte {
switch t := self.Root.(type) {
case string:
if t == "" {
return crypto.Sha3(ethutil.Encode(""))
}
return []byte(t)
case []byte:
if len(t) == 0 {
return crypto.Sha3(ethutil.Encode(""))
}
return t
default:
panic(fmt.Sprintf("invalid root type %T (%v)", self.Root, self.Root))
}
}
// Simple compare function which creates a rlp value out of the evaluated objects k := CompactHexDecode(string(key))
func (t *Trie) Cmp(trie *Trie) bool {
return ethutil.NewValue(t.Root).Cmp(ethutil.NewValue(trie.Root))
}
// Returns a copy of this trie n := self.get(self.root, k)
func (t *Trie) Copy() *Trie { if n != nil {
trie := New(t.cache.db, t.Root) return n.(*ValueNode).Val()
for key, node := range t.cache.nodes {
trie.cache.nodes[key] = node.Copy()
} }
return trie return nil
} }
// Save the cached value to the database. func (self *Trie) DeleteString(key string) Node { return self.Delete([]byte(key)) }
func (t *Trie) Sync() { func (self *Trie) Delete(key []byte) Node {
t.cache.Commit() self.mu.Lock()
t.prevRoot = copyRoot(t.Root) defer self.mu.Unlock()
}
func (t *Trie) Undo() { k := CompactHexDecode(string(key))
t.cache.Undo() self.root = self.delete(self.root, k)
t.Root = t.prevRoot
}
func (t *Trie) Cache() *Cache { return self.root
return t.cache
} }
func (t *Trie) getState(node interface{}, key []byte) interface{} { func (self *Trie) insert(node Node, key []byte, value Node) Node {
n := ethutil.NewValue(node) if len(key) == 0 {
// Return the node if key is empty (= found) return value
if len(key) == 0 || n.IsNil() || n.Len() == 0 {
return node
} }
currentNode := t.getNode(node) if node == nil {
length := currentNode.Len() return NewShortNode(self, key, value)
}
if length == 0 { switch node := node.(type) {
return "" case *ShortNode:
} else if length == 2 { k := node.Key()
// Decode the key cnode := node.Value()
k := CompactDecode(currentNode.Get(0).Str()) if bytes.Equal(k, key) {
v := currentNode.Get(1).Raw() return NewShortNode(self, key, value)
}
if len(key) >= len(k) && bytes.Equal(k, key[:len(k)]) { //CompareIntSlice(k, key[:len(k)]) { var n Node
return t.getState(v, key[len(k):]) matchlength := MatchingNibbleLength(key, k)
if matchlength == len(k) {
n = self.insert(cnode, key[matchlength:], value)
} else { } else {
return "" pnode := self.insert(nil, k[matchlength+1:], cnode)
nnode := self.insert(nil, key[matchlength+1:], value)
fulln := NewFullNode(self)
fulln.set(k[matchlength], pnode)
fulln.set(key[matchlength], nnode)
n = fulln
}
if matchlength == 0 {
return n
} }
} else if length == 17 {
return t.getState(currentNode.Get(int(key[0])).Raw(), key[1:])
}
// It shouldn't come this far
panic("unexpected return")
}
func (t *Trie) getNode(node interface{}) *ethutil.Value {
n := ethutil.NewValue(node)
if !n.Get(0).IsNil() {
return n
}
str := n.Str()
if len(str) == 0 {
return n
} else if len(str) < 32 {
return ethutil.NewValueFromBytes([]byte(str))
}
data := t.cache.Get(n.Bytes())
return data
}
func (t *Trie) UpdateState(node interface{}, key []byte, value string) interface{} { return NewShortNode(self, key[:matchlength], n)
return t.InsertState(node, key, value)
}
func (t *Trie) Put(node interface{}) interface{} { case *FullNode:
return t.cache.Put(node) cpy := node.Copy().(*FullNode)
cpy.set(key[0], self.insert(node.branch(key[0]), key[1:], value))
} return cpy
func EmptyStringSlice(l int) []interface{} { default:
slice := make([]interface{}, l) panic(fmt.Sprintf("%T: invalid node: %v", node, node))
for i := 0; i < l; i++ {
slice[i] = ""
} }
return slice
} }
func (t *Trie) InsertState(node interface{}, key []byte, value interface{}) interface{} { func (self *Trie) get(node Node, key []byte) Node {
if len(key) == 0 { if len(key) == 0 {
return value return node
} }
// New node if node == nil {
n := ethutil.NewValue(node) return nil
if node == nil || n.Len() == 0 {
newNode := []interface{}{CompactEncode(key), value}
return t.Put(newNode)
} }
currentNode := t.getNode(node) switch node := node.(type) {
// Check for "special" 2 slice type node case *ShortNode:
if currentNode.Len() == 2 { k := node.Key()
// Decode the key cnode := node.Value()
k := CompactDecode(currentNode.Get(0).Str())
v := currentNode.Get(1).Raw()
// Matching key pair (ie. there's already an object with this key)
if bytes.Equal(k, key) { //CompareIntSlice(k, key) {
newNode := []interface{}{CompactEncode(key), value}
return t.Put(newNode)
}
var newHash interface{}
matchingLength := MatchingNibbleLength(key, k)
if matchingLength == len(k) {
// Insert the hash, creating a new node
newHash = t.InsertState(v, key[matchingLength:], value)
} else {
// Expand the 2 length slice to a 17 length slice
oldNode := t.InsertState("", k[matchingLength+1:], v)
newNode := t.InsertState("", key[matchingLength+1:], value)
// Create an expanded slice
scaledSlice := EmptyStringSlice(17)
// Set the copied and new node
scaledSlice[k[matchingLength]] = oldNode
scaledSlice[key[matchingLength]] = newNode
newHash = t.Put(scaledSlice)
}
if matchingLength == 0 {
// End of the chain, return
return newHash
} else {
newNode := []interface{}{CompactEncode(key[:matchingLength]), newHash}
return t.Put(newNode)
}
} else {
// Copy the current node over to the new node and replace the first nibble in the key
newNode := EmptyStringSlice(17)
for i := 0; i < 17; i++ { if len(key) >= len(k) && bytes.Equal(k, key[:len(k)]) {
cpy := currentNode.Get(i).Raw() return self.get(cnode, key[len(k):])
if cpy != nil {
newNode[i] = cpy
}
} }
newNode[key[0]] = t.InsertState(currentNode.Get(int(key[0])).Raw(), key[1:], value) return nil
case *FullNode:
return t.Put(newNode) return self.get(node.branch(key[0]), key[1:])
default:
panic(fmt.Sprintf("%T: invalid node: %v", node, node))
} }
panic("unexpected end")
} }
func (t *Trie) deleteState(node interface{}, key []byte) interface{} { func (self *Trie) delete(node Node, key []byte) Node {
if len(key) == 0 { if len(key) == 0 && node == nil {
return "" return nil
}
// New node
n := ethutil.NewValue(node)
//if node == nil || (n.Type() == reflect.String && (n.Str() == "" || n.Get(0).IsNil())) || n.Len() == 0 {
if node == nil || n.Len() == 0 {
//return nil
//fmt.Printf("<empty ret> %x %d\n", n, len(n.Bytes()))
return ""
} }
currentNode := t.getNode(node) switch node := node.(type) {
// Check for "special" 2 slice type node case *ShortNode:
if currentNode.Len() == 2 { k := node.Key()
// Decode the key cnode := node.Value()
k := CompactDecode(currentNode.Get(0).Str()) if bytes.Equal(key, k) {
v := currentNode.Get(1).Raw() return nil
} else if bytes.Equal(key[:len(k)], k) {
// Matching key pair (ie. there's already an object with this key) child := self.delete(cnode, key[len(k):])
if bytes.Equal(k, key) { //CompareIntSlice(k, key) {
//fmt.Printf("<delete ret> %x\n", v) var n Node
switch child := child.(type) {
return "" case *ShortNode:
} else if bytes.Equal(key[:len(k)], k) { //CompareIntSlice(key[:len(k)], k) { nkey := append(k, child.Key()...)
hash := t.deleteState(v, key[len(k):]) n = NewShortNode(self, nkey, child.Value())
child := t.getNode(hash) case *FullNode:
sn := NewShortNode(self, node.Key(), child)
var newNode []interface{} sn.key = node.key
if child.Len() == 2 { n = sn
newKey := append(k, CompactDecode(child.Get(0).Str())...)
newNode = []interface{}{CompactEncode(newKey), child.Get(1).Raw()}
} else {
newNode = []interface{}{currentNode.Get(0).Str(), hash}
} }
//fmt.Printf("%x\n", newNode) return n
return t.Put(newNode)
} else { } else {
return node return node
} }
} else {
// Copy the current node over to the new node and replace the first nibble in the key
n := EmptyStringSlice(17)
var newNode []interface{}
for i := 0; i < 17; i++ { case *FullNode:
cpy := currentNode.Get(i).Raw() n := node.Copy().(*FullNode)
if cpy != nil { n.set(key[0], self.delete(n.branch(key[0]), key[1:]))
n[i] = cpy
}
}
n[key[0]] = t.deleteState(n[key[0]], key[1:]) pos := -1
amount := -1
for i := 0; i < 17; i++ { for i := 0; i < 17; i++ {
if n[i] != "" { if n.branch(byte(i)) != nil {
if amount == -1 { if pos == -1 {
amount = i pos = i
} else { } else {
amount = -2 pos = -2
} }
} }
} }
if amount == 16 {
newNode = []interface{}{CompactEncode([]byte{16}), n[amount]}
} else if amount >= 0 {
child := t.getNode(n[amount])
if child.Len() == 17 {
newNode = []interface{}{CompactEncode([]byte{byte(amount)}), n[amount]}
} else if child.Len() == 2 {
key := append([]byte{byte(amount)}, CompactDecode(child.Get(0).Str())...)
newNode = []interface{}{CompactEncode(key), child.Get(1).Str()}
}
var nnode Node
if pos == 16 {
nnode = NewShortNode(self, []byte{16}, n.branch(byte(pos)))
} else if pos >= 0 {
cnode := n.branch(byte(pos))
switch cnode := cnode.(type) {
case *ShortNode:
// Stitch keys
k := append([]byte{byte(pos)}, cnode.Key()...)
nnode = NewShortNode(self, k, cnode.Value())
case *FullNode:
nnode = NewShortNode(self, []byte{byte(pos)}, n.branch(byte(pos)))
}
} else { } else {
newNode = n nnode = n
} }
//fmt.Printf("%x\n", newNode) return nnode
return t.Put(newNode) case nil:
return nil
default:
panic(fmt.Sprintf("%T: invalid node: %v (%v)", node, node, key))
} }
panic("unexpected return")
}
type TrieIterator struct {
trie *Trie
key string
value string
shas [][]byte
values []string
lastNode []byte
} }
func (t *Trie) NewIterator() *TrieIterator { // casting functions and cache storing
return &TrieIterator{trie: t} func (self *Trie) mknode(value *ethutil.Value) Node {
} l := value.Len()
switch l {
func (self *Trie) Iterator() *Iterator { case 0:
return NewIterator(self) return nil
} case 2:
// A value node may consists of 2 bytes.
// Some time in the near future this will need refactoring :-) if value.Get(0).Len() != 0 {
// XXX Note to self, IsSlice == inline node. Str == sha3 to node return NewShortNode(self, CompactDecode(string(value.Get(0).Bytes())), self.mknode(value.Get(1)))
func (it *TrieIterator) workNode(currentNode *ethutil.Value) {
if currentNode.Len() == 2 {
k := CompactDecode(currentNode.Get(0).Str())
if currentNode.Get(1).Str() == "" {
it.workNode(currentNode.Get(1))
} else {
if k[len(k)-1] == 16 {
it.values = append(it.values, currentNode.Get(1).Str())
} else {
it.shas = append(it.shas, currentNode.Get(1).Bytes())
it.getNode(currentNode.Get(1).Bytes())
}
} }
} else { case 17:
for i := 0; i < currentNode.Len(); i++ { fnode := NewFullNode(self)
if i == 16 && currentNode.Get(i).Len() != 0 { for i := 0; i < l; i++ {
it.values = append(it.values, currentNode.Get(i).Str()) fnode.set(byte(i), self.mknode(value.Get(i)))
} else {
if currentNode.Get(i).Str() == "" {
it.workNode(currentNode.Get(i))
} else {
val := currentNode.Get(i).Str()
if val != "" {
it.shas = append(it.shas, currentNode.Get(1).Bytes())
it.getNode([]byte(val))
}
}
}
} }
return fnode
case 32:
return &HashNode{value.Bytes()}
} }
}
func (it *TrieIterator) getNode(node []byte) { return &ValueNode{self, value.Bytes()}
currentNode := it.trie.cache.Get(node)
it.workNode(currentNode)
} }
func (it *TrieIterator) Collect() [][]byte { func (self *Trie) trans(node Node) Node {
if it.trie.Root == "" { switch node := node.(type) {
return nil case *HashNode:
} value := ethutil.NewValueFromBytes(self.cache.Get(node.key))
return self.mknode(value)
it.getNode(ethutil.NewValue(it.trie.Root).Bytes()) default:
return node
return it.shas
}
func (it *TrieIterator) Purge() int {
shas := it.Collect()
for _, sha := range shas {
it.trie.cache.Delete(sha)
} }
return len(it.values)
}
func (it *TrieIterator) Key() string {
return ""
} }
func (it *TrieIterator) Value() string { func (self *Trie) store(node Node) interface{} {
return "" data := ethutil.Encode(node)
} if len(data) >= 32 {
key := crypto.Sha3(data)
type EachCallback func(key string, node *ethutil.Value) self.cache.Put(key, data)
func (it *TrieIterator) Each(cb EachCallback) { return key
it.fetchNode(nil, ethutil.NewValue(it.trie.Root).Bytes(), cb) }
}
func (it *TrieIterator) fetchNode(key []byte, node []byte, cb EachCallback) { return node.RlpData()
it.iterateNode(key, it.trie.cache.Get(node), cb)
} }
func (it *TrieIterator) iterateNode(key []byte, currentNode *ethutil.Value, cb EachCallback) { func (self *Trie) PrintRoot() {
if currentNode.Len() == 2 { fmt.Println(self.root)
k := CompactDecode(currentNode.Get(0).Str())
pk := append(key, k...)
if currentNode.Get(1).Len() != 0 && currentNode.Get(1).Str() == "" {
it.iterateNode(pk, currentNode.Get(1), cb)
} else {
if k[len(k)-1] == 16 {
cb(DecodeCompact(pk), currentNode.Get(1))
} else {
it.fetchNode(pk, currentNode.Get(1).Bytes(), cb)
}
}
} else {
for i := 0; i < currentNode.Len(); i++ {
pk := append(key, byte(i))
if i == 16 && currentNode.Get(i).Len() != 0 {
cb(DecodeCompact(pk), currentNode.Get(i))
} else {
if currentNode.Get(i).Len() != 0 && currentNode.Get(i).Str() == "" {
it.iterateNode(pk, currentNode.Get(i), cb)
} else {
val := currentNode.Get(i).Str()
if val != "" {
it.fetchNode(pk, []byte(val), cb)
}
}
}
}
}
} }
*/
trie/trie_test.go
View file @ db4aaedc
package trie package trie
/*
import ( import (
"bytes" "bytes"
"encoding/hex"
"encoding/json"
"fmt" "fmt"
"io/ioutil"
"math/rand"
"net/http"
"testing" "testing"
"time"
checker "gopkg.in/check.v1"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/ethutil"
) )
const LONG_WORD = "1234567890abcdefghijklmnopqrstuvwxxzABCEFGHIJKLMNOPQRSTUVWXYZ" type Db map[string][]byte
type TrieSuite struct {
db *MemDatabase
trie *Trie
}
type MemDatabase struct {
db map[string][]byte
}
func NewMemDatabase() (*MemDatabase, error) {
db := &MemDatabase{db: make(map[string][]byte)}
return db, nil
}
func (db *MemDatabase) Put(key []byte, value []byte) {
db.db[string(key)] = value
}
func (db *MemDatabase) Get(key []byte) ([]byte, error) {
return db.db[string(key)], nil
}
func (db *MemDatabase) Delete(key []byte) error {
delete(db.db, string(key))
return nil
}
func (db *MemDatabase) Print() {}
func (db *MemDatabase) Close() {}
func (db *MemDatabase) LastKnownTD() []byte { return nil }
func NewTrie() (*MemDatabase, *Trie) {
db, _ := NewMemDatabase()
return db, New(db, "")
}
func (s *TrieSuite) SetUpTest(c *checker.C) {
s.db, s.trie = NewTrie()
}
func (s *TrieSuite) TestTrieSync(c *checker.C) {
s.trie.Update("dog", LONG_WORD)
c.Assert(s.db.db, checker.HasLen, 0, checker.Commentf("Expected no data in database"))
s.trie.Sync()
c.Assert(s.db.db, checker.HasLen, 3)
}
func (s *TrieSuite) TestTrieDirtyTracking(c *checker.C) {
s.trie.Update("dog", LONG_WORD)
c.Assert(s.trie.cache.IsDirty, checker.Equals, true, checker.Commentf("Expected no data in database"))
s.trie.Sync()
c.Assert(s.trie.cache.IsDirty, checker.Equals, false, checker.Commentf("Expected trie to be dirty"))
s.trie.Update("test", LONG_WORD)
s.trie.cache.Undo()
c.Assert(s.trie.cache.IsDirty, checker.Equals, false)
}
func (s *TrieSuite) TestTrieReset(c *checker.C) {
s.trie.Update("cat", LONG_WORD)
c.Assert(s.trie.cache.nodes, checker.HasLen, 1, checker.Commentf("Expected cached nodes"))
s.trie.cache.Undo() func (self Db) Get(k []byte) ([]byte, error) { return self[string(k)], nil }
c.Assert(s.trie.cache.nodes, checker.HasLen, 0, checker.Commentf("Expected no nodes after undo")) func (self Db) Put(k, v []byte) { self[string(k)] = v }
}
func (s *TrieSuite) TestTrieGet(c *checker.C) { // Used for testing
s.trie.Update("cat", LONG_WORD) func NewEmpty() *Trie {
x := s.trie.Get("cat") return New(nil, make(Db))
c.Assert(x, checker.DeepEquals, LONG_WORD)
} }
func (s *TrieSuite) TestTrieUpdating(c *checker.C) { func TestEmptyTrie(t *testing.T) {
s.trie.Update("cat", LONG_WORD) trie := NewEmpty()
s.trie.Update("cat", LONG_WORD+"1") res := trie.Hash()
x := s.trie.Get("cat") exp := crypto.Sha3(ethutil.Encode(""))
c.Assert(x, checker.DeepEquals, LONG_WORD+"1") if !bytes.Equal(res, exp) {
t.Errorf("expected %x got %x", exp, res)
}
} }
func (s *TrieSuite) TestTrieCmp(c *checker.C) { func TestInsert(t *testing.T) {
_, trie1 := NewTrie() trie := NewEmpty()
_, trie2 := NewTrie()
trie1.Update("doge", LONG_WORD) trie.UpdateString("doe", "reindeer")
trie2.Update("doge", LONG_WORD) trie.UpdateString("dog", "puppy")
c.Assert(trie1, checker.DeepEquals, trie2) trie.UpdateString("dogglesworth", "cat")
trie1.Update("dog", LONG_WORD) exp := ethutil.Hex2Bytes("8aad789dff2f538bca5d8ea56e8abe10f4c7ba3a5dea95fea4cd6e7c3a1168d3")
trie2.Update("cat", LONG_WORD) root := trie.Hash()
c.Assert(trie1, checker.Not(checker.DeepEquals), trie2) if !bytes.Equal(root, exp) {
} t.Errorf("exp %x got %x", exp, root)
}
func (s *TrieSuite) TestTrieDelete(c *checker.C) { trie = NewEmpty()
s.trie.Update("cat", LONG_WORD) trie.UpdateString("A", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
exp := s.trie.Root
s.trie.Update("dog", LONG_WORD)
s.trie.Delete("dog")
c.Assert(s.trie.Root, checker.DeepEquals, exp)
s.trie.Update("dog", LONG_WORD)
exp = s.trie.Root
s.trie.Update("dude", LONG_WORD)
s.trie.Delete("dude")
c.Assert(s.trie.Root, checker.DeepEquals, exp)
}
func (s *TrieSuite) TestTrieDeleteWithValue(c *checker.C) { exp = ethutil.Hex2Bytes("d23786fb4a010da3ce639d66d5e904a11dbc02746d1ce25029e53290cabf28ab")
s.trie.Update("c", LONG_WORD) root = trie.Hash()
exp := s.trie.Root if !bytes.Equal(root, exp) {
s.trie.Update("ca", LONG_WORD) t.Errorf("exp %x got %x", exp, root)
s.trie.Update("cat", LONG_WORD) }
s.trie.Delete("ca")
s.trie.Delete("cat")
c.Assert(s.trie.Root, checker.DeepEquals, exp)
} }
func (s *TrieSuite) TestTriePurge(c *checker.C) { func TestGet(t *testing.T) {
s.trie.Update("c", LONG_WORD) trie := NewEmpty()
s.trie.Update("ca", LONG_WORD)
s.trie.Update("cat", LONG_WORD)
lenBefore := len(s.trie.cache.nodes) trie.UpdateString("doe", "reindeer")
it := s.trie.NewIterator() trie.UpdateString("dog", "puppy")
num := it.Purge() trie.UpdateString("dogglesworth", "cat")
c.Assert(num, checker.Equals, 3)
c.Assert(len(s.trie.cache.nodes), checker.Equals, lenBefore)
}
func h(str string) string { res := trie.GetString("dog")
d, err := hex.DecodeString(str) if !bytes.Equal(res, []byte("puppy")) {
if err != nil { t.Errorf("expected puppy got %x", res)
panic(err)
} }
return string(d) unknown := trie.GetString("unknown")
} if unknown != nil {
t.Errorf("expected nil got %x", unknown)
func get(in string) (out string) {
if len(in) > 2 && in[:2] == "0x" {
out = h(in[2:])
} else {
out = in
} }
return
} }
type TrieTest struct { func TestDelete(t *testing.T) {
Name string trie := NewEmpty()
In map[string]string
Root string
}
func CreateTest(name string, data []byte) (TrieTest, error) { vals := []struct{ k, v string }{
t := TrieTest{Name: name} {"do", "verb"},
err := json.Unmarshal(data, &t) {"ether", "wookiedoo"},
if err != nil { {"horse", "stallion"},
return TrieTest{}, fmt.Errorf("%v", err) {"shaman", "horse"},
{"doge", "coin"},
{"ether", ""},
{"dog", "puppy"},
{"shaman", ""},
} }
for _, val := range vals {
return t, nil if val.v != "" {
} trie.UpdateString(val.k, val.v)
} else {
func CreateTests(uri string, cb func(TrieTest)) map[string]TrieTest { trie.DeleteString(val.k)
resp, err := http.Get(uri) }
if err != nil {
panic(err)
} }
defer resp.Body.Close()
data, err := ioutil.ReadAll(resp.Body) hash := trie.Hash()
exp := ethutil.Hex2Bytes("5991bb8c6514148a29db676a14ac506cd2cd5775ace63c30a4fe457715e9ac84")
var objmap map[string]*json.RawMessage if !bytes.Equal(hash, exp) {
err = json.Unmarshal(data, &objmap) t.Errorf("expected %x got %x", exp, hash)
if err != nil {
panic(err)
} }
}
tests := make(map[string]TrieTest) func TestEmptyValues(t *testing.T) {
for name, testData := range objmap { trie := NewEmpty()
test, err := CreateTest(name, *testData)
if err != nil {
panic(err)
}
if cb != nil { vals := []struct{ k, v string }{
cb(test) {"do", "verb"},
} {"ether", "wookiedoo"},
tests[name] = test {"horse", "stallion"},
{"shaman", "horse"},
{"doge", "coin"},
{"ether", ""},
{"dog", "puppy"},
{"shaman", ""},
} }
for _, val := range vals {
return tests trie.UpdateString(val.k, val.v)
}
func RandomData() [][]string {
data := [][]string{
{"0x000000000000000000000000ec4f34c97e43fbb2816cfd95e388353c7181dab1", "0x4e616d6552656700000000000000000000000000000000000000000000000000"},
{"0x0000000000000000000000000000000000000000000000000000000000000045", "0x22b224a1420a802ab51d326e29fa98e34c4f24ea"},
{"0x0000000000000000000000000000000000000000000000000000000000000046", "0x67706c2076330000000000000000000000000000000000000000000000000000"},
{"0x000000000000000000000000697c7b8c961b56f675d570498424ac8de1a918f6", "0x6f6f6f6820736f2067726561742c207265616c6c6c793f000000000000000000"},
{"0x0000000000000000000000007ef9e639e2733cb34e4dfc576d4b23f72db776b2", "0x4655474156000000000000000000000000000000000000000000000000000000"},
{"0x6f6f6f6820736f2067726561742c207265616c6c6c793f000000000000000000", "0x697c7b8c961b56f675d570498424ac8de1a918f6"},
{"0x4655474156000000000000000000000000000000000000000000000000000000", "0x7ef9e639e2733cb34e4dfc576d4b23f72db776b2"},
{"0x4e616d6552656700000000000000000000000000000000000000000000000000", "0xec4f34c97e43fbb2816cfd95e388353c7181dab1"},
} }
var c [][]string hash := trie.Hash()
for len(data) != 0 { exp := ethutil.Hex2Bytes("5991bb8c6514148a29db676a14ac506cd2cd5775ace63c30a4fe457715e9ac84")
e := rand.Intn(len(data)) if !bytes.Equal(hash, exp) {
c = append(c, data[e]) t.Errorf("expected %x got %x", exp, hash)
copy(data[e:], data[e+1:])
data[len(data)-1] = nil
data = data[:len(data)-1]
} }
return c
} }
const MaxTest = 1000 func TestReplication(t *testing.T) {
trie := NewEmpty()
// This test insert data in random order and seeks to find indifferences between the different tries vals := []struct{ k, v string }{
func (s *TrieSuite) TestRegression(c *checker.C) { {"do", "verb"},
rand.Seed(time.Now().Unix()) {"ether", "wookiedoo"},
{"horse", "stallion"},
roots := make(map[string]int) {"shaman", "horse"},
for i := 0; i < MaxTest; i++ { {"doge", "coin"},
_, trie := NewTrie() {"ether", ""},
data := RandomData() {"dog", "puppy"},
{"shaman", ""},
for _, test := range data { {"somethingveryoddindeedthis is", "myothernodedata"},
trie.Update(test[0], test[1])
}
trie.Delete("0x4e616d6552656700000000000000000000000000000000000000000000000000")
roots[string(trie.Root.([]byte))] += 1
} }
for _, val := range vals {
trie.UpdateString(val.k, val.v)
}
trie.Commit()
c.Assert(len(roots) <= 1, checker.Equals, true) trie2 := New(trie.roothash, trie.cache.backend)
// if len(roots) > 1 { if string(trie2.GetString("horse")) != "stallion" {
// for root, num := range roots { t.Error("expected to have horse => stallion")
// t.Errorf("%x => %d\n", root, num) }
// }
// }
}
func (s *TrieSuite) TestDelete(c *checker.C) {
s.trie.Update("a", "jeffreytestlongstring")
s.trie.Update("aa", "otherstring")
s.trie.Update("aaa", "othermorestring")
s.trie.Update("aabbbbccc", "hithere")
s.trie.Update("abbcccdd", "hstanoehutnaheoustnh")
s.trie.Update("rnthaoeuabbcccdd", "hstanoehutnaheoustnh")
s.trie.Update("rneuabbcccdd", "hstanoehutnaheoustnh")
s.trie.Update("rneuabboeusntahoeucccdd", "hstanoehutnaheoustnh")
s.trie.Update("rnxabboeusntahoeucccdd", "hstanoehutnaheoustnh")
s.trie.Delete("aaboaestnuhbccc")
s.trie.Delete("a")
s.trie.Update("a", "nthaonethaosentuh")
s.trie.Update("c", "shtaosntehua")
s.trie.Delete("a")
s.trie.Update("aaaa", "testmegood")
_, t2 := NewTrie()
s.trie.NewIterator().Each(func(key string, v *ethutil.Value) {
if key == "aaaa" {
t2.Update(key, v.Str())
} else {
t2.Update(key, v.Str())
}
})
a := ethutil.NewValue(s.trie.Root).Bytes()
b := ethutil.NewValue(t2.Root).Bytes()
c.Assert(a, checker.DeepEquals, b) hash := trie2.Hash()
} exp := trie.Hash()
if !bytes.Equal(hash, exp) {
t.Errorf("root failure. expected %x got %x", exp, hash)
}
func (s *TrieSuite) TestTerminator(c *checker.C) {
key := CompactDecode("hello")
c.Assert(HasTerm(key), checker.Equals, true, checker.Commentf("Expected %v to have a terminator", key))
} }
func (s *TrieSuite) TestIt(c *checker.C) { func TestReset(t *testing.T) {
s.trie.Update("cat", "cat") trie := NewEmpty()
s.trie.Update("doge", "doge") vals := []struct{ k, v string }{
s.trie.Update("wallace", "wallace") {"do", "verb"},
it := s.trie.Iterator() {"ether", "wookiedoo"},
{"horse", "stallion"},
inputs := []struct {
In, Out string
}{
{"", "cat"},
{"bobo", "cat"},
{"c", "cat"},
{"car", "cat"},
{"catering", "doge"},
{"w", "wallace"},
{"wallace123", ""},
} }
for _, val := range vals {
for _, test := range inputs { trie.UpdateString(val.k, val.v)
res := string(it.Next(test.In))
c.Assert(res, checker.Equals, test.Out)
} }
} trie.Commit()
func (s *TrieSuite) TestBeginsWith(c *checker.C) { before := ethutil.CopyBytes(trie.roothash)
a := CompactDecode("hello") trie.UpdateString("should", "revert")
b := CompactDecode("hel") trie.Hash()
// Should have no effect
c.Assert(BeginsWith(a, b), checker.Equals, false) trie.Hash()
c.Assert(BeginsWith(b, a), checker.Equals, true) trie.Hash()
} // ###
func (s *TrieSuite) TestItems(c *checker.C) { trie.Reset()
s.trie.Update("A", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") after := ethutil.CopyBytes(trie.roothash)
exp := "d23786fb4a010da3ce639d66d5e904a11dbc02746d1ce25029e53290cabf28ab"
c.Assert(s.trie.GetRoot(), checker.DeepEquals, ethutil.Hex2Bytes(exp)) if !bytes.Equal(before, after) {
t.Errorf("expected roots to be equal. %x - %x", before, after)
}
} }
func TestOtherSomething(t *testing.T) { func TestParanoia(t *testing.T) {
_, trie := NewTrie() t.Skip()
trie := NewEmpty()
vals := []struct{ k, v string }{ vals := []struct{ k, v string }{
{"do", "verb"}, {"do", "verb"},
...@@ -350,20 +193,40 @@ func TestOtherSomething(t *testing.T) { ...@@ -350,20 +193,40 @@ func TestOtherSomething(t *testing.T) {
{"ether", ""}, {"ether", ""},
{"dog", "puppy"}, {"dog", "puppy"},
{"shaman", ""}, {"shaman", ""},
{"somethingveryoddindeedthis is", "myothernodedata"},
} }
for _, val := range vals { for _, val := range vals {
trie.Update(val.k, val.v) trie.UpdateString(val.k, val.v)
} }
trie.Commit()
exp := ethutil.Hex2Bytes("5991bb8c6514148a29db676a14ac506cd2cd5775ace63c30a4fe457715e9ac84") ok, t2 := ParanoiaCheck(trie, trie.cache.backend)
hash := trie.Root.([]byte) if !ok {
if !bytes.Equal(hash, exp) { t.Errorf("trie paranoia check failed %x %x", trie.roothash, t2.roothash)
t.Errorf("expected %x got %x", exp, hash)
} }
} }
// Not an actual test
func TestOutput(t *testing.T) {
t.Skip()
base := "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
trie := NewEmpty()
for i := 0; i < 50; i++ {
trie.UpdateString(fmt.Sprintf("%s%d", base, i), "valueeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee")
}
fmt.Println("############################## FULL ################################")
fmt.Println(trie.root)
trie.Commit()
fmt.Println("############################## SMALL ################################")
trie2 := New(trie.roothash, trie.cache.backend)
trie2.GetString(base + "20")
fmt.Println(trie2.root)
}
func BenchmarkGets(b *testing.B) { func BenchmarkGets(b *testing.B) {
_, trie := NewTrie() trie := NewEmpty()
vals := []struct{ k, v string }{ vals := []struct{ k, v string }{
{"do", "verb"}, {"do", "verb"},
{"ether", "wookiedoo"}, {"ether", "wookiedoo"},
...@@ -376,21 +239,21 @@ func BenchmarkGets(b *testing.B) { ...@@ -376,21 +239,21 @@ func BenchmarkGets(b *testing.B) {
{"somethingveryoddindeedthis is", "myothernodedata"}, {"somethingveryoddindeedthis is", "myothernodedata"},
} }
for _, val := range vals { for _, val := range vals {
trie.Update(val.k, val.v) trie.UpdateString(val.k, val.v)
} }
b.ResetTimer() b.ResetTimer()
for i := 0; i < b.N; i++ { for i := 0; i < b.N; i++ {
trie.Get("horse") trie.Get([]byte("horse"))
} }
} }
func BenchmarkUpdate(b *testing.B) { func BenchmarkUpdate(b *testing.B) {
_, trie := NewTrie() trie := NewEmpty()
b.ResetTimer() b.ResetTimer()
for i := 0; i < b.N; i++ { for i := 0; i < b.N; i++ {
trie.Update(fmt.Sprintf("aaaaaaaaaaaaaaa%d", i), "value") trie.UpdateString(fmt.Sprintf("aaaaaaaaa%d", i), "value")
} }
trie.Hash()
} }
*/
ptrie/valuenode.go → trie/valuenode.go
View file @ db4aaedc
package ptrie package trie
type ValueNode struct { type ValueNode struct {
trie *Trie trie *Trie
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment