Skip to content

fix(rawdb): correct MemoryFreezer AncientSize by decrementing size on truncation #33344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Bashmunta wants to merge 2 commits into
base: master
Choose a base branch
from
+27 −2
Open

fix(rawdb): correct MemoryFreezer AncientSize by decrementing size on truncation #33344

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2d4555
fix(rawdb): correct MemoryFreezer AncientSize by decrementing size on…
Bashmunta Dec 2, 2025
9c55041
refactor
Bashmunta Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions core/rawdb/freezer_memory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,15 @@ func (t *memoryTable) truncateHead(items uint64) error {
if items < t.offset {
return errors.New("truncation below tail")
}
t.data = t.data[:items-t.offset]
removeFrom := items - t.offset
Copy link
Member

@rjl493456442 rjl493456442 Dec 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably something like this?

	for i := int(items - t.offset); i < len(t.data); i++ {
		if t.size > uint64(len(t.data[i])) {
			t.size -= uint64(len(t.data[i]))
		} else {
			t.size = 0
		}
	}

Copy link
Contributor Author

@Bashmunta Bashmunta Dec 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably something like this?

	for i := int(items - t.offset); i < len(t.data); i++ {
		if t.size > uint64(len(t.data[i])) {
			t.size -= uint64(len(t.data[i]))
		} else {
			t.size = 0
		}
	}

good idea, refactored

for i := int(removeFrom); i < len(t.data); i++ {
if t.size > uint64(len(t.data[i])) {
t.size -= uint64(len(t.data[i]))
} else {
t.size = 0
}
}
t.data = t.data[:removeFrom]
t.items = items
return nil
}
Expand All @@ -108,8 +116,25 @@ func (t *memoryTable) truncateTail(items uint64) error {
if t.items < items {
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
if removed >= t.size {
t.size = 0
} else {
t.size -= removed
}
return nil
}

Expand Down
Loading