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 f956202b1e8 branch-3.0: [Fix](regression) Fix define global var in
regression case #46531 (#46734)
f956202b1e8 is described below
commit f956202b1e8e21f3c207d4261a2efc6ec03520b8
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Jan 13 21:57:51 2025 +0800
branch-3.0: [Fix](regression) Fix define global var in regression case
#46531 (#46734)
Cherry-picked from #46531
Co-authored-by: bobhan1 <bao...@selectdb.com>
---
.../suites/fault_injection_p0/test_delete_from_timeout.groovy | 2 +-
.../fault_injection_p0/test_full_compaciton_run_status.groovy | 2 +-
.../test_full_compaction_with_ordered_data.groovy | 8 ++++----
.../test_partial_update_rowset_not_found_fault_injection.groovy | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/regression-test/suites/fault_injection_p0/test_delete_from_timeout.groovy
b/regression-test/suites/fault_injection_p0/test_delete_from_timeout.groovy
index 8598d791e01..b15309891da 100644
--- a/regression-test/suites/fault_injection_p0/test_delete_from_timeout.groovy
+++ b/regression-test/suites/fault_injection_p0/test_delete_from_timeout.groovy
@@ -48,7 +48,7 @@ suite("test_delete_from_timeout","nonConcurrent") {
GetDebugPoint().enableDebugPointForAllBEs("PushHandler::_do_streaming_ingestion.try_lock_fail")
- t1 = Thread.start {
+ def t1 = Thread.start {
sleep(15000)
GetDebugPoint().disableDebugPointForAllBEs("PushHandler::_do_streaming_ingestion.try_lock_fail")
}
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 29f80528a80..dffcfb293f1 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
@@ -65,7 +65,7 @@ suite("test_full_compaction_run_status","nonConcurrent") {
String tablet_id = tablet.TabletId
backend_id = tablet.BackendId
- times = 1
+ 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)
logger.info("Run compaction: code=" + code + ", out=" + out +
", err=" + err)
diff --git
a/regression-test/suites/fault_injection_p0/test_full_compaction_with_ordered_data.groovy
b/regression-test/suites/fault_injection_p0/test_full_compaction_with_ordered_data.groovy
index c060888690c..6d741ddfedd 100644
---
a/regression-test/suites/fault_injection_p0/test_full_compaction_with_ordered_data.groovy
+++
b/regression-test/suites/fault_injection_p0/test_full_compaction_with_ordered_data.groovy
@@ -60,7 +60,7 @@
suite("test_full_compaction_with_ordered_data","nonConcurrent") {
int rowsetCount = 0
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())
@@ -76,7 +76,7 @@
suite("test_full_compaction_with_ordered_data","nonConcurrent") {
rowsetCount = 0
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())
@@ -116,7 +116,7 @@
suite("test_full_compaction_with_ordered_data","nonConcurrent") {
int rowsetCount = 0
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())
@@ -132,7 +132,7 @@
suite("test_full_compaction_with_ordered_data","nonConcurrent") {
rowsetCount = 0
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/fault_injection_p2/test_partial_update_rowset_not_found_fault_injection.groovy
b/regression-test/suites/fault_injection_p2/test_partial_update_rowset_not_found_fault_injection.groovy
index befad64da0a..39344550526 100644
---
a/regression-test/suites/fault_injection_p2/test_partial_update_rowset_not_found_fault_injection.groovy
+++
b/regression-test/suites/fault_injection_p2/test_partial_update_rowset_not_found_fault_injection.groovy
@@ -94,8 +94,8 @@ suite("test_partial_update_rowset_not_found_fault_injection",
"p2,nonConcurrent"
def tablets = sql_return_maparray """ show tablets from ${testTable};
"""
for (def tablet in tablets) {
String tablet_id = tablet.TabletId
- backend_id = tablet.BackendId
- (code, out, err) =
be_run_cumulative_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_cumulative_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)
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
