trie: optimize local node check

This commit is contained in:
Felix Lange 2017-07-15 01:37:11 +02:00
parent 52e7b2a9c8
commit 8e93c3e7a3
2 changed files with 3 additions and 3 deletions

View file

@ -138,7 +138,7 @@ func (s *TrieSync) AddRawEntry(hash common.Hash, depth int, parent common.Hash)
if _, ok := s.membatch.batch[hash]; ok { if _, ok := s.membatch.batch[hash]; ok {
return return
} }
if blob, _ := s.database.Get(hash.Bytes()); blob != nil { if ok, _ := s.database.Has(hash.Bytes()); ok {
return return
} }
// Assemble the new sub-trie sync request // Assemble the new sub-trie sync request
@ -296,8 +296,7 @@ func (s *TrieSync) children(req *request, object node) ([]*request, error) {
if _, ok := s.membatch.batch[hash]; ok { if _, ok := s.membatch.batch[hash]; ok {
continue continue
} }
blob, _ := s.database.Get(node) if ok, _ := s.database.Has(node); ok {
if local, err := decodeNode(node[:], blob, 0); local != nil && err == nil {
continue continue
} }
// Locally unknown node, schedule for retrieval // Locally unknown node, schedule for retrieval

View file

@ -66,6 +66,7 @@ type Database interface {
// DatabaseReader wraps the Get method of a backing store for the trie. // DatabaseReader wraps the Get method of a backing store for the trie.
type DatabaseReader interface { type DatabaseReader interface {
Get(key []byte) (value []byte, err error) Get(key []byte) (value []byte, err error)
Has(key []byte) (bool, error)
} }
// DatabaseWriter wraps the Put method of a backing store for the trie. // DatabaseWriter wraps the Put method of a backing store for the trie.