This is an automated email from the ASF dual-hosted git repository.
dataroaring 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 5c36328b100 [fix](case) fix some cluster key case (#44674)
5c36328b100 is described below
commit 5c36328b1008dd306e6caa80a67e7071ab8427c4
Author: meiyi <[email protected]>
AuthorDate: Thu Nov 28 14:15:39 2024 +0800
[fix](case) fix some cluster key case (#44674)
---
.../org/apache/doris/regression/Config.groovy | 29 +++++++-
.../org/apache/doris/regression/suite/Suite.groovy | 4 ++
.../suites/insert_p0/transaction/txn_insert.groovy | 2 +-
.../suites/nereids_function_p0/load.groovy | 5 +-
.../test_col_data_type_boundary.groovy | 79 ++++++++++++++++++----
.../point_query_p0/test_point_query_ck.groovy | 5 +-
...artial_update_insert_light_schema_change.groovy | 3 +
...test_partial_update_insert_schema_change.groovy | 3 +
.../test_partial_update_schema_change.groovy | 3 +
...t_partial_update_schema_change_row_store.groovy | 3 +
.../test_partial_update_seq_col.groovy | 3 +
.../test_partial_update_seq_col_delete.groovy | 3 +
.../test_partial_update_seq_type.groovy | 3 +
.../test_partial_update_seq_type_delete.groovy | 3 +
.../test_partial_update_strict_mode.groovy | 3 +
.../test_partial_update_upsert.groovy | 3 +
.../test_partial_update_with_inverted_index.groovy | 3 +
.../test_partial_update_with_row_column.groovy | 4 ++
.../test_update_on_current_timestamp.groovy | 4 ++
.../unique_with_mow_c_p0/test_create_table.groovy | 4 ++
.../test_schema_change_ck.groovy | 6 +-
21 files changed, 152 insertions(+), 23 deletions(-)
diff --git
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy
index 7b0d24482a2..5aa6d7ce7e7 100644
---
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy
+++
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/Config.groovy
@@ -524,7 +524,7 @@ class Config {
// docker suite no need external cluster.
// so can ignore error here.
}
-
+ config.excludeUnsupportedCase()
return config
}
@@ -1008,6 +1008,33 @@ class Config {
}
}
+ boolean isClusterKeyEnabled() {
+ try {
+ def result = JdbcUtils.executeToMapArray(getRootConnection(),
"SHOW FRONTEND CONFIG LIKE 'random_add_cluster_keys_for_mow'")
+ log.info("show random_add_cluster_keys_for_mow config:
${result}".toString())
+ return result[0].Value.toString().equalsIgnoreCase("true")
+ } catch (Throwable t) {
+ log.warn("Fetch server config 'random_add_cluster_keys_for_mow'
failed, jdbcUrl: ${jdbcUrl}".toString(), t)
+ return false
+ }
+ }
+
+ void excludeUnsupportedCase() {
+ boolean isCKEnabled = isClusterKeyEnabled()
+ log.info("random_add_cluster_keys_for_mow in fe.conf:
${isCKEnabled}".toString())
+ if (isCKEnabled) {
+ excludeDirectorySet.add("unique_with_mow_p0/partial_update")
+ excludeDirectorySet.add("unique_with_mow_p0/flexible")
+ excludeDirectorySet.add("doc")
+ List<String> excludeCases = ["test_table_properties",
"test_default_hll", "test_default_pi", "test_full_compaction",
"test_full_compaction_by_table_id", "test_create_table", "txn_insert",
"test_update_mow", "test_new_update", "test_update_unique",
"test_partial_update_generated_column",
"nereids_partial_update_native_insert_stmt", "partial_update",
"nereids_update_on_current_timestamp", "update_on_current_timestamp",
"test_default_bitmap_empty", "nereids_delete_mow_partial_up [...]
+ for (def excludeCase in excludeCases) {
+ excludeSuiteWildcard.add(excludeCase)
+ }
+ log.info("excludeDirectorySet: ${excludeDirectorySet}".toString())
+ log.info("excludeSuiteWildcard:
${excludeSuiteWildcard}".toString())
+ }
+ }
+
Connection getConnection() {
return DriverManager.getConnection(jdbcUrl, jdbcUser, jdbcPassword)
}
diff --git
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
index bd16342268f..2a5ba5acc41 100644
---
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
+++
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
@@ -1641,6 +1641,10 @@ class Suite implements GroovyInterceptable {
}
}
+ boolean isClusterKeyEnabled() {
+ return getFeConfig("random_add_cluster_keys_for_mow").equals("true")
+ }
+
boolean enableStoragevault() {
if (Strings.isNullOrEmpty(context.config.metaServiceHttpAddress)
|| Strings.isNullOrEmpty(context.config.instanceId)
diff --git a/regression-test/suites/insert_p0/transaction/txn_insert.groovy
b/regression-test/suites/insert_p0/transaction/txn_insert.groovy
index a4868ca6b11..b54fc66e714 100644
--- a/regression-test/suites/insert_p0/transaction/txn_insert.groovy
+++ b/regression-test/suites/insert_p0/transaction/txn_insert.groovy
@@ -717,7 +717,7 @@ suite("txn_insert") {
}
// 18. column update(mow table)
- if (use_nereids_planner) {
+ if (use_nereids_planner && !isClusterKeyEnabled()) {
def unique_table = "txn_insert_cu"
for (def i in 0..3) {
sql """ drop table if exists ${unique_table}_${i} """
diff --git a/regression-test/suites/nereids_function_p0/load.groovy
b/regression-test/suites/nereids_function_p0/load.groovy
index d4aeea53041..2777774449e 100644
--- a/regression-test/suites/nereids_function_p0/load.groovy
+++ b/regression-test/suites/nereids_function_p0/load.groovy
@@ -155,6 +155,7 @@ suite("load") {
}
}
+ if (!isClusterKeyEnabled()) {
// test fn_test_ip_nullable_rowstore table with update action
sql "update fn_test_ip_nullable_rowstore set ip4 = '' where id = 1;"
sql_res = sql "select * from fn_test_ip_nullable_rowstore where id = 1;"
@@ -169,6 +170,7 @@ suite("load") {
sql "update fn_test_ip_nullable_rowstore set ip6 = '::1' where id = 1;"
sql_res = sql "select * from fn_test_ip_nullable_rowstore where id = 1;"
assertEquals(sql_res[0].toString(), '[1, 127.0.0.1, ::1, "127.0.0.1",
"::1"]')
+ }
streamLoad {
table "fn_test_ip_not_nullable"
@@ -218,6 +220,7 @@ suite("load") {
}
}
+ if (!isClusterKeyEnabled()) {
// test fn_test_ip_not_nullable_rowstore table with update action
// not null will throw exception if we has data in table
test {
@@ -237,7 +240,7 @@ suite("load") {
sql "update fn_test_ip_not_nullable_rowstore set ip6 = '::2' where id = 1;"
sql_res1 = sql "select * from fn_test_ip_not_nullable_rowstore where id =
1;"
assertEquals(sql_res1[0].toString(), '[1, 192.10.10.1, ::2, "127.0.0.1",
"::1"]')
-
+ }
// make some normal ipv4/ipv6 data for sql function , which is increased
one by one
// 29-50 A 类地址 ; 51-68 B 类地址 ; 69-87 C 类地址 ; 88-100 D 类地址
diff --git
a/regression-test/suites/partition_p0/auto_partition/test_col_data_type_boundary.groovy
b/regression-test/suites/partition_p0/auto_partition/test_col_data_type_boundary.groovy
index 47fe118860e..65098e0fd23 100644
---
a/regression-test/suites/partition_p0/auto_partition/test_col_data_type_boundary.groovy
+++
b/regression-test/suites/partition_p0/auto_partition/test_col_data_type_boundary.groovy
@@ -68,7 +68,11 @@ suite("test_col_data_type_boundary") {
sql """alter table table_tinyint modify column c_tinyint largeint
key;"""
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Can not modify partition column"))
+ if (isClusterKeyEnabled()) {
+ assertTrue(e.getMessage().contains("Can not modify "))
+ } else {
+ assertTrue(e.getMessage().contains("Can not modify partition
column"))
+ }
}
sql """drop table if exists table_smallint"""
@@ -97,7 +101,11 @@ suite("test_col_data_type_boundary") {
sql """alter table table_smallint modify column c_smallint largeint
key;"""
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Can not modify partition column"))
+ if (isClusterKeyEnabled()) {
+ assertTrue(e.getMessage().contains("Can not modify "))
+ } else {
+ assertTrue(e.getMessage().contains("Can not modify partition
column"))
+ }
}
sql """drop table if exists table_int"""
@@ -126,7 +134,11 @@ suite("test_col_data_type_boundary") {
sql """alter table table_int modify column c_int largeint key;"""
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Can not modify partition column"))
+ if (isClusterKeyEnabled()) {
+ assertTrue(e.getMessage().contains("Can not modify "))
+ } else {
+ assertTrue(e.getMessage().contains("Can not modify partition
column"))
+ }
}
sql """drop table if exists table_bigint"""
@@ -155,7 +167,11 @@ suite("test_col_data_type_boundary") {
sql """alter table table_bigint modify column c_bigint largeint key;"""
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Can not modify partition column"))
+ if (isClusterKeyEnabled()) {
+ assertTrue(e.getMessage().contains("Can not modify "))
+ } else {
+ assertTrue(e.getMessage().contains("Can not modify partition
column"))
+ }
}
sql """drop table if exists table_largeint"""
@@ -225,7 +241,11 @@ suite("test_col_data_type_boundary") {
sql """alter table table_date_range modify column c_date datetime
key;"""
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Can not modify partition column"))
+ if (isClusterKeyEnabled()) {
+ assertTrue(e.getMessage().contains("Can not modify "))
+ } else {
+ assertTrue(e.getMessage().contains("Can not modify partition
column"))
+ }
}
@@ -249,7 +269,11 @@ suite("test_col_data_type_boundary") {
sql """alter table table_date_list modify column c_date datetime
key;"""
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Can not modify partition column"))
+ if (isClusterKeyEnabled()) {
+ assertTrue(e.getMessage().contains("Can not modify "))
+ } else {
+ assertTrue(e.getMessage().contains("Can not modify partition
column"))
+ }
}
sql """drop table if exists table_datetime_range"""
@@ -274,7 +298,11 @@ suite("test_col_data_type_boundary") {
sql """alter table table_datetime_range modify column c_datetime date
key;"""
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Can not modify partition column"))
+ if (isClusterKeyEnabled()) {
+ assertTrue(e.getMessage().contains("Can not modify "))
+ } else {
+ assertTrue(e.getMessage().contains("Can not modify partition
column"))
+ }
}
sql """drop table if exists table_datetime_list"""
@@ -299,7 +327,11 @@ suite("test_col_data_type_boundary") {
sql """alter table table_datetime_list modify column c_datetime date
key;"""
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Can not modify partition column"))
+ if (isClusterKeyEnabled()) {
+ assertTrue(e.getMessage().contains("Can not modify "))
+ } else {
+ assertTrue(e.getMessage().contains("Can not modify partition
column"))
+ }
}
@@ -323,7 +355,11 @@ suite("test_col_data_type_boundary") {
sql """alter table table_char modify column c_char varchar key;"""
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Can not modify partition column"))
+ if (isClusterKeyEnabled()) {
+ assertTrue(e.getMessage().contains("Can not modify "))
+ } else {
+ assertTrue(e.getMessage().contains("Can not modify partition
column"))
+ }
}
@@ -347,7 +383,11 @@ suite("test_col_data_type_boundary") {
sql """alter table table_varchar modify column c_varchar date key;"""
} catch (Exception e) {
log.info(e.getMessage())
- assertTrue(e.getMessage().contains("Can not modify partition column"))
+ if (isClusterKeyEnabled()) {
+ assertTrue(e.getMessage().contains("Can not modify "))
+ } else {
+ assertTrue(e.getMessage().contains("Can not modify partition
column"))
+ }
}
@@ -371,10 +411,19 @@ suite("test_col_data_type_boundary") {
assertEquals(select_rows[0][0], 3)
assertEquals(partitions_res1.size(), 2)
- sql """alter table table_datetime_range modify column c_int largeint;"""
- partitions_res1 = sql """show partitions from table_datetime_range order
by PartitionId;"""
- select_rows = sql """select count() from table_datetime_range;"""
- assertEquals(select_rows[0][0], 3)
- assertEquals(partitions_res1.size(), 2)
+ try {
+ sql """alter table table_datetime_range modify column c_int
largeint;"""
+ partitions_res1 = sql """show partitions from table_datetime_range
order by PartitionId;"""
+ select_rows = sql """select count() from table_datetime_range;"""
+ assertEquals(select_rows[0][0], 3)
+ assertEquals(partitions_res1.size(), 2)
+ } catch (Exception e) {
+ log.info(e.getMessage())
+ if (isClusterKeyEnabled()) {
+ assertTrue(e.getMessage().contains("Can not modify "))
+ } else {
+ throw e
+ }
+ }
}
diff --git a/regression-test/suites/point_query_p0/test_point_query_ck.groovy
b/regression-test/suites/point_query_p0/test_point_query_ck.groovy
index 09cf644cb9a..33c31dc0970 100644
--- a/regression-test/suites/point_query_p0/test_point_query_ck.groovy
+++ b/regression-test/suites/point_query_p0/test_point_query_ck.groovy
@@ -202,7 +202,7 @@ suite("test_point_query_ck") {
qe_point_select stmt
qe_point_select stmt
// invalidate cache
- sql "sync"
+ // sql "sync"
nprep_sql """ INSERT INTO ${tableName} VALUES(1235,
120939.11130, "a ddd", "xxxxxx", "2030-01-02", "2020-01-01 12:36:38",
22.822, "7022-01-01 11:30:38", 0, 1929111.1111,[119291.19291], ["111", "222",
"333"], 2) """
qe_point_select stmt
qe_point_select stmt
@@ -218,9 +218,10 @@ suite("test_point_query_ck") {
qe_point_select stmt
qe_point_select stmt
- sql """
+ nprep_sql """
ALTER table ${tableName} ADD COLUMN new_column1 INT default
"0";
"""
+ sql "select 1"
qe_point_select stmt
}
// disable useServerPrepStmts
diff --git
a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_insert_light_schema_change.groovy
b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_insert_light_schema_change.groovy
index 33f71ab3076..cc6faa03dc0 100644
---
a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_insert_light_schema_change.groovy
+++
b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_insert_light_schema_change.groovy
@@ -19,6 +19,9 @@ import java.util.concurrent.TimeUnit
import org.awaitility.Awaitility
suite("test_partial_update_insert_light_schema_change", "p0") {
+ if (isClusterKeyEnabled()) {
+ return
+ }
String db = context.config.getDbNameByFile(context.file)
sql "select 1;" // to create database
diff --git
a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_insert_schema_change.groovy
b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_insert_schema_change.groovy
index 07740b9a09d..62140ac58bf 100644
---
a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_insert_schema_change.groovy
+++
b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_insert_schema_change.groovy
@@ -19,6 +19,9 @@ import java.util.concurrent.TimeUnit
import org.awaitility.Awaitility
suite("test_partial_update_insert_schema_change", "p0") {
+ if (isClusterKeyEnabled()) {
+ return
+ }
// ===== light schema change =====
// test add value column
diff --git
a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_schema_change.groovy
b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_schema_change.groovy
index c40e98f6bad..d2e27699524 100644
---
a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_schema_change.groovy
+++
b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_schema_change.groovy
@@ -19,6 +19,9 @@ import java.util.concurrent.TimeUnit
import org.awaitility.Awaitility
suite("test_partial_update_schema_change", "p0") {
+ if (isClusterKeyEnabled()) {
+ return
+ }
/* ============================================== light schema change
cases: ============================================== */
diff --git
a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_schema_change_row_store.groovy
b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_schema_change_row_store.groovy
index 72698530f0a..cffb682488a 100644
---
a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_schema_change_row_store.groovy
+++
b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_schema_change_row_store.groovy
@@ -19,6 +19,9 @@ import java.util.concurrent.TimeUnit
import org.awaitility.Awaitility
suite("test_partial_update_row_store_schema_change", "p0") {
+ if (isClusterKeyEnabled()) {
+ return
+ }
/* ============================================== light schema change
cases: ============================================== */
diff --git
a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_col.groovy
b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_col.groovy
index 111037ae18f..884882b7c93 100644
---
a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_col.groovy
+++
b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_col.groovy
@@ -17,6 +17,9 @@
// under the License.
suite("test_primary_key_partial_update_seq_col", "p0") {
+ if (isClusterKeyEnabled()) {
+ return
+ }
String db = context.config.getDbNameByFile(context.file)
sql "select 1;" // to create database
diff --git
a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_col_delete.groovy
b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_col_delete.groovy
index dca646948b4..b37cdc68525 100644
---
a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_col_delete.groovy
+++
b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_col_delete.groovy
@@ -17,6 +17,9 @@
// under the License.
suite("test_primary_key_partial_update_seq_col_delete", "p0") {
+ if (isClusterKeyEnabled()) {
+ return
+ }
String db = context.config.getDbNameByFile(context.file)
sql "select 1;" // to create database
diff --git
a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_type.groovy
b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_type.groovy
index d7d55725df6..3075faa0222 100644
---
a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_type.groovy
+++
b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_type.groovy
@@ -17,6 +17,9 @@
// under the License.
suite("test_primary_key_partial_update_seq_type", "p0") {
+ if (isClusterKeyEnabled()) {
+ return
+ }
String db = context.config.getDbNameByFile(context.file)
sql "select 1;" // to create database
diff --git
a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_type_delete.groovy
b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_type_delete.groovy
index 6ad60e0cd75..142feebef55 100644
---
a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_type_delete.groovy
+++
b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_seq_type_delete.groovy
@@ -17,6 +17,9 @@
// under the License.
suite("test_primary_key_partial_update_seq_type_delete", "p0") {
+ if (isClusterKeyEnabled()) {
+ return
+ }
String db = context.config.getDbNameByFile(context.file)
sql "select 1;" // to create database
diff --git
a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_strict_mode.groovy
b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_strict_mode.groovy
index fe47a5ebc89..313fc97d06b 100644
---
a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_strict_mode.groovy
+++
b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_strict_mode.groovy
@@ -17,6 +17,9 @@
// under the License.
suite("test_partial_update_strict_mode", "p0") {
+ if (isClusterKeyEnabled()) {
+ return
+ }
String db = context.config.getDbNameByFile(context.file)
sql "select 1;" // to create database
diff --git
a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_upsert.groovy
b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_upsert.groovy
index 5e4a02f5407..c8203cb0f9d 100644
---
a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_upsert.groovy
+++
b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_upsert.groovy
@@ -17,6 +17,9 @@
// under the License.
suite("test_partial_update_upsert", "p0") {
+ if (isClusterKeyEnabled()) {
+ return
+ }
String db = context.config.getDbNameByFile(context.file)
sql "select 1;" // to create database
diff --git
a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_with_inverted_index.groovy
b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_with_inverted_index.groovy
index f72160bb594..3395757d876 100644
---
a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_with_inverted_index.groovy
+++
b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_with_inverted_index.groovy
@@ -17,6 +17,9 @@
// under the License.
suite("test_partial_update_with_inverted_index", "p0") {
+ if (isClusterKeyEnabled()) {
+ return
+ }
String db = context.config.getDbNameByFile(context.file)
sql "select 1;" // to create database
diff --git
a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_with_row_column.groovy
b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_with_row_column.groovy
index 4b4de014b67..ea80d898ff1 100644
---
a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_with_row_column.groovy
+++
b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_partial_update_with_row_column.groovy
@@ -17,6 +17,10 @@
// under the License.
suite("test_primary_key_partial_update_with_row_column", "p0") {
+ if (isClusterKeyEnabled()) {
+ return
+ }
+
def tableName = "test_primary_key_partial_update_with_row_column"
// create table
diff --git
a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_update_on_current_timestamp.groovy
b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_update_on_current_timestamp.groovy
index 85f4f721273..794097ffa14 100644
---
a/regression-test/suites/unique_with_mow_c_p0/partial_update/test_update_on_current_timestamp.groovy
+++
b/regression-test/suites/unique_with_mow_c_p0/partial_update/test_update_on_current_timestamp.groovy
@@ -17,6 +17,10 @@
// under the License.
suite("test_mow_update_on_current_timestamp", "p0") {
+ if (isClusterKeyEnabled()) {
+ return
+ }
+
sql 'set experimental_enable_nereids_planner=true'
sql 'set enable_fallback_to_original_planner=false'
sql 'set enable_nereids_dml=true'
diff --git
a/regression-test/suites/unique_with_mow_c_p0/test_create_table.groovy
b/regression-test/suites/unique_with_mow_c_p0/test_create_table.groovy
index a7810c2a6c3..c8cb94904c3 100644
--- a/regression-test/suites/unique_with_mow_c_p0/test_create_table.groovy
+++ b/regression-test/suites/unique_with_mow_c_p0/test_create_table.groovy
@@ -16,6 +16,10 @@
// under the License.
suite("test_create_table") {
+ if (isClusterKeyEnabled()) {
+ return
+ }
+
def tableName = "cluster_key_test_create_table"
sql """ DROP TABLE IF EXISTS ${tableName} """
onFinish {
diff --git
a/regression-test/suites/unique_with_mow_c_p0/test_schema_change_ck.groovy
b/regression-test/suites/unique_with_mow_c_p0/test_schema_change_ck.groovy
index 09849d9fce2..fb59aabf05d 100644
--- a/regression-test/suites/unique_with_mow_c_p0/test_schema_change_ck.groovy
+++ b/regression-test/suites/unique_with_mow_c_p0/test_schema_change_ck.groovy
@@ -242,8 +242,8 @@ suite("test_schema_change_ck") {
order_qt_select_restore_roll2 """select k2, k1, c4, c3 from
${tableName};"""
// restore
- logger.info(""" RESTORE SNAPSHOT ${context.dbName}.${backup} FROM
`${repoName}` ON (`${tableName}`) PROPERTIES ("backup_timestamp" =
"${snapshot}","replication_num" = "1" ) """)
- sql """ RESTORE SNAPSHOT ${context.dbName}.${backup} FROM
`${repoName}` ON (`${tableName}`) PROPERTIES ("backup_timestamp" =
"${snapshot}","replication_num" = "1" ) """
+ logger.info(""" RESTORE SNAPSHOT ${context.dbName}.${backup} FROM
`${repoName}` ON (`${tableName}`) PROPERTIES ("backup_timestamp" =
"${snapshot}","reserve_replica" = "true" ) """)
+ sql """ RESTORE SNAPSHOT ${context.dbName}.${backup} FROM
`${repoName}` ON (`${tableName}`) PROPERTIES ("backup_timestamp" =
"${snapshot}","reserve_replica" = "true" ) """
syncer.waitAllRestoreFinish(context.dbName)
result = sql """ show tablets from ${tableName}; """
logger.info("tablets 1: ${result}")
@@ -255,7 +255,7 @@ suite("test_schema_change_ck") {
// restore
sql """ drop table ${tableName}; """
- sql """ RESTORE SNAPSHOT ${context.dbName}.${backup} FROM
`${repoName}` ON (`${tableName}`) PROPERTIES ("backup_timestamp" =
"${snapshot}","replication_num" = "1" ) """
+ sql """ RESTORE SNAPSHOT ${context.dbName}.${backup} FROM
`${repoName}` ON (`${tableName}`) PROPERTIES ("backup_timestamp" =
"${snapshot}","reserve_replica" = "true" ) """
syncer.waitAllRestoreFinish(context.dbName)
result = sql """ show tablets from ${tableName}; """
logger.info("tablets 2: ${result}")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
