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 075cb92e7fa [misc](regression) adjust doc case for unique.md (#43290)
075cb92e7fa is described below
commit 075cb92e7fad840520381434b2000849d63d1338
Author: zhannngchen <48427519+zhannngc...@users.noreply.github.com>
AuthorDate: Wed Nov 6 19:17:19 2024 +0800
[misc](regression) adjust doc case for unique.md (#43290)
### What problem does this PR solve?
Since the document is updated, we should update the case as well
<!--
If there are related issues, please fill in the issue number.
- If you want the issue to be closed after the PR is merged, please use
"close #12345". Otherwise, use "ref #12345"
-->
Issue Number: close #xxx
<!--
If this PR is followup a preivous PR, for example, fix the bug that
introduced by a related PR,
link the PR here
-->
Related PR: https://github.com/apache/doris-website/pull/1288
Problem Summary:
### Check List (For Committer)
- Test <!-- At least one of them must be included. -->
- [x] Regression test
- [ ] Unit Test
- [ ] Manual test (add detailed scripts or steps below)
- [ ] No need to test or manual test. Explain why:
- [ ] This is a refactor/code format and no logic has been changed.
- [ ] Previous test can cover this change.
- [ ] No colde files have been changed.
- [ ] Other reason <!-- Add your reason? -->
- Behavior changed:
- [x] No.
- [ ] Yes. <!-- Explain the behavior change -->
- Does this need documentation?
- [x] No.
- [ ] Yes. <!-- Add document PR link here. eg:
https://github.com/apache/doris-website/pull/1214 -->
- Release note
<!-- bugfix, feat, behavior changed need a release note -->
<!-- Add one line release note for this PR. -->
None
### Check List (For Reviewer who merge this PR)
- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR
should merge into -->
---------
Co-authored-by: Chen Zhang <zhangc...@selectdb.com>
---
regression-test/pipeline/p0/conf/fe.conf | 2 ++
.../suites/doc/table-design/data-model/unique.md.groovy | 13 +++++++------
.../dynamic_partition/test_dynamic_partition.groovy | 6 ++++++
3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/regression-test/pipeline/p0/conf/fe.conf
b/regression-test/pipeline/p0/conf/fe.conf
index 625012f9a65..c31db3d9026 100644
--- a/regression-test/pipeline/p0/conf/fe.conf
+++ b/regression-test/pipeline/p0/conf/fe.conf
@@ -83,3 +83,5 @@ enable_advance_next_id = true
# enable deadlock detection
enable_deadlock_detection = true
max_lock_hold_threshold_seconds = 10
+
+force_olap_table_replication_allocation=tag.location.default:1
diff --git
a/regression-test/suites/doc/table-design/data-model/unique.md.groovy
b/regression-test/suites/doc/table-design/data-model/unique.md.groovy
index 7c5e7783b06..bceb684454b 100644
--- a/regression-test/suites/doc/table-design/data-model/unique.md.groovy
+++ b/regression-test/suites/doc/table-design/data-model/unique.md.groovy
@@ -32,14 +32,15 @@ suite("docs/table-design/data-model/unique.md") {
`register_time` DATETIME COMMENT "用户注册时间"
)
UNIQUE KEY(`user_id`, `username`)
- DISTRIBUTED BY HASH(`user_id`) BUCKETS 1
+ DISTRIBUTED BY HASH(`user_id`) BUCKETS 10
PROPERTIES (
- "replication_allocation" = "tag.location.default: 1"
+ "replication_allocation" = "tag.location.default: 3"
);
"""
multi_sql """
- CREATE TABLE IF NOT EXISTS example_tbl_unique_merge_on_write
+ DROP TABLE example_tbl_unique;
+ CREATE TABLE IF NOT EXISTS example_tbl_unique
(
`user_id` LARGEINT NOT NULL COMMENT "用户id",
`username` VARCHAR(50) NOT NULL COMMENT "用户昵称",
@@ -51,10 +52,10 @@ suite("docs/table-design/data-model/unique.md") {
`register_time` DATETIME COMMENT "用户注册时间"
)
UNIQUE KEY(`user_id`, `username`)
- DISTRIBUTED BY HASH(`user_id`) BUCKETS 1
+ DISTRIBUTED BY HASH(`user_id`) BUCKETS 10
PROPERTIES (
- "replication_allocation" = "tag.location.default: 1",
- "enable_unique_key_merge_on_write" = "true"
+ "replication_allocation" = "tag.location.default: 3",
+ "enable_unique_key_merge_on_write" = "false"
);
"""
} catch (Throwable t) {
diff --git
a/regression-test/suites/partition_p0/dynamic_partition/test_dynamic_partition.groovy
b/regression-test/suites/partition_p0/dynamic_partition/test_dynamic_partition.groovy
index a4b3eb66176..cbd58007e6c 100644
---
a/regression-test/suites/partition_p0/dynamic_partition/test_dynamic_partition.groovy
+++
b/regression-test/suites/partition_p0/dynamic_partition/test_dynamic_partition.groovy
@@ -15,6 +15,9 @@
// specific language governing permissions and limitations
// under the License.
suite("test_dynamic_partition") {
+ config_row = sql """ ADMIN SHOW FRONTEND CONFIG LIKE
'force_olap_table_replication_allocation'; """
+ String old_conf_value = config_row[0][1]
+ sql """ ADMIN SET FRONTEND CONFIG
("force_olap_table_replication_allocation" = ""); """
// todo: test dynamic partition
sql "drop table if exists dy_par"
sql """
@@ -158,4 +161,7 @@ suite("test_dynamic_partition") {
}
}
sql "drop table if exists dy_par_bad"
+
+ // restore force_olap_table_replication_allocation to old_value
+ sql """ ADMIN SET FRONTEND CONFIG
("force_olap_table_replication_allocation" = "${old_conf_value}"); """
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
