Merge branch 'apache:master' into enhancement_nereids_show-catalog-su…

…pport
apache · Dec 17, 2024 · 316befc · 316befc
2 parents 28bb9db + 13999c8
commit 316befc
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 225 deletions.
diff --git a/regression-test/data/ddl_p0/test_recover.out b/regression-test/data/ddl_p0/test_recover.out
@@ -27,33 +27,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
@@ -89,33 +62,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
@@ -151,33 +97,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
@@ -213,33 +132,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,33 +167,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
@@ -337,33 +202,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
@@ -399,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
@@ -461,33 +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

diff --git 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`"""