[tarantool-patches] Re: [PATCH v2 2/4] sql: account REPLACE as two row changes

[Vladislav Shpilevoy]

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 at 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()