parser: support LOAD DATA ... IGNORE/REPLACE (#10336)

pingcap · May 22, 2019 · 54899f6 · 54899f6
1 parent 3439e6b
commit 54899f6
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 3 deletions.
diff --git a/cmd/ddltest/random.go b/cmd/ddltest/random.go
@@ -33,7 +33,7 @@ func randomFloat() float64 {
 func randomString(n int) string {
 	const alphanum = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
 	var bytes = make([]byte, n)
-	for i, _ := range bytes {
+	for i := range bytes {
 		bytes[i] = alphanum[randomIntn(len(alphanum))]
 	}
 	return string(bytes)

diff --git a/executor/builder.go b/executor/builder.go
@@ -657,6 +657,7 @@ func (b *executorBuilder) buildLoadData(v *plannercore.LoadData) Executor {
 	loadDataExec := &LoadDataExec{
 		baseExecutor: newBaseExecutor(b.ctx, nil, v.ExplainID()),
 		IsLocal:      v.IsLocal,
+		OnDuplicate:  v.OnDuplicate,
 		loadDataInfo: &LoadDataInfo{
 			row:          make([]types.Datum, len(insertVal.insertColumns)),
 			InsertValues: insertVal,

diff --git a/executor/load_data.go b/executor/load_data.go
@@ -35,6 +35,7 @@ type LoadDataExec struct {
 	baseExecutor
 
 	IsLocal      bool
+	OnDuplicate  ast.OnDuplicateKeyHandlingType
 	loadDataInfo *LoadDataInfo
 }
 
@@ -58,6 +59,10 @@ func (e *LoadDataExec) Next(ctx context.Context, req *chunk.RecordBatch) error {
 	if !e.IsLocal {
 		return errors.New("Load Data: don't support load data without local field")
 	}
+	// TODO: support load data with replace field.
+	if e.OnDuplicate == ast.OnDuplicateKeyHandlingReplace {
+		return errors.New("Load Data: don't support load data with replace field")
+	}
 	// TODO: support lines terminated is "".
 	if len(e.loadDataInfo.LinesInfo.Terminated) == 0 {
 		return errors.New("Load Data: don't support load data terminated is nil")

diff --git a/executor/write_test.go b/executor/write_test.go
@@ -1788,7 +1788,9 @@ func (s *testSuite4) TestLoadData(c *C) {
 	tk.MustExec(createSQL)
 	_, err = tk.Exec("load data infile '/tmp/nonexistence.csv' into table load_data_test")
 	c.Assert(err, NotNil)
-	tk.MustExec("load data local infile '/tmp/nonexistence.csv' into table load_data_test")
+	_, err = tk.Exec("load data local infile '/tmp/nonexistence.csv' replace into table load_data_test")
+	c.Assert(err, NotNil)
+	tk.MustExec("load data local infile '/tmp/nonexistence.csv' ignore into table load_data_test")
 	ctx := tk.Se.(sessionctx.Context)
 	ld, ok := ctx.Value(executor.LoadDataVarKey).(*executor.LoadDataInfo)
 	c.Assert(ok, IsTrue)
@@ -2018,7 +2020,7 @@ func (s *testSuite4) TestLoadDataIgnoreLines(c *C) {
 	checkCases(tests, ld, c, tk, ctx, selectSQL, deleteSQL)
 }
 
-// related to issue 6360
+// TestLoadDataOverflowBigintUnsigned related to issue 6360
 func (s *testSuite4) TestLoadDataOverflowBigintUnsigned(c *C) {
 	tk := testkit.NewTestKit(c, s.store)
 	tk.MustExec("use test; drop table if exists load_data_test;")

diff --git a/planner/core/common_plans.go b/planner/core/common_plans.go
@@ -460,6 +460,7 @@ type LoadData struct {
 	baseSchemaProducer
 
 	IsLocal     bool
+	OnDuplicate ast.OnDuplicateKeyHandlingType
 	Path        string
 	Table       *ast.TableName
 	Columns     []*ast.ColumnName

diff --git a/planner/core/planbuilder.go b/planner/core/planbuilder.go
@@ -1577,6 +1577,7 @@ func (b *PlanBuilder) buildSelectPlanOfInsert(insert *ast.InsertStmt, insertPlan
 func (b *PlanBuilder) buildLoadData(ld *ast.LoadDataStmt) (Plan, error) {
 	p := &LoadData{
 		IsLocal:     ld.IsLocal,
+		OnDuplicate: ld.OnDuplicate,
 		Path:        ld.Path,
 		Table:       ld.Table,
 		Columns:     ld.Columns,