This is an automated cherry-pick of pingcap#53097

Signed-off-by: ti-chi-bot <[email protected]>
ti-chi-bot · May 10, 2024 · d7ed7c2 · d7ed7c2
1 parent d1e3dee
commit d7ed7c2
Show file tree

Hide file tree

Showing 3 changed files with 682 additions and 0 deletions.
diff --git a/executor/builder.go b/executor/builder.go
@@ -3128,6 +3128,21 @@ func (b *executorBuilder) corColInDistPlan(plans []plannercore.PhysicalPlan) boo
 					return true
 				}
 			}
+<<<<<<< HEAD:executor/builder.go
+=======
+		case *plannercore.PhysicalProjection:
+			for _, expr := range x.Exprs {
+				if len(expression.ExtractCorColumns(expr)) > 0 {
+					return true
+				}
+			}
+		case *plannercore.PhysicalTopN:
+			for _, byItem := range x.ByItems {
+				if len(expression.ExtractCorColumns(byItem.Expr)) > 0 {
+					return true
+				}
+			}
+>>>>>>> 203e5f2cff1 (executor: Fix push downed topN won't replace correlated column problem (#53097)):pkg/executor/builder.go
 		case *plannercore.PhysicalTableScan:
 			for _, cond := range x.LateMaterializationFilterCondition {
 				if len(expression.ExtractCorColumns(cond)) > 0 {

diff --git a/executor/issuetest/BUILD.bazel b/executor/issuetest/BUILD.bazel
@@ -8,7 +8,11 @@ go_test(
         "main_test.go",
     ],
     flaky = True,
+<<<<<<< HEAD:executor/issuetest/BUILD.bazel
     shard_count = 50,
+=======
+    shard_count = 19,
+>>>>>>> 203e5f2cff1 (executor: Fix push downed topN won't replace correlated column problem (#53097)):pkg/executor/test/issuetest/BUILD.bazel
     deps = [
         "//autoid_service",
         "//config",