Skip to content

Commit

Permalink
trie: more node iterator improvements (#14615)
Browse files Browse the repository at this point in the history
* ethdb: remove Set

Set deadlocks immediately and isn't part of the Database interface.

* trie: add Err to Iterator

This is useful for testing because the underlying NodeIterator doesn't
need to be kept in a separate variable just to get the error.

* trie: add LeafKey to iterator, panic when not at leaf

LeafKey is useful for callers that can't interpret Path.

* trie: retry failed seek/peek in iterator Next

Instead of failing iteration irrecoverably, make it so Next retries the
pending seek or peek every time.

Smaller changes in this commit make this easier to test:

* The iterator previously returned from Next on encountering a hash
  node. This caused it to visit the same path twice.
* Path returned nibbles with terminator symbol for valueNode attached
  to fullNode, but removed it for valueNode attached to shortNode. Now
  the terminator is always present. This makes Path unique to each node
  and simplifies Leaf.

* trie: add Path to MissingNodeError

The light client trie iterator needs to know the path of the node that's
missing so it can retrieve a proof for it. NodeIterator.Path is not
sufficient because it is updated when the node is resolved and actually
visited by the iterator.

Also remove unused fields. They were added a long time ago before we
knew which fields would be needed for the light client.
  • Loading branch information
fjl authored Jun 20, 2017
1 parent 431cf2a commit 693d9cc
Show file tree
Hide file tree
Showing 7 changed files with 288 additions and 172 deletions.
7 changes: 0 additions & 7 deletions ethdb/memory_database.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,6 @@ func (db *MemDatabase) Put(key []byte, value []byte) error {
return nil
}

func (db *MemDatabase) Set(key []byte, value []byte) {
db.lock.Lock()
defer db.lock.Unlock()

db.Put(key, value)
}

func (db *MemDatabase) Get(key []byte) ([]byte, error) {
db.lock.RLock()
defer db.lock.RUnlock()
Expand Down
21 changes: 5 additions & 16 deletions trie/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,13 @@ import (
)

// MissingNodeError is returned by the trie functions (TryGet, TryUpdate, TryDelete)
// in the case where a trie node is not present in the local database. Contains
// information necessary for retrieving the missing node through an ODR service.
//
// NodeHash is the hash of the missing node
//
// RootHash is the original root of the trie that contains the node
//
// PrefixLen is the nibble length of the key prefix that leads from the root to
// the missing node
//
// SuffixLen is the nibble length of the remaining part of the key that hints on
// which further nodes should also be retrieved (can be zero when there are no
// such hints in the error message)
// in the case where a trie node is not present in the local database. It contains
// information necessary for retrieving the missing node.
type MissingNodeError struct {
RootHash, NodeHash common.Hash
PrefixLen, SuffixLen int
NodeHash common.Hash // hash of the missing node
Path []byte // hex-encoded path to the missing node
}

func (err *MissingNodeError) Error() string {
return fmt.Sprintf("Missing trie node %064x", err.NodeHash)
return fmt.Sprintf("missing trie node %x (path %x)", err.NodeHash, err.Path)
}
Loading

0 comments on commit 693d9cc

Please sign in to comment.