From c138d74cd0be0c740b5445ad04773c2080bd9d87 Mon Sep 17 00:00:00 2001 From: Ti Chi Robot Date: Tue, 11 Jul 2023 19:23:19 +0800 Subject: [PATCH] *: fix data race in ProcessInfo (#45127) (#45172) close pingcap/tidb#45126 --- executor/index_merge_reader_test.go | 32 +++++++++++++++++++++++++++++ session/session.go | 2 ++ util/processinfo.go | 2 ++ util/util.go | 8 ++++---- 4 files changed, 40 insertions(+), 4 deletions(-) diff --git a/executor/index_merge_reader_test.go b/executor/index_merge_reader_test.go index eb477020f623a..8842064e63fa2 100644 --- a/executor/index_merge_reader_test.go +++ b/executor/index_merge_reader_test.go @@ -20,6 +20,7 @@ import ( "regexp" "strconv" "strings" + "sync" "testing" "time" @@ -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() +} diff --git a/session/session.go b/session/session.go index 642cb54a42280..c8829fa20e710 100644 --- a/session/session.go +++ b/session/session.go @@ -1575,6 +1575,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, diff --git a/util/processinfo.go b/util/processinfo.go index d7e2e7c15ea83..0e641b132affb 100644 --- a/util/processinfo.go +++ b/util/processinfo.go @@ -58,6 +58,8 @@ type ProcessInfo struct { Port string ResourceGroupName string PlanExplainRows [][]string + TableIDs []int64 + IndexNames []string OOMAlarmVariablesInfo OOMAlarmVariablesInfo ID uint64 CurTxnStartTS uint64 diff --git a/util/util.go b/util/util.go index 9a8731cd94bb9..3e54054514b69 100644 --- a/util/util.go +++ b/util/util.go @@ -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))