executor: fix index_lookup_hash_join hang when used with limit (#35820)…

… (#36098) close #35638
pingcap · Jul 14, 2022 · 23ab34a · 23ab34a
1 parent 1baedb9
commit 23ab34a
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/executor/index_lookup_hash_join.go b/executor/index_lookup_hash_join.go
@@ -500,7 +500,10 @@ func (iw *indexHashJoinInnerWorker) run(ctx context.Context, cancelFunc context.
 		joinResult.err = errors.New("mockIndexHashJoinInnerWorkerErr")
 	})
 	if joinResult.err != nil {
-		resultCh <- joinResult
+		select {
+		case resultCh <- joinResult:
+		case <-ctx.Done():
+		}
 		return
 	}
 	// When task.keepOuterOrder is TRUE(resultCh != iw.resultCh), the last