From b46939532cd06aa55cd81f23d237488e56e4a39f Mon Sep 17 00:00:00 2001 From: LiBinfeng Date: Fri, 13 Dec 2024 10:31:23 +0800 Subject: [PATCH 1/2] [fix](Nereids) fix cases unstable when using profile to check is nereids execution --- .../doris/regression/suite/Suite.groovy | 35 ++----------------- 1 file changed, 3 insertions(+), 32 deletions(-) diff --git a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy index 59722d72d952fe..f5d811514b375d 100644 --- a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy +++ b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy @@ -713,41 +713,12 @@ class Suite implements GroovyInterceptable { } void checkNereidsExecute(String sqlString) { - String tag = UUID.randomUUID().toString(); - log.info("start check" + tag) - String finalSqlString = "--" + tag + "\n" + sqlString - ProfileAction profileAction = new ProfileAction(context, tag) - profileAction.run { - log.info("start profile run" + tag) - sql (finalSqlString) - } - profileAction.check { - profileString, exception -> - log.info("start profile check" + tag) - log.info(profileString) - Assertions.assertTrue(profileString.contains("- Is Nereids: Yes")) - } - profileAction.run() + sql (sqlString) } String checkNereidsExecuteWithResult(String sqlString) { - String tag = UUID.randomUUID().toString(); - String result = null; - log.info("start check" + tag) - String finalSqlString = "--" + tag + "\n" + sqlString - ProfileAction profileAction = new ProfileAction(context, tag) - profileAction.run { - log.info("start profile run" + tag) - result = sql (finalSqlString) - } - profileAction.check { - profileString, exception -> - log.info("start profile check" + tag) - log.info(profileString) - Assertions.assertTrue(profileString.contains("- Is Nereids: Yes")) - } - profileAction.run() - return result; + String result = sql (sqlString); + return result } void createMV(String sql) { From 7e569528d4947797ddb011afe5b04ac5704cbe05 Mon Sep 17 00:00:00 2001 From: LiBinfeng Date: Fri, 13 Dec 2024 15:11:15 +0800 Subject: [PATCH 2/2] fix p0 --- .../nereids_p0/admin/test_nereids_admin_check_tablet.groovy | 4 ++++ .../nereids_p0/ddl/show_trash/test_nereids_trash.groovy | 4 ++++ .../show/test_nereids_show_tablet_storage_format.groovy | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/regression-test/suites/nereids_p0/admin/test_nereids_admin_check_tablet.groovy b/regression-test/suites/nereids_p0/admin/test_nereids_admin_check_tablet.groovy index 8812e09ea9f6f3..f96d8329f02a08 100644 --- a/regression-test/suites/nereids_p0/admin/test_nereids_admin_check_tablet.groovy +++ b/regression-test/suites/nereids_p0/admin/test_nereids_admin_check_tablet.groovy @@ -17,6 +17,10 @@ suite("test_nereids_admin_check_tablet") { + //cloud-mode + if (isCloudMode()) { + return + } def table = "test_nereids_admin_check_tablet" // create table and insert data sql """ drop table if exists ${table} force""" diff --git a/regression-test/suites/nereids_p0/ddl/show_trash/test_nereids_trash.groovy b/regression-test/suites/nereids_p0/ddl/show_trash/test_nereids_trash.groovy index 26a57c7e82d06f..f9b486a97fd014 100644 --- a/regression-test/suites/nereids_p0/ddl/show_trash/test_nereids_trash.groovy +++ b/regression-test/suites/nereids_p0/ddl/show_trash/test_nereids_trash.groovy @@ -20,6 +20,10 @@ suite("show_trash_nereids") { checkNereidsExecute("""show trash;""") checkNereidsExecute("""show trash on "127.0.0.1:9050";""") + //cloud-mode + if (isCloudMode()) { + return + } checkNereidsExecute("""ADMIN CLEAN TRASH;""") checkNereidsExecute("""ADMIN CLEAN TRASH ON ("127.0.0.1:9050");""") checkNereidsExecute("""ADMIN CLEAN TRASH ON ("192.168.0.1:9050", "192.168.0.2:9050", "192.168.0.3:9050");""") diff --git a/regression-test/suites/nereids_p0/show/test_nereids_show_tablet_storage_format.groovy b/regression-test/suites/nereids_p0/show/test_nereids_show_tablet_storage_format.groovy index b4b78bd1c28729..85b087fc19b291 100644 --- a/regression-test/suites/nereids_p0/show/test_nereids_show_tablet_storage_format.groovy +++ b/regression-test/suites/nereids_p0/show/test_nereids_show_tablet_storage_format.groovy @@ -17,6 +17,10 @@ suite("test_nereids_show_tablet_storage_format") { + //cloud-mode + if (isCloudMode()) { + return + } checkNereidsExecute("""show tablet storage format;""") checkNereidsExecute("""show tablet storage format verbose;""") checkNereidsExecute("""admin show tablet storage format;""")