Skip to content

Commit f6c0a7b

Browse files
authored
avoid using sql.Row.Append() (#3154)
1 parent a7e14d8 commit f6c0a7b

File tree

6 files changed

+173
-148
lines changed

6 files changed

+173
-148
lines changed

sql/rowexec/dml_iters.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,8 @@ func (u *updateSourceIter) Next(ctx *sql.Context) (sql.Row, error) {
754754
newRow = newRow[len(newRow)-expectedSchemaLen:]
755755
}
756756

757-
return oldRow.Append(newRow), nil
757+
row := append(oldRow, newRow...)
758+
return row, nil
758759
}
759760

760761
func (u *updateSourceIter) Close(ctx *sql.Context) error {

sql/rowexec/insert.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,13 +233,11 @@ func (i *insertIter) handleOnDuplicateKeyUpdate(ctx *sql.Context, oldRow, newRow
233233
if !ok {
234234
return nil, err
235235
}
236-
237236
val = convertDataAndWarn(ctx, i.schema, newRow, idx, err)
238237
} else {
239238
return nil, err
240239
}
241240
}
242-
243241
updateAcc = val.(sql.Row)
244242
}
245243
// project LHS only

0 commit comments

Comments
 (0)