This is an automated email from the ASF dual-hosted git repository.
starocean999 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 2ca753feb84 [fix](Nereids) fix cases unstable when using profile to
check is nereids execution (#45384)
2ca753feb84 is described below
commit 2ca753feb84c6931aedb760c1d2b3e9be3ead310
Author: LiBinfeng <libinf...@selectdb.com>
AuthorDate: Fri Dec 13 17:40:52 2024 +0800
[fix](Nereids) fix cases unstable when using profile to check is nereids
execution (#45384)
Problem Summary:
when commands running in doris using profile to check whether it's plan
is generated by nereids, it would randomly failed because profile is not
always generated on time.
solved by remove this check and check whether command was running by
nereids by reviewer
---
.../org/apache/doris/regression/suite/Suite.groovy | 35 ++--------------------
.../admin/test_nereids_admin_check_tablet.groovy | 4 +++
.../ddl/show_trash/test_nereids_trash.groovy | 4 +++
.../test_nereids_show_tablet_storage_format.groovy | 4 +++
4 files changed, 15 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 59722d72d95..f5d811514b3 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) {
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 8812e09ea9f..f96d8329f02 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 26a57c7e82d..f9b486a97fd 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 b4b78bd1c28..85b087fc19b 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;""")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
