This is an automated email from the ASF dual-hosted git repository.
hello-stephen pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.0 by this push:
new 6bf2d488ae7 branch-4.0: [fix](test) fix flaky tests in branch-4.0 p0
(#64992)
6bf2d488ae7 is described below
commit 6bf2d488ae7df70c74fee2b6995503e325e5bf1d
Author: Mingyu Chen (Rayner) <[email protected]>
AuthorDate: Thu Jul 2 09:49:45 2026 +0800
branch-4.0: [fix](test) fix flaky tests in branch-4.0 p0 (#64992)
---
.../external_table_p0/tvf/test_file_tvf_local.groovy | 3 +--
.../insert_p0/mow_insert_with_partition_drop.groovy | 19 +++++++++++++++----
.../test_p_seq_publish_read_from_old.groovy | 3 ++-
3 files changed, 18 insertions(+), 7 deletions(-)
diff --git
a/regression-test/suites/external_table_p0/tvf/test_file_tvf_local.groovy
b/regression-test/suites/external_table_p0/tvf/test_file_tvf_local.groovy
index 606133d0c95..5d36b4f6e9d 100644
--- a/regression-test/suites/external_table_p0/tvf/test_file_tvf_local.groovy
+++ b/regression-test/suites/external_table_p0/tvf/test_file_tvf_local.groovy
@@ -23,8 +23,7 @@ suite("test_file_tvf_local",
"p0,tvf,external,external_docker") {
def be_id = backends[0][0]
def dataFilePath = context.config.dataPath +
"/external_table_p0/tvf/compress"
- def outFilePath="/compress"
-
+ def outFilePath="/tmp/test_file_tvf_local_compress"
for (List<Object> backend : backends) {
def be_host = backend[1]
scpFiles ("root", be_host, dataFilePath, outFilePath, false);
diff --git
a/regression-test/suites/insert_p0/mow_insert_with_partition_drop.groovy
b/regression-test/suites/insert_p0/mow_insert_with_partition_drop.groovy
index 8f9c6d97a54..9deda22b6a0 100644
--- a/regression-test/suites/insert_p0/mow_insert_with_partition_drop.groovy
+++ b/regression-test/suites/insert_p0/mow_insert_with_partition_drop.groovy
@@ -49,19 +49,30 @@ suite("mow_insert_with_partition_drop") {
j++
} catch (Exception e) {
logger.info("exception=" + e.getMessage())
- assertTrue(e.getMessage().contains("Insert has filtered data
in strict mode. url:") ||
- (e.getMessage().contains("partition") &&
e.getMessage().contains("does not exist")))
+ def errMsg = e.getMessage()
+ def lowerErrMsg = errMsg.toLowerCase()
+ assertTrue((errMsg.contains("Insert has filtered data in
strict mode") && errMsg.contains("url:")) ||
+ (lowerErrMsg.contains("partition") &&
+ (lowerErrMsg.contains("does not exist") ||
lowerErrMsg.contains("no partition"))))
}
}
}
+ Throwable insertThrowable = null
def t1 = Thread.startDaemon {
- do_insert_into()
+ try {
+ do_insert_into()
+ } catch (Throwable t) {
+ insertThrowable = t
+ }
}
for (int i = 0; i < 30; i++) {
sql """ ALTER TABLE ${table} DROP PARTITION p3 force; """
sql """ ALTER TABLE ${table} ADD PARTITION p3 VALUES LESS THAN
('2023-01-01'); """
}
t1.join()
-}
\ No newline at end of file
+ if (insertThrowable != null) {
+ throw insertThrowable
+ }
+}
diff --git
a/regression-test/suites/unique_with_mow_p0/partial_update/test_p_seq_publish_read_from_old.groovy
b/regression-test/suites/unique_with_mow_p0/partial_update/test_p_seq_publish_read_from_old.groovy
index f1a6ea813e8..2b7fa20ce68 100644
---
a/regression-test/suites/unique_with_mow_p0/partial_update/test_p_seq_publish_read_from_old.groovy
+++
b/regression-test/suites/unique_with_mow_p0/partial_update/test_p_seq_publish_read_from_old.groovy
@@ -38,6 +38,7 @@ suite("test_p_seq_publish_read_from_old") {
"enable_unique_key_merge_on_write" = "true",
"light_schema_change" = "true",
"function_column.sequence_col" = "v1",
+ "disable_auto_compaction" = "true",
"store_row_column" = "false"); """
sql """insert into ${tableName}
values(1,100,1,1,1,1),(2,100,2,2,2,2),(3,100,3,3,3,3),(4,100,4,4,4,4);"""
qt_sql "select k,v1,v2,v3,v4,v5 from ${tableName} order by k;"
@@ -159,7 +160,7 @@ suite("test_p_seq_publish_read_from_old") {
do_streamload_2pc_commit(txnId2)
wait_for_publish(txnId2, 60)
do_streamload_2pc_commit(txnId3)
- wait_for_publish(txnId2, 60)
+ wait_for_publish(txnId3, 60)
sql "sync;"
qt_sql "select k,v1,v2,v3,v4,v5,__DORIS_SEQUENCE_COL__ from ${tableName}
order by k,v1,v2,v3,v4,v5,__DORIS_SEQUENCE_COL__;"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
