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

executor: avoid goroutine leak in index Lookup join (#19251) #20791

Merged
merged 4 commits into from
Nov 12, 2020
+21 −5
Merged

executor: avoid goroutine leak in index Lookup join (#19251) #20791

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e323d5c
cherry pick #19251 to release-3.0
fzhedu Nov 3, 2020
01f7480
Update index_lookup_join.go
fzhedu Nov 11, 2020
7983371
Delete index_lookup_merge_join.go
fzhedu Nov 11, 2020
b929f00
Merge branch 'release-3.0' into release-3.0-6444a0550918
ti-srebot Nov 12, 2020
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
9 changes: 9 additions & 0 deletions cmd/benchdb/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,17 @@ func newBenchDB() *benchDB {

func (ut *benchDB) mustExec(sql string) {
rss, err := ut.session.Execute(context.Background(), sql)
defer func() {
for _, rs := range rss {
err = rs.Close()
if err != nil {
log.Fatal(err.Error())
}
}
}()
if err != nil {
log.Fatal(err.Error())
return
}
if len(rss) > 0 {
ctx := context.Background()
Expand Down
4 changes: 3 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 @@ -601,10 +601,12 @@ func compareRow(sc *stmtctx.StatementContext, left, right []types.Datum) int {

func (iw *innerWorker) fetchInnerResults(ctx context.Context, task *lookUpJoinTask, lookUpContent []*indexJoinLookUpContent) error {
innerExec, err := iw.readerBuilder.buildExecutorForIndexJoin(ctx, lookUpContent, iw.indexRanges, iw.keyOff2IdxOff, iw.nextColCompareFilters)
if innerExec != nil {
defer terror.Call(innerExec.Close)
}
if err != nil {
return err
}
defer terror.Call(innerExec.Close)
innerResult := chunk.NewList(retTypes(innerExec), iw.ctx.GetSessionVars().MaxChunkSize, iw.ctx.GetSessionVars().MaxChunkSize)
innerResult.GetMemTracker().SetLabel(innerResultLabel)
innerResult.GetMemTracker().AttachTo(task.memTracker)
Expand Down
13 changes: 9 additions & 4 deletions session/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,6 +819,14 @@ func (s *session) ExecRestrictedSQLWithSnapshot(sctx sessionctx.Context, sql str
func execRestrictedSQL(ctx context.Context, se *session, sql string) ([]chunk.Row, []*ast.ResultField, error) {
startTime := time.Now()
recordSets, err := se.Execute(ctx, sql)
defer func() {
for _, rs := range recordSets {
closeErr := rs.Close()
if closeErr != nil && err == nil {
err = closeErr
}
}
}()
if err != nil {
return nil, nil, err
}
Expand All @@ -833,17 +841,14 @@ func execRestrictedSQL(ctx context.Context, se *session, sql string) ([]chunk.Ro
if err != nil {
return nil, nil, err
}
if err = rs.Close(); err != nil {
return nil, nil, err
}

if i == 0 {
rows = tmp
fields = rs.Fields()
}
}
metrics.QueryDurationHistogram.WithLabelValues(metrics.LblInternal).Observe(time.Since(startTime).Seconds())
return rows, fields, nil
return rows, fields, err
}

func createSessionFunc(store kv.Storage) pools.Factory {
Expand Down