Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

executor: fix load data assertion failure #43858

Merged
merged 2 commits into from
May 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 70 additions & 0 deletions server/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2381,3 +2381,73 @@ func (cli *testServerClient) runTestInfoschemaClientErrors(t *testing.T) {
}
})
}

func (cli *testServerClient) runTestLoadDataReplace(t *testing.T) {
fp1, err := os.CreateTemp("", "a.dat")
require.NoError(t, err)
require.NotNil(t, fp1)
path1 := fp1.Name()
fp2, err := os.CreateTemp("", "b.dat")
require.NoError(t, err)
require.NotNil(t, fp2)
path2 := fp2.Name()
defer func() {
err = fp1.Close()
require.NoError(t, err)
err = os.Remove(path1)
require.NoError(t, err)

err = fp2.Close()
require.NoError(t, err)
err = os.Remove(path2)
require.NoError(t, err)
}()

_, err = fp1.WriteString(
"1,abc\n" +
"2,cdef\n" +
"3,asdf\n")
require.NoError(t, err)
_, err = fp2.WriteString(
"1,AAA\n" +
"2,BBB\n" +
"3,asdf\n" +
"4,444\n")
require.NoError(t, err)

expects := []struct {
col1 int64
col2 string
}{
{1, "AAA"},
{2, "BBB"},
{3, "asdf"},
{4, "444"},
}

cli.runTestsOnNewDB(t, func(config *mysql.Config) {
config.AllowAllFiles = true
config.Params["sql_mode"] = "''"
}, "LoadData", func(dbt *testkit.DBTestKit) {
dbt.MustExec("create table t1(id int, name varchar(20), primary key(id) clustered);")
_, err = dbt.GetDB().Exec(fmt.Sprintf(`load data local infile '%s' replace into table t1 fields terminated by ',' enclosed by '' (id,name)`, path1))
require.NoError(t, err)
_, err = dbt.GetDB().Exec(fmt.Sprintf(`load data local infile '%s' replace into table t1 fields terminated by ',' enclosed by '' (id,name)`, path2))
require.NoError(t, err)
var (
a sql.NullInt64
b sql.NullString
)
rows := dbt.MustQuery("select * from t1 order by id asc")
for _, expect := range expects {
require.Truef(t, rows.Next(), "unexpected data")
err = rows.Scan(&a, &b)
require.NoError(t, err)
require.Equal(t, expect.col1, a.Int64)
require.Equal(t, expect.col2, b.String)
err = rows.Scan(&a, &b)
require.NoError(t, err)
}
require.Falsef(t, rows.Next(), "expect end")
})
}
5 changes: 5 additions & 0 deletions server/tidb_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3210,3 +3210,8 @@ func TestProxyProtocolWithIpNoFallbackable(t *testing.T) {
require.NotNil(t, err)
db.Close()
}

func TestLoadData(t *testing.T) {
ts := createTidbTestSuite(t)
ts.runTestLoadDataReplace(t)
}
3 changes: 2 additions & 1 deletion table/tables/tables.go
Original file line number Diff line number Diff line change
Expand Up @@ -882,7 +882,8 @@ func (t *TableCommon) AddRecord(sctx sessionctx.Context, r []types.Datum, opts .
}
}
})
if setPresume && !txn.IsPessimistic() {
// batch-check guarantees the existence of key itself.
if setPresume && !txn.IsPessimistic() || sctx.GetSessionVars().StmtCtx.BatchCheck {
err = txn.SetAssertion(key, kv.SetAssertUnknown)
} else {
err = txn.SetAssertion(key, kv.SetAssertNotExist)
Expand Down