executor: fix hash join panic after killing (pingcap#14712)

fatpa · Feb 11, 2020 · 0f7a3e8 · 0f7a3e8
1 parent 750583c
commit 0f7a3e8
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/executor/join.go b/executor/join.go
@@ -459,11 +459,12 @@ func (e *HashJoinExec) runJoinWorker(workerID uint, probeKeyColIdx []int) {
 		emptyProbeSideResult.chk = probeSideResult
 		e.probeChkResourceCh <- emptyProbeSideResult
 	}
+	// note joinResult.chk may be nil when getNewJoinResult fails in loops
 	if joinResult == nil {
 		return
 	} else if joinResult.err != nil || (joinResult.chk != nil && joinResult.chk.NumRows() > 0) {
 		e.joinResultCh <- joinResult
-	} else if joinResult.chk.NumRows() == 0 {
+	} else if joinResult.chk != nil && joinResult.chk.NumRows() == 0 {
 		e.joinChkResourceCh[workerID] <- joinResult.chk
 	}
 }