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.

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 data race in ProcessInfo (#45127) #45172

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 32 additions & 0 deletions executor/index_merge_reader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"regexp"
"strconv"
"strings"
"sync"
"testing"
"time"

Expand Down Expand Up @@ -1073,3 +1074,34 @@ func TestOrderByWithLimit(t *testing.T) {
}
}
}

func TestProcessInfoRaceWithIndexScan(t *testing.T) {
store := testkit.CreateMockStore(t)
tk := testkit.NewTestKit(t, store)
tk.MustExec("use test;")
tk.MustExec("drop table if exists t1;")
tk.MustExec("create table t1(c1 int, c2 int, c3 int, c4 int, c5 int, key(c1), key(c2), key(c3), key(c4),key(c5));")
insertStr := "insert into t1 values(0, 0, 0, 0 , 0)"
for i := 1; i < 100; i++ {
insertStr += fmt.Sprintf(", (%d, %d, %d, %d, %d)", i, i, i, i, i)
}
tk.MustExec(insertStr)

tk.Session().SetSessionManager(&testkit.MockSessionManager{
PS: []*util.ProcessInfo{tk.Session().ShowProcess()},
})

wg := sync.WaitGroup{}
wg.Add(1)
go func() {
defer wg.Done()
for i := 0; i <= 100; i++ {
ps := tk.Session().ShowProcess()
util.GenLogFields(233, ps, true)
}
}()
for i := 0; i <= 100; i++ {
tk.MustQuery("select /*+ use_index(t1, c1) */ c1 from t1 where c1 = 0 union all select /*+ use_index(t1, c2) */ c2 from t1 where c2 = 0 union all select /*+ use_index(t1, c3) */ c3 from t1 where c3 = 0 ")
}
wg.Wait()
}
2 changes: 2 additions & 0 deletions session/session.go
Original file line number Diff line number Diff line change
Expand Up @@ -1572,6 +1572,8 @@ func (s *session) SetProcessInfo(sql string, t time.Time, command byte, maxExecu
DiskTracker: s.sessionVars.DiskTracker,
StatsInfo: plannercore.GetStatsInfo,
OOMAlarmVariablesInfo: s.getOomAlarmVariablesInfo(),
TableIDs: s.sessionVars.StmtCtx.TableIDs,
IndexNames: s.sessionVars.StmtCtx.IndexNames,
MaxExecutionTime: maxExecutionTime,
RedactSQL: s.sessionVars.EnableRedactLog,
ResourceGroupName: s.sessionVars.ResourceGroupName,
Expand Down
2 changes: 2 additions & 0 deletions util/processinfo.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ type ProcessInfo struct {
Port string
ResourceGroupName string
PlanExplainRows [][]string
TableIDs []int64
IndexNames []string
OOMAlarmVariablesInfo OOMAlarmVariablesInfo
ID uint64
CurTxnStartTS uint64
Expand Down
8 changes: 4 additions & 4 deletions util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,12 @@ func GenLogFields(costTime time.Duration, info *ProcessInfo, needTruncateSQL boo
logFields = append(logFields, zap.String("database", info.DB))
}
var tableIDs, indexNames string
if len(info.StmtCtx.TableIDs) > 0 {
tableIDs = strings.Replace(fmt.Sprintf("%v", info.StmtCtx.TableIDs), " ", ",", -1)
if len(info.TableIDs) > 0 {
tableIDs = strings.Replace(fmt.Sprintf("%v", info.TableIDs), " ", ",", -1)
logFields = append(logFields, zap.String("table_ids", tableIDs))
}
if len(info.StmtCtx.IndexNames) > 0 {
indexNames = strings.Replace(fmt.Sprintf("%v", info.StmtCtx.IndexNames), " ", ",", -1)
if len(info.IndexNames) > 0 {
indexNames = strings.Replace(fmt.Sprintf("%v", info.IndexNames), " ", ",", -1)
logFields = append(logFields, zap.String("index_names", indexNames))
}
logFields = append(logFields, zap.Uint64("txn_start_ts", info.CurTxnStartTS))
Expand Down