executor: fix index_hash_join hang when context canceled (#54855)

close #54688
pingcap · Jul 26, 2024 · 0353655 · 0353655
1 parent 7e73ddc
commit 0353655
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 1 deletion.
diff --git a/pkg/executor/join/BUILD.bazel b/pkg/executor/join/BUILD.bazel
@@ -79,7 +79,7 @@ go_test(
     ],
     embed = [":join"],
     flaky = True,
-    shard_count = 47,
+    shard_count = 48,
     deps = [
         "//pkg/config",
         "//pkg/domain",
@@ -88,6 +88,7 @@ go_test(
         "//pkg/parser/ast",
         "//pkg/parser/mysql",
         "//pkg/planner/core",
+        "//pkg/session",
         "//pkg/sessionctx",
         "//pkg/sessionctx/variable",
         "//pkg/testkit",

diff --git a/pkg/executor/join/index_lookup_hash_join.go b/pkg/executor/join/index_lookup_hash_join.go
@@ -563,6 +563,7 @@ func (iw *indexHashJoinInnerWorker) getNewJoinResult(ctx context.Context) (*inde
 	select {
 	case joinResult.chk, ok = <-iw.joinChkResourceCh:
 	case <-ctx.Done():
+		joinResult.err = ctx.Err()
 		return joinResult, false
 	}
 	return joinResult, ok
@@ -783,7 +784,10 @@ func (iw *indexHashJoinInnerWorker) joinMatchedInnerRow2Chunk(ctx context.Contex
 			select {
 			case iw.resultCh <- joinResult:
 			case <-ctx.Done():
+				joinResult.err = ctx.Err()
+				return false, joinResult
 			}
+			failpoint.InjectCall("joinMatchedInnerRow2Chunk")
 			joinResult, ok = iw.getNewJoinResult(ctx)
 			if !ok {
 				return false, joinResult

diff --git a/pkg/executor/join/index_lookup_join_test.go b/pkg/executor/join/index_lookup_join_test.go
@@ -18,10 +18,12 @@ import (
 	"context"
 	"fmt"
 	"math/rand"
+	"runtime"
 	"strings"
 	"testing"
 
 	"github.com/pingcap/failpoint"
+	"github.com/pingcap/tidb/pkg/session"
 	"github.com/pingcap/tidb/pkg/testkit"
 	"github.com/stretchr/testify/require"
 )
@@ -134,3 +136,41 @@ func TestIssue45716(t *testing.T) {
 	require.Error(t, err)
 	tk.MustContainErrMsg(err.Error(), "test inlNewInnerPanic")
 }
+
+func TestIssue54688(t *testing.T) {
+	val := runtime.GOMAXPROCS(1)
+	defer func() {
+		runtime.GOMAXPROCS(val)
+	}()
+	store := testkit.CreateMockStore(t)
+	tk := testkit.NewTestKit(t, store)
+	tk.MustExec("use test;")
+	tk.MustExec("drop table if exists t, s;")
+	tk.MustExec("create table t(a int, index(a));")
+	tk.MustExec("create table s(a int, index(a));")
+	tk.MustExec("insert into t values(1), (2), (3), (4), (5), (6), (7), (8), (9), (10), (11), (12), (13), (14), (15), (16);")
+	tk.MustExec("insert into s values(1), (2), (3), (4), (5), (6), (7), (8), (9), (10), (11), (12), (13), (14), (15), (16);")
+	tk.MustExec("insert into s select * from s")
+	tk.MustExec("insert into s select * from s")
+	tk.MustExec("insert into s select * from s")
+	tk.MustExec("insert into s select * from s")
+	tk.MustExec("insert into s select * from s")
+	tk.MustExec("insert into s select * from s")
+	tk.MustExec("insert into s select * from s")
+	tk.MustExec("insert into s select * from s")
+	tk.MustExec("set @@tidb_index_lookup_join_concurrency=1;")
+	tk.MustExec("set @@tidb_index_join_batch_size=1000000;")
+
+	for i := 0; i <= 100; i++ {
+		rs, err := tk.Exec("select /*+ INL_HASH_JOIN(s) */ * from t join s on t.a=s.a")
+		require.NoError(t, err)
+		context, cancel := context.WithCancel(context.Background())
+		require.NoError(t, failpoint.EnableCall("github.com/pingcap/tidb/pkg/executor/join/joinMatchedInnerRow2Chunk",
+			func() {
+				cancel()
+			},
+		))
+		_, _ = session.GetRows4Test(context, nil, rs)
+		rs.Close()
+	}
+}