From 84a559d826e0911be718b5e351c6d76c2a0eb6e1 Mon Sep 17 00:00:00 2001 From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Date: Mon, 6 Feb 2023 11:11:15 +0200 Subject: [PATCH 1/2] onlineddl_vrepl suite: fix auto_increment flakyness Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> --- .../autoinc-copy-deletes-mysql80/create.sql | 18 +++++++++++++++--- .../expect_table_structure | 2 +- .../autoinc-copy-simple-mysql80/create.sql | 16 +++++++++++++++- .../expect_table_structure | 2 +- 4 files changed, 32 insertions(+), 6 deletions(-) diff --git a/go/test/endtoend/onlineddl/vrepl_suite/testdata/autoinc-copy-deletes-mysql80/create.sql b/go/test/endtoend/onlineddl/vrepl_suite/testdata/autoinc-copy-deletes-mysql80/create.sql index 0a150c3f040..448aa8e98bb 100644 --- a/go/test/endtoend/onlineddl/vrepl_suite/testdata/autoinc-copy-deletes-mysql80/create.sql +++ b/go/test/endtoend/onlineddl/vrepl_suite/testdata/autoinc-copy-deletes-mysql80/create.sql @@ -5,7 +5,7 @@ create table onlineddl_test ( id int auto_increment, i int not null, primary key(id) -) auto_increment=1; +) auto_increment=8; insert into onlineddl_test values (NULL, 11); insert into onlineddl_test values (NULL, 13); @@ -13,5 +13,17 @@ insert into onlineddl_test values (NULL, 17); insert into onlineddl_test values (NULL, 23); insert into onlineddl_test values (NULL, 29); insert into onlineddl_test values (NULL, 31); -insert into onlineddl_test values (NULL, 37); -delete from onlineddl_test where id>=5; + +drop event if exists onlineddl_test; +delimiter ;; +create event onlineddl_test + on schedule every 1 second + starts current_timestamp + ends current_timestamp + interval 60 second + on completion not preserve + enable + do +begin + insert into onlineddl_test values (NULL, 37); + delete from onlineddl_test where id>=5; +end ;; diff --git a/go/test/endtoend/onlineddl/vrepl_suite/testdata/autoinc-copy-deletes-mysql80/expect_table_structure b/go/test/endtoend/onlineddl/vrepl_suite/testdata/autoinc-copy-deletes-mysql80/expect_table_structure index aecaa0d0b4c..a0db9f00f5e 100644 --- a/go/test/endtoend/onlineddl/vrepl_suite/testdata/autoinc-copy-deletes-mysql80/expect_table_structure +++ b/go/test/endtoend/onlineddl/vrepl_suite/testdata/autoinc-copy-deletes-mysql80/expect_table_structure @@ -1 +1 @@ -AUTO_INCREMENT=[89] +AUTO_INCREMENT=([1-9][0-9]) diff --git a/go/test/endtoend/onlineddl/vrepl_suite/testdata/autoinc-copy-simple-mysql80/create.sql b/go/test/endtoend/onlineddl/vrepl_suite/testdata/autoinc-copy-simple-mysql80/create.sql index b2680e8ff4d..cbe6f6670cc 100644 --- a/go/test/endtoend/onlineddl/vrepl_suite/testdata/autoinc-copy-simple-mysql80/create.sql +++ b/go/test/endtoend/onlineddl/vrepl_suite/testdata/autoinc-copy-simple-mysql80/create.sql @@ -5,9 +5,23 @@ create table onlineddl_test ( id int auto_increment, i int not null, primary key(id) -) auto_increment=1; +) auto_increment=8; insert into onlineddl_test values (NULL, 11); insert into onlineddl_test values (NULL, 13); insert into onlineddl_test values (NULL, 17); insert into onlineddl_test values (NULL, 23); + + +drop event if exists onlineddl_test; +delimiter ;; +create event onlineddl_test + on schedule every 1 second + starts current_timestamp + ends current_timestamp + interval 60 second + on completion not preserve + enable + do +begin + insert into onlineddl_test values (NULL, 37); +end ;; diff --git a/go/test/endtoend/onlineddl/vrepl_suite/testdata/autoinc-copy-simple-mysql80/expect_table_structure b/go/test/endtoend/onlineddl/vrepl_suite/testdata/autoinc-copy-simple-mysql80/expect_table_structure index aecaa0d0b4c..a0db9f00f5e 100644 --- a/go/test/endtoend/onlineddl/vrepl_suite/testdata/autoinc-copy-simple-mysql80/expect_table_structure +++ b/go/test/endtoend/onlineddl/vrepl_suite/testdata/autoinc-copy-simple-mysql80/expect_table_structure @@ -1 +1 @@ -AUTO_INCREMENT=[89] +AUTO_INCREMENT=([1-9][0-9]) From f80580501d50839d7f01245090970f5dc65746f8 Mon Sep 17 00:00:00 2001 From: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> Date: Mon, 6 Feb 2023 11:19:52 +0200 Subject: [PATCH 2/2] delete all rows before events begin Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com> --- .../testdata/autoinc-copy-deletes-mysql80/create.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/go/test/endtoend/onlineddl/vrepl_suite/testdata/autoinc-copy-deletes-mysql80/create.sql b/go/test/endtoend/onlineddl/vrepl_suite/testdata/autoinc-copy-deletes-mysql80/create.sql index 448aa8e98bb..a5b7005dcde 100644 --- a/go/test/endtoend/onlineddl/vrepl_suite/testdata/autoinc-copy-deletes-mysql80/create.sql +++ b/go/test/endtoend/onlineddl/vrepl_suite/testdata/autoinc-copy-deletes-mysql80/create.sql @@ -13,6 +13,7 @@ insert into onlineddl_test values (NULL, 17); insert into onlineddl_test values (NULL, 23); insert into onlineddl_test values (NULL, 29); insert into onlineddl_test values (NULL, 31); +delete from onlineddl_test where id>=0; drop event if exists onlineddl_test; delimiter ;; @@ -25,5 +26,5 @@ create event onlineddl_test do begin insert into onlineddl_test values (NULL, 37); - delete from onlineddl_test where id>=5; + delete from onlineddl_test where id>=0; end ;;