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 9dd5f647bb80568b007301a066a46e56d78e0048
Author: deadlinefen <deadline...@bupt.edu.cn>
AuthorDate: Sat Oct 14 22:28:59 2023 +0800
Fix a naming conflict in ccr regression test (#25436)
---
.../test_create_table_with_binlog_config.groovy | 40 +++++++++++-----------
.../ccr_mow_syncer_p0/test_get_binlog.groovy | 4 +--
.../test_create_table_with_binlog_config.groovy | 2 +-
.../suites/ccr_syncer_p0/test_get_binlog.groovy | 4 +--
4 files changed, 25 insertions(+), 25 deletions(-)
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 7f8fc5e7ce3..b847b2d02a2 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
@@ -21,73 +21,73 @@ suite("test_mow_create_table_with_binlog_config") {
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 "drop database if exists test_mow_table_binlog"
sql """
- create database test_table_binlog
+ create database test_mow_table_binlog
"""
- result = sql "show create database test_table_binlog"
+ def result = sql "show create database test_mow_table_binlog"
logger.info("${result}")
// Case 1: database disable binlog, create table with binlog disable
sql """
- CREATE TABLE test_table_binlog.t1 ( k1 INT ) ENGINE = olap UNIQUE
KEY(k1) DISTRIBUTED BY HASH(k1) BUCKETS 3 PROPERTIES (
"enable_unique_key_merge_on_write" = "true", "replication_num" = "1",
"binlog.enable" = "false" );
+ CREATE TABLE test_mow_table_binlog.t1 ( k1 INT ) ENGINE = olap UNIQUE
KEY(k1) DISTRIBUTED BY HASH(k1) BUCKETS 3 PROPERTIES (
"enable_unique_key_merge_on_write" = "true", "replication_num" = "1",
"binlog.enable" = "false" );
"""
- result = sql "show create table test_table_binlog.t1"
+ result = sql "show create table test_mow_table_binlog.t1"
logger.info("${result}")
assertTrue(result.toString().containsIgnoreCase('"binlog.enable" =
"false"'))
sql """
- drop table if exists test_table_binlog.t1
+ drop table if exists test_mow_table_binlog.t1
"""
// Case 2: database disable binlog, create table with binlog enable
sql """
- CREATE TABLE test_table_binlog.t1 ( k1 INT ) ENGINE = olap UNIQUE
KEY(k1) DISTRIBUTED BY HASH(k1) BUCKETS 3 PROPERTIES (
"enable_unique_key_merge_on_write" = "true", "replication_num" = "1",
"binlog.enable" = "true" );
+ CREATE TABLE test_mow_table_binlog.t1 ( k1 INT ) ENGINE = olap UNIQUE
KEY(k1) DISTRIBUTED BY HASH(k1) BUCKETS 3 PROPERTIES (
"enable_unique_key_merge_on_write" = "true", "replication_num" = "1",
"binlog.enable" = "true" );
"""
- result = sql "show create table test_table_binlog.t1"
+ result = sql "show create table test_mow_table_binlog.t1"
logger.info("${result}")
assertTrue(result.toString().containsIgnoreCase('"binlog.enable" =
"true"'))
sql """
- drop table if exists test_table_binlog.t1
+ drop table if exists test_mow_table_binlog.t1
"""
// Case 3: database enable binlog, create table with binlog disable
sql """
- alter database test_table_binlog set properties ("binlog.enable" =
"true")
+ alter database test_mow_table_binlog set properties ("binlog.enable" =
"true")
"""
assertThrows(Exception.class, {
sql """
- CREATE TABLE test_table_binlog.t1 ( k1 INT ) ENGINE = olap UNIQUE
KEY(k1) DISTRIBUTED BY HASH(k1) BUCKETS 3 PROPERTIES (
"enable_unique_key_merge_on_write" = "true", "replication_num" = "1",
"binlog.enable" = "false" );
+ CREATE TABLE test_mow_table_binlog.t1 ( k1 INT ) ENGINE = olap
UNIQUE KEY(k1) DISTRIBUTED BY HASH(k1) BUCKETS 3 PROPERTIES (
"enable_unique_key_merge_on_write" = "true", "replication_num" = "1",
"binlog.enable" = "false" );
"""
})
sql """
- drop table if exists test_table_binlog.t1
+ drop table if exists test_mow_table_binlog.t1
"""
// Case 4: database enable binlog, create table with binlog enable
sql """
- alter database test_table_binlog set properties ("binlog.enable" =
"true")
+ alter database test_mow_table_binlog set properties ("binlog.enable" =
"true")
"""
sql """
- CREATE TABLE test_table_binlog.t1 ( k1 INT ) ENGINE = olap UNIQUE
KEY(k1) DISTRIBUTED BY HASH(k1) BUCKETS 3 PROPERTIES (
"enable_unique_key_merge_on_write" = "true", "replication_num" = "1",
"binlog.enable" = "true" );
+ CREATE TABLE test_mow_table_binlog.t1 ( k1 INT ) ENGINE = olap UNIQUE
KEY(k1) DISTRIBUTED BY HASH(k1) BUCKETS 3 PROPERTIES (
"enable_unique_key_merge_on_write" = "true", "replication_num" = "1",
"binlog.enable" = "true" );
"""
- result = sql "show create table test_table_binlog.t1"
+ result = sql "show create table test_mow_table_binlog.t1"
logger.info("${result}")
assertTrue(result.toString().containsIgnoreCase('"binlog.enable" =
"true"'))
sql """
- drop table if exists test_table_binlog.t1
+ drop table if exists test_mow_table_binlog.t1
"""
// Case 5: database enable binlog, create table inherit database binlog
config
sql """
- CREATE TABLE test_table_binlog.t1 ( k1 INT ) ENGINE = olap UNIQUE
KEY(k1) DISTRIBUTED BY HASH(k1) BUCKETS 3 PROPERTIES (
"enable_unique_key_merge_on_write" = "true", "replication_num" = "1" );
+ CREATE TABLE test_mow_table_binlog.t1 ( k1 INT ) ENGINE = olap UNIQUE
KEY(k1) DISTRIBUTED BY HASH(k1) BUCKETS 3 PROPERTIES (
"enable_unique_key_merge_on_write" = "true", "replication_num" = "1" );
"""
- result = sql "show create table test_table_binlog.t1"
+ result = sql "show create table test_mow_table_binlog.t1"
logger.info("${result}")
assertTrue(result.toString().containsIgnoreCase('"binlog.enable" =
"true"'))
sql """
- drop table if exists test_table_binlog.t1
+ drop table if exists test_mow_table_binlog.t1
"""
- sql "drop database if exists test_table_binlog"
+ sql "drop database if exists test_mow_table_binlog"
}
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 cd93bd7dc0d..62ba97551f6 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
@@ -113,8 +113,8 @@ suite("test_mow_get_binlog_case") {
logger.info("=== Test 3.2: no priv user get binlog case ===")
syncer.context.seq = -1
- noPrivUser = "no_priv_user0"
- emptyTable = "tbl_empty_test"
+ def noPrivUser = "no_priv_mow_user0"
+ def emptyTable = "tbl_mow_empty_test"
sql "DROP TABLE IF EXISTS ${emptyTable}"
sql """
CREATE TABLE if NOT EXISTS ${emptyTable}
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 4988b8bba9b..9d276646865 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
@@ -26,7 +26,7 @@ suite("test_create_table_with_binlog_config") {
sql """
create database test_table_binlog
"""
- result = sql "show create database test_table_binlog"
+ def result = sql "show create database test_table_binlog"
logger.info("${result}")
// Case 1: database disable binlog, create table with binlog disable
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 2750e9f87d0..be835801bc0 100644
--- a/regression-test/suites/ccr_syncer_p0/test_get_binlog.groovy
+++ b/regression-test/suites/ccr_syncer_p0/test_get_binlog.groovy
@@ -112,8 +112,8 @@ suite("test_get_binlog_case") {
logger.info("=== Test 3.2: no priv user get binlog case ===")
syncer.context.seq = -1
- noPrivUser = "no_priv_user2"
- emptyTable = "tbl_empty_test"
+ def noPrivUser = "no_priv_user2"
+ def emptyTable = "tbl_empty_test"
sql "DROP TABLE IF EXISTS ${emptyTable}"
sql """
CREATE TABLE if NOT EXISTS ${emptyTable}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
