This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
commit 107d52dcffa7aa8289d03e574b72c06a867bb124
Author: DeadlineFen <117912096+deadline...@users.noreply.github.com>
AuthorDate: Sun Sep 10 10:49:42 2023 +0800
[supplement](regression-test) pass ccr case when fe
enable_feature_binlog=false (#24077)
---
.../main/groovy/org/apache/doris/regression/suite/Syncer.groovy | 8 ++++++++
.../suites/ccr_mow_syncer_p0/test_binlog_config_change.groovy | 4 ++++
.../ccr_mow_syncer_p0/test_create_table_with_binlog_config.groovy | 5 +++++
regression-test/suites/ccr_mow_syncer_p0/test_get_binlog.groovy | 4 ++++
.../suites/ccr_mow_syncer_p0/test_ingest_binlog.groovy | 4 ++++
.../suites/ccr_mow_syncer_p0/test_multi_buckets.groovy | 4 ++++
regression-test/suites/ccr_mow_syncer_p0/test_txn_case.groovy | 4 ++++
.../suites/ccr_mow_syncer_p1/test_backup_restore.groovy | 4 ++++
.../suites/ccr_syncer_p0/test_binlog_config_change.groovy | 4 ++++
.../ccr_syncer_p0/test_create_table_with_binlog_config.groovy | 5 +++++
regression-test/suites/ccr_syncer_p0/test_get_binlog.groovy | 4 ++++
regression-test/suites/ccr_syncer_p0/test_ingest_binlog.groovy | 4 ++++
regression-test/suites/ccr_syncer_p0/test_multi_buckets.groovy | 4 ++++
regression-test/suites/ccr_syncer_p0/test_txn_case.groovy | 4 ++++
regression-test/suites/ccr_syncer_p1/test_backup_restore.groovy | 4 ++++
15 files changed, 66 insertions(+)
diff --git
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Syncer.groovy
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Syncer.groovy
index 15bfec72a8..08d224c330 100644
---
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Syncer.groovy
+++
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Syncer.groovy
@@ -63,6 +63,14 @@ class Syncer {
TARGET
}
+ Boolean checkEnableFeatureBinlog() {
+ List<List<Object>> rows = suite.sql("ADMIN SHOW FRONTEND CONFIG LIKE
\"%%enable_feature_binlog%%\"")
+ if (rows.size() >= 1 && (rows[0][0] as
String).contains("enable_feature_binlog")) {
+ return (rows[0][1] as String) == "true"
+ }
+ return false
+ }
+
private Boolean checkBinlog(TBinlog binlog, String table, Boolean update) {
// step 1: check binlog availability
diff --git
a/regression-test/suites/ccr_mow_syncer_p0/test_binlog_config_change.groovy
b/regression-test/suites/ccr_mow_syncer_p0/test_binlog_config_change.groovy
index 0e8a2022eb..427740ff01 100644
--- a/regression-test/suites/ccr_mow_syncer_p0/test_binlog_config_change.groovy
+++ b/regression-test/suites/ccr_mow_syncer_p0/test_binlog_config_change.groovy
@@ -18,6 +18,10 @@
suite("test_mow_binlog_config_change") {
def syncer = getSyncer()
+ if (!syncer.checkEnableFeatureBinlog()) {
+ logger.info("fe enable_feature_binlog is false, skip case
test_mow_binlog_config_change")
+ return
+ }
def tableName = "tbl_binlog_config_change"
def test_num = 0
def insert_num = 5
diff --git
a/regression-test/suites/ccr_mow_syncer_p0/test_create_table_with_binlog_config.groovy
b/regression-test/suites/ccr_mow_syncer_p0/test_create_table_with_binlog_config.groovy
index e4610bbe0d..7f8fc5e7ce 100644
---
a/regression-test/suites/ccr_mow_syncer_p0/test_create_table_with_binlog_config.groovy
+++
b/regression-test/suites/ccr_mow_syncer_p0/test_create_table_with_binlog_config.groovy
@@ -16,6 +16,11 @@
// under the License.
suite("test_mow_create_table_with_binlog_config") {
+ def syncer = getSyncer()
+ if (!syncer.checkEnableFeatureBinlog()) {
+ logger.info("fe enable_feature_binlog is false, skip case
test_mow_create_table_with_binlog_config")
+ return
+ }
sql "drop database if exists test_table_binlog"
sql """
diff --git a/regression-test/suites/ccr_mow_syncer_p0/test_get_binlog.groovy
b/regression-test/suites/ccr_mow_syncer_p0/test_get_binlog.groovy
index 18a680380c..ae679c5ab1 100644
--- a/regression-test/suites/ccr_mow_syncer_p0/test_get_binlog.groovy
+++ b/regression-test/suites/ccr_mow_syncer_p0/test_get_binlog.groovy
@@ -36,6 +36,10 @@ suite("test_mow_get_binlog_case") {
}
def syncer = getSyncer()
+ if (!syncer.checkEnableFeatureBinlog()) {
+ logger.info("fe enable_feature_binlog is false, skip case
test_mow_get_binlog_case")
+ return
+ }
def seqTableName = "tbl_get_binlog_case"
def test_num = 0
def insert_num = 5
diff --git a/regression-test/suites/ccr_mow_syncer_p0/test_ingest_binlog.groovy
b/regression-test/suites/ccr_mow_syncer_p0/test_ingest_binlog.groovy
index 4b1b273ab8..fd35c4b392 100644
--- a/regression-test/suites/ccr_mow_syncer_p0/test_ingest_binlog.groovy
+++ b/regression-test/suites/ccr_mow_syncer_p0/test_ingest_binlog.groovy
@@ -18,6 +18,10 @@
suite("test_mow_ingest_binlog") {
def syncer = getSyncer()
+ if (!syncer.checkEnableFeatureBinlog()) {
+ logger.info("fe enable_feature_binlog is false, skip case
test_mow_ingest_binlog")
+ return
+ }
def tableName = "tbl_ingest_binlog"
def insert_num = 5
def test_num = 0
diff --git a/regression-test/suites/ccr_mow_syncer_p0/test_multi_buckets.groovy
b/regression-test/suites/ccr_mow_syncer_p0/test_multi_buckets.groovy
index 7f4051552f..ef66ef0610 100644
--- a/regression-test/suites/ccr_mow_syncer_p0/test_multi_buckets.groovy
+++ b/regression-test/suites/ccr_mow_syncer_p0/test_multi_buckets.groovy
@@ -18,6 +18,10 @@
suite("test_mow_multi_buckets") {
def syncer = getSyncer()
+ if (!syncer.checkEnableFeatureBinlog()) {
+ logger.info("fe enable_feature_binlog is false, skip case
test_mow_multi_buckets")
+ return
+ }
def tableName = "tbl_multi_buckets"
def test_num = 0
def insert_num = 5
diff --git a/regression-test/suites/ccr_mow_syncer_p0/test_txn_case.groovy
b/regression-test/suites/ccr_mow_syncer_p0/test_txn_case.groovy
index 05f44e4808..a447b24a83 100644
--- a/regression-test/suites/ccr_mow_syncer_p0/test_txn_case.groovy
+++ b/regression-test/suites/ccr_mow_syncer_p0/test_txn_case.groovy
@@ -39,6 +39,10 @@ suite("test_mow_txn_case") {
}
def syncer = getSyncer()
+ if (!syncer.checkEnableFeatureBinlog()) {
+ logger.info("fe enable_feature_binlog is false, skip case
test_mow_txn_case")
+ return
+ }
def txnTableName = "tbl_txn_case"
def test_num = 0
sql "DROP TABLE IF EXISTS ${txnTableName}"
diff --git
a/regression-test/suites/ccr_mow_syncer_p1/test_backup_restore.groovy
b/regression-test/suites/ccr_mow_syncer_p1/test_backup_restore.groovy
index b0844cded5..8abd15b378 100644
--- a/regression-test/suites/ccr_mow_syncer_p1/test_backup_restore.groovy
+++ b/regression-test/suites/ccr_mow_syncer_p1/test_backup_restore.groovy
@@ -18,6 +18,10 @@
suite("test_mow_backup_restore") {
def syncer = getSyncer()
+ if (!syncer.checkEnableFeatureBinlog()) {
+ logger.info("fe enable_feature_binlog is false, skip case
test_mow_backup_restore")
+ return
+ }
def tableName = "tbl_backup_restore"
def test_num = 0
def insert_num = 5
diff --git
a/regression-test/suites/ccr_syncer_p0/test_binlog_config_change.groovy
b/regression-test/suites/ccr_syncer_p0/test_binlog_config_change.groovy
index b9cccb0fc4..cbdf929742 100644
--- a/regression-test/suites/ccr_syncer_p0/test_binlog_config_change.groovy
+++ b/regression-test/suites/ccr_syncer_p0/test_binlog_config_change.groovy
@@ -18,6 +18,10 @@
suite("test_binlog_config_change") {
def syncer = getSyncer()
+ if (!syncer.checkEnableFeatureBinlog()) {
+ logger.info("fe enable_feature_binlog is false, skip case
test_binlog_config_change")
+ return
+ }
def tableName = "tbl_binlog_config_change"
def test_num = 0
def insert_num = 5
diff --git
a/regression-test/suites/ccr_syncer_p0/test_create_table_with_binlog_config.groovy
b/regression-test/suites/ccr_syncer_p0/test_create_table_with_binlog_config.groovy
index 0065ede1c6..4988b8bba9 100644
---
a/regression-test/suites/ccr_syncer_p0/test_create_table_with_binlog_config.groovy
+++
b/regression-test/suites/ccr_syncer_p0/test_create_table_with_binlog_config.groovy
@@ -16,6 +16,11 @@
// under the License.
suite("test_create_table_with_binlog_config") {
+ def syncer = getSyncer()
+ if (!syncer.checkEnableFeatureBinlog()) {
+ logger.info("fe enable_feature_binlog is false, skip case
test_create_table_with_binlog_config")
+ return
+ }
sql "drop database if exists test_table_binlog"
sql """
diff --git a/regression-test/suites/ccr_syncer_p0/test_get_binlog.groovy
b/regression-test/suites/ccr_syncer_p0/test_get_binlog.groovy
index 874161aa69..8720d8106a 100644
--- a/regression-test/suites/ccr_syncer_p0/test_get_binlog.groovy
+++ b/regression-test/suites/ccr_syncer_p0/test_get_binlog.groovy
@@ -35,6 +35,10 @@ suite("test_get_binlog_case") {
}
def syncer = getSyncer()
+ if (!syncer.checkEnableFeatureBinlog()) {
+ logger.info("fe enable_feature_binlog is false, skip case
test_get_binlog_case")
+ return
+ }
def seqTableName = "tbl_get_binlog_case"
def test_num = 0
def insert_num = 5
diff --git a/regression-test/suites/ccr_syncer_p0/test_ingest_binlog.groovy
b/regression-test/suites/ccr_syncer_p0/test_ingest_binlog.groovy
index ec38890d9a..cef48715ae 100644
--- a/regression-test/suites/ccr_syncer_p0/test_ingest_binlog.groovy
+++ b/regression-test/suites/ccr_syncer_p0/test_ingest_binlog.groovy
@@ -18,6 +18,10 @@
suite("test_ingest_binlog") {
def syncer = getSyncer()
+ if (!syncer.checkEnableFeatureBinlog()) {
+ logger.info("fe enable_feature_binlog is false, skip case
test_ingest_binlog")
+ return
+ }
def tableName = "tbl_ingest_binlog"
def insert_num = 5
def test_num = 0
diff --git a/regression-test/suites/ccr_syncer_p0/test_multi_buckets.groovy
b/regression-test/suites/ccr_syncer_p0/test_multi_buckets.groovy
index 04dbf8e827..a353015c58 100644
--- a/regression-test/suites/ccr_syncer_p0/test_multi_buckets.groovy
+++ b/regression-test/suites/ccr_syncer_p0/test_multi_buckets.groovy
@@ -18,6 +18,10 @@
suite("test_multi_buckets") {
def syncer = getSyncer()
+ if (!syncer.checkEnableFeatureBinlog()) {
+ logger.info("fe enable_feature_binlog is false, skip case
test_multi_buckets")
+ return
+ }
def tableName = "tbl_multi_buckets"
def test_num = 0
def insert_num = 5
diff --git a/regression-test/suites/ccr_syncer_p0/test_txn_case.groovy
b/regression-test/suites/ccr_syncer_p0/test_txn_case.groovy
index 85c26007f0..72593c4a63 100644
--- a/regression-test/suites/ccr_syncer_p0/test_txn_case.groovy
+++ b/regression-test/suites/ccr_syncer_p0/test_txn_case.groovy
@@ -39,6 +39,10 @@ suite("test_txn_case") {
}
def syncer = getSyncer()
+ if (!syncer.checkEnableFeatureBinlog()) {
+ logger.info("fe enable_feature_binlog is false, skip case
test_txn_case")
+ return
+ }
def txnTableName = "tbl_txn_case"
def test_num = 0
sql "DROP TABLE IF EXISTS ${txnTableName}"
diff --git a/regression-test/suites/ccr_syncer_p1/test_backup_restore.groovy
b/regression-test/suites/ccr_syncer_p1/test_backup_restore.groovy
index 0d37a4b832..b0b8034750 100644
--- a/regression-test/suites/ccr_syncer_p1/test_backup_restore.groovy
+++ b/regression-test/suites/ccr_syncer_p1/test_backup_restore.groovy
@@ -18,6 +18,10 @@
suite("test_backup_restore") {
def syncer = getSyncer()
+ if (!syncer.checkEnableFeatureBinlog()) {
+ logger.info("fe enable_feature_binlog is false, skip case
test_backup_restore")
+ return
+ }
def tableName = "tbl_backup_restore"
def test_num = 0
def insert_num = 5
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
