This is an automated cherry-pick of pingcap#55553

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

pkg/planner/core/rule_decorrelate.go

@@ -130,29 +130,33 @@ func ExtractCorrelatedCols4PhysicalPlan(p PhysicalPlan) []*expression.Correlated
 //	 |_ Apply_3
 //	     |_ outerSide
 //	     |_ innerSide(cor_col_3)
+<<<<<<< HEAD
 func ExtractOuterApplyCorrelatedCols(p PhysicalPlan) []*expression.CorrelatedColumn {
 	return extractOuterApplyCorrelatedColsHelper(p, []*expression.Schema{})
 }
 
 func extractOuterApplyCorrelatedColsHelper(p PhysicalPlan, outerSchemas []*expression.Schema) []*expression.CorrelatedColumn {
+=======
+func ExtractOuterApplyCorrelatedCols(p base.PhysicalPlan) []*expression.CorrelatedColumn {
+	corCols, _ := extractOuterApplyCorrelatedColsHelper(p)
+	return corCols
+}
+
+func extractOuterApplyCorrelatedColsHelper(p base.PhysicalPlan) ([]*expression.CorrelatedColumn, []*expression.Schema) {
+>>>>>>> d04ec9d914a (planner: fix CTE hang or wrong result when multiple Apply is used (#55553))
 	if p == nil {
-		return nil
+		return nil, nil
 	}
-	curCorCols := p.ExtractCorrelatedCols()
-	newCorCols := make([]*expression.CorrelatedColumn, 0, len(curCorCols))
 
-	// If a corresponding Apply is found inside this PhysicalPlan, ignore it.
-	for _, corCol := range curCorCols {
-		var found bool
-		for _, outerSchema := range outerSchemas {
-			if outerSchema.ColumnIndex(&corCol.Column) != -1 {
-				found = true
-				break
-			}
-		}
-		if !found {
-			newCorCols = append(newCorCols, corCol)
-		}
+	// allCorCols store all sub plan's correlated columns.
+	// allOuterSchemas store all child Apply's outer side schemas.
+	allCorCols := p.ExtractCorrelatedCols()
+	allOuterSchemas := []*expression.Schema{}
+
+	handler := func(child base.PhysicalPlan) {
+		childCorCols, childOuterSchemas := extractOuterApplyCorrelatedColsHelper(child)
+		allCorCols = append(allCorCols, childCorCols...)
+		allOuterSchemas = append(allOuterSchemas, childOuterSchemas...)
 	}
 
 	switch v := p.(type) {
@@ -163,19 +167,35 @@ func extractOuterApplyCorrelatedColsHelper(p PhysicalPlan, outerSchemas []*expre
 		} else {
 			outerPlan = v.Children()[0]
 		}
-		outerSchemas = append(outerSchemas, outerPlan.Schema())
-		newCorCols = append(newCorCols, extractOuterApplyCorrelatedColsHelper(v.Children()[0], outerSchemas)...)
-		newCorCols = append(newCorCols, extractOuterApplyCorrelatedColsHelper(v.Children()[1], outerSchemas)...)
+		allOuterSchemas = append(allOuterSchemas, outerPlan.Schema())
+		handler(v.Children()[0])
+		handler(v.Children()[1])
 	case *PhysicalCTE:
-		newCorCols = append(newCorCols, extractOuterApplyCorrelatedColsHelper(v.SeedPlan, outerSchemas)...)
-		newCorCols = append(newCorCols, extractOuterApplyCorrelatedColsHelper(v.RecurPlan, outerSchemas)...)
+		handler(v.SeedPlan)
+		handler(v.RecurPlan)
 	default:
 		for _, child := range p.Children() {
-			newCorCols = append(newCorCols, extractOuterApplyCorrelatedColsHelper(child, outerSchemas)...)
+			handler(child)
 		}
 	}
 
-	return newCorCols
+	resCorCols := make([]*expression.CorrelatedColumn, 0, len(allCorCols))
+
+	// If one correlated column is found in allOuterSchemas, it means this correlated column is corresponding to an Apply inside `p`.
+	// However, we only need the correlated columns that correspond to the Apply of the parent node of `p`.
+	for _, corCol := range allCorCols {
+		var found bool
+		for _, outerSchema := range allOuterSchemas {
+			if outerSchema.ColumnIndex(&corCol.Column) != -1 {
+				found = true
+				break
+			}
+		}
+		if !found {
+			resCorCols = append(resCorCols, corCol)
+		}
+	}
+	return resCorCols, allOuterSchemas
 }
 
 // decorrelateSolver tries to convert apply plan to join plan.