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

sessionctx: fix data-race bug when alloc task id (#28022) #28283

Merged
merged 4 commits into from
Oct 13, 2021
Merged

sessionctx: fix data-race bug when alloc task id (#28022) #28283

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
80d749b
cherry pick #28022 to release-5.2
hanfei1991 Sep 22, 2021
aa0bcfe
Merge branch 'release-5.2' into release-5.2-9a7f572d0ab1
ti-chi-bot Oct 13, 2021
91f47f8
Merge branch 'release-5.2' into release-5.2-9a7f572d0ab1
ti-chi-bot Oct 13, 2021
7604fee
Merge branch 'release-5.2' into release-5.2-9a7f572d0ab1
ti-chi-bot Oct 13, 2021
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
29 changes: 29 additions & 0 deletions executor/tiflash_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,35 @@ func (s *tiflashTestSuite) TestReadUnsigedPK(c *C) {
tk.MustQuery("select count(*) from t1 , t where t1.a = t.a and ((t1.a < 9223372036854775800 and t1.a > 2) or (t1.a <= 1 and t1.a > -1))").Check(testkit.Rows("3"))
}

// to fix https://github.com/pingcap/tidb/issues/27952
func (s *tiflashTestSuite) TestJoinRace(c *C) {
tk := testkit.NewTestKit(c, s.store)
tk.MustExec("use test")
tk.MustExec("drop table if exists t")
tk.MustExec("create table t(a int not null, b int not null)")
tk.MustExec("alter table t set tiflash replica 1")
tb := testGetTableByName(c, tk.Se, "test", "t")
err := domain.GetDomain(tk.Se).DDL().UpdateTableReplicaInfo(tk.Se, tb.Meta().ID, true)
c.Assert(err, IsNil)
tk.MustExec("insert into t values(1,1)")
tk.MustExec("insert into t values(2,1)")
tk.MustExec("insert into t values(3,1)")
tk.MustExec("insert into t values(1,2)")
tk.MustExec("insert into t values(2,2)")
tk.MustExec("insert into t values(3,2)")
tk.MustExec("insert into t values(1,2)")
tk.MustExec("insert into t values(2,2)")
tk.MustExec("insert into t values(3,2)")
tk.MustExec("insert into t values(1,3)")
tk.MustExec("insert into t values(2,3)")
tk.MustExec("insert into t values(3,4)")
tk.MustExec("set @@session.tidb_isolation_read_engines=\"tiflash\"")
tk.MustExec("set @@session.tidb_enforce_mpp=ON")
tk.MustExec("set @@tidb_opt_broadcast_cartesian_join=0")
tk.MustQuery("select count(*) from (select count(a) x from t group by b) t1 join (select count(a) x from t group by b) t2 on t1.x > t2.x").Check(testkit.Rows("6"))

}

func (s *tiflashTestSuite) TestMppExecution(c *C) {
if israce.RaceEnabled {
c.Skip("skip race test because of long running")
Expand Down
3 changes: 3 additions & 0 deletions sessionctx/variable/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,7 @@ type SessionVars struct {

// mppTaskIDAllocator is used to allocate mpp task id for a session.
mppTaskIDAllocator struct {
mu sync.Mutex
lastTS uint64
taskID int64
}
Expand Down Expand Up @@ -887,6 +888,8 @@ type SessionVars struct {
// AllocMPPTaskID allocates task id for mpp tasks. It will reset the task id if the query's
// startTs is different.
func (s *SessionVars) AllocMPPTaskID(startTS uint64) int64 {
s.mppTaskIDAllocator.mu.Lock()
defer s.mppTaskIDAllocator.mu.Unlock()
if s.mppTaskIDAllocator.lastTS == startTS {
s.mppTaskIDAllocator.taskID++
return s.mppTaskIDAllocator.taskID
Expand Down