2015-07-07 00:54:22 +00:00
|
|
|
// Copyright 2014 The go-ethereum Authors
|
2015-07-22 16:48:40 +00:00
|
|
|
// This file is part of the go-ethereum library.
|
2015-07-07 00:54:22 +00:00
|
|
|
//
|
2015-07-23 16:35:11 +00:00
|
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
2015-07-07 00:54:22 +00:00
|
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
|
|
// (at your option) any later version.
|
|
|
|
//
|
2015-07-22 16:48:40 +00:00
|
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
2015-07-07 00:54:22 +00:00
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2015-07-22 16:48:40 +00:00
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
2015-07-07 00:54:22 +00:00
|
|
|
// GNU Lesser General Public License for more details.
|
|
|
|
//
|
|
|
|
// You should have received a copy of the GNU Lesser General Public License
|
2015-07-22 16:48:40 +00:00
|
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
2015-07-07 00:54:22 +00:00
|
|
|
|
2015-01-08 10:47:04 +00:00
|
|
|
package trie
|
2014-11-19 14:05:08 +00:00
|
|
|
|
2016-01-06 10:11:56 +00:00
|
|
|
import (
|
2017-04-13 12:41:24 +00:00
|
|
|
"bytes"
|
2021-04-21 10:25:26 +00:00
|
|
|
"encoding/binary"
|
2017-04-13 12:41:24 +00:00
|
|
|
"fmt"
|
2017-06-20 16:26:09 +00:00
|
|
|
"math/rand"
|
2016-01-06 10:11:56 +00:00
|
|
|
"testing"
|
|
|
|
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
2022-03-31 07:28:32 +00:00
|
|
|
"github.com/ethereum/go-ethereum/core/rawdb"
|
2023-05-09 07:11:04 +00:00
|
|
|
"github.com/ethereum/go-ethereum/core/types"
|
2021-04-21 10:25:26 +00:00
|
|
|
"github.com/ethereum/go-ethereum/crypto"
|
|
|
|
"github.com/ethereum/go-ethereum/ethdb"
|
2018-09-24 12:57:49 +00:00
|
|
|
"github.com/ethereum/go-ethereum/ethdb/memorydb"
|
2023-05-09 07:11:04 +00:00
|
|
|
"github.com/ethereum/go-ethereum/trie/trienode"
|
2016-01-06 10:11:56 +00:00
|
|
|
)
|
2014-11-19 14:05:08 +00:00
|
|
|
|
2022-03-15 09:23:37 +00:00
|
|
|
func TestEmptyIterator(t *testing.T) {
|
2022-08-04 08:03:20 +00:00
|
|
|
trie := NewEmpty(NewDatabase(rawdb.NewMemoryDatabase()))
|
cmd, core/state, eth, tests, trie: improve state reader (#27428)
The state availability is checked during the creation of a state reader.
- In hash-based database, if the specified root node does not exist on disk disk, then
the state reader won't be created and an error will be returned.
- In path-based database, if the specified state layer is not available, then the
state reader won't be created and an error will be returned.
This change also contains a stricter semantics regarding the `Commit` operation: once it has been performed, the trie is no longer usable, and certain operations will return an error.
2023-06-20 19:31:45 +00:00
|
|
|
iter := trie.MustNodeIterator(nil)
|
2022-03-15 09:23:37 +00:00
|
|
|
|
|
|
|
seen := make(map[string]struct{})
|
|
|
|
for iter.Next(true) {
|
|
|
|
seen[string(iter.Path())] = struct{}{}
|
|
|
|
}
|
|
|
|
if len(seen) != 0 {
|
|
|
|
t.Fatal("Unexpected trie node iterated")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-11-19 14:05:08 +00:00
|
|
|
func TestIterator(t *testing.T) {
|
2022-08-04 08:03:20 +00:00
|
|
|
db := NewDatabase(rawdb.NewMemoryDatabase())
|
|
|
|
trie := NewEmpty(db)
|
2014-11-19 14:05:08 +00:00
|
|
|
vals := []struct{ k, v string }{
|
|
|
|
{"do", "verb"},
|
|
|
|
{"ether", "wookiedoo"},
|
|
|
|
{"horse", "stallion"},
|
2014-11-20 17:11:31 +00:00
|
|
|
{"shaman", "horse"},
|
|
|
|
{"doge", "coin"},
|
|
|
|
{"dog", "puppy"},
|
|
|
|
{"somethingveryoddindeedthis is", "myothernodedata"},
|
2014-11-19 14:05:08 +00:00
|
|
|
}
|
2016-09-25 18:49:02 +00:00
|
|
|
all := make(map[string]string)
|
2014-11-19 14:05:08 +00:00
|
|
|
for _, val := range vals {
|
2016-09-25 18:49:02 +00:00
|
|
|
all[val.k] = val.v
|
2023-04-20 10:57:24 +00:00
|
|
|
trie.MustUpdate([]byte(val.k), []byte(val.v))
|
2014-11-19 14:05:08 +00:00
|
|
|
}
|
2023-06-27 12:36:38 +00:00
|
|
|
root, nodes, _ := trie.Commit(false)
|
2023-07-24 10:22:09 +00:00
|
|
|
db.Update(root, types.EmptyRootHash, 0, trienode.NewWithNodeSet(nodes), nil)
|
2014-11-19 14:05:08 +00:00
|
|
|
|
cmd, core, eth, les, light: track deleted nodes (#25757)
* cmd, core, eth, les, light: track deleted nodes
* trie: add docs
* trie: address comments
* cmd, core, eth, les, light, trie: trie id
* trie: add tests
* trie, core: updates
* trie: fix imports
* trie: add utility print-method for nodeset
* trie: import err
* trie: fix go vet warnings
Co-authored-by: Martin Holst Swende <martin@swende.se>
2022-09-27 08:01:02 +00:00
|
|
|
trie, _ = New(TrieID(root), db)
|
2016-09-25 18:49:02 +00:00
|
|
|
found := make(map[string]string)
|
cmd, core/state, eth, tests, trie: improve state reader (#27428)
The state availability is checked during the creation of a state reader.
- In hash-based database, if the specified root node does not exist on disk disk, then
the state reader won't be created and an error will be returned.
- In path-based database, if the specified state layer is not available, then the
state reader won't be created and an error will be returned.
This change also contains a stricter semantics regarding the `Commit` operation: once it has been performed, the trie is no longer usable, and certain operations will return an error.
2023-06-20 19:31:45 +00:00
|
|
|
it := NewIterator(trie.MustNodeIterator(nil))
|
2014-11-19 14:05:08 +00:00
|
|
|
for it.Next() {
|
2016-09-25 18:49:02 +00:00
|
|
|
found[string(it.Key)] = string(it.Value)
|
2014-11-19 14:05:08 +00:00
|
|
|
}
|
|
|
|
|
2016-09-25 18:49:02 +00:00
|
|
|
for k, v := range all {
|
|
|
|
if found[k] != v {
|
|
|
|
t.Errorf("iterator value mismatch for %s: got %q want %q", k, found[k], v)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
type kv struct {
|
|
|
|
k, v []byte
|
|
|
|
t bool
|
|
|
|
}
|
|
|
|
|
2023-06-19 09:41:31 +00:00
|
|
|
func (k *kv) less(other *kv) bool {
|
|
|
|
return bytes.Compare(k.k, other.k) < 0
|
|
|
|
}
|
|
|
|
|
2016-09-25 18:49:02 +00:00
|
|
|
func TestIteratorLargeData(t *testing.T) {
|
2022-08-04 08:03:20 +00:00
|
|
|
trie := NewEmpty(NewDatabase(rawdb.NewMemoryDatabase()))
|
2016-09-25 18:49:02 +00:00
|
|
|
vals := make(map[string]*kv)
|
|
|
|
|
|
|
|
for i := byte(0); i < 255; i++ {
|
|
|
|
value := &kv{common.LeftPadBytes([]byte{i}, 32), []byte{i}, false}
|
|
|
|
value2 := &kv{common.LeftPadBytes([]byte{10, i}, 32), []byte{i}, false}
|
2023-04-20 10:57:24 +00:00
|
|
|
trie.MustUpdate(value.k, value.v)
|
|
|
|
trie.MustUpdate(value2.k, value2.v)
|
2016-09-25 18:49:02 +00:00
|
|
|
vals[string(value.k)] = value
|
|
|
|
vals[string(value2.k)] = value2
|
|
|
|
}
|
|
|
|
|
cmd, core/state, eth, tests, trie: improve state reader (#27428)
The state availability is checked during the creation of a state reader.
- In hash-based database, if the specified root node does not exist on disk disk, then
the state reader won't be created and an error will be returned.
- In path-based database, if the specified state layer is not available, then the
state reader won't be created and an error will be returned.
This change also contains a stricter semantics regarding the `Commit` operation: once it has been performed, the trie is no longer usable, and certain operations will return an error.
2023-06-20 19:31:45 +00:00
|
|
|
it := NewIterator(trie.MustNodeIterator(nil))
|
2016-09-25 18:49:02 +00:00
|
|
|
for it.Next() {
|
|
|
|
vals[string(it.Key)].t = true
|
|
|
|
}
|
|
|
|
|
|
|
|
var untouched []*kv
|
|
|
|
for _, value := range vals {
|
|
|
|
if !value.t {
|
|
|
|
untouched = append(untouched, value)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(untouched) > 0 {
|
|
|
|
t.Errorf("Missed %d nodes", len(untouched))
|
|
|
|
for _, value := range untouched {
|
|
|
|
t.Error(value)
|
2014-11-19 14:05:08 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-01-06 10:11:56 +00:00
|
|
|
|
2023-05-09 07:11:04 +00:00
|
|
|
type iterationElement struct {
|
|
|
|
hash common.Hash
|
|
|
|
path []byte
|
|
|
|
blob []byte
|
|
|
|
}
|
|
|
|
|
2016-01-06 10:11:56 +00:00
|
|
|
// Tests that the node iterator indeed walks over the entire database contents.
|
|
|
|
func TestNodeIteratorCoverage(t *testing.T) {
|
2023-05-09 07:11:04 +00:00
|
|
|
testNodeIteratorCoverage(t, rawdb.HashScheme)
|
2023-08-01 12:17:32 +00:00
|
|
|
testNodeIteratorCoverage(t, rawdb.PathScheme)
|
2023-05-09 07:11:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func testNodeIteratorCoverage(t *testing.T, scheme string) {
|
2016-01-06 10:11:56 +00:00
|
|
|
// Create some arbitrary test trie to iterate
|
2023-05-09 07:11:04 +00:00
|
|
|
db, nodeDb, trie, _ := makeTestTrie(scheme)
|
2016-01-06 10:11:56 +00:00
|
|
|
|
|
|
|
// Gather all the node hashes found by the iterator
|
2023-05-09 07:11:04 +00:00
|
|
|
var elements = make(map[common.Hash]iterationElement)
|
cmd, core/state, eth, tests, trie: improve state reader (#27428)
The state availability is checked during the creation of a state reader.
- In hash-based database, if the specified root node does not exist on disk disk, then
the state reader won't be created and an error will be returned.
- In path-based database, if the specified state layer is not available, then the
state reader won't be created and an error will be returned.
This change also contains a stricter semantics regarding the `Commit` operation: once it has been performed, the trie is no longer usable, and certain operations will return an error.
2023-06-20 19:31:45 +00:00
|
|
|
for it := trie.MustNodeIterator(nil); it.Next(true); {
|
2017-02-22 22:49:34 +00:00
|
|
|
if it.Hash() != (common.Hash{}) {
|
2023-05-09 07:11:04 +00:00
|
|
|
elements[it.Hash()] = iterationElement{
|
|
|
|
hash: it.Hash(),
|
|
|
|
path: common.CopyBytes(it.Path()),
|
|
|
|
blob: common.CopyBytes(it.NodeBlob()),
|
|
|
|
}
|
2016-01-06 10:11:56 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
// Cross check the hashes and the database itself
|
cmd, core/state, eth, tests, trie: improve state reader (#27428)
The state availability is checked during the creation of a state reader.
- In hash-based database, if the specified root node does not exist on disk disk, then
the state reader won't be created and an error will be returned.
- In path-based database, if the specified state layer is not available, then the
state reader won't be created and an error will be returned.
This change also contains a stricter semantics regarding the `Commit` operation: once it has been performed, the trie is no longer usable, and certain operations will return an error.
2023-06-20 19:31:45 +00:00
|
|
|
reader, err := nodeDb.Reader(trie.Hash())
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("state is not available %x", trie.Hash())
|
|
|
|
}
|
2023-05-09 07:11:04 +00:00
|
|
|
for _, element := range elements {
|
cmd, core/state, eth, tests, trie: improve state reader (#27428)
The state availability is checked during the creation of a state reader.
- In hash-based database, if the specified root node does not exist on disk disk, then
the state reader won't be created and an error will be returned.
- In path-based database, if the specified state layer is not available, then the
state reader won't be created and an error will be returned.
This change also contains a stricter semantics regarding the `Commit` operation: once it has been performed, the trie is no longer usable, and certain operations will return an error.
2023-06-20 19:31:45 +00:00
|
|
|
if blob, err := reader.Node(common.Hash{}, element.path, element.hash); err != nil {
|
2023-05-09 07:11:04 +00:00
|
|
|
t.Errorf("failed to retrieve reported node %x: %v", element.hash, err)
|
|
|
|
} else if !bytes.Equal(blob, element.blob) {
|
|
|
|
t.Errorf("node blob is different, want %v got %v", element.blob, blob)
|
2016-01-06 10:11:56 +00:00
|
|
|
}
|
|
|
|
}
|
2023-05-09 07:11:04 +00:00
|
|
|
var (
|
|
|
|
count int
|
|
|
|
it = db.NewIterator(nil, nil)
|
|
|
|
)
|
2018-09-24 12:57:49 +00:00
|
|
|
for it.Next() {
|
2023-05-09 07:11:04 +00:00
|
|
|
res, _, _ := isTrieNode(nodeDb.Scheme(), it.Key(), it.Value())
|
|
|
|
if !res {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
count += 1
|
|
|
|
if elem, ok := elements[crypto.Keccak256Hash(it.Value())]; !ok {
|
|
|
|
t.Error("state entry not reported")
|
|
|
|
} else if !bytes.Equal(it.Value(), elem.blob) {
|
|
|
|
t.Errorf("node blob is different, want %v got %v", elem.blob, it.Value())
|
2016-01-06 10:11:56 +00:00
|
|
|
}
|
|
|
|
}
|
2018-09-24 12:57:49 +00:00
|
|
|
it.Release()
|
2023-05-09 07:11:04 +00:00
|
|
|
if count != len(elements) {
|
|
|
|
t.Errorf("state entry is mismatched %d %d", count, len(elements))
|
|
|
|
}
|
2016-01-06 10:11:56 +00:00
|
|
|
}
|
2017-02-22 22:49:34 +00:00
|
|
|
|
2017-04-13 12:41:24 +00:00
|
|
|
type kvs struct{ k, v string }
|
|
|
|
|
|
|
|
var testdata1 = []kvs{
|
2017-04-13 09:14:19 +00:00
|
|
|
{"barb", "ba"},
|
|
|
|
{"bard", "bc"},
|
2017-04-13 12:41:24 +00:00
|
|
|
{"bars", "bb"},
|
|
|
|
{"bar", "b"},
|
2017-04-13 09:14:19 +00:00
|
|
|
{"fab", "z"},
|
|
|
|
{"food", "ab"},
|
|
|
|
{"foos", "aa"},
|
2017-04-13 12:41:24 +00:00
|
|
|
{"foo", "a"},
|
2017-04-13 09:14:19 +00:00
|
|
|
}
|
|
|
|
|
2017-04-13 12:41:24 +00:00
|
|
|
var testdata2 = []kvs{
|
2017-04-13 09:14:19 +00:00
|
|
|
{"aardvark", "c"},
|
|
|
|
{"bar", "b"},
|
|
|
|
{"barb", "bd"},
|
|
|
|
{"bars", "be"},
|
|
|
|
{"fab", "z"},
|
|
|
|
{"foo", "a"},
|
|
|
|
{"foos", "aa"},
|
|
|
|
{"food", "ab"},
|
|
|
|
{"jars", "d"},
|
|
|
|
}
|
|
|
|
|
2017-04-13 12:41:24 +00:00
|
|
|
func TestIteratorSeek(t *testing.T) {
|
2022-08-04 08:03:20 +00:00
|
|
|
trie := NewEmpty(NewDatabase(rawdb.NewMemoryDatabase()))
|
2017-04-13 12:41:24 +00:00
|
|
|
for _, val := range testdata1 {
|
2023-04-20 10:57:24 +00:00
|
|
|
trie.MustUpdate([]byte(val.k), []byte(val.v))
|
2017-04-13 12:41:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Seek to the middle.
|
cmd, core/state, eth, tests, trie: improve state reader (#27428)
The state availability is checked during the creation of a state reader.
- In hash-based database, if the specified root node does not exist on disk disk, then
the state reader won't be created and an error will be returned.
- In path-based database, if the specified state layer is not available, then the
state reader won't be created and an error will be returned.
This change also contains a stricter semantics regarding the `Commit` operation: once it has been performed, the trie is no longer usable, and certain operations will return an error.
2023-06-20 19:31:45 +00:00
|
|
|
it := NewIterator(trie.MustNodeIterator([]byte("fab")))
|
2017-04-13 12:41:24 +00:00
|
|
|
if err := checkIteratorOrder(testdata1[4:], it); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Seek to a non-existent key.
|
cmd, core/state, eth, tests, trie: improve state reader (#27428)
The state availability is checked during the creation of a state reader.
- In hash-based database, if the specified root node does not exist on disk disk, then
the state reader won't be created and an error will be returned.
- In path-based database, if the specified state layer is not available, then the
state reader won't be created and an error will be returned.
This change also contains a stricter semantics regarding the `Commit` operation: once it has been performed, the trie is no longer usable, and certain operations will return an error.
2023-06-20 19:31:45 +00:00
|
|
|
it = NewIterator(trie.MustNodeIterator([]byte("barc")))
|
2017-04-13 12:41:24 +00:00
|
|
|
if err := checkIteratorOrder(testdata1[1:], it); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Seek beyond the end.
|
cmd, core/state, eth, tests, trie: improve state reader (#27428)
The state availability is checked during the creation of a state reader.
- In hash-based database, if the specified root node does not exist on disk disk, then
the state reader won't be created and an error will be returned.
- In path-based database, if the specified state layer is not available, then the
state reader won't be created and an error will be returned.
This change also contains a stricter semantics regarding the `Commit` operation: once it has been performed, the trie is no longer usable, and certain operations will return an error.
2023-06-20 19:31:45 +00:00
|
|
|
it = NewIterator(trie.MustNodeIterator([]byte("z")))
|
2017-04-13 12:41:24 +00:00
|
|
|
if err := checkIteratorOrder(nil, it); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func checkIteratorOrder(want []kvs, it *Iterator) error {
|
|
|
|
for it.Next() {
|
|
|
|
if len(want) == 0 {
|
|
|
|
return fmt.Errorf("didn't expect any more values, got key %q", it.Key)
|
|
|
|
}
|
|
|
|
if !bytes.Equal(it.Key, []byte(want[0].k)) {
|
|
|
|
return fmt.Errorf("wrong key: got %q, want %q", it.Key, want[0].k)
|
|
|
|
}
|
|
|
|
want = want[1:]
|
|
|
|
}
|
|
|
|
if len(want) > 0 {
|
|
|
|
return fmt.Errorf("iterator ended early, want key %q", want[0])
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2017-02-22 22:49:34 +00:00
|
|
|
func TestDifferenceIterator(t *testing.T) {
|
2022-08-04 08:03:20 +00:00
|
|
|
dba := NewDatabase(rawdb.NewMemoryDatabase())
|
|
|
|
triea := NewEmpty(dba)
|
2017-04-13 09:14:19 +00:00
|
|
|
for _, val := range testdata1 {
|
2023-04-20 10:57:24 +00:00
|
|
|
triea.MustUpdate([]byte(val.k), []byte(val.v))
|
2017-02-22 22:49:34 +00:00
|
|
|
}
|
2023-06-27 12:36:38 +00:00
|
|
|
rootA, nodesA, _ := triea.Commit(false)
|
2023-07-24 10:22:09 +00:00
|
|
|
dba.Update(rootA, types.EmptyRootHash, 0, trienode.NewWithNodeSet(nodesA), nil)
|
cmd, core, eth, les, light: track deleted nodes (#25757)
* cmd, core, eth, les, light: track deleted nodes
* trie: add docs
* trie: address comments
* cmd, core, eth, les, light, trie: trie id
* trie: add tests
* trie, core: updates
* trie: fix imports
* trie: add utility print-method for nodeset
* trie: import err
* trie: fix go vet warnings
Co-authored-by: Martin Holst Swende <martin@swende.se>
2022-09-27 08:01:02 +00:00
|
|
|
triea, _ = New(TrieID(rootA), dba)
|
2017-02-22 22:49:34 +00:00
|
|
|
|
2022-08-04 08:03:20 +00:00
|
|
|
dbb := NewDatabase(rawdb.NewMemoryDatabase())
|
|
|
|
trieb := NewEmpty(dbb)
|
2017-04-13 09:14:19 +00:00
|
|
|
for _, val := range testdata2 {
|
2023-04-20 10:57:24 +00:00
|
|
|
trieb.MustUpdate([]byte(val.k), []byte(val.v))
|
2017-02-22 22:49:34 +00:00
|
|
|
}
|
2023-06-27 12:36:38 +00:00
|
|
|
rootB, nodesB, _ := trieb.Commit(false)
|
2023-07-24 10:22:09 +00:00
|
|
|
dbb.Update(rootB, types.EmptyRootHash, 0, trienode.NewWithNodeSet(nodesB), nil)
|
cmd, core, eth, les, light: track deleted nodes (#25757)
* cmd, core, eth, les, light: track deleted nodes
* trie: add docs
* trie: address comments
* cmd, core, eth, les, light, trie: trie id
* trie: add tests
* trie, core: updates
* trie: fix imports
* trie: add utility print-method for nodeset
* trie: import err
* trie: fix go vet warnings
Co-authored-by: Martin Holst Swende <martin@swende.se>
2022-09-27 08:01:02 +00:00
|
|
|
trieb, _ = New(TrieID(rootB), dbb)
|
2017-02-22 22:49:34 +00:00
|
|
|
|
|
|
|
found := make(map[string]string)
|
cmd, core/state, eth, tests, trie: improve state reader (#27428)
The state availability is checked during the creation of a state reader.
- In hash-based database, if the specified root node does not exist on disk disk, then
the state reader won't be created and an error will be returned.
- In path-based database, if the specified state layer is not available, then the
state reader won't be created and an error will be returned.
This change also contains a stricter semantics regarding the `Commit` operation: once it has been performed, the trie is no longer usable, and certain operations will return an error.
2023-06-20 19:31:45 +00:00
|
|
|
di, _ := NewDifferenceIterator(triea.MustNodeIterator(nil), trieb.MustNodeIterator(nil))
|
2017-04-18 11:37:10 +00:00
|
|
|
it := NewIterator(di)
|
2017-02-22 22:49:34 +00:00
|
|
|
for it.Next() {
|
|
|
|
found[string(it.Key)] = string(it.Value)
|
|
|
|
}
|
|
|
|
|
|
|
|
all := []struct{ k, v string }{
|
|
|
|
{"aardvark", "c"},
|
|
|
|
{"barb", "bd"},
|
|
|
|
{"bars", "be"},
|
|
|
|
{"jars", "d"},
|
|
|
|
}
|
|
|
|
for _, item := range all {
|
|
|
|
if found[item.k] != item.v {
|
2017-04-13 09:14:19 +00:00
|
|
|
t.Errorf("iterator value mismatch for %s: got %v want %v", item.k, found[item.k], item.v)
|
2017-02-22 22:49:34 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if len(found) != len(all) {
|
|
|
|
t.Errorf("iterator count mismatch: got %d values, want %d", len(found), len(all))
|
|
|
|
}
|
|
|
|
}
|
2017-04-13 09:14:19 +00:00
|
|
|
|
|
|
|
func TestUnionIterator(t *testing.T) {
|
2022-08-04 08:03:20 +00:00
|
|
|
dba := NewDatabase(rawdb.NewMemoryDatabase())
|
|
|
|
triea := NewEmpty(dba)
|
2017-04-13 09:14:19 +00:00
|
|
|
for _, val := range testdata1 {
|
2023-04-20 10:57:24 +00:00
|
|
|
triea.MustUpdate([]byte(val.k), []byte(val.v))
|
2017-04-13 09:14:19 +00:00
|
|
|
}
|
2023-06-27 12:36:38 +00:00
|
|
|
rootA, nodesA, _ := triea.Commit(false)
|
2023-07-24 10:22:09 +00:00
|
|
|
dba.Update(rootA, types.EmptyRootHash, 0, trienode.NewWithNodeSet(nodesA), nil)
|
cmd, core, eth, les, light: track deleted nodes (#25757)
* cmd, core, eth, les, light: track deleted nodes
* trie: add docs
* trie: address comments
* cmd, core, eth, les, light, trie: trie id
* trie: add tests
* trie, core: updates
* trie: fix imports
* trie: add utility print-method for nodeset
* trie: import err
* trie: fix go vet warnings
Co-authored-by: Martin Holst Swende <martin@swende.se>
2022-09-27 08:01:02 +00:00
|
|
|
triea, _ = New(TrieID(rootA), dba)
|
2017-04-13 09:14:19 +00:00
|
|
|
|
2022-08-04 08:03:20 +00:00
|
|
|
dbb := NewDatabase(rawdb.NewMemoryDatabase())
|
|
|
|
trieb := NewEmpty(dbb)
|
2017-04-13 09:14:19 +00:00
|
|
|
for _, val := range testdata2 {
|
2023-04-20 10:57:24 +00:00
|
|
|
trieb.MustUpdate([]byte(val.k), []byte(val.v))
|
2017-04-13 09:14:19 +00:00
|
|
|
}
|
2023-06-27 12:36:38 +00:00
|
|
|
rootB, nodesB, _ := trieb.Commit(false)
|
2023-07-24 10:22:09 +00:00
|
|
|
dbb.Update(rootB, types.EmptyRootHash, 0, trienode.NewWithNodeSet(nodesB), nil)
|
cmd, core, eth, les, light: track deleted nodes (#25757)
* cmd, core, eth, les, light: track deleted nodes
* trie: add docs
* trie: address comments
* cmd, core, eth, les, light, trie: trie id
* trie: add tests
* trie, core: updates
* trie: fix imports
* trie: add utility print-method for nodeset
* trie: import err
* trie: fix go vet warnings
Co-authored-by: Martin Holst Swende <martin@swende.se>
2022-09-27 08:01:02 +00:00
|
|
|
trieb, _ = New(TrieID(rootB), dbb)
|
2017-04-13 09:14:19 +00:00
|
|
|
|
cmd, core/state, eth, tests, trie: improve state reader (#27428)
The state availability is checked during the creation of a state reader.
- In hash-based database, if the specified root node does not exist on disk disk, then
the state reader won't be created and an error will be returned.
- In path-based database, if the specified state layer is not available, then the
state reader won't be created and an error will be returned.
This change also contains a stricter semantics regarding the `Commit` operation: once it has been performed, the trie is no longer usable, and certain operations will return an error.
2023-06-20 19:31:45 +00:00
|
|
|
di, _ := NewUnionIterator([]NodeIterator{triea.MustNodeIterator(nil), trieb.MustNodeIterator(nil)})
|
2017-04-18 11:37:10 +00:00
|
|
|
it := NewIterator(di)
|
2017-04-13 09:14:19 +00:00
|
|
|
|
|
|
|
all := []struct{ k, v string }{
|
|
|
|
{"aardvark", "c"},
|
|
|
|
{"barb", "ba"},
|
2017-06-20 16:26:09 +00:00
|
|
|
{"barb", "bd"},
|
2017-04-13 09:14:19 +00:00
|
|
|
{"bard", "bc"},
|
|
|
|
{"bars", "bb"},
|
|
|
|
{"bars", "be"},
|
|
|
|
{"bar", "b"},
|
|
|
|
{"fab", "z"},
|
|
|
|
{"food", "ab"},
|
|
|
|
{"foos", "aa"},
|
|
|
|
{"foo", "a"},
|
|
|
|
{"jars", "d"},
|
|
|
|
}
|
|
|
|
|
|
|
|
for i, kv := range all {
|
|
|
|
if !it.Next() {
|
|
|
|
t.Errorf("Iterator ends prematurely at element %d", i)
|
|
|
|
}
|
|
|
|
if kv.k != string(it.Key) {
|
|
|
|
t.Errorf("iterator value mismatch for element %d: got key %s want %s", i, it.Key, kv.k)
|
|
|
|
}
|
|
|
|
if kv.v != string(it.Value) {
|
|
|
|
t.Errorf("iterator value mismatch for element %d: got value %s want %s", i, it.Value, kv.v)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if it.Next() {
|
|
|
|
t.Errorf("Iterator returned extra values.")
|
|
|
|
}
|
|
|
|
}
|
2017-06-20 16:26:09 +00:00
|
|
|
|
|
|
|
func TestIteratorNoDups(t *testing.T) {
|
2022-06-06 15:14:55 +00:00
|
|
|
tr := NewEmpty(NewDatabase(rawdb.NewMemoryDatabase()))
|
2017-06-20 16:26:09 +00:00
|
|
|
for _, val := range testdata1 {
|
2023-04-20 10:57:24 +00:00
|
|
|
tr.MustUpdate([]byte(val.k), []byte(val.v))
|
2017-06-20 16:26:09 +00:00
|
|
|
}
|
cmd, core/state, eth, tests, trie: improve state reader (#27428)
The state availability is checked during the creation of a state reader.
- In hash-based database, if the specified root node does not exist on disk disk, then
the state reader won't be created and an error will be returned.
- In path-based database, if the specified state layer is not available, then the
state reader won't be created and an error will be returned.
This change also contains a stricter semantics regarding the `Commit` operation: once it has been performed, the trie is no longer usable, and certain operations will return an error.
2023-06-20 19:31:45 +00:00
|
|
|
checkIteratorNoDups(t, tr.MustNodeIterator(nil), nil)
|
2017-06-20 16:26:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// This test checks that nodeIterator.Next can be retried after inserting missing trie nodes.
|
2023-05-09 07:11:04 +00:00
|
|
|
func TestIteratorContinueAfterError(t *testing.T) {
|
|
|
|
testIteratorContinueAfterError(t, false, rawdb.HashScheme)
|
|
|
|
testIteratorContinueAfterError(t, true, rawdb.HashScheme)
|
2023-08-01 12:17:32 +00:00
|
|
|
testIteratorContinueAfterError(t, false, rawdb.PathScheme)
|
|
|
|
testIteratorContinueAfterError(t, true, rawdb.PathScheme)
|
2023-05-09 07:11:04 +00:00
|
|
|
}
|
2018-02-05 16:40:32 +00:00
|
|
|
|
2023-05-09 07:11:04 +00:00
|
|
|
func testIteratorContinueAfterError(t *testing.T, memonly bool, scheme string) {
|
2022-11-28 13:31:28 +00:00
|
|
|
diskdb := rawdb.NewMemoryDatabase()
|
2023-05-09 07:11:04 +00:00
|
|
|
tdb := newTestDatabase(diskdb, scheme)
|
2018-02-05 16:40:32 +00:00
|
|
|
|
2023-05-09 07:11:04 +00:00
|
|
|
tr := NewEmpty(tdb)
|
2017-06-20 16:26:09 +00:00
|
|
|
for _, val := range testdata1 {
|
2023-04-20 10:57:24 +00:00
|
|
|
tr.MustUpdate([]byte(val.k), []byte(val.v))
|
2017-06-20 16:26:09 +00:00
|
|
|
}
|
2023-06-27 12:36:38 +00:00
|
|
|
root, nodes, _ := tr.Commit(false)
|
2023-07-24 10:22:09 +00:00
|
|
|
tdb.Update(root, types.EmptyRootHash, 0, trienode.NewWithNodeSet(nodes), nil)
|
2018-02-05 16:40:32 +00:00
|
|
|
if !memonly {
|
2023-05-09 07:11:04 +00:00
|
|
|
tdb.Commit(root, false)
|
2018-02-05 16:40:32 +00:00
|
|
|
}
|
2023-05-09 07:11:04 +00:00
|
|
|
tr, _ = New(TrieID(root), tdb)
|
cmd, core/state, eth, tests, trie: improve state reader (#27428)
The state availability is checked during the creation of a state reader.
- In hash-based database, if the specified root node does not exist on disk disk, then
the state reader won't be created and an error will be returned.
- In path-based database, if the specified state layer is not available, then the
state reader won't be created and an error will be returned.
This change also contains a stricter semantics regarding the `Commit` operation: once it has been performed, the trie is no longer usable, and certain operations will return an error.
2023-06-20 19:31:45 +00:00
|
|
|
wantNodeCount := checkIteratorNoDups(t, tr.MustNodeIterator(nil), nil)
|
2017-06-20 16:26:09 +00:00
|
|
|
|
2018-02-05 16:40:32 +00:00
|
|
|
var (
|
2023-05-09 07:11:04 +00:00
|
|
|
paths [][]byte
|
|
|
|
hashes []common.Hash
|
2018-02-05 16:40:32 +00:00
|
|
|
)
|
|
|
|
if memonly {
|
2023-05-09 07:11:04 +00:00
|
|
|
for path, n := range nodes.Nodes {
|
|
|
|
paths = append(paths, []byte(path))
|
|
|
|
hashes = append(hashes, n.Hash)
|
|
|
|
}
|
2018-02-05 16:40:32 +00:00
|
|
|
} else {
|
2020-04-15 11:08:53 +00:00
|
|
|
it := diskdb.NewIterator(nil, nil)
|
2018-09-24 12:57:49 +00:00
|
|
|
for it.Next() {
|
2023-05-09 07:11:04 +00:00
|
|
|
ok, path, hash := isTrieNode(tdb.Scheme(), it.Key(), it.Value())
|
|
|
|
if !ok {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
paths = append(paths, path)
|
|
|
|
hashes = append(hashes, hash)
|
2018-09-24 12:57:49 +00:00
|
|
|
}
|
|
|
|
it.Release()
|
2018-02-05 16:40:32 +00:00
|
|
|
}
|
2017-06-20 16:26:09 +00:00
|
|
|
for i := 0; i < 20; i++ {
|
|
|
|
// Create trie that will load all nodes from DB.
|
2023-05-09 07:11:04 +00:00
|
|
|
tr, _ := New(TrieID(tr.Hash()), tdb)
|
2017-06-20 16:26:09 +00:00
|
|
|
|
|
|
|
// Remove a random node from the database. It can't be the root node
|
|
|
|
// because that one is already loaded.
|
2018-02-05 16:40:32 +00:00
|
|
|
var (
|
2023-05-09 07:11:04 +00:00
|
|
|
rval []byte
|
|
|
|
rpath []byte
|
|
|
|
rhash common.Hash
|
2018-02-05 16:40:32 +00:00
|
|
|
)
|
2017-06-20 16:26:09 +00:00
|
|
|
for {
|
2018-02-05 16:40:32 +00:00
|
|
|
if memonly {
|
2023-05-09 07:11:04 +00:00
|
|
|
rpath = paths[rand.Intn(len(paths))]
|
|
|
|
n := nodes.Nodes[string(rpath)]
|
|
|
|
if n == nil {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
rhash = n.Hash
|
2018-02-05 16:40:32 +00:00
|
|
|
} else {
|
2023-05-09 07:11:04 +00:00
|
|
|
index := rand.Intn(len(paths))
|
|
|
|
rpath = paths[index]
|
|
|
|
rhash = hashes[index]
|
2018-02-05 16:40:32 +00:00
|
|
|
}
|
2023-05-09 07:11:04 +00:00
|
|
|
if rhash != tr.Hash() {
|
2017-06-20 16:26:09 +00:00
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
2018-02-05 16:40:32 +00:00
|
|
|
if memonly {
|
2023-05-09 07:11:04 +00:00
|
|
|
tr.reader.banned = map[string]struct{}{string(rpath): {}}
|
2018-02-05 16:40:32 +00:00
|
|
|
} else {
|
2023-05-09 07:11:04 +00:00
|
|
|
rval = rawdb.ReadTrieNode(diskdb, common.Hash{}, rpath, rhash, tdb.Scheme())
|
|
|
|
rawdb.DeleteTrieNode(diskdb, common.Hash{}, rpath, rhash, tdb.Scheme())
|
2018-02-05 16:40:32 +00:00
|
|
|
}
|
2017-06-20 16:26:09 +00:00
|
|
|
// Iterate until the error is hit.
|
|
|
|
seen := make(map[string]bool)
|
cmd, core/state, eth, tests, trie: improve state reader (#27428)
The state availability is checked during the creation of a state reader.
- In hash-based database, if the specified root node does not exist on disk disk, then
the state reader won't be created and an error will be returned.
- In path-based database, if the specified state layer is not available, then the
state reader won't be created and an error will be returned.
This change also contains a stricter semantics regarding the `Commit` operation: once it has been performed, the trie is no longer usable, and certain operations will return an error.
2023-06-20 19:31:45 +00:00
|
|
|
it := tr.MustNodeIterator(nil)
|
2017-06-20 16:26:09 +00:00
|
|
|
checkIteratorNoDups(t, it, seen)
|
|
|
|
missing, ok := it.Error().(*MissingNodeError)
|
2023-05-09 07:11:04 +00:00
|
|
|
if !ok || missing.NodeHash != rhash {
|
2017-06-20 16:26:09 +00:00
|
|
|
t.Fatal("didn't hit missing node, got", it.Error())
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add the node back and continue iteration.
|
2018-02-05 16:40:32 +00:00
|
|
|
if memonly {
|
2023-05-09 07:11:04 +00:00
|
|
|
delete(tr.reader.banned, string(rpath))
|
2018-02-05 16:40:32 +00:00
|
|
|
} else {
|
2023-05-09 07:11:04 +00:00
|
|
|
rawdb.WriteTrieNode(diskdb, common.Hash{}, rpath, rhash, rval, tdb.Scheme())
|
2018-02-05 16:40:32 +00:00
|
|
|
}
|
2017-06-20 16:26:09 +00:00
|
|
|
checkIteratorNoDups(t, it, seen)
|
|
|
|
if it.Error() != nil {
|
|
|
|
t.Fatal("unexpected error", it.Error())
|
|
|
|
}
|
|
|
|
if len(seen) != wantNodeCount {
|
|
|
|
t.Fatal("wrong node iteration count, got", len(seen), "want", wantNodeCount)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Similar to the test above, this one checks that failure to create nodeIterator at a
|
|
|
|
// certain key prefix behaves correctly when Next is called. The expectation is that Next
|
|
|
|
// should retry seeking before returning true for the first time.
|
2023-05-09 07:11:04 +00:00
|
|
|
func TestIteratorContinueAfterSeekError(t *testing.T) {
|
|
|
|
testIteratorContinueAfterSeekError(t, false, rawdb.HashScheme)
|
|
|
|
testIteratorContinueAfterSeekError(t, true, rawdb.HashScheme)
|
2023-08-01 12:17:32 +00:00
|
|
|
testIteratorContinueAfterSeekError(t, false, rawdb.PathScheme)
|
|
|
|
testIteratorContinueAfterSeekError(t, true, rawdb.PathScheme)
|
2018-02-05 16:40:32 +00:00
|
|
|
}
|
|
|
|
|
2023-05-09 07:11:04 +00:00
|
|
|
func testIteratorContinueAfterSeekError(t *testing.T, memonly bool, scheme string) {
|
2017-06-20 16:26:09 +00:00
|
|
|
// Commit test trie to db, then remove the node containing "bars".
|
2023-05-09 07:11:04 +00:00
|
|
|
var (
|
|
|
|
barNodePath []byte
|
|
|
|
barNodeHash = common.HexToHash("05041990364eb72fcb1127652ce40d8bab765f2bfe53225b1170d276cc101c2e")
|
|
|
|
)
|
2022-11-28 13:31:28 +00:00
|
|
|
diskdb := rawdb.NewMemoryDatabase()
|
2023-05-09 07:11:04 +00:00
|
|
|
triedb := newTestDatabase(diskdb, scheme)
|
2022-06-06 15:14:55 +00:00
|
|
|
ctr := NewEmpty(triedb)
|
2017-06-20 16:26:09 +00:00
|
|
|
for _, val := range testdata1 {
|
2023-04-20 10:57:24 +00:00
|
|
|
ctr.MustUpdate([]byte(val.k), []byte(val.v))
|
2017-06-20 16:26:09 +00:00
|
|
|
}
|
2023-06-27 12:36:38 +00:00
|
|
|
root, nodes, _ := ctr.Commit(false)
|
2023-05-09 07:11:04 +00:00
|
|
|
for path, n := range nodes.Nodes {
|
|
|
|
if n.Hash == barNodeHash {
|
|
|
|
barNodePath = []byte(path)
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
2023-07-24 10:22:09 +00:00
|
|
|
triedb.Update(root, types.EmptyRootHash, 0, trienode.NewWithNodeSet(nodes), nil)
|
2018-02-05 16:40:32 +00:00
|
|
|
if !memonly {
|
2023-02-08 11:14:34 +00:00
|
|
|
triedb.Commit(root, false)
|
2018-02-05 16:40:32 +00:00
|
|
|
}
|
|
|
|
var (
|
|
|
|
barNodeBlob []byte
|
|
|
|
)
|
2023-05-09 07:11:04 +00:00
|
|
|
tr, _ := New(TrieID(root), triedb)
|
2018-02-05 16:40:32 +00:00
|
|
|
if memonly {
|
2023-05-09 07:11:04 +00:00
|
|
|
tr.reader.banned = map[string]struct{}{string(barNodePath): {}}
|
2018-02-05 16:40:32 +00:00
|
|
|
} else {
|
2023-05-09 07:11:04 +00:00
|
|
|
barNodeBlob = rawdb.ReadTrieNode(diskdb, common.Hash{}, barNodePath, barNodeHash, triedb.Scheme())
|
|
|
|
rawdb.DeleteTrieNode(diskdb, common.Hash{}, barNodePath, barNodeHash, triedb.Scheme())
|
2018-02-05 16:40:32 +00:00
|
|
|
}
|
2017-06-20 16:26:09 +00:00
|
|
|
// Create a new iterator that seeks to "bars". Seeking can't proceed because
|
|
|
|
// the node is missing.
|
cmd, core/state, eth, tests, trie: improve state reader (#27428)
The state availability is checked during the creation of a state reader.
- In hash-based database, if the specified root node does not exist on disk disk, then
the state reader won't be created and an error will be returned.
- In path-based database, if the specified state layer is not available, then the
state reader won't be created and an error will be returned.
This change also contains a stricter semantics regarding the `Commit` operation: once it has been performed, the trie is no longer usable, and certain operations will return an error.
2023-06-20 19:31:45 +00:00
|
|
|
it := tr.MustNodeIterator([]byte("bars"))
|
2017-06-20 16:26:09 +00:00
|
|
|
missing, ok := it.Error().(*MissingNodeError)
|
|
|
|
if !ok {
|
|
|
|
t.Fatal("want MissingNodeError, got", it.Error())
|
|
|
|
} else if missing.NodeHash != barNodeHash {
|
|
|
|
t.Fatal("wrong node missing")
|
|
|
|
}
|
|
|
|
// Reinsert the missing node.
|
2018-02-05 16:40:32 +00:00
|
|
|
if memonly {
|
2023-05-09 07:11:04 +00:00
|
|
|
delete(tr.reader.banned, string(barNodePath))
|
2018-02-05 16:40:32 +00:00
|
|
|
} else {
|
2023-05-09 07:11:04 +00:00
|
|
|
rawdb.WriteTrieNode(diskdb, common.Hash{}, barNodePath, barNodeHash, barNodeBlob, triedb.Scheme())
|
2018-02-05 16:40:32 +00:00
|
|
|
}
|
2017-06-20 16:26:09 +00:00
|
|
|
// Check that iteration produces the right set of values.
|
|
|
|
if err := checkIteratorOrder(testdata1[2:], NewIterator(it)); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func checkIteratorNoDups(t *testing.T, it NodeIterator, seen map[string]bool) int {
|
|
|
|
if seen == nil {
|
|
|
|
seen = make(map[string]bool)
|
|
|
|
}
|
|
|
|
for it.Next(true) {
|
|
|
|
if seen[string(it.Path())] {
|
|
|
|
t.Fatalf("iterator visited node path %x twice", it.Path())
|
|
|
|
}
|
|
|
|
seen[string(it.Path())] = true
|
|
|
|
}
|
|
|
|
return len(seen)
|
|
|
|
}
|
2021-04-21 10:25:26 +00:00
|
|
|
|
2023-05-09 07:11:04 +00:00
|
|
|
func TestIteratorNodeBlob(t *testing.T) {
|
|
|
|
testIteratorNodeBlob(t, rawdb.HashScheme)
|
2023-08-01 12:17:32 +00:00
|
|
|
testIteratorNodeBlob(t, rawdb.PathScheme)
|
2023-05-09 07:11:04 +00:00
|
|
|
}
|
|
|
|
|
2021-04-21 10:25:26 +00:00
|
|
|
type loggingDb struct {
|
|
|
|
getCount uint64
|
|
|
|
backend ethdb.KeyValueStore
|
|
|
|
}
|
|
|
|
|
|
|
|
func (l *loggingDb) Has(key []byte) (bool, error) {
|
|
|
|
return l.backend.Has(key)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (l *loggingDb) Get(key []byte) ([]byte, error) {
|
|
|
|
l.getCount++
|
|
|
|
return l.backend.Get(key)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (l *loggingDb) Put(key []byte, value []byte) error {
|
|
|
|
return l.backend.Put(key, value)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (l *loggingDb) Delete(key []byte) error {
|
|
|
|
return l.backend.Delete(key)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (l *loggingDb) NewBatch() ethdb.Batch {
|
|
|
|
return l.backend.NewBatch()
|
|
|
|
}
|
|
|
|
|
2022-02-15 13:15:13 +00:00
|
|
|
func (l *loggingDb) NewBatchWithSize(size int) ethdb.Batch {
|
|
|
|
return l.backend.NewBatchWithSize(size)
|
|
|
|
}
|
|
|
|
|
2021-04-21 10:25:26 +00:00
|
|
|
func (l *loggingDb) NewIterator(prefix []byte, start []byte) ethdb.Iterator {
|
|
|
|
return l.backend.NewIterator(prefix, start)
|
|
|
|
}
|
2022-03-10 08:35:22 +00:00
|
|
|
|
|
|
|
func (l *loggingDb) NewSnapshot() (ethdb.Snapshot, error) {
|
|
|
|
return l.backend.NewSnapshot()
|
|
|
|
}
|
|
|
|
|
2021-04-21 10:25:26 +00:00
|
|
|
func (l *loggingDb) Stat(property string) (string, error) {
|
|
|
|
return l.backend.Stat(property)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (l *loggingDb) Compact(start []byte, limit []byte) error {
|
|
|
|
return l.backend.Compact(start, limit)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (l *loggingDb) Close() error {
|
|
|
|
return l.backend.Close()
|
|
|
|
}
|
|
|
|
|
|
|
|
// makeLargeTestTrie create a sample test trie
|
2022-08-04 14:13:18 +00:00
|
|
|
func makeLargeTestTrie() (*Database, *StateTrie, *loggingDb) {
|
2021-04-21 10:25:26 +00:00
|
|
|
// Create an empty trie
|
|
|
|
logDb := &loggingDb{0, memorydb.New()}
|
2022-11-28 13:31:28 +00:00
|
|
|
triedb := NewDatabase(rawdb.NewDatabase(logDb))
|
2023-05-11 07:19:42 +00:00
|
|
|
trie, _ := NewStateTrie(TrieID(types.EmptyRootHash), triedb)
|
2021-04-21 10:25:26 +00:00
|
|
|
|
|
|
|
// Fill it with some arbitrary data
|
|
|
|
for i := 0; i < 10000; i++ {
|
|
|
|
key := make([]byte, 32)
|
|
|
|
val := make([]byte, 32)
|
|
|
|
binary.BigEndian.PutUint64(key, uint64(i))
|
|
|
|
binary.BigEndian.PutUint64(val, uint64(i))
|
|
|
|
key = crypto.Keccak256(key)
|
|
|
|
val = crypto.Keccak256(val)
|
2023-04-20 10:57:24 +00:00
|
|
|
trie.MustUpdate(key, val)
|
2021-04-21 10:25:26 +00:00
|
|
|
}
|
2023-06-27 12:36:38 +00:00
|
|
|
root, nodes, _ := trie.Commit(false)
|
2023-07-24 10:22:09 +00:00
|
|
|
triedb.Update(root, types.EmptyRootHash, 0, trienode.NewWithNodeSet(nodes), nil)
|
cmd, core/state, eth, tests, trie: improve state reader (#27428)
The state availability is checked during the creation of a state reader.
- In hash-based database, if the specified root node does not exist on disk disk, then
the state reader won't be created and an error will be returned.
- In path-based database, if the specified state layer is not available, then the
state reader won't be created and an error will be returned.
This change also contains a stricter semantics regarding the `Commit` operation: once it has been performed, the trie is no longer usable, and certain operations will return an error.
2023-06-20 19:31:45 +00:00
|
|
|
triedb.Commit(root, false)
|
|
|
|
|
2021-04-21 10:25:26 +00:00
|
|
|
// Return the generated trie
|
cmd, core/state, eth, tests, trie: improve state reader (#27428)
The state availability is checked during the creation of a state reader.
- In hash-based database, if the specified root node does not exist on disk disk, then
the state reader won't be created and an error will be returned.
- In path-based database, if the specified state layer is not available, then the
state reader won't be created and an error will be returned.
This change also contains a stricter semantics regarding the `Commit` operation: once it has been performed, the trie is no longer usable, and certain operations will return an error.
2023-06-20 19:31:45 +00:00
|
|
|
trie, _ = NewStateTrie(TrieID(root), triedb)
|
2021-04-21 10:25:26 +00:00
|
|
|
return triedb, trie, logDb
|
|
|
|
}
|
|
|
|
|
|
|
|
// Tests that the node iterator indeed walks over the entire database contents.
|
|
|
|
func TestNodeIteratorLargeTrie(t *testing.T) {
|
|
|
|
// Create some arbitrary test trie to iterate
|
|
|
|
db, trie, logDb := makeLargeTestTrie()
|
|
|
|
db.Cap(0) // flush everything
|
|
|
|
// Do a seek operation
|
|
|
|
trie.NodeIterator(common.FromHex("0x77667766776677766778855885885885"))
|
|
|
|
// master: 24 get operations
|
cmd, core/state, eth, tests, trie: improve state reader (#27428)
The state availability is checked during the creation of a state reader.
- In hash-based database, if the specified root node does not exist on disk disk, then
the state reader won't be created and an error will be returned.
- In path-based database, if the specified state layer is not available, then the
state reader won't be created and an error will be returned.
This change also contains a stricter semantics regarding the `Commit` operation: once it has been performed, the trie is no longer usable, and certain operations will return an error.
2023-06-20 19:31:45 +00:00
|
|
|
// this pr: 6 get operations
|
|
|
|
if have, want := logDb.getCount, uint64(6); have != want {
|
2021-04-21 10:25:26 +00:00
|
|
|
t.Fatalf("Too many lookups during seek, have %d want %d", have, want)
|
|
|
|
}
|
|
|
|
}
|
2022-02-15 08:07:27 +00:00
|
|
|
|
2023-05-09 07:11:04 +00:00
|
|
|
func testIteratorNodeBlob(t *testing.T, scheme string) {
|
2022-02-15 08:07:27 +00:00
|
|
|
var (
|
2022-11-28 13:31:28 +00:00
|
|
|
db = rawdb.NewMemoryDatabase()
|
2023-05-09 07:11:04 +00:00
|
|
|
triedb = newTestDatabase(db, scheme)
|
2022-06-06 15:14:55 +00:00
|
|
|
trie = NewEmpty(triedb)
|
2022-02-15 08:07:27 +00:00
|
|
|
)
|
|
|
|
vals := []struct{ k, v string }{
|
|
|
|
{"do", "verb"},
|
|
|
|
{"ether", "wookiedoo"},
|
|
|
|
{"horse", "stallion"},
|
|
|
|
{"shaman", "horse"},
|
|
|
|
{"doge", "coin"},
|
|
|
|
{"dog", "puppy"},
|
|
|
|
{"somethingveryoddindeedthis is", "myothernodedata"},
|
|
|
|
}
|
|
|
|
all := make(map[string]string)
|
|
|
|
for _, val := range vals {
|
|
|
|
all[val.k] = val.v
|
2023-04-20 10:57:24 +00:00
|
|
|
trie.MustUpdate([]byte(val.k), []byte(val.v))
|
2022-02-15 08:07:27 +00:00
|
|
|
}
|
2023-06-27 12:36:38 +00:00
|
|
|
root, nodes, _ := trie.Commit(false)
|
2023-07-24 10:22:09 +00:00
|
|
|
triedb.Update(root, types.EmptyRootHash, 0, trienode.NewWithNodeSet(nodes), nil)
|
2023-05-09 07:11:04 +00:00
|
|
|
triedb.Commit(root, false)
|
2022-02-15 08:07:27 +00:00
|
|
|
|
2023-05-09 07:11:04 +00:00
|
|
|
var found = make(map[common.Hash][]byte)
|
|
|
|
trie, _ = New(TrieID(root), triedb)
|
cmd, core/state, eth, tests, trie: improve state reader (#27428)
The state availability is checked during the creation of a state reader.
- In hash-based database, if the specified root node does not exist on disk disk, then
the state reader won't be created and an error will be returned.
- In path-based database, if the specified state layer is not available, then the
state reader won't be created and an error will be returned.
This change also contains a stricter semantics regarding the `Commit` operation: once it has been performed, the trie is no longer usable, and certain operations will return an error.
2023-06-20 19:31:45 +00:00
|
|
|
it := trie.MustNodeIterator(nil)
|
2022-02-15 08:07:27 +00:00
|
|
|
for it.Next(true) {
|
|
|
|
if it.Hash() == (common.Hash{}) {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
found[it.Hash()] = it.NodeBlob()
|
|
|
|
}
|
|
|
|
|
|
|
|
dbIter := db.NewIterator(nil, nil)
|
|
|
|
defer dbIter.Release()
|
|
|
|
|
|
|
|
var count int
|
|
|
|
for dbIter.Next() {
|
2023-05-09 07:11:04 +00:00
|
|
|
ok, _, _ := isTrieNode(triedb.Scheme(), dbIter.Key(), dbIter.Value())
|
|
|
|
if !ok {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
got, present := found[crypto.Keccak256Hash(dbIter.Value())]
|
2022-02-15 08:07:27 +00:00
|
|
|
if !present {
|
2023-05-09 07:11:04 +00:00
|
|
|
t.Fatal("Miss trie node")
|
2022-02-15 08:07:27 +00:00
|
|
|
}
|
|
|
|
if !bytes.Equal(got, dbIter.Value()) {
|
|
|
|
t.Fatalf("Unexpected trie node want %v got %v", dbIter.Value(), got)
|
|
|
|
}
|
|
|
|
count += 1
|
|
|
|
}
|
|
|
|
if count != len(found) {
|
|
|
|
t.Fatal("Find extra trie node via iterator")
|
|
|
|
}
|
|
|
|
}
|
2023-05-09 07:11:04 +00:00
|
|
|
|
|
|
|
// isTrieNode is a helper function which reports if the provided
|
|
|
|
// database entry belongs to a trie node or not. Note in tests
|
|
|
|
// only single layer trie is used, namely storage trie is not
|
|
|
|
// considered at all.
|
|
|
|
func isTrieNode(scheme string, key, val []byte) (bool, []byte, common.Hash) {
|
|
|
|
var (
|
|
|
|
path []byte
|
|
|
|
hash common.Hash
|
|
|
|
)
|
|
|
|
if scheme == rawdb.HashScheme {
|
|
|
|
ok := rawdb.IsLegacyTrieNode(key, val)
|
|
|
|
if !ok {
|
|
|
|
return false, nil, common.Hash{}
|
|
|
|
}
|
|
|
|
hash = common.BytesToHash(key)
|
|
|
|
} else {
|
|
|
|
ok, remain := rawdb.IsAccountTrieNode(key)
|
|
|
|
if !ok {
|
|
|
|
return false, nil, common.Hash{}
|
|
|
|
}
|
|
|
|
path = common.CopyBytes(remain)
|
|
|
|
hash = crypto.Keccak256Hash(val)
|
|
|
|
}
|
|
|
|
return true, path, hash
|
|
|
|
}
|