From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> To: tarantool-patches@freelists.org, Nikita Pettik <korablev@tarantool.org> Subject: [tarantool-patches] Re: [PATCH v2 2/4] sql: account REPLACE as two row changes Date: Wed, 14 Nov 2018 15:32:52 +0300 [thread overview] Message-ID: <1cb8f01c-80a8-658a-895f-31649a9e70e8@tarantool.org> (raw) In-Reply-To: <60bebfba861b6378f0bf5de24effba83370a4e7b.1542124689.git.korablev@tarantool.org> Thanks for the patch! On 13/11/2018 19:11, Nikita Pettik wrote: > In our SQL implementation REPLACE acts as DELETE + INSERT, so we should > account it as two row changes. > > Needed for #2181 > --- > src/box/sql/insert.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-)> > diff --git a/src/box/sql/insert.c b/src/box/sql/insert.c > index fd05c0254..a53568810 100644 > --- a/src/box/sql/insert.c > +++ b/src/box/sql/insert.c > @@ -1076,7 +1076,7 @@ process_index: ; > sql_triggers_exist(tab, TK_DELETE, NULL, NULL); > sql_generate_row_delete(parse_context, tab, trigger, > cursor, idx_key_reg, part_count, > - false, > + true, > ON_CONFLICT_ACTION_REPLACE, > ONEPASS_SINGLE, -1); > sqlite3VdbeResolveLabel(v, skip_index); > I added a test on the branch and here: ========================================================== commit faff2944f609b443ec7c32b03ed8101e381f2828 Author: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> Date: Wed Nov 14 15:18:02 2018 +0300 Review fix diff --git a/test/sql/iproto.result b/test/sql/iproto.result index e75f79110..d077ee861 100644 --- a/test/sql/iproto.result +++ b/test/sql/iproto.result @@ -742,11 +742,11 @@ box.sql.execute('drop table test3') -- -- Ensure that FK inside CREATE TABLE does not affect rowcount. -- -cn:execute('create table test (id integer primary key)') +cn:execute('create table test (id integer primary key, a integer)') --- - rowcount: 1 ... -cn:execute('create table test2 (id integer primary key, ref integer references test)') +cn:execute('create table test2 (id integer primary key, ref integer references test(id))') --- - rowcount: 1 ... @@ -754,6 +754,18 @@ cn:execute('drop table test2') --- - rowcount: 1 ... +-- +-- Ensure that REPLACE is accounted twice in rowcount. As delete + +-- insert. +-- +cn:execute('insert into test values(1, 1)') +--- +- rowcount: 1 +... +cn:execute('insert or replace into test values(1, 2)') +--- +- rowcount: 2 +... cn:execute('drop table test') --- - rowcount: 1 diff --git a/test/sql/iproto.test.lua b/test/sql/iproto.test.lua index fb5685a9e..1470edad7 100644 --- a/test/sql/iproto.test.lua +++ b/test/sql/iproto.test.lua @@ -233,9 +233,16 @@ box.sql.execute('drop table test3') -- -- Ensure that FK inside CREATE TABLE does not affect rowcount. -- -cn:execute('create table test (id integer primary key)') -cn:execute('create table test2 (id integer primary key, ref integer references test)') +cn:execute('create table test (id integer primary key, a integer)') +cn:execute('create table test2 (id integer primary key, ref integer references test(id))') cn:execute('drop table test2') + +-- +-- Ensure that REPLACE is accounted twice in rowcount. As delete + +-- insert. +-- +cn:execute('insert into test values(1, 1)') +cn:execute('insert or replace into test values(1, 2)') cn:execute('drop table test') cn:close()
next prev parent reply other threads:[~2018-11-14 12:32 UTC|newest] Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-11-13 16:11 [tarantool-patches] [PATCH v2 0/4] Introduce row_count() function Nikita Pettik 2018-11-13 16:11 ` [tarantool-patches] [PATCH v2 1/4] sql: don't increment row count on FK creation within CREATE TABLE Nikita Pettik 2018-11-14 12:32 ` [tarantool-patches] " Vladislav Shpilevoy 2018-11-14 16:20 ` n.pettik 2018-11-13 16:11 ` [tarantool-patches] [PATCH v2 2/4] sql: account REPLACE as two row changes Nikita Pettik 2018-11-14 12:32 ` Vladislav Shpilevoy [this message] 2018-11-14 16:20 ` [tarantool-patches] " n.pettik 2018-11-13 16:11 ` [tarantool-patches] [PATCH v2 3/4] sql: remove total_changes() function Nikita Pettik 2018-11-13 16:11 ` [tarantool-patches] [PATCH v2 4/4] sql: rename changes() to row_count() Nikita Pettik 2018-11-14 12:32 ` [tarantool-patches] " Vladislav Shpilevoy 2018-11-14 16:20 ` n.pettik 2018-11-14 16:43 ` Vladislav Shpilevoy 2018-11-15 5:06 ` [tarantool-patches] Re: [PATCH v2 0/4] Introduce row_count() function Kirill Yukhin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1cb8f01c-80a8-658a-895f-31649a9e70e8@tarantool.org \ --to=v.shpilevoy@tarantool.org \ --cc=korablev@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='[tarantool-patches] Re: [PATCH v2 2/4] sql: account REPLACE as two row changes' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox