This is an automated email from the ASF dual-hosted git repository.
hellostephen pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 0bd9bd59c4b branch-3.0: [fix](case) fix some failed cases #46807
(#46821)
0bd9bd59c4b is described below
commit 0bd9bd59c4b682553b5aa18cd95f33b7194c6e47
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Sat Jan 11 21:30:16 2025 +0800
branch-3.0: [fix](case) fix some failed cases #46807 (#46821)
Cherry-picked from #46807
Co-authored-by: Dongyang Li <[email protected]>
---
.../suites/inject_hdfs_vault_p0/inject_hdfs_load_error.groovy | 4 ++++
.../suites/inject_hdfs_vault_p0/inject_hdfs_select_error.groovy | 4 ++++
.../test_index_compaction_with_multi_index_segments.groovy | 2 +-
.../suites/inverted_index_p0/test_inverted_index_file_size.groovy | 2 +-
.../suites/inverted_index_p0/test_inverted_index_v2_file_size.groovy | 4 ++--
regression-test/suites/node_p0/test_frontend.groovy | 2 +-
6 files changed, 13 insertions(+), 5 deletions(-)
diff --git
a/regression-test/suites/inject_hdfs_vault_p0/inject_hdfs_load_error.groovy
b/regression-test/suites/inject_hdfs_vault_p0/inject_hdfs_load_error.groovy
index 407f914f964..cc24c06e409 100755
--- a/regression-test/suites/inject_hdfs_vault_p0/inject_hdfs_load_error.groovy
+++ b/regression-test/suites/inject_hdfs_vault_p0/inject_hdfs_load_error.groovy
@@ -18,6 +18,10 @@
import org.codehaus.groovy.runtime.IOGroovyMethods
suite("inject_hdfs_load_error", "nonConcurrent") {
+ if (!isCloudMode()) {
+ logger.info("skip create storgage vault case")
+ return
+ }
if (!enableStoragevault()) {
logger.info("skip create storgage vault case")
return
diff --git
a/regression-test/suites/inject_hdfs_vault_p0/inject_hdfs_select_error.groovy
b/regression-test/suites/inject_hdfs_vault_p0/inject_hdfs_select_error.groovy
index e49a9a242b2..c993df538d0 100755
---
a/regression-test/suites/inject_hdfs_vault_p0/inject_hdfs_select_error.groovy
+++
b/regression-test/suites/inject_hdfs_vault_p0/inject_hdfs_select_error.groovy
@@ -18,6 +18,10 @@
import org.codehaus.groovy.runtime.IOGroovyMethods
suite("inject_hdfs_load_error", "nonConcurrent") {
+ if (!isCloudMode()) {
+ logger.info("skip create storgage vault case")
+ return
+ }
if (!enableStoragevault()) {
logger.info("skip create storgage vault case")
return
diff --git
a/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_with_multi_index_segments.groovy
b/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_with_multi_index_segments.groovy
index 5d9c53ccfb2..6b8b64ec11e 100644
---
a/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_with_multi_index_segments.groovy
+++
b/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_with_multi_index_segments.groovy
@@ -288,7 +288,7 @@ suite("test_index_compaction_with_multi_index_segments",
"nonConcurrent") {
assert (rowsetCount == 3 * replicaNum)
// trigger full compactions for all tablets in ${tableName}
- trigger_and_wait_compaction.call(tableName, "full")
+ trigger_and_wait_compaction(tableName, "full")
// after full compaction, there is only 1 rowset.
rowsetCount = get_rowset_count.call(tablets)
if (isCloudMode) {
diff --git
a/regression-test/suites/inverted_index_p0/test_inverted_index_file_size.groovy
b/regression-test/suites/inverted_index_p0/test_inverted_index_file_size.groovy
index 73446089bb2..b0fee7cc557 100644
---
a/regression-test/suites/inverted_index_p0/test_inverted_index_file_size.groovy
+++
b/regression-test/suites/inverted_index_p0/test_inverted_index_file_size.groovy
@@ -87,7 +87,7 @@ suite("test_inverted_index_file_size", "nonConcurrent"){
qt_sql """ select count() from ${tableName} where clientip match
'17.0.0.0' and request match 'GET' and status match '200' and size > 200 """
qt_sql """ select count() from ${tableName} where clientip
match_phrase '17.0.0.0' and request match_phrase 'GET' and status match '200'
and size > 200 """
- trigger_and_wait_compaction.call(tableName, "full")
+ trigger_and_wait_compaction(tableName, "full")
qt_sql """ select count() from ${tableName} where clientip match
'17.0.0.0' and request match 'GET' and status match '200' and size > 200 """
qt_sql """ select count() from ${tableName} where clientip
match_phrase '17.0.0.0' and request match_phrase 'GET' and status match '200'
and size > 200 """
diff --git
a/regression-test/suites/inverted_index_p0/test_inverted_index_v2_file_size.groovy
b/regression-test/suites/inverted_index_p0/test_inverted_index_v2_file_size.groovy
index e9ab66bbad4..76017c8bb30 100644
---
a/regression-test/suites/inverted_index_p0/test_inverted_index_v2_file_size.groovy
+++
b/regression-test/suites/inverted_index_p0/test_inverted_index_v2_file_size.groovy
@@ -100,7 +100,7 @@ suite("test_index_index_V2_file_size", "nonConcurrent") {
qt_sql """ select * from ${tableName} where score < 100 order by id,
name, hobbies, score """
// trigger full compactions for all tablets in ${tableName}
- trigger_and_wait_compaction.call(tableName, "full")
+ trigger_and_wait_compaction(tableName, "full")
def dedup_tablets = deduplicate_tablets(tablets)
@@ -135,7 +135,7 @@ suite("test_index_index_V2_file_size", "nonConcurrent") {
set_be_config.call("inverted_index_compaction_enable", "false")
// trigger full compactions for all tablets in ${tableName}
- trigger_and_wait_compaction.call(tableName, "full")
+ trigger_and_wait_compaction(tableName, "full")
// after full compaction, there is only 1 rowset.
count = get_rowset_count.call(tablets);
diff --git a/regression-test/suites/node_p0/test_frontend.groovy
b/regression-test/suites/node_p0/test_frontend.groovy
index 29ee3e06315..57d1445e63d 100644
--- a/regression-test/suites/node_p0/test_frontend.groovy
+++ b/regression-test/suites/node_p0/test_frontend.groovy
@@ -22,7 +22,7 @@ suite("test_frontend", "nonConcurrent") {
def res2 = sql """SHOW FRONTENDS Disks"""
assertTrue(res2.size() != 0)
- if (Config.isCloudMode()) {
+ if (isCloudMode()) {
// In the test_sql_mode_node_mgr regression case, there is already a
similar and more complex case. This case is redundant. Additionally, there is a
5-minute limit for dropping FE on the cloud.
// so ignore it in cloud
return;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
