forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

trie: rename unhashedCount/unhashed

Browse source
This commit is contained in:
Martin Holst Swende 2020-02-04 12:39:30 +01:00
parent e0c1fec36a
commit d4076b2b1f
No known key found for this signature in database
GPG key ID: 683B438C05A5DDF0
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
trie/trie.go
View file

@ -51,7 +51,7 @@ type Trie struct {
// Keep track of the number leafs which have been inserted since the last // Keep track of the number leafs which have been inserted since the last
// hashing operation. This number will not directly map to the number of // hashing operation. This number will not directly map to the number of
// actually unhashed nodes // actually unhashed nodes
unhashedCount int unhashed int
} }
// newFlag returns the cache flag value for a newly created node. // newFlag returns the cache flag value for a newly created node.
@ -167,7 +167,7 @@ func (t *Trie) Update(key, value []byte) {
// //
// If a node was not found in the database, a MissingNodeError is returned. // If a node was not found in the database, a MissingNodeError is returned.
func (t *Trie) TryUpdate(key, value []byte) error { func (t *Trie) TryUpdate(key, value []byte) error {
t.unhashedCount++ t.unhashed++
k := keybytesToHex(key) k := keybytesToHex(key)
if len(value) != 0 { if len(value) != 0 {
_, n, err := t.insert(t.root, nil, k, valueNode(value)) _, n, err := t.insert(t.root, nil, k, valueNode(value))
@ -264,7 +264,7 @@ func (t *Trie) Delete(key []byte) {
// TryDelete removes any existing value for key from the trie. // TryDelete removes any existing value for key from the trie.
// If a node was not found in the database, a MissingNodeError is returned. // If a node was not found in the database, a MissingNodeError is returned.
func (t *Trie) TryDelete(key []byte) error { func (t *Trie) TryDelete(key []byte) error {
t.unhashedCount++ t.unhashed++
k := keybytesToHex(key) k := keybytesToHex(key)
_, n, err := t.delete(t.root, nil, k) _, n, err := t.delete(t.root, nil, k)
if err != nil { if err != nil {
@ -467,9 +467,9 @@ func (t *Trie) hashRoot(db *Database) (node, node, error) {
return hashNode(emptyRoot.Bytes()), nil, nil return hashNode(emptyRoot.Bytes()), nil, nil
} }
// If the number of changes is below 100, we let one thread handle it // If the number of changes is below 100, we let one thread handle it
h := newHasher(t.unhashedCount >= 100) h := newHasher(t.unhashed >= 100)
defer returnHasherToPool(h) defer returnHasherToPool(h)
hashed, cached := h.hash(t.root, true) hashed, cached := h.hash(t.root, true)
t.unhashedCount = 0 t.unhashed = 0
return hashed, cached, nil return hashed, cached, nil
} }