Skip to content
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

fix oom #21371

Merged
merged 2 commits into from
Feb 13, 2025
Merged

fix oom #21371

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3c2875
fix oom
w-zr Feb 10, 2025
03542ee
Merge branch 'main' into fix-oom
mergify[bot] Feb 13, 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
3 changes: 2 additions & 1 deletion pkg/vm/engine/tae/mergesort/merger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ func newMerger[T comparable](host MergeTaskHost, lessFunc sort.LessFunc[T], sort
}

func (m *merger[T]) merge(ctx context.Context) error {
defer m.release()

for i := 0; i < m.objCnt; i++ {
if ok, err := m.loadBlk(ctx, uint32(i)); !ok {
if err == nil {
Expand All @@ -156,7 +158,6 @@ func (m *merger[T]) merge(ctx context.Context) error {
src: uint32(i),
})
}
defer m.release()

var releaseF func()
for i := 0; i < m.objCnt; i++ {
Expand Down
Loading