From cfb62468069fb0c7dc15b624b2a7649d017cb241 Mon Sep 17 00:00:00 2001 From: Yiding Cui Date: Fri, 6 Jan 2023 18:56:21 +0800 Subject: [PATCH 1/2] This is an automated cherry-pick of #40354 Signed-off-by: ti-chi-bot --- executor/executor.go | 6 ++++++ executor/insert.go | 2 -- executor/write_test.go | 20 ++++++++++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/executor/executor.go b/executor/executor.go index 09f946b442a9a..bdf12d883f43c 100644 --- a/executor/executor.go +++ b/executor/executor.go @@ -2168,6 +2168,12 @@ func ResetContextOfStmt(ctx sessionctx.Context, s ast.StmtNode) (err error) { vars.ClearStmtVars() vars.PrevFoundInBinding = vars.FoundInBinding vars.FoundInBinding = false +<<<<<<< HEAD +======= + vars.DurationWaitTS = 0 + vars.CurrInsertBatchExtraCols = nil + vars.CurrInsertValues = chunk.Row{} +>>>>>>> f600fc694f (executor: reset the related session vars for both INSERT and REPLACE (#40354)) return } diff --git a/executor/insert.go b/executor/insert.go index d0b09e302860c..1a4eb27d3c6f6 100644 --- a/executor/insert.go +++ b/executor/insert.go @@ -345,8 +345,6 @@ func (e *InsertExec) Close() error { defer e.ctx.GetSessionVars().StmtCtx.RuntimeStatsColl.RegisterStats(e.id, e.stats) } defer e.memTracker.ReplaceBytesUsed(0) - e.ctx.GetSessionVars().CurrInsertValues = chunk.Row{} - e.ctx.GetSessionVars().CurrInsertBatchExtraCols = e.ctx.GetSessionVars().CurrInsertBatchExtraCols[0:0:0] e.setMessage() if e.SelectExec != nil { return e.SelectExec.Close() diff --git a/executor/write_test.go b/executor/write_test.go index 32aa261c5518d..ce7647a58be7e 100644 --- a/executor/write_test.go +++ b/executor/write_test.go @@ -4299,3 +4299,23 @@ func TestIssueInsertPrefixIndexForNonUTF8Collation(t *testing.T) { tk.MustExec("insert into t3 select 'abc '") tk.MustGetErrCode("insert into t3 select 'abc d'", 1062) } + +func TestMutipleReplaceAndInsertInOneSession(t *testing.T) { + store := testkit.CreateMockStore(t) + tk := testkit.NewTestKit(t, store) + tk.MustExec("use test") + tk.MustExec("create table t_securities(id bigint not null auto_increment primary key, security_id varchar(8), market_id smallint, security_type int, unique key uu(security_id, market_id))") + tk.MustExec(`insert into t_securities (security_id, market_id, security_type) values ("1", 2, 7), ("7", 1, 7) ON DUPLICATE KEY UPDATE security_type = VALUES(security_type)`) + tk.MustExec(`replace into t_securities (security_id, market_id, security_type) select security_id+1, 1, security_type from t_securities where security_id="7";`) + tk.MustExec(`INSERT INTO t_securities (security_id, market_id, security_type) values ("1", 2, 7), ("7", 1, 7) ON DUPLICATE KEY UPDATE security_type = VALUES(security_type)`) + + tk.MustQuery("select * from t_securities").Sort().Check(testkit.Rows("1 1 2 7", "2 7 1 7", "3 8 1 7")) + + tk2 := testkit.NewTestKit(t, store) + tk2.MustExec("use test") + tk2.MustExec(`insert into t_securities (security_id, market_id, security_type) values ("1", 2, 7), ("7", 1, 7) ON DUPLICATE KEY UPDATE security_type = VALUES(security_type)`) + tk2.MustExec(`insert into t_securities (security_id, market_id, security_type) select security_id+2, 1, security_type from t_securities where security_id="7";`) + tk2.MustExec(`INSERT INTO t_securities (security_id, market_id, security_type) values ("1", 2, 7), ("7", 1, 7) ON DUPLICATE KEY UPDATE security_type = VALUES(security_type)`) + + tk2.MustQuery("select * from t_securities").Sort().Check(testkit.Rows("1 1 2 7", "2 7 1 7", "3 8 1 7", "8 9 1 7")) +} From 57a0a00171f3e0dcccb437917a9b92f337964671 Mon Sep 17 00:00:00 2001 From: Yiding Cui Date: Thu, 12 Jan 2023 11:06:15 +0800 Subject: [PATCH 2/2] resolve conflicts --- executor/executor.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/executor/executor.go b/executor/executor.go index bdf12d883f43c..30614525cdc48 100644 --- a/executor/executor.go +++ b/executor/executor.go @@ -2168,12 +2168,8 @@ func ResetContextOfStmt(ctx sessionctx.Context, s ast.StmtNode) (err error) { vars.ClearStmtVars() vars.PrevFoundInBinding = vars.FoundInBinding vars.FoundInBinding = false -<<<<<<< HEAD -======= - vars.DurationWaitTS = 0 vars.CurrInsertBatchExtraCols = nil vars.CurrInsertValues = chunk.Row{} ->>>>>>> f600fc694f (executor: reset the related session vars for both INSERT and REPLACE (#40354)) return }