planner: Fix the problem that PlanBuilder.buildWindowFunctions may …

…change sub operator's schema. (pingcap#27176) (pingcap#27204)
ti-srebot · Aug 13, 2021 · 6f4dd17 · 6f4dd17
1 parent 4f919b0
commit 6f4dd17
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/expression/aggregation/base_func.go b/expression/aggregation/base_func.go
@@ -432,7 +432,7 @@ func (a *baseFuncDesc) WrapCastForAggArgs(ctx sessionctx.Context) {
 		if col, ok := a.Args[i].(*expression.Column); ok {
 			col.RetType = types.NewFieldType(col.RetType.Tp)
 		}
-		// originTp is used when the the `Tp` of column is TypeFloat32 while
+		// originTp is used when the `Tp` of column is TypeFloat32 while
 		// the type of the aggregation function is TypeFloat64.
 		originTp := a.Args[i].GetType().Tp
 		*(a.Args[i].GetType()) = *(a.RetTp)

diff --git a/planner/core/logical_plan_builder.go b/planner/core/logical_plan_builder.go
@@ -4511,7 +4511,7 @@ func (b *PlanBuilder) buildProjectionForWindow(ctx context.Context, p LogicalPla
 		p = np
 		switch newArg.(type) {
 		case *expression.Column, *expression.Constant:
-			newArgList = append(newArgList, newArg)
+			newArgList = append(newArgList, newArg.Clone())
 			continue
 		}
 		proj.Exprs = append(proj.Exprs, newArg)
@@ -4543,7 +4543,7 @@ func (b *PlanBuilder) buildArgs4WindowFunc(ctx context.Context, p LogicalPlan, a
 		p = np
 		switch newArg.(type) {
 		case *expression.Column, *expression.Constant:
-			newArgList = append(newArgList, newArg)
+			newArgList = append(newArgList, newArg.Clone())
 			continue
 		}
 		col := &expression.Column{