Skip to content

fix(resolve): fix GC-liveness bug in the loadBatchEntityFetch #1536

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
ysmolski wants to merge 4 commits into
base: master
Choose a base branch
from
+78 −293
Open

fix(resolve): fix GC-liveness bug in the loadBatchEntityFetch #1536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
68d8c07
fix(resolve): fix GC-liveness bug in the loadBatchEntityFetch
ysmolski Jun 12, 2026
f2f4674
propagate errors gracefully
ysmolski Jun 12, 2026
c8a2984
Merge branch 'master' into yury/eng-9717-concurrency-bugs-in-the-reso…
ysmolski Jun 16, 2026
7427f5c
handle via cleanup
ysmolski Jun 16, 2026
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
14 changes: 11 additions & 3 deletions v2/pkg/engine/resolve/loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,11 @@ func (l *Loader) resolveSingle(item *FetchItem) error {
return err
case *BatchEntityFetch:
res := &result{}
defer batchEntityToolPool.Put(res.tools)
// res.tools is assigned inside loadBatchEntityFetch.
// Evaluate when the deferred function runs, not at defer registration:
defer func() {
batchEntityToolPool.Put(res.tools)
}()
err := l.loadBatchEntityFetch(l.ctx.ctx, item, f, items, res)
if err != nil {
return errors.WithStack(err)
Expand Down Expand Up @@ -1533,8 +1537,12 @@ WithNextItem:
_, _ = itemInput.WriteTo(preparedInput)
// new unique representation
res.tools.batchHashToIndex[itemHash] = batchItemIndex
// create a new targets bucket for this unique index
batchStats = arena.SliceAppend(res.tools.a, batchStats, []*astjson.Value{items[i]})
// A new targets bucket for the unique index must be allocated on the arena:
// a heap-allocated bucket would only be referenced from arena memory,
// so the GC could collect its backing array while it is still in use.
bucket := arena.AllocateSlice[*astjson.Value](res.tools.a, 1, 1)
bucket[0] = items[i]
batchStats = arena.SliceAppend(res.tools.a, batchStats, bucket)
batchItemIndex++
addSeparator = true
}
Expand Down
Loading
Loading