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 1d7163ddabd [fix](regression-test) Revome "UNIQUE KEY (k1)" case for
test_dynamic_partition_mod_distribution_key (#41002)
1d7163ddabd is described below
commit 1d7163ddabdb59165d9001261ddda0a6f7f79d68
Author: Siyang Tang <82279870+tangsiyang2...@users.noreply.github.com>
AuthorDate: Tue Oct 22 19:22:53 2024 +0800
[fix](regression-test) Revome "UNIQUE KEY (k1)" case for
test_dynamic_partition_mod_distribution_key (#41002)
## Proposed changes
1. Remove "UNIQUE KEY (k1)" case, because for unique table hash column
must be key column, but for that historical bugs, this case will fail if
adding k2 unique key.
2. Seperate a p0 suite from docker suite because docker suite will not
be triggered in community doris p0 CI.
---
...t_dynamic_partition_mod_distribution_key.groovy | 92 ++++++++++------------
..._partition_mod_distribution_key_restart.groovy} | 11 ++-
2 files changed, 49 insertions(+), 54 deletions(-)
diff --git
a/regression-test/suites/partition_p0/dynamic_partition/test_dynamic_partition_mod_distribution_key.groovy
b/regression-test/suites/partition_p0/dynamic_partition/test_dynamic_partition_mod_distribution_key.groovy
index 51ddf0ef853..e3bef5fce10 100644
---
a/regression-test/suites/partition_p0/dynamic_partition/test_dynamic_partition_mod_distribution_key.groovy
+++
b/regression-test/suites/partition_p0/dynamic_partition/test_dynamic_partition_mod_distribution_key.groovy
@@ -15,61 +15,53 @@
// specific language governing permissions and limitations
// under the License.
-
-import org.apache.doris.regression.suite.ClusterOptions
-
suite("test_dynamic_partition_mod_distribution_key", "docker") {
- def options = new ClusterOptions()
- options.setFeNum(2)
- docker(options) {
- // FIXME: for historical bugs, this case will fail if adding k2 as dup
key or unique key
- // see in https://github.com/apache/doris/issues/39798
- def keys = ["DUPLICATE KEY (k1)", "UNIQUE KEY (k1)", "AGGREGATE KEY
(k1, k2)"]
- def aggTypes = ["", "", "REPLACE"]
- for (i in 0..<3) {
- def key = keys.get(i)
- def aggType = aggTypes.get(i)
- def tableName = "test_dynamic_partition_mod_distribution_key"
- sql """ DROP TABLE IF EXISTS ${tableName} """
-
- sql """
- CREATE TABLE IF NOT EXISTS ${tableName} (
- k1 DATE NOT NULL,
- k2 VARCHAR(20) NOT NULL,
- v INT ${aggType}
- ) ${key}
- PARTITION BY RANGE(k1) ()
- DISTRIBUTED BY HASH(k1, k2) BUCKETS 1
- PROPERTIES (
- "dynamic_partition.enable"="true",
- "dynamic_partition.end"="3",
- "dynamic_partition.buckets"="1",
- "dynamic_partition.start"="-3",
- "dynamic_partition.prefix"="p",
- "dynamic_partition.time_unit"="DAY",
- "dynamic_partition.create_history_partition"="true",
- "dynamic_partition.replication_allocation" =
"tag.location.default: 1")
- """
+ // FIXME: for historical bugs, this case will fail if adding k2 as dup key
or unique key
+ // see in https://github.com/apache/doris/issues/39798
+ //
+ // do not add "UNIQUE KEY (k1)" case here because for unique table hash
column must be key column
+ // but for that historical bugs, this case will fail if adding k2 unique
key
+ def keys = ["DUPLICATE KEY (k1)", "AGGREGATE KEY (k1, k2)"]
+ def aggTypes = ["", "REPLACE"]
+ for (i in 0..<2) {
+ def key = keys.get(i)
+ def aggType = aggTypes.get(i)
+ def tableName = "test_dynamic_partition_mod_distribution_key"
+ sql """ DROP TABLE IF EXISTS ${tableName} """
- sql """ alter table ${tableName} modify column k1 comment
'new_comment_for_k1' """
- sql """ alter table ${tableName} modify column k2 varchar(255) """
+ sql """
+ CREATE TABLE IF NOT EXISTS ${tableName} (
+ k1 DATE NOT NULL,
+ k2 VARCHAR(20) NOT NULL,
+ v INT ${aggType}
+ ) ${key}
+ PARTITION BY RANGE(k1) ()
+ DISTRIBUTED BY HASH(k1, k2) BUCKETS 1
+ PROPERTIES (
+ "dynamic_partition.enable"="true",
+ "dynamic_partition.end"="3",
+ "dynamic_partition.buckets"="1",
+ "dynamic_partition.start"="-3",
+ "dynamic_partition.prefix"="p",
+ "dynamic_partition.time_unit"="DAY",
+ "dynamic_partition.create_history_partition"="true",
+ "dynamic_partition.replication_allocation" =
"tag.location.default: 1")
+ """
- cluster.restartFrontends()
- sleep(30000)
- context.reconnectFe()
+ sql """ alter table ${tableName} modify column k1 comment
'new_comment_for_k1' """
+ sql """ alter table ${tableName} modify column k2 varchar(255) """
- sql """ ADMIN SET FRONTEND CONFIG
('dynamic_partition_check_interval_seconds' = '1') """
- sql """ alter table ${tableName} set('dynamic_partition.end'='5')
"""
- result = sql "show partitions from ${tableName}"
- for (def retry = 0; retry < 10; retry++) { // at most wait 120s
- if (result.size() == 9) {
- break;
- }
- logger.info("wait dynamic partition scheduler, sleep 1s")
- sleep(1000) // sleep 1s
- result = sql "show partitions from ${tableName}"
+ sql """ ADMIN SET FRONTEND CONFIG
('dynamic_partition_check_interval_seconds' = '1') """
+ sql """ alter table ${tableName} set('dynamic_partition.end'='5') """
+ result = sql "show partitions from ${tableName}"
+ for (def retry = 0; retry < 10; retry++) { // at most wait 120s
+ if (result.size() == 9) {
+ break;
}
- assertEquals(9, result.size())
+ logger.info("wait dynamic partition scheduler, sleep 1s")
+ sleep(1000) // sleep 1s
+ result = sql "show partitions from ${tableName}"
}
+ assertEquals(9, result.size())
}
}
diff --git
a/regression-test/suites/partition_p0/dynamic_partition/test_dynamic_partition_mod_distribution_key.groovy
b/regression-test/suites/partition_p0/dynamic_partition/test_dynamic_partition_mod_distribution_key_restart.groovy
similarity index 88%
copy from
regression-test/suites/partition_p0/dynamic_partition/test_dynamic_partition_mod_distribution_key.groovy
copy to
regression-test/suites/partition_p0/dynamic_partition/test_dynamic_partition_mod_distribution_key_restart.groovy
index 51ddf0ef853..d31b26758e0 100644
---
a/regression-test/suites/partition_p0/dynamic_partition/test_dynamic_partition_mod_distribution_key.groovy
+++
b/regression-test/suites/partition_p0/dynamic_partition/test_dynamic_partition_mod_distribution_key_restart.groovy
@@ -18,15 +18,18 @@
import org.apache.doris.regression.suite.ClusterOptions
-suite("test_dynamic_partition_mod_distribution_key", "docker") {
+suite("test_dynamic_partition_mod_distribution_key_restart", "docker") {
def options = new ClusterOptions()
options.setFeNum(2)
docker(options) {
// FIXME: for historical bugs, this case will fail if adding k2 as dup
key or unique key
// see in https://github.com/apache/doris/issues/39798
- def keys = ["DUPLICATE KEY (k1)", "UNIQUE KEY (k1)", "AGGREGATE KEY
(k1, k2)"]
- def aggTypes = ["", "", "REPLACE"]
- for (i in 0..<3) {
+ //
+ // do not add "UNIQUE KEY (k1)" case here because for unique table
hash column must be key column
+ // but for that historical bugs, this case will fail if adding k2
unique key
+ def keys = ["DUPLICATE KEY (k1)", "AGGREGATE KEY (k1, k2)"]
+ def aggTypes = ["", "REPLACE"]
+ for (i in 0..<2) {
def key = keys.get(i)
def aggType = aggTypes.get(i)
def tableName = "test_dynamic_partition_mod_distribution_key"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
