This is an automated email from the ASF dual-hosted git repository.
yiguolei 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 6b13dd55021 [regression-test](fix) fix 3.0 global vars (#47119)
6b13dd55021 is described below
commit 6b13dd55021fc0e2bb04ac3daa16f2f5de870b09
Author: shuke <sh...@selectdb.com>
AuthorDate: Thu Jan 16 23:47:04 2025 +0800
[regression-test](fix) fix 3.0 global vars (#47119)
---
regression-test/suites/account_p0/test_alter_user.groovy | 2 +-
.../suites/alter_p2/test_alter_table_property.groovy | 2 +-
.../suites/compaction/compaction_width_array_column.groovy | 8 ++++----
...t_base_compaction_with_dup_key_max_file_size_limit.groovy | 8 ++++----
.../compaction/test_single_compaction_fault_injection.groovy | 12 ++++++------
.../suites/compaction/test_single_replica_compaction.groovy | 12 ++++++------
.../test_partial_update_publish_conflict_with_error.groovy | 6 +++---
.../fault_injection_p0/test_calc_crc_fault_injection.groovy | 2 +-
...mtable_flush_is_high_priority_for_vtablet_writerV2.groovy | 2 +-
...high_priority_for_vtablet_writerv1_fault_injection.groovy | 2 +-
.../test_segcompaction_fault_injection.groovy | 2 +-
.../test_too_many_segments_fault_injection.groovy | 2 +-
.../fault_injection_p0/test_variant_bloom_filter.groovy | 2 +-
...est_index_compaction_with_multi_index_segments_arr.groovy | 2 +-
.../test_index_compaction_empty_segments.groovy | 2 +-
.../index_compaction/test_index_compaction_p0.groovy | 4 ++--
.../index_compaction/test_index_compaction_p1.groovy | 4 ++--
.../show_data/test_show_index_data_p2.groovy | 12 ++++++------
.../suites/inverted_index_p2/test_show_data.groovy | 2 +-
.../suites/load_p2/broker_load/test_broker_load.groovy | 2 +-
.../broker_load/test_parquet_large_metadata_load.groovy | 2 +-
.../suites/schema_change_p2/test_schema_change.groovy | 2 +-
regression-test/suites/ssb_sf1_p2/nereids/q1.1.groovy | 2 +-
regression-test/suites/ssb_sf1_p2/nereids/q1.2.groovy | 2 +-
regression-test/suites/ssb_sf1_p2/nereids/q1.3.groovy | 2 +-
regression-test/suites/ssb_sf1_p2/nereids/q2.1.groovy | 2 +-
regression-test/suites/ssb_sf1_p2/nereids/q2.2.groovy | 2 +-
regression-test/suites/ssb_sf1_p2/nereids/q2.3.groovy | 2 +-
regression-test/suites/ssb_sf1_p2/nereids/q3.1.groovy | 2 +-
regression-test/suites/ssb_sf1_p2/nereids/q3.2.groovy | 2 +-
regression-test/suites/ssb_sf1_p2/nereids/q3.3.groovy | 2 +-
regression-test/suites/ssb_sf1_p2/nereids/q3.4.groovy | 2 +-
regression-test/suites/ssb_sf1_p2/nereids/q4.1.groovy | 2 +-
regression-test/suites/ssb_sf1_p2/nereids/q4.2.groovy | 2 +-
regression-test/suites/ssb_sf1_p2/nereids/q4.3.groovy | 2 +-
.../ssb_unique_load_zstd/four/load_four_step.groovy | 2 +-
.../ssb_unique_load_zstd/three/load_three_step.groovy | 2 +-
.../variant_github_events_nonConcurrent_p2/load.groovy | 2 +-
regression-test/suites/variant_log_data_p2/load.groovy | 2 +-
39 files changed, 64 insertions(+), 64 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 5ad017f276c..e9219359a3b 100644
--- a/regression-test/suites/alter_p2/test_alter_table_property.groovy
+++ b/regression-test/suites/alter_p2/test_alter_table_property.groovy
@@ -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/compaction_width_array_column.groovy
b/regression-test/suites/compaction/compaction_width_array_column.groovy
index d433e81f555..570877cfc4c 100644
--- a/regression-test/suites/compaction/compaction_width_array_column.groovy
+++ b/regression-test/suites/compaction/compaction_width_array_column.groovy
@@ -56,13 +56,13 @@ suite('compaction_width_array_column', "p2") {
}
def table_load_task = { table_name ->
- uniqueID = Math.abs(UUID.randomUUID().hashCode()).toString()
- loadLabel = table_name + "_" + uniqueID
+ def uniqueID = Math.abs(UUID.randomUUID().hashCode()).toString()
+ def loadLabel = table_name + "_" + uniqueID
//loadLabel = table_name + '_load_5'
- loadSql = new
File("""${context.file.parent}/ddl/${table_name}_load.sql""").text.replaceAll("\\\$\\{s3BucketName\\}",
s3BucketName)
+ def loadSql = new
File("""${context.file.parent}/ddl/${table_name}_load.sql""").text.replaceAll("\\\$\\{s3BucketName\\}",
s3BucketName)
loadSql = loadSql.replaceAll("\\\$\\{loadLabel\\}", loadLabel)
loadSql = loadSql.replaceAll("\\\$\\{table\\_name\\}", table_name)
- nowloadSql = loadSql + s3WithProperties
+ def nowloadSql = loadSql + s3WithProperties
try_sql nowloadSql
while (true) {
diff --git
a/regression-test/suites/compaction/test_base_compaction_with_dup_key_max_file_size_limit.groovy
b/regression-test/suites/compaction/test_base_compaction_with_dup_key_max_file_size_limit.groovy
index 400e799a914..40f226a514a 100644
---
a/regression-test/suites/compaction/test_base_compaction_with_dup_key_max_file_size_limit.groovy
+++
b/regression-test/suites/compaction/test_base_compaction_with_dup_key_max_file_size_limit.groovy
@@ -97,10 +97,10 @@
suite("test_base_compaction_with_dup_key_max_file_size_limit", "p2") {
String command = sb.toString()
logger.info(command)
- process = command.execute()
- code = process.waitFor()
- err = IOGroovyMethods.getText(new BufferedReader(new
InputStreamReader(process.getErrorStream())));
- out = process.getText()
+ def process = command.execute()
+ def code = process.waitFor()
+ def err = IOGroovyMethods.getText(new BufferedReader(new
InputStreamReader(process.getErrorStream())));
+ def out = process.getText()
logger.info("Run compaction: code=" + code + ", out=" + out + ",
disableAutoCompaction " + disableAutoCompaction + ", err=" + err)
if (!disableAutoCompaction) {
return "Success, " + out
diff --git
a/regression-test/suites/compaction/test_single_compaction_fault_injection.groovy
b/regression-test/suites/compaction/test_single_compaction_fault_injection.groovy
index 839bfaa10dd..0b18b4af707 100644
---
a/regression-test/suites/compaction/test_single_compaction_fault_injection.groovy
+++
b/regression-test/suites/compaction/test_single_compaction_fault_injection.groovy
@@ -86,9 +86,9 @@ suite("test_single_compaction_fault_injection", "p2,
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())
@@ -107,9 +107,9 @@ suite("test_single_compaction_fault_injection", "p2,
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())
diff --git
a/regression-test/suites/compaction/test_single_replica_compaction.groovy
b/regression-test/suites/compaction/test_single_replica_compaction.groovy
index 05286a6fa19..24dd01ff411 100644
--- a/regression-test/suites/compaction/test_single_replica_compaction.groovy
+++ b/regression-test/suites/compaction/test_single_replica_compaction.groovy
@@ -93,9 +93,9 @@ suite("test_single_compaction_p2", "p2") {
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())
@@ -114,9 +114,9 @@ suite("test_single_compaction_p2", "p2") {
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 tabletStatus = 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_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 42e9fb865e8..40765cb92f7 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())
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 d1e18ed0a63..37b762c10fe 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())
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 3c679af7a66..2cd9ab7841c 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
@@ -92,7 +92,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 cd36bb7d185..1712928904c 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
@@ -97,7 +97,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..d5ffd070003 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())
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 5c351c49449..b1f92795b79 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
@@ -95,7 +95,7 @@ suite("test_index_compaction_p0", "p0, 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())
@@ -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_p1/index_compaction/test_index_compaction_p1.groovy
b/regression-test/suites/inverted_index_p1/index_compaction/test_index_compaction_p1.groovy
index 176a1dbd8d8..7eadd5612fd 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
@@ -99,7 +99,7 @@ suite("test_index_compaction_p1", "p1, 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())
@@ -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 2839a8a47b0..d8962cdd3ef 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
@@ -119,7 +119,7 @@ suite("test_show_index_data_p2", "p2") {
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())
@@ -133,8 +133,8 @@ suite("test_show_index_data_p2", "p2") {
// trigger compactions for all tablets in ${tableName}
for (def tablet in tablets) {
String tablet_id = tablet.TabletId
- backend_id = tablet.BackendId
- (code, out, err) =
be_run_full_compaction(backendId_to_backendIP.get(backend_id),
backendId_to_backendHttpPort.get(backend_id), tablet_id)
+ def backend_id = tablet.BackendId
+ 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)
assertEquals(code, 0)
def compactJson = parseJson(out.trim())
@@ -146,8 +146,8 @@ suite("test_show_index_data_p2", "p2") {
Awaitility.await().atMost(60, TimeUnit.MINUTES).untilAsserted(()
-> {
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 backend_id = tablet.BackendId
+ 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())
@@ -158,7 +158,7 @@ suite("test_show_index_data_p2", "p2") {
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/test_show_data.groovy
b/regression-test/suites/inverted_index_p2/test_show_data.groovy
index 91939d5507d..c24c14e9857 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_p2/broker_load/test_broker_load.groovy
b/regression-test/suites/load_p2/broker_load/test_broker_load.groovy
index f8a0043842c..01e15608952 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
@@ -452,7 +452,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/load_p2/broker_load/test_parquet_large_metadata_load.groovy
b/regression-test/suites/load_p2/broker_load/test_parquet_large_metadata_load.groovy
index fe8cdfa997d..6d8f841715f 100644
---
a/regression-test/suites/load_p2/broker_load/test_parquet_large_metadata_load.groovy
+++
b/regression-test/suites/load_p2/broker_load/test_parquet_large_metadata_load.groovy
@@ -88,7 +88,7 @@ suite("test_parquet_large_metadata_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 a24de2297df..6e495a15b57 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 ca73f3a4e4c..fa4e1ce3017 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 b0af2bed329..aa11b87851f 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 dd76b45cb81..b58a18fa2ad 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 712744acb67..d74b567899a 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 e72a28730f8..75ab8fb9c92 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 a9ec4fa77e0..7e796db9209 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 34687e3bbbf..4211608dbe8 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 b7edd51750f..89f726676d2 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 dd685db92ed..371c472255f 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 e88cba1a35d..2e32b89e905 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 d4cc3c96c03..20a50b51957 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 e01a5090a27..b0af8df5cce 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/unique_with_mow_p2/ssb_unique_load_zstd/four/load_four_step.groovy
b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd/four/load_four_step.groovy
index 1ab6bd29844..d0e93c322cc 100644
---
a/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd/four/load_four_step.groovy
+++
b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd/four/load_four_step.groovy
@@ -70,7 +70,7 @@ suite("load_four_step") {
}
sleep(5000)
}
- rowCount = sql "select count(*) from ${tableName}"
+ def rowCount = sql "select count(*) from ${tableName}"
assertEquals(rows[1], rowCount[0][0])
}
diff --git
a/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd/three/load_three_step.groovy
b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd/three/load_three_step.groovy
index 1b470515f7b..40225f73433 100644
---
a/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd/three/load_three_step.groovy
+++
b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd/three/load_three_step.groovy
@@ -67,7 +67,7 @@ suite("load_three_step") {
}
sleep(5000)
}
- rowCount = sql "select count(*) from ${tableName}"
+ def rowCount = sql "select count(*) from ${tableName}"
assertEquals(rows[1], rowCount[0][0])
}
diff --git
a/regression-test/suites/variant_github_events_nonConcurrent_p2/load.groovy
b/regression-test/suites/variant_github_events_nonConcurrent_p2/load.groovy
index 5fd72b71ce7..bc91d75ad53 100644
--- a/regression-test/suites/variant_github_events_nonConcurrent_p2/load.groovy
+++ b/regression-test/suites/variant_github_events_nonConcurrent_p2/load.groovy
@@ -181,7 +181,7 @@ suite("regression_test_variant_github_events_p2",
"nonConcurrent,p2"){
if (!isCloudMode()) {
// BUILD INDEX and expect state is FINISHED
sql """ BUILD INDEX idx_var ON github_events"""
- state = wait_for_last_build_index_on_table_finish("github_events",
timeout)
+ def state = wait_for_last_build_index_on_table_finish("github_events",
timeout)
assertEquals("FINISHED", state)
}
diff --git a/regression-test/suites/variant_log_data_p2/load.groovy
b/regression-test/suites/variant_log_data_p2/load.groovy
index b277c7ef4a9..4673d0e2635 100644
--- a/regression-test/suites/variant_log_data_p2/load.groovy
+++ b/regression-test/suites/variant_log_data_p2/load.groovy
@@ -68,7 +68,7 @@ suite("regression_test_variant_logdata", "nonConcurrent,p2"){
"""
}
// 12. streamload remote file
- table_name = "logdata"
+ def table_name = "logdata"
create_table.call(table_name, "DUPLICATE", "4")
// sql "set enable_two_phase_read_opt = false;"
// no sparse columns
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
