This is an automated cherry-pick of pingcap#43763

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot · May 30, 2023 · 84f5645 · 84f5645
1 parent 7bd4528
commit 84f5645
Show file tree

Hide file tree

Showing 3 changed files with 501 additions and 0 deletions.
diff --git a/executor/builder.go b/executor/builder.go
@@ -3580,6 +3580,9 @@ func (builder *dataReaderBuilder) prunePartitionForInnerExecutor(tbl table.Table
 			locateKey[keyColOffsets[i]] = data
 		}
 		p, err := partitionTbl.GetPartitionByRow(builder.ctx, locateKey)
+		if table.ErrNoPartitionForGivenValue.Equal(err) {
+			continue
+		}
 		if err != nil {
 			return nil, false, nil, err
 		}

diff --git a/executor/oomtest/BUILD.bazel b/executor/oomtest/BUILD.bazel
@@ -6,6 +6,10 @@ go_test(
     srcs = ["oom_test.go"],
     flaky = True,
     race = "on",
+<<<<<<< HEAD:executor/oomtest/BUILD.bazel
+=======
+    shard_count = 5,
+>>>>>>> cb175516d20 (executor: ignore non-found partitions in inner joins (#43763)):executor/test/partitiontest/BUILD.bazel
     deps = [
         "//testkit",
         "//testkit/testsetup",