cherry pick pingcap#35820 to release-5.0

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
ti-srebot · Jul 11, 2022 · 7495b06 · 7495b06
1 parent 1baedb9
commit 7495b06
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/executor/index_lookup_hash_join.go b/executor/index_lookup_hash_join.go
@@ -582,7 +582,24 @@ func (iw *indexHashJoinInnerWorker) handleHashJoinInnerWorkerPanic(r interface{}
 	iw.wg.Done()
 }
 
+<<<<<<< HEAD
 func (iw *indexHashJoinInnerWorker) handleTask(ctx context.Context, task *indexHashJoinTask, joinResult *indexHashJoinResult, h hash.Hash64, resultCh chan *indexHashJoinResult) error {
+=======
+func (iw *indexHashJoinInnerWorker) handleTask(ctx context.Context, task *indexHashJoinTask, joinResult *indexHashJoinResult, h hash.Hash64, resultCh chan *indexHashJoinResult) (err error) {
+	defer func() {
+		iw.memTracker.Consume(-iw.memTracker.BytesConsumed())
+		if task.keepOuterOrder {
+			if err != nil {
+				joinResult.err = err
+				select {
+				case <-ctx.Done():
+				case resultCh <- joinResult:
+				}
+			}
+			close(resultCh)
+		}
+	}()
+>>>>>>> 87052dc2f... executor: fix index_lookup_hash_join hang when used with limit (#35820)
 	var joinStartTime time.Time
 	if iw.stats != nil {
 		start := time.Now()