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

bindInfo: fix datarace on bindings #40846

Merged
merged 11 commits into from
Jan 30, 2023
Merged

bindInfo: fix datarace on bindings #40846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5cfe959
fix 40843
Yisaer Jan 30, 2023
304b6e0
fix 40843
Yisaer Jan 30, 2023
76d96b9
fix 40843
Yisaer Jan 30, 2023
974723a
Merge branch 'master' into fix_40843
Yisaer Jan 30, 2023
f64e05a
fix 40843
Yisaer Jan 30, 2023
dc98125
Merge branch 'fix_40843' of https://github.com/Yisaer/tidb into fix_4…
Yisaer Jan 30, 2023
6864a18
Merge branch 'master' into fix_40843
Yisaer Jan 30, 2023
b4c641c
fix 40843
Yisaer Jan 30, 2023
94d2725
Merge branch 'fix_40843' of https://github.com/Yisaer/tidb into fix_4…
Yisaer Jan 30, 2023
8c14f9d
fix 40843
Yisaer Jan 30, 2023
29832cb
Merge branch 'master' into fix_40843
ti-chi-bot Jan 30, 2023
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
11 changes: 11 additions & 0 deletions bindinfo/bind_record.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,17 @@ type BindRecord struct {
Bindings []Binding
}

// Copy get the copy of bindRecord
func (br *BindRecord) Copy() *BindRecord {
nbr := &BindRecord{
OriginalSQL: br.OriginalSQL,
Db: br.Db,
}
nbr.Bindings = make([]Binding, len(br.Bindings))
copy(nbr.Bindings, br.Bindings)
return nbr
}

// HasEnabledBinding checks if there are any enabled bindings in bind record.
func (br *BindRecord) HasEnabledBinding() bool {
for _, binding := range br.Bindings {
Expand Down
1 change: 0 additions & 1 deletion executor/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ go_library(
"//util/servermemorylimit",
"//util/set",
"//util/size",
"//util/slice",
"//util/sqlexec",
"//util/stmtsummary",
"//util/stringutil",
Expand Down
6 changes: 4 additions & 2 deletions executor/show.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ import (
"github.com/pingcap/tidb/util/memory"
"github.com/pingcap/tidb/util/sem"
"github.com/pingcap/tidb/util/set"
"github.com/pingcap/tidb/util/slice"
"github.com/pingcap/tidb/util/sqlexec"
"github.com/pingcap/tidb/util/stringutil"
"golang.org/x/exp/slices"
Expand Down Expand Up @@ -317,7 +316,10 @@ func (e *ShowExec) fetchShowBind() error {
} else {
tmp = domain.GetDomain(e.ctx).BindHandle().GetAllBindRecord()
}
bindRecords := slice.Copy(tmp)
bindRecords := make([]*bindinfo.BindRecord, 0)
for _, bindRecord := range tmp {
bindRecords = append(bindRecords, bindRecord.Copy())
}
// Remove the invalid bindRecord.
ind := 0
for _, bindData := range bindRecords {
Expand Down