executor: fix the data race in hash join tests (#58406)

close #58286
pingcap · Dec 20, 2024 · acba0cd · acba0cd
1 parent 220d5cb
commit acba0cd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/executor/join/hash_join_spill_helper.go b/pkg/executor/join/hash_join_spill_helper.go
@@ -81,7 +81,7 @@ type hashJoinSpillHelper struct {
 	spillTriggedInBuildingStageForTest           bool
 	spillTriggeredBeforeBuildingHashTableForTest bool
 	allPartitionsSpilledForTest                  bool
-	skipProbeInRestoreForTest                    bool
+	skipProbeInRestoreForTest                    atomic.Bool
 }
 
 func newHashJoinSpillHelper(hashJoinExec *HashJoinV2Exec, partitionNum int, probeFieldTypes []*types.FieldType) *hashJoinSpillHelper {
@@ -554,7 +554,7 @@ func (h *hashJoinSpillHelper) initTmpSpillBuildSideChunks() {
 }
 
 func (h *hashJoinSpillHelper) isProbeSkippedInRestoreForTest() bool {
-	return h.skipProbeInRestoreForTest
+	return h.skipProbeInRestoreForTest.Load()
 }
 
 func (h *hashJoinSpillHelper) isRespillTriggeredForTest() bool {

diff --git a/pkg/executor/join/hash_join_v2.go b/pkg/executor/join/hash_join_v2.go
@@ -933,7 +933,7 @@ func (w *ProbeWorkerV2) processOneProbeChunk(probeChunk *chunk.Chunk, joinResult
 func (w *ProbeWorkerV2) probeAndSendResult(joinResult *hashjoinWorkerResult) (bool, int64, *hashjoinWorkerResult) {
 	if w.HashJoinCtx.spillHelper.areAllPartitionsSpilled() {
 		if intest.InTest && w.HashJoinCtx.spillHelper.hashJoinExec.inRestore {
-			w.HashJoinCtx.spillHelper.skipProbeInRestoreForTest = true
+			w.HashJoinCtx.spillHelper.skipProbeInRestoreForTest.Store(true)
 		}
 		return true, 0, joinResult
 	}