executor: fix insert ignore into not exists partition (pingcap#21904)…

… (pingcap#21971) Signed-off-by: ti-srebot <[email protected]> Signed-off-by: lysu <[email protected]>
ti-srebot · Jan 26, 2021 · c7beb87 · c7beb87
1 parent 55a1f65
commit c7beb87
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 1 deletion.
diff --git a/executor/batch_checker.go b/executor/batch_checker.go
@@ -17,7 +17,10 @@ import (
 	"context"
 	"strconv"
 
+	"github.com/pingcap/errors"
 	"github.com/pingcap/parser/model"
+	"github.com/pingcap/parser/terror"
+	"github.com/pingcap/tidb/errno"
 	"github.com/pingcap/tidb/expression"
 	"github.com/pingcap/tidb/kv"
 	"github.com/pingcap/tidb/sessionctx"
@@ -38,7 +41,8 @@ type toBeCheckedRow struct {
 	handleKey  *keyValueWithDupInfo
 	uniqueKeys []*keyValueWithDupInfo
 	// t is the table or partition this row belongs to.
-	t table.Table
+	t       table.Table
+	ignored bool
 }
 
 // encodeNewRow encodes a new row to value.
@@ -96,6 +100,11 @@ func getKeysNeedCheckOneRow(ctx sessionctx.Context, t table.Table, row []types.D
 	if p, ok := t.(table.PartitionedTable); ok {
 		t, err = p.GetPartitionByRow(ctx, row)
 		if err != nil {
+			if terr, ok := errors.Cause(err).(*terror.Error); ctx.GetSessionVars().StmtCtx.IgnoreNoPartition && ok && terr.Code() == errno.ErrNoPartitionForGivenValue {
+				ctx.GetSessionVars().StmtCtx.AppendWarning(err)
+				result = append(result, toBeCheckedRow{ignored: true})
+				return result, nil
+			}
 			return nil, err
 		}
 	}

diff --git a/executor/executor.go b/executor/executor.go
@@ -1691,6 +1691,7 @@ func ResetContextOfStmt(ctx sessionctx.Context, s ast.StmtNode) (err error) {
 		// but should not make DupKeyAsWarning or BadNullAsWarning,
 		sc.DupKeyAsWarning = stmt.IgnoreErr
 		sc.BadNullAsWarning = stmt.IgnoreErr
+		sc.IgnoreNoPartition = stmt.IgnoreErr
 		sc.TruncateAsWarning = !vars.StrictSQLMode || stmt.IgnoreErr
 		sc.DividedByZeroAsWarning = !vars.StrictSQLMode || stmt.IgnoreErr
 		sc.AllowInvalidDate = vars.SQLMode.HasAllowInvalidDatesMode()

diff --git a/executor/insert.go b/executor/insert.go
@@ -113,13 +113,19 @@ func prefetchUniqueIndices(ctx context.Context, txn kv.Transaction, rows []toBeC
 
 	nKeys := 0
 	for _, r := range rows {
+		if r.ignored {
+			continue
+		}
 		if r.handleKey != nil {
 			nKeys++
 		}
 		nKeys += len(r.uniqueKeys)
 	}
 	batchKeys := make([]kv.Key, 0, nKeys)
 	for _, r := range rows {
+		if r.ignored {
+			continue
+		}
 		if r.handleKey != nil {
 			batchKeys = append(batchKeys, r.handleKey.newKey)
 		}

diff --git a/executor/insert_common.go b/executor/insert_common.go
@@ -1028,6 +1028,9 @@ func (e *InsertValues) batchCheckAndInsert(ctx context.Context, rows [][]types.D
 
 	// append warnings and get no duplicated error rows
 	for i, r := range toBeCheckedRows {
+		if r.ignored {
+			continue
+		}
 		skip := false
 		if r.handleKey != nil {
 			_, err := txn.Get(ctx, r.handleKey.newKey)

diff --git a/executor/write_test.go b/executor/write_test.go
@@ -569,6 +569,10 @@ commit;`
 	tk.MustQuery("show warnings").Check(testkit.Rows("Warning 1048 Column 'i' cannot be null"))
 	testSQL = `select * from badnull`
 	tk.MustQuery(testSQL).Check(testkit.Rows("0"))
+
+	tk.MustExec("create table tp (id int) partition by range (id) (partition p0 values less than (1), partition p1 values less than(2))")
+	tk.MustExec("insert ignore into tp values (1), (3)")
+	tk.MustQuery("show warnings").Check(testkit.Rows("Warning 1526 Table has no partition for value 3"))
 }
 
 func (s *testSuite8) TestInsertOnDup(c *C) {

diff --git a/sessionctx/stmtctx/stmtctx.go b/sessionctx/stmtctx/stmtctx.go
@@ -80,6 +80,7 @@ type StatementContext struct {
 	InNullRejectCheck         bool
 	AllowInvalidDate          bool
 	OptimDependOnMutableConst bool
+	IgnoreNoPartition         bool
 
 	// mu struct holds variables that change during execution.
 	mu struct {