database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

planner/core: fix missing nilness check for passed onDup map (#63146)

Browse Source 
close pingcap/tidb#63147
This commit is contained in:
Ruihao Chen
2025-08-22 19:25:29 +08:00
committed by GitHub
parent 4061d6a5e8
commit f2401cd78e
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/planner/core/plan_test.go
View File

@ -713,8 +713,8 @@ func TestImportIntoBuildPlan(t *testing.T) {
tk := testkit.NewTestKit(t, store)
tk.MustExec("use test")
tk.MustExec("create table t1 (a int, b int);")
tk.MustExec("create table t2 (a int, b int);")
tk.MustExec("create table t1 (a int, b int, c datetime on update CURRENT_TIMESTAMP);")
tk.MustExec("create table t2 (a int, b int, c datetime on update CURRENT_TIMESTAMP);")
require.ErrorIs(t, tk.ExecToErr("IMPORT INTO t1 FROM select a from t2;"),
plannererrors.ErrWrongValueCountOnRow)
require.ErrorIs(t, tk.ExecToErr("IMPORT INTO t1(a) FROM select * from t2;"),

5
pkg/planner/core/planbuilder.go
View File

@ -3994,13 +3994,12 @@ func (b *PlanBuilder) getDefaultValueForInsert(col *table.Column) (*expression.C
}
// resolveGeneratedColumns resolves generated columns with their generation expressions respectively.
// onDups indicates which columns are in on-duplicate list
// and it will be **modified** inside this function.
// If not-nil onDups is passed in, it will be **modified in place** and record columns in on-duplicate list
func (b *PlanBuilder) resolveGeneratedColumns(ctx context.Context, columns []*table.Column, onDups map[string]struct{}, mockPlan base.LogicalPlan) (igc InsertGeneratedColumns, err error) {
for _, column := range columns {
if !column.IsGenerated() {
// columns having on-update-now flag should also be considered.
if mysql.HasOnUpdateNowFlag(column.GetFlag()) {
if onDups != nil && mysql.HasOnUpdateNowFlag(column.GetFlag()) {
onDups[column.Name.L] = struct{}{}
}
continue

16
tests/realtikvtest/importintotest/import_into_test.go
View File

@ -331,6 +331,22 @@ func (s *mockGCSSuite) TestInputNull() {
s.tk.MustQuery("SELECT * FROM t;").Check(testkit.Rows([]string{"1 def 11", "2 test2 22"}...))
}
func (s *mockGCSSuite) TestOnUpdateColumn() {
s.server.CreateObject(fakestorage.Object{
ObjectAttrs: fakestorage.ObjectAttrs{
BucketName: "test-on-update",
Name: "on-update.tsv",
},
Content: []byte("1,2025-08-22 02:35:00"),
})
s.prepareAndUseDB("load_data")
s.tk.MustExec("drop table if exists t;")
s.tk.MustExec("create table t(id int, c1 datetime on update CURRENT_TIMESTAMP)")
loadDataSQL := fmt.Sprintf(`IMPORT INTO t FROM 'gs://test-on-update/on-update.tsv?endpoint=%s'`, gcsEndpoint)
s.tk.MustQuery(loadDataSQL)
s.tk.MustQuery("SELECT * FROM t;").Check(testkit.Rows([]string{"1 2025-08-22 02:35:00"}...))
}
func (s *mockGCSSuite) TestIgnoreNLines() {
s.server.CreateObject(fakestorage.Object{
ObjectAttrs: fakestorage.ObjectAttrs{BucketName: "test-multi-load", Name: "skip-rows-1.csv"},