mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-22 04:36:42 +00:00
fix(rawdb): correct MemoryFreezer AncientSize by decrementing size on truncation
This commit is contained in:
parent
da3822dcec
commit
e2d4555580
1 changed files with 29 additions and 2 deletions
|
|
@ -91,8 +91,18 @@ func (t *memoryTable) truncateHead(items uint64) error {
|
||||||
if items < t.offset {
|
if items < t.offset {
|
||||||
return errors.New("truncation below tail")
|
return errors.New("truncation below tail")
|
||||||
}
|
}
|
||||||
t.data = t.data[:items-t.offset]
|
removeFrom := items - t.offset
|
||||||
|
var removed uint64
|
||||||
|
for i := removeFrom; i < uint64(len(t.data)); i++ {
|
||||||
|
removed += uint64(len(t.data[i]))
|
||||||
|
}
|
||||||
|
t.data = t.data[:removeFrom]
|
||||||
t.items = items
|
t.items = items
|
||||||
|
if removed >= t.size {
|
||||||
|
t.size = 0
|
||||||
|
} else {
|
||||||
|
t.size -= removed
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -108,8 +118,25 @@ func (t *memoryTable) truncateTail(items uint64) error {
|
||||||
if t.items < items {
|
if t.items < items {
|
||||||
return errors.New("truncation above head")
|
return errors.New("truncation above head")
|
||||||
}
|
}
|
||||||
t.data = t.data[items-t.offset:]
|
drop := items - t.offset
|
||||||
|
var removed uint64
|
||||||
|
for i := uint64(0); i < drop; i++ {
|
||||||
|
removed += uint64(len(t.data[i]))
|
||||||
|
}
|
||||||
|
newLen := uint64(len(t.data)) - drop
|
||||||
|
if newLen == 0 {
|
||||||
|
t.data = nil
|
||||||
|
} else {
|
||||||
|
newData := make([][]byte, newLen)
|
||||||
|
copy(newData, t.data[drop:])
|
||||||
|
t.data = newData
|
||||||
|
}
|
||||||
t.offset = items
|
t.offset = items
|
||||||
|
if removed >= t.size {
|
||||||
|
t.size = 0
|
||||||
|
} else {
|
||||||
|
t.size -= removed
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue