This is an automated email from the ASF dual-hosted git repository.
dataroaring 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 ce1de0c4674 branch-3.0: [fix](case) fix some failure cases #55811
(#55834)
ce1de0c4674 is described below
commit ce1de0c4674856e1f35095043b4e5cdc41d026ee
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Sep 10 11:47:33 2025 +0800
branch-3.0: [fix](case) fix some failure cases #55811 (#55834)
Cherry-picked from #55811
Co-authored-by: Yongqiang YANG <[email protected]>
---
regression-test/suites/export/test_array_export.groovy | 7 +++++--
regression-test/suites/load_p0/broker_load/test_array_load.groovy | 4 ++--
.../suites/load_p0/broker_load/test_broker_load_seq.groovy | 4 ++--
.../suites/load_p0/broker_load/test_broker_load_with_merge.groovy | 2 +-
.../load_p0/broker_load/test_broker_load_with_partition.groovy | 4 ++--
.../suites/load_p0/broker_load/test_broker_load_with_where.groovy | 2 +-
regression-test/suites/load_p0/stream_load/test_json_load.groovy | 2 +-
7 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/regression-test/suites/export/test_array_export.groovy
b/regression-test/suites/export/test_array_export.groovy
index a6c834cefc6..4a322832905 100644
--- a/regression-test/suites/export/test_array_export.groovy
+++ b/regression-test/suites/export/test_array_export.groovy
@@ -118,10 +118,11 @@ suite("test_array_export", "export") {
}
def select_out_file = {exportTable, HdfsPath, outFormat, BrokerName,
HdfsUserName, HdfsPasswd->
- sql """
+
+ def sqlString = """
SELECT * FROM ${exportTable}
INTO OUTFILE "${HdfsPath}"
- FORMAT AS "${outFormat}"
+ FORMAT AS ${outFormat}
PROPERTIES
(
"broker.name" = "${BrokerName}",
@@ -131,6 +132,8 @@ suite("test_array_export", "export") {
"broker.password"="${HdfsPasswd}"
)
"""
+ logger.info("sqlString: ${sqlString}")
+ sql sqlString
}
def check_export_result = {checklabel->
diff --git a/regression-test/suites/load_p0/broker_load/test_array_load.groovy
b/regression-test/suites/load_p0/broker_load/test_array_load.groovy
index 6ec6a601d0f..754c7ef9f2a 100644
--- a/regression-test/suites/load_p0/broker_load/test_array_load.groovy
+++ b/regression-test/suites/load_p0/broker_load/test_array_load.groovy
@@ -171,9 +171,9 @@ suite("test_array_load", "load_p0") {
}
def check_load_result = {checklabel, testTablex ->
- max_try_milli_secs = 10000
+ def max_try_milli_secs = 10000
while(max_try_milli_secs) {
- result = sql "show load where label = '${checklabel}'"
+ def result = sql "show load where label = '${checklabel}'"
if(result[0][2] == "FINISHED") {
sql "sync"
qt_select "select * from ${testTablex} order by k1"
diff --git
a/regression-test/suites/load_p0/broker_load/test_broker_load_seq.groovy
b/regression-test/suites/load_p0/broker_load/test_broker_load_seq.groovy
index b9851c11789..b270b8266e9 100644
--- a/regression-test/suites/load_p0/broker_load/test_broker_load_seq.groovy
+++ b/regression-test/suites/load_p0/broker_load/test_broker_load_seq.groovy
@@ -75,9 +75,9 @@ suite("test_broker_load_seq", "load_p0") {
}
def check_load_result = {checklabel, testTablex ->
- max_try_milli_secs = 10000
+ def max_try_milli_secs = 10000
while(max_try_milli_secs) {
- result = sql "show load where label = '${checklabel}'"
+ def result = sql "show load where label = '${checklabel}'"
if(result[0][2] == "FINISHED") {
//sql "sync"
qt_select "select * from ${testTablex} order by user_id, date,
group_id"
diff --git
a/regression-test/suites/load_p0/broker_load/test_broker_load_with_merge.groovy
b/regression-test/suites/load_p0/broker_load/test_broker_load_with_merge.groovy
index 24bdee97613..1816e6d4985 100644
---
a/regression-test/suites/load_p0/broker_load/test_broker_load_with_merge.groovy
+++
b/regression-test/suites/load_p0/broker_load/test_broker_load_with_merge.groovy
@@ -26,7 +26,7 @@ suite("test_broker_load_with_merge", "load_p0") {
`k2` DATE NOT NULL,
`k3` INT(11) NOT NULL,
`k4` INT(11) NOT NULL,
- `v5` BIGINT SUM NULL DEFAULT "0"
+ `v5` BIGINT NULL DEFAULT "0"
) ENGINE=OLAP
UNIQUE KEY(`k1`)
COMMENT 'OLAP'
diff --git
a/regression-test/suites/load_p0/broker_load/test_broker_load_with_partition.groovy
b/regression-test/suites/load_p0/broker_load/test_broker_load_with_partition.groovy
index 3b1620e1358..d63b68153e2 100644
---
a/regression-test/suites/load_p0/broker_load/test_broker_load_with_partition.groovy
+++
b/regression-test/suites/load_p0/broker_load/test_broker_load_with_partition.groovy
@@ -110,7 +110,7 @@ suite("test_broker_load_with_partition", "load_p0") {
def check_load_result = {checklabel, testTablex ->
def max_try_milli_secs = 10000
while(max_try_milli_secs) {
- result = sql "show load where label = '${checklabel}'"
+ def result = sql "show load where label = '${checklabel}'"
log.info("result: ${result}")
if(result[0][2] == "FINISHED") {
//sql "sync"
@@ -129,7 +129,7 @@ suite("test_broker_load_with_partition", "load_p0") {
def check_load_tmp_partition_result = {checklabel, testTablex ->
def max_try_milli_secs = 10000
while(max_try_milli_secs) {
- result = sql "show load where label = '${checklabel}'"
+ def result = sql "show load where label = '${checklabel}'"
log.info("result: ${result}")
if(result[0][2] == "FINISHED") {
//sql "sync"
diff --git
a/regression-test/suites/load_p0/broker_load/test_broker_load_with_where.groovy
b/regression-test/suites/load_p0/broker_load/test_broker_load_with_where.groovy
index a058f10349e..08d72a54b53 100644
---
a/regression-test/suites/load_p0/broker_load/test_broker_load_with_where.groovy
+++
b/regression-test/suites/load_p0/broker_load/test_broker_load_with_where.groovy
@@ -101,7 +101,7 @@ suite("test_broker_load_with_where", "load_p0") {
def check_load_result = {checklabel, testTablex ->
def max_try_milli_secs = 10000
while(max_try_milli_secs) {
- result = sql "show load where label = '${checklabel}'"
+ def result = sql "show load where label = '${checklabel}'"
if(result[0][2] == "FINISHED") {
//sql "sync"
qt_select "select * from ${testTablex} order by k1"
diff --git a/regression-test/suites/load_p0/stream_load/test_json_load.groovy
b/regression-test/suites/load_p0/stream_load/test_json_load.groovy
index 172fd9fe7a9..2fdd8e724c1 100644
--- a/regression-test/suites/load_p0/stream_load/test_json_load.groovy
+++ b/regression-test/suites/load_p0/stream_load/test_json_load.groovy
@@ -228,7 +228,7 @@ suite("test_json_load", "p0,nonConcurrent") {
}
def check_load_result = {checklabel, testTablex ->
- def max_try_milli_secs = 10000
+ def max_try_milli_secs = 100000
while(max_try_milli_secs) {
def result = sql "show load where label = '${checklabel}'"
if(result[0][2] == "FINISHED") {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
