From 5025a3548b64cffc7513531b34ddd393bb867d51 Mon Sep 17 00:00:00 2001 From: ti-srebot <66930949+ti-srebot@users.noreply.github.com> Date: Thu, 14 Jul 2022 21:55:06 +0800 Subject: [PATCH] executor: fix index_lookup_hash_join hang when used with limit (#35820) (#36100) close pingcap/tidb#35638 --- executor/index_lookup_hash_join.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/executor/index_lookup_hash_join.go b/executor/index_lookup_hash_join.go index 2ccba4c891f18..9d83ae81da2c8 100644 --- a/executor/index_lookup_hash_join.go +++ b/executor/index_lookup_hash_join.go @@ -620,7 +620,10 @@ func (iw *indexHashJoinInnerWorker) handleTask(ctx context.Context, task *indexH if task.keepOuterOrder { if err != nil { joinResult.err = err - resultCh <- joinResult + select { + case <-ctx.Done(): + case resultCh <- joinResult: + } } close(resultCh) }