This is an automated email from the ASF dual-hosted git repository.
hellostephen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new db26b7fa8dc [regression-test](cases) fix global vars (#51437)
db26b7fa8dc is described below
commit db26b7fa8dc27593467f6710bebeafbf8f286432
Author: shuke <[email protected]>
AuthorDate: Tue Jun 3 17:06:32 2025 +0800
[regression-test](cases) fix global vars (#51437)
---
.../suites/account_p0/test_alter_user.groovy | 2 +-
.../alter_p2/test_alter_table_property.groovy | 4 ++--
...paction_remove_old_version_delete_bitmap.groovy | 24 +++++++++++-----------
...rtial_update_publish_conflict_with_error.groovy | 6 +++---
.../test_calc_crc_fault_injection.groovy | 2 +-
.../test_full_compaciton_run_status.groovy | 8 ++++----
...sh_is_high_priority_for_vtablet_writerV2.groovy | 2 +-
...ity_for_vtablet_writerv1_fault_injection.groovy | 2 +-
.../test_segcompaction_fault_injection.groovy | 2 +-
.../test_too_many_segments_fault_injection.groovy | 2 +-
.../test_variant_bloom_filter.groovy | 4 ++--
...compaction_with_multi_index_segments_arr.groovy | 2 +-
.../test_index_compaction_empty_segments.groovy | 2 +-
.../test_index_compaction_p0.groovy | 2 +-
.../test_index_like_select.groovy | 4 ++--
.../test_index_compaction_p1.groovy | 2 +-
.../show_data/test_show_index_data_p2.groovy | 4 ++--
.../suites/inverted_index_p2/test_show_data.groovy | 2 +-
.../load_p0/spark_load/test_spark_load.groovy | 6 +++---
.../load_p2/broker_load/test_broker_load.groovy | 2 +-
.../schema_change_p2/test_schema_change.groovy | 2 +-
.../suites/ssb_sf1_p2/nereids/q1.1.groovy | 2 +-
.../suites/ssb_sf1_p2/nereids/q1.2.groovy | 2 +-
.../suites/ssb_sf1_p2/nereids/q1.3.groovy | 2 +-
.../suites/ssb_sf1_p2/nereids/q2.1.groovy | 2 +-
.../suites/ssb_sf1_p2/nereids/q2.2.groovy | 2 +-
.../suites/ssb_sf1_p2/nereids/q2.3.groovy | 2 +-
.../suites/ssb_sf1_p2/nereids/q3.1.groovy | 2 +-
.../suites/ssb_sf1_p2/nereids/q3.2.groovy | 2 +-
.../suites/ssb_sf1_p2/nereids/q3.3.groovy | 2 +-
.../suites/ssb_sf1_p2/nereids/q3.4.groovy | 2 +-
.../suites/ssb_sf1_p2/nereids/q4.1.groovy | 2 +-
.../suites/ssb_sf1_p2/nereids/q4.2.groovy | 2 +-
.../suites/ssb_sf1_p2/nereids/q4.3.groovy | 2 +-
.../suites/tpcds_sf1_unique_ck_p1/query46.groovy | 2 +-
35 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/regression-test/suites/account_p0/test_alter_user.groovy
b/regression-test/suites/account_p0/test_alter_user.groovy
index 7a2c4649a06..fc4b8a12bf2 100644
--- a/regression-test/suites/account_p0/test_alter_user.groovy
+++ b/regression-test/suites/account_p0/test_alter_user.groovy
@@ -170,7 +170,7 @@ suite("test_alter_user", "account,nonConcurrent") {
}
sleep(6000)
sql """set password for 'test_auth_user4' = password('123')"""
- result2 = connect('test_auth_user4', '123', context.config.jdbcUrl) {
+ def result2 = connect('test_auth_user4', '123', context.config.jdbcUrl) {
sql 'select 1'
}
sleep(6000)
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 c50f5426e41..54541b85024 100644
--- a/regression-test/suites/alter_p2/test_alter_table_property.groovy
+++ b/regression-test/suites/alter_p2/test_alter_table_property.groovy
@@ -45,7 +45,7 @@ suite ("test_alter_table_property") {
def result = sql "SHOW REPLICA DISTRIBUTION FROM ${tableName}
PARTITION ${partitionName}"
logger.info("${result}")
int sum = 0
- for (row in result) {
+ for (def row in result) {
sum += row[1].toInteger()
}
sum
@@ -71,7 +71,7 @@ suite ("test_alter_table_property") {
assertEquals(2, queryReplicaCount("p3"))
sql """ ALTER TABLE ${tableName} MODIFY PARTITION p1 SET (
"replication_allocation" = "tag.location.default: 2" ) """
- for (i = 0; i < 300; i++) {
+ for (def i = 0; i < 300; i++) {
if (queryReplicaCount("p1") != 2) {
Thread.sleep(3000)
}
diff --git
a/regression-test/suites/compaction/test_cu_compaction_remove_old_version_delete_bitmap.groovy
b/regression-test/suites/compaction/test_cu_compaction_remove_old_version_delete_bitmap.groovy
index bfd07d6546b..65ba1818a88 100644
---
a/regression-test/suites/compaction/test_cu_compaction_remove_old_version_delete_bitmap.groovy
+++
b/regression-test/suites/compaction/test_cu_compaction_remove_old_version_delete_bitmap.groovy
@@ -89,9 +89,9 @@ suite("test_cu_compaction_remove_old_version_delete_bitmap",
"nonConcurrent") {
String command = sb.toString()
logger.info(command)
- process = command.execute()
- code = process.waitFor()
- out = process.getText()
+ def process = command.execute()
+ def code = process.waitFor()
+ def out = process.getText()
logger.info("Get tablet status: =" + code + ", out=" + out)
assertEquals(code, 0)
def tabletStatus = parseJson(out.trim())
@@ -109,9 +109,9 @@
suite("test_cu_compaction_remove_old_version_delete_bitmap", "nonConcurrent") {
String command = sb.toString()
logger.info(command)
- process = command.execute()
- code = process.waitFor()
- out = process.getText()
+ def process = command.execute()
+ def code = process.waitFor()
+ def out = process.getText()
logger.info("Get compaction status: code=" + code + ", out=" + out)
assertEquals(code, 0)
def compactionStatus = parseJson(out.trim())
@@ -129,9 +129,9 @@
suite("test_cu_compaction_remove_old_version_delete_bitmap", "nonConcurrent") {
String command = sb.toString()
logger.info(command)
- process = command.execute()
- code = process.waitFor()
- out = process.getText()
+ def process = command.execute()
+ def code = process.waitFor()
+ def out = process.getText()
logger.info("Get local delete bitmap count status: =" + code + ",
out=" + out)
assertEquals(code, 0)
def deleteBitmapStatus = parseJson(out.trim())
@@ -147,9 +147,9 @@
suite("test_cu_compaction_remove_old_version_delete_bitmap", "nonConcurrent") {
String command = sb.toString()
logger.info(command)
- process = command.execute()
- code = process.waitFor()
- out = process.getText()
+ def process = command.execute()
+ def code = process.waitFor()
+ def out = process.getText()
logger.info("Get ms delete bitmap count status: =" + code + ", out="
+ out)
assertEquals(code, 0)
def deleteBitmapStatus = parseJson(out.trim())
diff --git
a/regression-test/suites/fault_injection_p0/partial_update/test_partial_update_publish_conflict_with_error.groovy
b/regression-test/suites/fault_injection_p0/partial_update/test_partial_update_publish_conflict_with_error.groovy
index a3e18194318..e5589a446b3 100644
---
a/regression-test/suites/fault_injection_p0/partial_update/test_partial_update_publish_conflict_with_error.groovy
+++
b/regression-test/suites/fault_injection_p0/partial_update/test_partial_update_publish_conflict_with_error.groovy
@@ -83,9 +83,9 @@ suite("test_partial_update_publish_conflict_with_error",
"nonConcurrent") {
log.info("http_stream execute 2pc: ${command}")
def process = command.execute()
- code = process.waitFor()
- out = process.text
- json2pc = parseJson(out)
+ def code = process.waitFor()
+ def out = process.text
+ def json2pc = parseJson(out)
log.info("http_stream 2pc result: ${out}".toString())
assertEquals(code, 0)
assertEquals("success", json2pc.status.toLowerCase())
diff --git
a/regression-test/suites/fault_injection_p0/test_calc_crc_fault_injection.groovy
b/regression-test/suites/fault_injection_p0/test_calc_crc_fault_injection.groovy
index e238aa48b47..408e7c403eb 100644
---
a/regression-test/suites/fault_injection_p0/test_calc_crc_fault_injection.groovy
+++
b/regression-test/suites/fault_injection_p0/test_calc_crc_fault_injection.groovy
@@ -60,7 +60,7 @@ suite("test_calc_crc", "nonConcurrent") {
sql """ INSERT INTO ${tableName} VALUES (3, "andy", 100); """
sql """ INSERT INTO ${tableName} VALUES (3, "bason", 99); """
- tablets = sql_return_maparray """ show tablets from ${tableName}; """
+ def tablets = sql_return_maparray """ show tablets from ${tableName}; """
String tablet_id = tablets[0].TabletId
String backend_id = tablets[0].BackendId
String ip = backendId_to_backendIP.get(backend_id)
diff --git
a/regression-test/suites/fault_injection_p0/test_full_compaciton_run_status.groovy
b/regression-test/suites/fault_injection_p0/test_full_compaciton_run_status.groovy
index dffcfb293f1..1279530aad6 100644
---
a/regression-test/suites/fault_injection_p0/test_full_compaciton_run_status.groovy
+++
b/regression-test/suites/fault_injection_p0/test_full_compaciton_run_status.groovy
@@ -67,13 +67,13 @@ suite("test_full_compaction_run_status","nonConcurrent") {
def times = 1
do{
- (code, out, err) =
be_run_full_compaction(backendId_to_backendIP.get(backend_id),
backendId_to_backendHttpPort.get(backend_id), tablet_id)
+ def (code, out, err) =
be_run_full_compaction(backendId_to_backendIP.get(backend_id),
backendId_to_backendHttpPort.get(backend_id), tablet_id)
logger.info("Run compaction: code=" + code + ", out=" + out +
", err=" + err)
++times
sleep(1000)
} while (parseJson(out.trim()).status.toLowerCase()!="success" &&
times<=10)
- (code, out, err) =
be_get_compaction_status(backendId_to_backendIP.get(backend_id),
backendId_to_backendHttpPort.get(backend_id), tablet_id)
+ def (code, out, err) =
be_get_compaction_status(backendId_to_backendIP.get(backend_id),
backendId_to_backendHttpPort.get(backend_id), tablet_id)
logger.info("Get compaction status: code=" + code + ", out=" + out
+ ", err=" + err)
assertEquals(code, 0)
def compactJson = parseJson(out.trim())
@@ -85,14 +85,14 @@ suite("test_full_compaction_run_status","nonConcurrent") {
String tablet_id = tablet.TabletId
backend_id = tablet.BackendId
- (code, out, err) =
be_get_compaction_status(backendId_to_backendIP.get(backend_id),
backendId_to_backendHttpPort.get(backend_id), tablet_id)
+ def (code, out, err) =
be_get_compaction_status(backendId_to_backendIP.get(backend_id),
backendId_to_backendHttpPort.get(backend_id), tablet_id)
logger.info("Get compaction status: code=" + code + ", out=" + out
+ ", err=" + err)
assertEquals(code, 0)
def compactJson = parseJson(out.trim())
assertTrue(compactJson.msg.toLowerCase().contains("is not
running"))
}
- (code, out, err) =
be_get_overall_compaction_status(backendId_to_backendIP.get(backend_id),
backendId_to_backendHttpPort.get(backend_id))
+ def (code, out, err) =
be_get_overall_compaction_status(backendId_to_backendIP.get(backend_id),
backendId_to_backendHttpPort.get(backend_id))
logger.info("Get overall compaction status: code=" + code + ", out=" +
out + ", err=" + err)
assertEquals(code, 0)
assertTrue(out.toLowerCase().contains("cumulativecompaction"))
diff --git
a/regression-test/suites/fault_injection_p0/test_memtable_flush_is_high_priority_for_vtablet_writerV2.groovy
b/regression-test/suites/fault_injection_p0/test_memtable_flush_is_high_priority_for_vtablet_writerV2.groovy
index 4f03d5647d0..091384b7490 100644
---
a/regression-test/suites/fault_injection_p0/test_memtable_flush_is_high_priority_for_vtablet_writerV2.groovy
+++
b/regression-test/suites/fault_injection_p0/test_memtable_flush_is_high_priority_for_vtablet_writerV2.groovy
@@ -48,7 +48,7 @@
suite("test_memtable_flush_is_high_priority_for_vtablet_writerV2", "nonConcurren
"""
try {
GetDebugPoint().enableDebugPointForAllBEs("VTabletWriterV2._init.is_high_priority")
- result = sql "show VARIABLES like \'enable_memtable_on_sink_node\'"
+ def result = sql "show VARIABLES like \'enable_memtable_on_sink_node\'"
log.info(result.toString())
def original_status = result[0][1]
sql """set enable_memtable_on_sink_node = true"""
diff --git
a/regression-test/suites/fault_injection_p0/test_memtable_flush_is_high_priority_for_vtablet_writerv1_fault_injection.groovy
b/regression-test/suites/fault_injection_p0/test_memtable_flush_is_high_priority_for_vtablet_writerv1_fault_injection.groovy
index b0874e2196a..6e778dc3a92 100644
---
a/regression-test/suites/fault_injection_p0/test_memtable_flush_is_high_priority_for_vtablet_writerv1_fault_injection.groovy
+++
b/regression-test/suites/fault_injection_p0/test_memtable_flush_is_high_priority_for_vtablet_writerv1_fault_injection.groovy
@@ -48,7 +48,7 @@
suite("test_memtable_flush_is_high_priority_for_vtablet_writerV1", "nonConcurren
"""
try {
GetDebugPoint().enableDebugPointForAllBEs("VTabletWriter._init.is_high_priority")
- result = sql "show VARIABLES like \'enable_memtable_on_sink_node\'"
+ def result = sql "show VARIABLES like \'enable_memtable_on_sink_node\'"
log.info(result.toString())
def original_status = result[0][1]
sql """set enable_memtable_on_sink_node = false"""
diff --git
a/regression-test/suites/fault_injection_p0/test_segcompaction_fault_injection.groovy
b/regression-test/suites/fault_injection_p0/test_segcompaction_fault_injection.groovy
index 20252e9189d..a9e3f2678a7 100644
---
a/regression-test/suites/fault_injection_p0/test_segcompaction_fault_injection.groovy
+++
b/regression-test/suites/fault_injection_p0/test_segcompaction_fault_injection.groovy
@@ -89,7 +89,7 @@ suite("test_segcompaction_correctness", "nonConcurrent,p2") {
result = sql """ show load where label="$uuid" order by createtime
desc limit 1; """
qt_select_default """ SELECT * FROM ${tableName} WHERE col_0=47
order by col_1, col_2; """
- tablets = sql """ show tablets from ${tableName}; """
+ def tablets = sql """ show tablets from ${tableName}; """
} finally {
try_sql("DROP TABLE IF EXISTS ${tableName}")
}
diff --git
a/regression-test/suites/fault_injection_p0/test_too_many_segments_fault_injection.groovy
b/regression-test/suites/fault_injection_p0/test_too_many_segments_fault_injection.groovy
index c9015b77c7f..956e428e674 100644
---
a/regression-test/suites/fault_injection_p0/test_too_many_segments_fault_injection.groovy
+++
b/regression-test/suites/fault_injection_p0/test_too_many_segments_fault_injection.groovy
@@ -94,7 +94,7 @@ suite("test_too_many_segments", "nonConcurrent,p2") { // the
epic -238 case
result = sql """ show load where label="$uuid" order by createtime
desc limit 1; """
qt_select_default """ SELECT * FROM ${tableName} WHERE col_0=47
order by col_1, col_2; """
- tablets = sql """ show tablets from ${tableName}; """
+ def tablets = sql """ show tablets from ${tableName}; """
} finally {
try_sql("DROP TABLE IF EXISTS ${tableName}")
GetDebugPoint().disableDebugPointForAllBEs("BetaRowsetWriter._check_segment_number_limit_too_many_segments")
diff --git
a/regression-test/suites/fault_injection_p0/test_variant_bloom_filter.groovy
b/regression-test/suites/fault_injection_p0/test_variant_bloom_filter.groovy
index e1e1e051ec1..5c0d1f2591b 100644
--- a/regression-test/suites/fault_injection_p0/test_variant_bloom_filter.groovy
+++ b/regression-test/suites/fault_injection_p0/test_variant_bloom_filter.groovy
@@ -76,7 +76,7 @@ suite("test_variant_bloom_filter", "nonConcurrent") {
for (def tablet in tablets) {
int beforeSegmentCount = 0
String tablet_id = tablet.TabletId
- (code, out, err) = curl("GET", tablet.CompactionStatus)
+ def (code, out, err) = curl("GET", tablet.CompactionStatus)
logger.info("Show tablets status: code=" + code + ", out=" + out + ",
err=" + err)
assertEquals(code, 0)
def tabletJson = parseJson(out.trim())
@@ -93,7 +93,7 @@ suite("test_variant_bloom_filter", "nonConcurrent") {
for (def tablet in tablets) {
int afterSegmentCount = 0
String tablet_id = tablet.TabletId
- (code, out, err) = curl("GET", tablet.CompactionStatus)
+ def (code, out, err) = curl("GET", tablet.CompactionStatus)
logger.info("Show tablets status: code=" + code + ", out=" + out + ",
err=" + err)
assertEquals(code, 0)
def tabletJson = parseJson(out.trim())
diff --git
a/regression-test/suites/inverted_index_p0/array_contains/test_index_compaction_with_multi_index_segments_arr.groovy
b/regression-test/suites/inverted_index_p0/array_contains/test_index_compaction_with_multi_index_segments_arr.groovy
index f2f24eec2a9..3ef2dcf5dc1 100644
---
a/regression-test/suites/inverted_index_p0/array_contains/test_index_compaction_with_multi_index_segments_arr.groovy
+++
b/regression-test/suites/inverted_index_p0/array_contains/test_index_compaction_with_multi_index_segments_arr.groovy
@@ -110,7 +110,7 @@
suite("test_index_compaction_with_multi_index_segments_arr", "nonConcurrent") {
* 4. insert 10 rows, again
* 5. full compaction
*/
- table_name = "test_index_compaction_with_multi_index_segments_dups_arr"
+ def table_name =
"test_index_compaction_with_multi_index_segments_dups_arr"
sql """ DROP TABLE IF EXISTS ${tableName}; """
sql """
CREATE TABLE ${tableName} (
diff --git
a/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_empty_segments.groovy
b/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_empty_segments.groovy
index 1f858d9de96..8ab09f0b21e 100644
---
a/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_empty_segments.groovy
+++
b/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_empty_segments.groovy
@@ -63,7 +63,7 @@ suite("test_index_compaction_empty_segments", "p0,
nonConcurrent") {
for (def tablet in tablets) {
int afterSegmentCount = 0
String tablet_id = tablet.TabletId
- (code, out, err) = curl("GET", tablet.CompactionStatus)
+ def (code, out, err) = curl("GET", tablet.CompactionStatus)
logger.info("Show tablets status: code=" + code + ", out=" + out + ",
err=" + err)
assertEquals(code, 0)
def tabletJson = parseJson(out.trim())
diff --git
a/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_p0.groovy
b/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_p0.groovy
index 65b9c8be85f..99931423702 100644
---
a/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_p0.groovy
+++
b/regression-test/suites/inverted_index_p0/index_compaction/test_index_compaction_p0.groovy
@@ -111,7 +111,7 @@ suite("test_index_compaction_p0", "p0, nonConcurrent") {
for (def tablet in tablets) {
int afterSegmentCount = 0
String tablet_id = tablet.TabletId
- (code, out, err) = curl("GET", tablet.CompactionStatus)
+ def (code, out, err) = curl("GET", tablet.CompactionStatus)
logger.info("Show tablets status: code=" + code + ", out=" + out + ",
err=" + err)
assertEquals(code, 0)
def tabletJson = parseJson(out.trim())
diff --git
a/regression-test/suites/inverted_index_p0/test_index_like_select.groovy
b/regression-test/suites/inverted_index_p0/test_index_like_select.groovy
index 14996599789..2db05aa8734 100644
--- a/regression-test/suites/inverted_index_p0/test_index_like_select.groovy
+++ b/regression-test/suites/inverted_index_p0/test_index_like_select.groovy
@@ -161,8 +161,8 @@ suite("test_index_like_select", "inverted_index_select"){
// case5 test int colume cannot use like
def int_colume_like_result = "fail"
try {
- drop_result = sql "select * from ${indexTbName1} where
${int_colume1} like 9"
- drop_index_twice_result = 'success'
+ sql "select * from ${indexTbName1} where ${int_colume1} like 9"
+ int_colume_like_result = 'success'
} catch(Exception ex) {
logger.info("int colume should not match succ, result: " + ex)
}
diff --git
a/regression-test/suites/inverted_index_p1/index_compaction/test_index_compaction_p1.groovy
b/regression-test/suites/inverted_index_p1/index_compaction/test_index_compaction_p1.groovy
index ef643881def..846e9ea3112 100644
---
a/regression-test/suites/inverted_index_p1/index_compaction/test_index_compaction_p1.groovy
+++
b/regression-test/suites/inverted_index_p1/index_compaction/test_index_compaction_p1.groovy
@@ -115,7 +115,7 @@ suite("test_index_compaction_p1", "p1, nonConcurrent") {
for (def tablet in tablets) {
int afterSegmentCount = 0
String tablet_id = tablet.TabletId
- (code, out, err) = curl("GET", tablet.CompactionStatus)
+ def (code, out, err) = curl("GET", tablet.CompactionStatus)
logger.info("Show tablets status: code=" + code + ", out=" + out + ",
err=" + err)
assertEquals(code, 0)
def tabletJson = parseJson(out.trim())
diff --git
a/regression-test/suites/inverted_index_p2/show_data/test_show_index_data_p2.groovy
b/regression-test/suites/inverted_index_p2/show_data/test_show_index_data_p2.groovy
index 18d27723992..064650312b0 100644
---
a/regression-test/suites/inverted_index_p2/show_data/test_show_index_data_p2.groovy
+++
b/regression-test/suites/inverted_index_p2/show_data/test_show_index_data_p2.groovy
@@ -147,7 +147,7 @@ suite("test_show_index_data_p2", "p2") {
Thread.sleep(30000)
String tablet_id = tablet.TabletId
backend_id = tablet.BackendId
- (code, out, err) =
be_get_compaction_status(backendId_to_backendIP.get(backend_id),
backendId_to_backendHttpPort.get(backend_id), tablet_id)
+ def (code, out, err) =
be_get_compaction_status(backendId_to_backendIP.get(backend_id),
backendId_to_backendHttpPort.get(backend_id), tablet_id)
logger.info("Get compaction status: code=" + code + ", out=" +
out + ", err=" + err)
assertEquals(code, 0)
def compactionStatus = parseJson(out.trim())
@@ -248,7 +248,7 @@ suite("test_show_index_data_p2", "p2") {
tablets = sql_return_maparray """ show tablets from
${show_table_name}; """
for (def tablet in tablets) {
String tablet_id = tablet.TabletId
- (code, out, err) = curl("GET", tablet.CompactionStatus)
+ def (code, out, err) = curl("GET", tablet.CompactionStatus)
logger.info("Show tablets status: code=" + code + ", out=" +
out + ", err=" + err)
assertEquals(code, 0)
def tabletJson = parseJson(out.trim())
diff --git a/regression-test/suites/inverted_index_p2/test_show_data.groovy
b/regression-test/suites/inverted_index_p2/test_show_data.groovy
index 93c87027cca..c11da3328c7 100644
--- a/regression-test/suites/inverted_index_p2/test_show_data.groovy
+++ b/regression-test/suites/inverted_index_p2/test_show_data.groovy
@@ -627,7 +627,7 @@ suite("test_show_data_with_compaction", "p2") {
def backendId_to_backendHttpPort = [:]
getBackendIpHttpPort(backendId_to_backendIP, backendId_to_backendHttpPort);
- backend_id = backendId_to_backendIP.keySet()[0]
+ def backend_id = backendId_to_backendIP.keySet()[0]
def (code, out, err) =
show_be_config(backendId_to_backendIP.get(backend_id),
backendId_to_backendHttpPort.get(backend_id))
logger.info("Show config: code=" + code + ", out=" + out + ", err=" + err)
diff --git a/regression-test/suites/load_p0/spark_load/test_spark_load.groovy
b/regression-test/suites/load_p0/spark_load/test_spark_load.groovy
index c798ad1fcf7..5c97c9ca748 100644
--- a/regression-test/suites/load_p0/spark_load/test_spark_load.groovy
+++ b/regression-test/suites/load_p0/spark_load/test_spark_load.groovy
@@ -23,9 +23,9 @@ suite("test_spark_load", "p0") {
def yarnAddress = "master:8032"
def hdfsAddress = "hdfs://master:9000"
def hdfsWorkingDir = "hdfs://master:9000/doris"
- brokerName =getBrokerName()
- hdfsUser = getHdfsUser()
- hdfsPasswd = getHdfsPasswd()
+ def brokerName =getBrokerName()
+ def hdfsUser = getHdfsUser()
+ def hdfsPasswd = getHdfsPasswd()
def create_test_table = {testTablex ->
def result1 = sql """
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 9ec4f7dcfde..e95f08cd034 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
@@ -449,7 +449,7 @@ suite("test_broker_load_p2", "p2") {
if (result[0][2].equals("FINISHED")) {
logger.info("Load FINISHED " + label)
assertTrue(result[0][6].contains(task_info[i]))
- load_counters = etl_info[i].split('; ');
+ def load_counters = etl_info[i].split('; ');
for (String counter : load_counters) {
assertTrue(result[0][5].contains(counter),
"expected: " + counter + ", actual: " + result[0][5] + ", label: $label")
}
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 d6ca29caa03..b7108efdd41 100644
--- a/regression-test/suites/schema_change_p2/test_schema_change.groovy
+++ b/regression-test/suites/schema_change_p2/test_schema_change.groovy
@@ -84,7 +84,7 @@ suite("test_schema_change") {
waitBrokerLoadJob(loadLabel)
sql "sync"
- rowCount = sql "select count(*) from ${tableName}"
+ def rowCount = sql "select count(*) from ${tableName}"
logger.info("rowCount:{}", rowCount)
assertEquals(rowCount[0][0], 15000000)
diff --git a/regression-test/suites/ssb_sf1_p2/nereids/q1.1.groovy
b/regression-test/suites/ssb_sf1_p2/nereids/q1.1.groovy
index ff02314923b..04feb1aabb3 100644
--- a/regression-test/suites/ssb_sf1_p2/nereids/q1.1.groovy
+++ b/regression-test/suites/ssb_sf1_p2/nereids/q1.1.groovy
@@ -38,6 +38,6 @@ suite("ssb_sf1_q1_1_nereids") {
AND lo_quantity < 25;
"""
- resultFile(file = "../sql/q1.1.out", tag = "q1.1")
+ resultFile("../sql/q1.1.out", "q1.1")
}
}
diff --git a/regression-test/suites/ssb_sf1_p2/nereids/q1.2.groovy
b/regression-test/suites/ssb_sf1_p2/nereids/q1.2.groovy
index 46d3f8b1398..0cc8a4b6835 100644
--- a/regression-test/suites/ssb_sf1_p2/nereids/q1.2.groovy
+++ b/regression-test/suites/ssb_sf1_p2/nereids/q1.2.groovy
@@ -39,6 +39,6 @@ suite("ssb_sf1_q1_2_nereids") {
AND lo_discount BETWEEN 4 AND 6
AND lo_quantity BETWEEN 26 AND 35;"""
- resultFile(file = "../sql/q1.2.out", tag = "q1.2")
+ resultFile("../sql/q1.2.out", "q1.2")
}
}
diff --git a/regression-test/suites/ssb_sf1_p2/nereids/q1.3.groovy
b/regression-test/suites/ssb_sf1_p2/nereids/q1.3.groovy
index 2212cd4603f..7dd1e6cac18 100644
--- a/regression-test/suites/ssb_sf1_p2/nereids/q1.3.groovy
+++ b/regression-test/suites/ssb_sf1_p2/nereids/q1.3.groovy
@@ -40,6 +40,6 @@ suite("ssb_sf1_q1_3_nereids") {
AND lo_quantity BETWEEN 26 AND 35;
"""
- resultFile(file = "../sql/q1.3.out", tag = "q1.3")
+ resultFile("../sql/q1.3.out", "q1.3")
}
}
diff --git a/regression-test/suites/ssb_sf1_p2/nereids/q2.1.groovy
b/regression-test/suites/ssb_sf1_p2/nereids/q2.1.groovy
index e2fd37fa561..5c255fcc40a 100644
--- a/regression-test/suites/ssb_sf1_p2/nereids/q2.1.groovy
+++ b/regression-test/suites/ssb_sf1_p2/nereids/q2.1.groovy
@@ -41,6 +41,6 @@ suite("ssb_sf1_q2_1_nereids") {
ORDER BY d_year, p_brand;
"""
- resultFile(file = "../sql/q2.1.out", tag = "q2.1")
+ resultFile("../sql/q2.1.out", "q2.1")
}
}
diff --git a/regression-test/suites/ssb_sf1_p2/nereids/q2.2.groovy
b/regression-test/suites/ssb_sf1_p2/nereids/q2.2.groovy
index 9a20ea288b0..5df9ba503a8 100644
--- a/regression-test/suites/ssb_sf1_p2/nereids/q2.2.groovy
+++ b/regression-test/suites/ssb_sf1_p2/nereids/q2.2.groovy
@@ -42,6 +42,6 @@ suite("ssb_sf1_q2_2_nereids") {
ORDER BY d_year, p_brand;
"""
- resultFile(file = "../sql/q2.2.out", tag = "q2.2")
+ resultFile("../sql/q2.2.out", "q2.2")
}
}
diff --git a/regression-test/suites/ssb_sf1_p2/nereids/q2.3.groovy
b/regression-test/suites/ssb_sf1_p2/nereids/q2.3.groovy
index 2b0311155c1..c1cf8be6ab0 100644
--- a/regression-test/suites/ssb_sf1_p2/nereids/q2.3.groovy
+++ b/regression-test/suites/ssb_sf1_p2/nereids/q2.3.groovy
@@ -40,6 +40,6 @@ suite("ssb_sf1_q2_3_nereids") {
ORDER BY d_year, p_brand;
"""
- resultFile(file = "../sql/q2.3.out", tag = "q2.3")
+ resultFile("../sql/q2.3.out", "q2.3")
}
}
diff --git a/regression-test/suites/ssb_sf1_p2/nereids/q3.1.groovy
b/regression-test/suites/ssb_sf1_p2/nereids/q3.1.groovy
index ea05b9dacdd..db218e19d4a 100644
--- a/regression-test/suites/ssb_sf1_p2/nereids/q3.1.groovy
+++ b/regression-test/suites/ssb_sf1_p2/nereids/q3.1.groovy
@@ -41,6 +41,6 @@ suite("ssb_sf1_q3_1_nereids") {
GROUP BY c_nation, s_nation, d_year
ORDER BY d_year ASC, REVENUE DESC;"""
- resultFile(file = "../sql/q3.1.out", tag = "q3.1")
+ resultFile("../sql/q3.1.out", "q3.1")
}
}
diff --git a/regression-test/suites/ssb_sf1_p2/nereids/q3.2.groovy
b/regression-test/suites/ssb_sf1_p2/nereids/q3.2.groovy
index dff174a0c60..830f66fcb70 100644
--- a/regression-test/suites/ssb_sf1_p2/nereids/q3.2.groovy
+++ b/regression-test/suites/ssb_sf1_p2/nereids/q3.2.groovy
@@ -42,6 +42,6 @@ suite("ssb_sf1_q3_2_nereids") {
ORDER BY d_year ASC, REVENUE DESC;
"""
- resultFile(file = "../sql/q3.2.out", tag = "q3.2")
+ resultFile("../sql/q3.2.out", "q3.2")
}
}
diff --git a/regression-test/suites/ssb_sf1_p2/nereids/q3.3.groovy
b/regression-test/suites/ssb_sf1_p2/nereids/q3.3.groovy
index 516175af086..862324ce8fc 100644
--- a/regression-test/suites/ssb_sf1_p2/nereids/q3.3.groovy
+++ b/regression-test/suites/ssb_sf1_p2/nereids/q3.3.groovy
@@ -43,6 +43,6 @@ suite("ssb_sf1_q3_3_nereids") {
GROUP BY c_city, s_city, d_year
ORDER BY d_year ASC, REVENUE DESC;"""
- resultFile(file = "../sql/q3.3.out", tag = "q3.3")
+ resultFile("../sql/q3.3.out", "q3.3")
}
}
diff --git a/regression-test/suites/ssb_sf1_p2/nereids/q3.4.groovy
b/regression-test/suites/ssb_sf1_p2/nereids/q3.4.groovy
index 816dcea714e..87ff0388eb9 100644
--- a/regression-test/suites/ssb_sf1_p2/nereids/q3.4.groovy
+++ b/regression-test/suites/ssb_sf1_p2/nereids/q3.4.groovy
@@ -43,6 +43,6 @@ suite("ssb_sf1_q3_4_nereids") {
GROUP BY c_city, s_city, d_year
ORDER BY d_year ASC, REVENUE DESC;"""
- resultFile(file = "../sql/q3.4.out", tag = "q3.4")
+ resultFile("../sql/q3.4.out", "q3.4")
}
}
diff --git a/regression-test/suites/ssb_sf1_p2/nereids/q4.1.groovy
b/regression-test/suites/ssb_sf1_p2/nereids/q4.1.groovy
index 8656a5259aa..0e2da481ce3 100644
--- a/regression-test/suites/ssb_sf1_p2/nereids/q4.1.groovy
+++ b/regression-test/suites/ssb_sf1_p2/nereids/q4.1.groovy
@@ -45,6 +45,6 @@ suite("ssb_sf1_q4_1_nereids") {
ORDER BY d_year, c_nation;
"""
- resultFile(file = "../sql/q4.1.out", tag = "q4.1")
+ resultFile("../sql/q4.1.out", "q4.1")
}
}
diff --git a/regression-test/suites/ssb_sf1_p2/nereids/q4.2.groovy
b/regression-test/suites/ssb_sf1_p2/nereids/q4.2.groovy
index 9fa59565a95..9293a3e5c0f 100644
--- a/regression-test/suites/ssb_sf1_p2/nereids/q4.2.groovy
+++ b/regression-test/suites/ssb_sf1_p2/nereids/q4.2.groovy
@@ -44,6 +44,6 @@ suite("ssb_sf1_q4_2_nereids") {
GROUP BY d_year, s_nation, p_category
ORDER BY d_year, s_nation, p_category;"""
- resultFile(file = "../sql/q4.2.out", tag = "q4.2")
+ resultFile("../sql/q4.2.out", "q4.2")
}
}
diff --git a/regression-test/suites/ssb_sf1_p2/nereids/q4.3.groovy
b/regression-test/suites/ssb_sf1_p2/nereids/q4.3.groovy
index f98a8cb41a2..c2d2c475e2f 100644
--- a/regression-test/suites/ssb_sf1_p2/nereids/q4.3.groovy
+++ b/regression-test/suites/ssb_sf1_p2/nereids/q4.3.groovy
@@ -42,6 +42,6 @@ suite("ssb_sf1_q4_3_nereids") {
GROUP BY d_year, s_city, p_brand
ORDER BY d_year, s_city, p_brand;"""
- resultFile(file = "../sql/q4.3.out", tag = "q4.3")
+ resultFile("../sql/q4.3.out", "q4.3")
}
}
diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/query46.groovy
b/regression-test/suites/tpcds_sf1_unique_ck_p1/query46.groovy
index f5a6a40d5a8..bf10aa36544 100644
--- a/regression-test/suites/tpcds_sf1_unique_ck_p1/query46.groovy
+++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/query46.groovy
@@ -26,7 +26,7 @@ suite("tpcds_sf1_unique_p1_q46") {
logger.info("${stats}")
stats = sql "show column stats customer_address"
logger.info("${stats}")
- ds46 = """
+ def ds46 = """
SELECT
c_last_name
, c_first_name
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
