This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new b11f2ad9f0d [fix](cases) fix broker_load & schema_change &
table_property cases (#35061)
b11f2ad9f0d is described below
commit b11f2ad9f0de61ff76e11bdfa2788c56af4624ed
Author: Yongqiang YANG <[email protected]>
AuthorDate: Mon May 20 19:46:23 2024 +0800
[fix](cases) fix broker_load & schema_change & table_property cases (#35061)
1. log more info to investigate problem.
2. use def in groovy to avoid gloabl namespace
---
regression-test/suites/alter_p2/test_alter_table_property.groovy | 1 +
.../suites/load_p2/broker_load/test_broker_load.groovy | 8 +++++---
regression-test/suites/schema_change_p2/test_schema_change.groovy | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/regression-test/suites/alter_p2/test_alter_table_property.groovy
b/regression-test/suites/alter_p2/test_alter_table_property.groovy
index f3d300aafc2..42ee9959d28 100644
--- a/regression-test/suites/alter_p2/test_alter_table_property.groovy
+++ b/regression-test/suites/alter_p2/test_alter_table_property.groovy
@@ -39,6 +39,7 @@ suite ("test_alter_table_property") {
def queryReplicaCount = { partitionName ->
def result = sql "SHOW REPLICA DISTRIBUTION FROM ${tableName}
PARTITION ${partitionName}"
+ logger.info("${result}")
int sum = 0
for (row in result) {
sum += row[1].toInteger()
diff --git a/regression-test/suites/load_p2/broker_load/test_broker_load.groovy
b/regression-test/suites/load_p2/broker_load/test_broker_load.groovy
index b0e172818db..75aa0a9aa9b 100644
--- a/regression-test/suites/load_p2/broker_load/test_broker_load.groovy
+++ b/regression-test/suites/load_p2/broker_load/test_broker_load.groovy
@@ -323,7 +323,8 @@ suite("test_broker_load_p2", "p2") {
for (String label in uuids) {
def max_try_milli_secs = 600000
while (max_try_milli_secs > 0) {
- String[][] result = sql """ show load where label="$label"
order by createtime desc limit 1; """
+ def String[][] result = sql """ show load where
label="$label" order by createtime desc limit 1; """
+ logger.info("Load status: " + result[0][2] + ", label:
$label")
if (result[0][2].equals("FINISHED")) {
logger.info("Load FINISHED " + label)
assertTrue(result[0][6].contains(task_info[i]))
@@ -347,7 +348,7 @@ suite("test_broker_load_p2", "p2") {
def orc_expect_result = """[[20, 15901, 6025915247311731176,
1373910657, 8863282788606566657], [38, 15901, -9154375582268094750, 1373853561,
4923892366467329038], [38, 15901, -9154375582268094750, 1373853561,
8447995939656287502], [38, 15901, -9154375582268094750, 1373853565,
7451966001310881759], [38, 15901, -9154375582268094750, 1373853565,
7746521994248163870], [38, 15901, -9154375582268094750, 1373853577,
6795654975682437824], [38, 15901, -9154375582268094750, 1373853577, [...]
for (String table in tables) {
if (table.matches("orc_s3_case[23456789]")) {
- String[][] orc_actual_result = sql """select CounterID,
EventDate, UserID, EventTime, WatchID from $table order by CounterID,
EventDate, UserID, EventTime, WatchID limit 10;"""
+ def String[][] orc_actual_result = sql """select
CounterID, EventDate, UserID, EventTime, WatchID from $table order by
CounterID, EventDate, UserID, EventTime, WatchID limit 10;"""
assertTrue("$orc_actual_result" == "$orc_expect_result")
}
}
@@ -402,7 +403,8 @@ suite("test_broker_load_p2", "p2") {
def max_try_milli_secs = 600000
while (max_try_milli_secs > 0) {
- String[][] result = sql """ show load where
label="$label_22666" order by createtime desc limit 1; """
+ def String[][] result = sql """ show load where
label="$label_22666" order by createtime desc limit 1; """
+ logger.info("Load status: " + result[0][2] + ", label:
$label_22666")
if (result[0][2].equals("FINISHED")) {
logger.info("Load FINISHED " + label_22666)
break;
diff --git a/regression-test/suites/schema_change_p2/test_schema_change.groovy
b/regression-test/suites/schema_change_p2/test_schema_change.groovy
index 7c7435fa18e..ccd2efc5162 100644
--- a/regression-test/suites/schema_change_p2/test_schema_change.groovy
+++ b/regression-test/suites/schema_change_p2/test_schema_change.groovy
@@ -64,7 +64,7 @@ suite("test_schema_change") {
)
"""
- waitBrokerLoadJob = { String label /* param */ ->
+ def waitBrokerLoadJob = { String label /* param */ ->
// check load state
int tryTimes = 20
while (tryTimes-- > 0) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
