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 177752ff67d branch-2.1: [Fix](regression) Fix define global var in
regression case #46531 (#46735)
177752ff67d is described below
commit 177752ff67da3b1f54c29dd3b984381fd65cd7e1
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Jan 10 12:44:18 2025 +0800
branch-2.1: [Fix](regression) Fix define global var in regression case
#46531 (#46735)
Cherry-picked from #46531
Co-authored-by: bobhan1 <bao...@selectdb.com>
---
.../test_full_compaction_with_ordered_data.groovy | 6 +++---
.../test_partial_update_rowset_not_found_fault_injection.groovy | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
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 23865019561..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())
@@ -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
