This is an automated email from the ASF dual-hosted git repository.
morningman 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 6b23aa876d2 [test](regression) Rename the binlog result tags left in
the cloud changelog suites (#69374)
6b23aa876d2 is described below
commit 6b23aa876d2587af1aa6afc71135965632b254a6
Author: Mingyu Chen (Rayner) <[email protected]>
AuthorDate: Thu Oct 22 10:07:32 2026 +0100
[test](regression) Rename the binlog result tags left in the cloud
changelog suites (#69374)
### What problem does this PR solve?
Issue Number: None
Related PR: #69311
Problem Summary: #69311 renamed row binlog to changelog. It also renamed
the result tags that said binlog in the changelog suites and regenerated
their .out files, except in the two suites that only run in cloud mode,
test_cloud_changelog_compaction and
test_cloud_changelog_publish_conflict: regenerating their .out files
needs a cloud cluster running that code. Those two suites still carry
nine tags that say binlog, such as qt_row_binlog_publish_conflict and
order_qt_cloud_dup_binlog_compaction.
This renames the nine tags in the two groovy files and the matching "--
!tag --" lines in the two .out files, the same way #69311 renamed the
tags of the other changelog suites (row_binlog -> changelog,
binlog_compaction -> changelog_compaction). The queries are unchanged,
so no result row changes. The .out files were edited by hand, only on
the nine tag lines, instead of being regenerated.
### Release note
None
### Check List (For Author)
- Test: No need to test. Only result tag names change; the queries and
the expected rows are unchanged. The two suites return early outside
cloud mode and were not run locally.
- Behavior changed: No
- Does this need documentation: No
Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
---
.../data/changelog_p0/test_cloud_changelog_compaction.out | 10 +++++-----
.../changelog_p0/test_cloud_changelog_publish_conflict.out | 8 ++++----
.../suites/changelog_p0/test_cloud_changelog_compaction.groovy | 10 +++++-----
.../changelog_p0/test_cloud_changelog_publish_conflict.groovy | 8 ++++----
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git
a/regression-test/data/changelog_p0/test_cloud_changelog_compaction.out
b/regression-test/data/changelog_p0/test_cloud_changelog_compaction.out
index 73b22ba4de3..5fee8b8e8d8 100644
--- a/regression-test/data/changelog_p0/test_cloud_changelog_compaction.out
+++ b/regression-test/data/changelog_p0/test_cloud_changelog_compaction.out
@@ -1,11 +1,11 @@
-- This file is automatically generated. You should know what you did if you
want to edit this
--- !cloud_dup_binlog_compaction --
+-- !cloud_dup_changelog_compaction --
0 1 10 a
0 1 11 a1
0 2 20 b
0 3 30 c
--- !cloud_mow_historical_binlog_compaction --
+-- !cloud_mow_historical_changelog_compaction --
0 1 10 a \N \N
0 2 20 b \N \N
0 3 30 c \N \N
@@ -16,19 +16,19 @@
1 2 22 b2 21 b1
2 3 30 c 30 c
--- !cloud_mow_seq_historical_binlog_compaction --
+-- !cloud_mow_seq_historical_changelog_compaction --
0 1 100 a1 \N \N
0 2 200 b1 \N \N
1 1 300 a3 100 a1
2 2 200 b1 200 b1
--- !cloud_mow_seq_historical_binlog_compaction_skip_delete_bitmap --
+-- !cloud_mow_seq_historical_changelog_compaction_skip_delete_bitmap --
0 1 100 a1 \N \N
0 2 200 b1 \N \N
1 1 300 a3 100 a1
2 2 200 b1 200 b1
--- !cloud_mow_historical_long_chain_binlog_compaction --
+-- !cloud_mow_historical_long_chain_changelog_compaction --
0 1 100 a0 \N \N
0 2 200 b0 \N \N
1 1 110 a1 100 a0
diff --git
a/regression-test/data/changelog_p0/test_cloud_changelog_publish_conflict.out
b/regression-test/data/changelog_p0/test_cloud_changelog_publish_conflict.out
index 74e268f25b6..396961c0c77 100644
---
a/regression-test/data/changelog_p0/test_cloud_changelog_publish_conflict.out
+++
b/regression-test/data/changelog_p0/test_cloud_changelog_publish_conflict.out
@@ -1,5 +1,5 @@
-- This file is automatically generated. You should know what you did if you
want to edit this
--- !row_binlog_publish_conflict --
+-- !changelog_publish_conflict --
0 1 1 1 10 10 \N \N
0 2 2 2 20 20 \N \N
0 3 3 3 30 30 \N \N
@@ -7,7 +7,7 @@
1 3 3 3 30 300 30 30
1 2 2 2 2200 200 20 200
--- !row_binlog_publish_conflict_skip_bitmap --
+-- !changelog_publish_conflict_skip_bitmap --
0 1 1 1 10 10 \N \N
0 2 2 2 20 20 \N \N
0 3 3 3 30 30 \N \N
@@ -16,7 +16,7 @@
1 2 2 2 2200 20 20 20
1 2 2 2 2200 200 20 200
--- !row_binlog_publish_conflict_upsert --
+-- !changelog_publish_conflict_upsert --
0 2 2 2 20 20 \N \N
0 3 3 3 30 30 \N \N
1 2 2 2 20 200 20 20
@@ -26,7 +26,7 @@
1 3 3 3 3000 3000 30 300
1 2 2 2 2222 2222 2000 2000
--- !row_binlog_publish_conflict_upsert_skip_bitmap --
+-- !changelog_publish_conflict_upsert_skip_bitmap --
0 2 2 2 20 20 \N \N
0 3 3 3 30 30 \N \N
1 2 2 2 20 200 20 20
diff --git
a/regression-test/suites/changelog_p0/test_cloud_changelog_compaction.groovy
b/regression-test/suites/changelog_p0/test_cloud_changelog_compaction.groovy
index 4e378b47e7a..c2b32cf5252 100644
--- a/regression-test/suites/changelog_p0/test_cloud_changelog_compaction.groovy
+++ b/regression-test/suites/changelog_p0/test_cloud_changelog_compaction.groovy
@@ -57,7 +57,7 @@ suite("test_cloud_changelog_compaction", "nonConcurrent") {
// Round 1: Level0 [2-2], [3-3] -> Level1 [2-3].
trigger_and_wait_compaction("test_cloud_changelog_compaction_dup",
"cumulative")
- order_qt_cloud_dup_binlog_compaction """
+ order_qt_cloud_dup_changelog_compaction """
SELECT __DORIS_CHANGELOG_OP__ AS op,
k1,
v1,
@@ -131,7 +131,7 @@ suite("test_cloud_changelog_compaction", "nonConcurrent") {
// Round 6: Level1 [6-7], [8-9] -> Level2 [6-9].
trigger_and_wait_compaction("test_cloud_changelog_compaction_mow_historical",
"cumulative")
- order_qt_cloud_mow_historical_binlog_compaction """
+ order_qt_cloud_mow_historical_changelog_compaction """
SELECT __DORIS_CHANGELOG_OP__ AS op,
k1,
v1,
@@ -194,7 +194,7 @@ suite("test_cloud_changelog_compaction", "nonConcurrent") {
"cumulative")
sql "SET skip_delete_bitmap = false"
- order_qt_cloud_mow_seq_historical_binlog_compaction """
+ order_qt_cloud_mow_seq_historical_changelog_compaction """
SELECT __DORIS_CHANGELOG_OP__ AS op,
k1,
v1,
@@ -205,7 +205,7 @@ suite("test_cloud_changelog_compaction", "nonConcurrent") {
"""
sql "SET skip_delete_bitmap = true"
- order_qt_cloud_mow_seq_historical_binlog_compaction_skip_delete_bitmap
"""
+
order_qt_cloud_mow_seq_historical_changelog_compaction_skip_delete_bitmap """
SELECT __DORIS_CHANGELOG_OP__ AS op,
k1,
v1,
@@ -269,7 +269,7 @@ suite("test_cloud_changelog_compaction", "nonConcurrent") {
trigger_and_wait_compaction("test_cloud_changelog_compaction_mow_historical_long_chain",
"cumulative")
- order_qt_cloud_mow_historical_long_chain_binlog_compaction """
+ order_qt_cloud_mow_historical_long_chain_changelog_compaction """
SELECT __DORIS_CHANGELOG_OP__ AS op,
k1,
v1,
diff --git
a/regression-test/suites/changelog_p0/test_cloud_changelog_publish_conflict.groovy
b/regression-test/suites/changelog_p0/test_cloud_changelog_publish_conflict.groovy
index 1b4451d815f..b566caa92ef 100644
---
a/regression-test/suites/changelog_p0/test_cloud_changelog_publish_conflict.groovy
+++
b/regression-test/suites/changelog_p0/test_cloud_changelog_publish_conflict.groovy
@@ -107,7 +107,7 @@ suite("test_cloud_changelog_publish_conflict",
"nonConcurrent") {
throw txn2Error.get()
}
- qt_row_binlog_publish_conflict """
+ qt_changelog_publish_conflict """
SELECT __DORIS_CHANGELOG_OP__ AS op,
k1,
k2,
@@ -122,7 +122,7 @@ suite("test_cloud_changelog_publish_conflict",
"nonConcurrent") {
"""
sql "SET skip_delete_bitmap = true"
- qt_row_binlog_publish_conflict_skip_bitmap """
+ qt_changelog_publish_conflict_skip_bitmap """
SELECT __DORIS_CHANGELOG_OP__ AS op,
k1,
k2,
@@ -170,7 +170,7 @@ suite("test_cloud_changelog_publish_conflict",
"nonConcurrent") {
throw txn4Error.get()
}
- qt_row_binlog_publish_conflict_upsert """
+ qt_changelog_publish_conflict_upsert """
SELECT __DORIS_CHANGELOG_OP__ AS op,
k1,
k2,
@@ -185,7 +185,7 @@ suite("test_cloud_changelog_publish_conflict",
"nonConcurrent") {
"""
sql "SET skip_delete_bitmap = true"
- qt_row_binlog_publish_conflict_upsert_skip_bitmap """
+ qt_changelog_publish_conflict_upsert_skip_bitmap """
SELECT __DORIS_CHANGELOG_OP__ AS op,
k1,
k2,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
