trie: handle removing the freshest node too
This commit is contained in:
parent
6380c06c65
commit
8a9c31a307
@ -475,9 +475,14 @@ func (db *Database) dereference(child common.Hash, parent common.Hash) {
|
|||||||
}
|
}
|
||||||
if node.parents == 0 {
|
if node.parents == 0 {
|
||||||
// Remove the node from the flush-list
|
// Remove the node from the flush-list
|
||||||
if child == db.oldest {
|
switch child {
|
||||||
|
case db.oldest:
|
||||||
db.oldest = node.flushNext
|
db.oldest = node.flushNext
|
||||||
} else {
|
db.nodes[node.flushNext].flushPrev = common.Hash{}
|
||||||
|
case db.newest:
|
||||||
|
db.newest = node.flushPrev
|
||||||
|
db.nodes[node.flushPrev].flushNext = common.Hash{}
|
||||||
|
default:
|
||||||
db.nodes[node.flushPrev].flushNext = node.flushNext
|
db.nodes[node.flushPrev].flushNext = node.flushNext
|
||||||
db.nodes[node.flushNext].flushPrev = node.flushPrev
|
db.nodes[node.flushNext].flushPrev = node.flushPrev
|
||||||
}
|
}
|
||||||
@ -697,9 +702,14 @@ func (db *Database) uncache(hash common.Hash) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
// Node still exists, remove it from the flush-list
|
// Node still exists, remove it from the flush-list
|
||||||
if hash == db.oldest {
|
switch hash {
|
||||||
|
case db.oldest:
|
||||||
db.oldest = node.flushNext
|
db.oldest = node.flushNext
|
||||||
} else {
|
db.nodes[node.flushNext].flushPrev = common.Hash{}
|
||||||
|
case db.newest:
|
||||||
|
db.newest = node.flushPrev
|
||||||
|
db.nodes[node.flushPrev].flushNext = common.Hash{}
|
||||||
|
default:
|
||||||
db.nodes[node.flushPrev].flushNext = node.flushNext
|
db.nodes[node.flushPrev].flushNext = node.flushNext
|
||||||
db.nodes[node.flushNext].flushPrev = node.flushPrev
|
db.nodes[node.flushNext].flushPrev = node.flushPrev
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user