fix

Signed-off-by: AilinKid <314806019@qq.com>
pingcap · Jan 18, 2023 · d55d15c · d55d15c
1 parent 9633698
commit d55d15c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/expression/util.go b/expression/util.go
@@ -420,7 +420,10 @@ func ColumnSubstituteImpl(expr Expression, schema *Schema, newExprs []Expression
 		substituted := false
 		hasFail := false
 		if v.FuncName.L == ast.Cast {
-			substituted, hasFail, newFunc.GetArgs()[0] = ColumnSubstituteImpl(v.GetArgs()[0], schema, newExprs, fail1Return)
+			var (
+				newArg Expression
+			)
+			substituted, hasFail, newArg = ColumnSubstituteImpl(v.GetArgs()[0], schema, newExprs, fail1Return)
 			if fail1Return && hasFail {
 				return substituted, hasFail, v
 			}
@@ -440,9 +443,9 @@ func ColumnSubstituteImpl(expr Expression, schema *Schema, newExprs []Expression
 			tmpArgForCollCheck = make([]Expression, len(v.GetArgs()))
 		}
 		for idx, arg := range v.GetArgs() {
-			changed, hasFail, newFuncExpr := ColumnSubstituteImpl(arg, schema, newExprs, fail1Return)
-			if fail1Return && hasFail {
-				return changed, hasFail, v
+			changed, failed, newFuncExpr := ColumnSubstituteImpl(arg, schema, newExprs, fail1Return)
+			if fail1Return && failed {
+				return changed, failed, v
 			}
 			oldChanged := changed
 			if collate.NewCollationEnabled() && changed {

diff --git a/planner/cascades/transformation_rules.go b/planner/cascades/transformation_rules.go
@@ -550,7 +550,7 @@ func (r *PushSelDownProjection) OnTransform(old *memo.ExprIter) (newExprs []*mem
 	canBePushed := make([]expression.Expression, 0, len(sel.Conditions))
 	canNotBePushed := make([]expression.Expression, 0, len(sel.Conditions))
 	for _, cond := range sel.Conditions {
-		substituted, hasFailed, newFilter := expression.ColumnSubstituteImpl(cond, projSchema, proj.Exprs)
+		substituted, hasFailed, newFilter := expression.ColumnSubstituteImpl(cond, projSchema, proj.Exprs, false)
 		if substituted && !hasFailed && !expression.HasGetSetVarFunc(newFilter) {
 			canBePushed = append(canBePushed, newFilter)
 		} else {

diff --git a/planner/core/rule_predicate_push_down.go b/planner/core/rule_predicate_push_down.go
@@ -418,7 +418,7 @@ func (p *LogicalProjection) PredicatePushDown(predicates []expression.Expression
 		}
 	}
 	for _, cond := range predicates {
-		substituted, hasFailed, newFilter := expression.ColumnSubstituteImpl(cond, p.Schema(), p.Exprs)
+		substituted, hasFailed, newFilter := expression.ColumnSubstituteImpl(cond, p.Schema(), p.Exprs, true)
 		if substituted && !hasFailed && !expression.HasGetSetVarFunc(newFilter) {
 			canBePushed = append(canBePushed, newFilter)
 		} else {