From 1980e098bcfda2fe8720c97e55117e13cd65dff3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 22:43:15 +0800 Subject: [PATCH] branch-2.1: [Test](binlog) Check correctly for show create database #45472 (#45551) Cherry-picked from #45472 Co-authored-by: Uniqueyou --- regression-test/data/ddl_p0/test_recover.out | 318 +++--------------- .../suites/ddl_p0/test_recover.groovy | 27 +- 2 files changed, 69 insertions(+), 276 deletions(-) diff --git a/regression-test/data/ddl_p0/test_recover.out b/regression-test/data/ddl_p0/test_recover.out index 149c4c5459..646ec068a0 100644 --- a/regression-test/data/ddl_p0/test_recover.out +++ b/regression-test/data/ddl_p0/test_recover.out @@ -28,31 +28,39 @@ test_recover_tb test_recover_tb_new -- !select -- -test_recover_db CREATE DATABASE `test_recover_db` +test_recover_tb +test_recover_tb_2 -- !select -- -test_recover_db CREATE DATABASE `test_recover_db` +test_recover_tb_2 -- !select -- -test_recover_db CREATE DATABASE `test_recover_db` -- !select -- -test_recover_db CREATE DATABASE `test_recover_db` +test_recover_tb -- !select -- -test_recover_db CREATE DATABASE `test_recover_db` -- !select -- -test_recover_db CREATE DATABASE `test_recover_db` +test_recover_tb -- !select -- -test_recover_db_new CREATE DATABASE `test_recover_db_new` +test_recover_tb -- !select -- -test_recover_db CREATE DATABASE `test_recover_db` +test_recover_tb -- !select -- -test_recover_db_new CREATE DATABASE `test_recover_db_new` +test_recover_tb + +-- !select -- + +-- !select -- +test_recover_tb_new + +-- !select -- +test_recover_tb +test_recover_tb_new -- !select -- test_recover_tb @@ -90,31 +98,39 @@ test_recover_tb test_recover_tb_new -- !select -- -test_recover_db CREATE DATABASE `test_recover_db` +test_recover_tb +test_recover_tb_2 -- !select -- -test_recover_db CREATE DATABASE `test_recover_db` +test_recover_tb_2 -- !select -- -test_recover_db CREATE DATABASE `test_recover_db` -- !select -- -test_recover_db CREATE DATABASE `test_recover_db` +test_recover_tb -- !select -- -test_recover_db CREATE DATABASE `test_recover_db` -- !select -- -test_recover_db CREATE DATABASE `test_recover_db` +test_recover_tb -- !select -- -test_recover_db_new CREATE DATABASE `test_recover_db_new` +test_recover_tb -- !select -- -test_recover_db CREATE DATABASE `test_recover_db` +test_recover_tb -- !select -- -test_recover_db_new CREATE DATABASE `test_recover_db_new` +test_recover_tb + +-- !select -- + +-- !select -- +test_recover_tb_new + +-- !select -- +test_recover_tb +test_recover_tb_new -- !select -- test_recover_tb @@ -152,31 +168,39 @@ test_recover_tb test_recover_tb_new -- !select -- -test_recover_db CREATE DATABASE `test_recover_db` +test_recover_tb +test_recover_tb_2 -- !select -- -test_recover_db CREATE DATABASE `test_recover_db` +test_recover_tb_2 -- !select -- -test_recover_db CREATE DATABASE `test_recover_db` -- !select -- -test_recover_db CREATE DATABASE `test_recover_db` +test_recover_tb -- !select -- -test_recover_db CREATE DATABASE `test_recover_db` -- !select -- -test_recover_db CREATE DATABASE `test_recover_db` +test_recover_tb -- !select -- -test_recover_db_new CREATE DATABASE `test_recover_db_new` +test_recover_tb -- !select -- -test_recover_db CREATE DATABASE `test_recover_db` +test_recover_tb -- !select -- -test_recover_db_new CREATE DATABASE `test_recover_db_new` +test_recover_tb + +-- !select -- + +-- !select -- +test_recover_tb_new + +-- !select -- +test_recover_tb +test_recover_tb_new -- !select -- test_recover_tb @@ -213,33 +237,6 @@ test_recover_tb_new test_recover_tb test_recover_tb_new --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db_new CREATE DATABASE `test_recover_db_new` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db_new CREATE DATABASE `test_recover_db_new` - -- !select -- test_recover_tb test_recover_tb_2 @@ -275,219 +272,6 @@ test_recover_tb_new test_recover_tb test_recover_tb_new --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db_new CREATE DATABASE `test_recover_db_new` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db_new CREATE DATABASE `test_recover_db_new` - --- !select -- -test_recover_tb -test_recover_tb_2 - --- !select -- -test_recover_tb_2 - --- !select -- - --- !select -- -test_recover_tb - --- !select -- - --- !select -- -test_recover_tb - --- !select -- -test_recover_tb - --- !select -- -test_recover_tb - --- !select -- -test_recover_tb - --- !select -- - --- !select -- -test_recover_tb_new - --- !select -- -test_recover_tb -test_recover_tb_new - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db_new CREATE DATABASE `test_recover_db_new` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db_new CREATE DATABASE `test_recover_db_new` - --- !select -- -test_recover_tb -test_recover_tb_2 - --- !select -- -test_recover_tb_2 - --- !select -- - --- !select -- -test_recover_tb - --- !select -- - --- !select -- -test_recover_tb - --- !select -- -test_recover_tb - --- !select -- -test_recover_tb - --- !select -- -test_recover_tb - --- !select -- - --- !select -- -test_recover_tb_new - --- !select -- -test_recover_tb -test_recover_tb_new - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db_new CREATE DATABASE `test_recover_db_new` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db_new CREATE DATABASE `test_recover_db_new` - --- !select -- -test_recover_tb -test_recover_tb_2 - --- !select -- -test_recover_tb_2 - --- !select -- - --- !select -- -test_recover_tb - --- !select -- - --- !select -- -test_recover_tb - --- !select -- -test_recover_tb - --- !select -- -test_recover_tb - --- !select -- -test_recover_tb - --- !select -- - --- !select -- -test_recover_tb_new - --- !select -- -test_recover_tb -test_recover_tb_new - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db_new CREATE DATABASE `test_recover_db_new` - --- !select -- -test_recover_db CREATE DATABASE `test_recover_db` - --- !select -- -test_recover_db_new CREATE DATABASE `test_recover_db_new` - -- !select -- test_recover_tb test_recover_tb_2 diff --git a/regression-test/suites/ddl_p0/test_recover.groovy b/regression-test/suites/ddl_p0/test_recover.groovy index 4f17b0f644..a1c1b1917a 100644 --- a/regression-test/suites/ddl_p0/test_recover.groovy +++ b/regression-test/suites/ddl_p0/test_recover.groovy @@ -273,7 +273,8 @@ suite("test_recover") { // test drop/recover db - qt_select """ SHOW CREATE DATABASE `test_recover_db` """ + def showDatabase = sql """ SHOW CREATE DATABASE test_recover_db """ + assertTrue(showDatabase[0][1].contains("CREATE DATABASE `test_recover_db`")) sql """ DROP DATABASE `test_recover_db` @@ -283,7 +284,8 @@ suite("test_recover") { RECOVER DATABASE `test_recover_db` """ - qt_select """ SHOW CREATE DATABASE `test_recover_db` """ + showDatabase = sql """ SHOW CREATE DATABASE test_recover_db """ + assertTrue(showDatabase[0][1].contains("CREATE DATABASE `test_recover_db`")) sql """ CREATE TABLE `test_recover_db`.`test_recover_tb_1` ( @@ -312,7 +314,8 @@ suite("test_recover") { CREATE DATABASE `test_recover_db` """ - qt_select """ SHOW CREATE DATABASE `test_recover_db` """ + showDatabase = sql """ SHOW CREATE DATABASE `test_recover_db` """ + assertTrue(showDatabase[0][1].contains("CREATE DATABASE `test_recover_db`")) sql """ DROP DATABASE `test_recover_db` @@ -321,7 +324,8 @@ suite("test_recover") { CREATE DATABASE `test_recover_db` """ - qt_select """ SHOW CREATE DATABASE `test_recover_db` """ + showDatabase = sql """ SHOW CREATE DATABASE `test_recover_db` """ + assertTrue(showDatabase[0][1].contains("CREATE DATABASE `test_recover_db`")) sql """ DROP DATABASE `test_recover_db` @@ -331,7 +335,8 @@ suite("test_recover") { CREATE DATABASE `test_recover_db` """ - qt_select """ SHOW CREATE DATABASE `test_recover_db` """ + showDatabase = sql """ SHOW CREATE DATABASE `test_recover_db` """ + assertTrue(showDatabase[0][1].contains("CREATE DATABASE `test_recover_db`")) sql """ CREATE TABLE `test_recover_db`.`test_recover_tb` ( @@ -359,7 +364,8 @@ suite("test_recover") { CREATE DATABASE `test_recover_db` """ - qt_select """ SHOW CREATE DATABASE `test_recover_db` """ + showDatabase = sql """ SHOW CREATE DATABASE `test_recover_db` """ + assertTrue(showDatabase[0][1].contains("CREATE DATABASE `test_recover_db`")) sql """ DROP DATABASE `test_recover_db` @@ -369,7 +375,8 @@ suite("test_recover") { RECOVER DATABASE `test_recover_db` AS `test_recover_db_new` """ - qt_select """ SHOW CREATE DATABASE `test_recover_db_new` """ + showDatabase = sql """ SHOW CREATE DATABASE `test_recover_db_new` """ + assertTrue(showDatabase[0][1].contains("CREATE DATABASE `test_recover_db_new`")) sql """ CREATE TABLE `test_recover_db_new`.`test_recover_tb_2` ( @@ -413,8 +420,10 @@ suite("test_recover") { ) """ - qt_select """ SHOW CREATE DATABASE `test_recover_db` """ - qt_select """ SHOW CREATE DATABASE `test_recover_db_new` """ + showDatabase = sql """ SHOW CREATE DATABASE `test_recover_db` """ + assertTrue(showDatabase[0][1].contains("CREATE DATABASE `test_recover_db`")) + showDatabase = sql """ SHOW CREATE DATABASE `test_recover_db_new` """ + assertTrue(showDatabase[0][1].contains("CREATE DATABASE `test_recover_db_new`")) res = sql """SHOW CREATE TABLE `test_recover_db`.`test_recover_tb`""" assertTrue(res.size() != 0) qt_select """SHOW TABLES FROM `test_recover_db`"""