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

Jump to bottom

executor: release memory usage of task in indexJoin/indexHashJoin (#34418) #34474

Merged
merged 6 commits into from
Jun 17, 2022
Merged

executor: release memory usage of task in indexJoin/indexHashJoin (#34418) #34474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4a6c75a
cherry pick #34418 to release-5.3
wshwsh12 May 9, 2022
b876f42
Merge branch 'release-5.3' into release-5.3-b1379a61b5b5
ti-chi-bot Jun 16, 2022
aa867c7
Merge branch 'release-5.3' into release-5.3-b1379a61b5b5
ti-chi-bot Jun 16, 2022
9fcbc23
Merge branch 'release-5.3' into release-5.3-b1379a61b5b5
ti-chi-bot Jun 16, 2022
fd67c85
Merge branch 'release-5.3' into release-5.3-b1379a61b5b5
ti-chi-bot Jun 16, 2022
7b8ef2b
Merge branch 'release-5.3' into release-5.3-b1379a61b5b5
ti-chi-bot Jun 17, 2022
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
4 changes: 4 additions & 0 deletions executor/index_lookup_hash_join.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,10 @@ func (iw *indexHashJoinInnerWorker) run(ctx context.Context, cancelFunc context.
}
h, resultCh := fnv.New64(), iw.resultCh
for {
// The previous task has been processed, so release the occupied memory
if task != nil {
task.memTracker.Detach()
}
select {
case <-ctx.Done():
return
Expand Down
6 changes: 5 additions & 1 deletion executor/index_lookup_join.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,10 @@ func (e *IndexLookUpJoin) getFinishedTask(ctx context.Context) (*lookUpJoinTask,
return task, nil
}

// The previous task has been processed, so release the occupied memory
if task != nil {
task.memTracker.Detach()
}
select {
case task = <-e.resultCh:
case <-ctx.Done():
Expand Down Expand Up @@ -573,7 +577,7 @@ func (iw *innerWorker) constructLookupContent(task *lookUpJoinTask) ([]*indexJoi
return nil, err
}
if rowIdx == 0 {
iw.lookup.memTracker.Consume(types.EstimatedMemUsage(dLookUpKey, numRows))
iw.memTracker.Consume(types.EstimatedMemUsage(dLookUpKey, numRows))
}
if dHashKey == nil {
// Append null to make looUpKeys the same length as outer Result.
Expand Down