Skip to content

[fix](Nereids) fix cases unstable when using profile to check is nereids execution #45384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
starocean999 merged 2 commits into from
Dec 13, 2024
Merged

[fix](Nereids) fix cases unstable when using profile to check is nereids execution #45384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b469395
[fix](Nereids) fix cases unstable when using profile to check is nere…
Dec 13, 2024
7e56952
fix p0
Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 3 additions & 32 deletions regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 4 additions & 0 deletions regression-test/suites/nereids_p0/admin/test_nereids_admin_check_tablet.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"""
Expand Down
4 changes: 4 additions & 0 deletions regression-test/suites/nereids_p0/ddl/show_trash/test_nereids_trash.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");""")
Expand Down
4 changes: 4 additions & 0 deletions regression-test/suites/nereids_p0/show/test_nereids_show_tablet_storage_format.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;""")
Expand Down
Loading