You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by yi...@apache.org on 2022/06/19 10:17:06 UTC
[doris] branch master updated: [Improvement] delete deprefacte config in document and regression test (#10231)
This is an automated email from the ASF dual-hosted git repository.
yiguolei 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 e09066c7ee [Improvement] delete deprefacte config in document and regression test (#10231)
e09066c7ee is described below
commit e09066c7ee776dd91c649f86a400dc398c692704
Author: Gabriel <ga...@gmail.com>
AuthorDate: Sun Jun 19 18:16:59 2022 +0800
[Improvement] delete deprefacte config in document and regression test (#10231)
---
docs/en/docs/admin-manual/config/be-config.md | 6 ------
docs/zh-CN/docs/admin-manual/config/be-config.md | 6 ------
.../suites/compaction/test_compaction_agg_keys.groovy | 10 +---------
.../suites/compaction/test_compaction_dup_keys.groovy | 10 +---------
.../suites/compaction/test_compaction_uniq_keys.groovy | 10 +---------
5 files changed, 3 insertions(+), 39 deletions(-)
diff --git a/docs/en/docs/admin-manual/config/be-config.md b/docs/en/docs/admin-manual/config/be-config.md
index 043ffb7cc3..5f72ad71d5 100644
--- a/docs/en/docs/admin-manual/config/be-config.md
+++ b/docs/en/docs/admin-manual/config/be-config.md
@@ -335,12 +335,6 @@ Default: 104857600
One of the trigger conditions of BaseCompaction: Singleton file size limit, 100MB
-### `cumulative_compaction_skip_window_seconds`
-
-Default: 30（s）
-
-CumulativeCompaction skips the most recently released increments to prevent compacting versions that may be queried (in case the query planning phase takes some time). Change the parameter is to set the skipped window time size
-
### cumulative_compaction_trace_threshold
* Type: int32
diff --git a/docs/zh-CN/docs/admin-manual/config/be-config.md b/docs/zh-CN/docs/admin-manual/config/be-config.md
index 5d9a4ffbb6..0fd824b294 100644
--- a/docs/zh-CN/docs/admin-manual/config/be-config.md
+++ b/docs/zh-CN/docs/admin-manual/config/be-config.md
@@ -331,12 +331,6 @@ BE创建tablet的工作线程数
BaseCompaction触发条件之一：Singleton文件大小限制，100MB
-### `cumulative_compaction_skip_window_seconds`
-
-默认值：30 （s）
-
-CumulativeCompaction会跳过最近发布的增量，以防止压缩可能被查询的版本（以防查询计划阶段花费一些时间）。改参数是设置跳过的窗口时间大小
-
### `cumulative_compaction_trace_threshold`
* 类型：int32
diff --git a/regression-test/suites/compaction/test_compaction_agg_keys.groovy b/regression-test/suites/compaction/test_compaction_agg_keys.groovy
index 8833c3d097..3eed24141e 100644
--- a/regression-test/suites/compaction/test_compaction_agg_keys.groovy
+++ b/regression-test/suites/compaction/test_compaction_agg_keys.groovy
@@ -34,13 +34,10 @@ suite("test_compaction_agg_keys") {
def configList = parseJson(out.trim())
assert configList instanceof List
- int cumulativeCompactionSkipWindowSeconds = -1
boolean disableAutoCompaction = true
for (Object ele in (List) configList) {
assert ele instanceof List<String>
- if (((List<String>) ele)[0] == "cumulative_compaction_skip_window_seconds") {
- cumulativeCompactionSkipWindowSeconds = Integer.parseInt(((List<String>) ele)[2])
- } else if (((List<String>) ele)[0] == "disable_auto_compaction") {
+ if (((List<String>) ele)[0] == "disable_auto_compaction") {
disableAutoCompaction = Boolean.parseBoolean(((List<String>) ele)[2])
}
}
@@ -100,11 +97,6 @@ suite("test_compaction_agg_keys") {
qt_select_default """ SELECT * FROM ${tableName} t ORDER BY user_id; """
String[][] tablets = sql """ show tablets from ${tableName}; """
- if (cumulativeCompactionSkipWindowSeconds > 0) {
- logger.info("Config `cumulative_compaction_skip_window_seconds` is set to " + cumulativeCompactionSkipWindowSeconds + " seconds so sleep for a while.")
- Thread.sleep(cumulativeCompactionSkipWindowSeconds * 1000)
- }
-
// trigger compactions for all tablets in ${tableName}
for (String[] tablet in tablets) {
String tablet_id = tablet[0]
diff --git a/regression-test/suites/compaction/test_compaction_dup_keys.groovy b/regression-test/suites/compaction/test_compaction_dup_keys.groovy
index 7b3af01148..d4a37969fa 100644
--- a/regression-test/suites/compaction/test_compaction_dup_keys.groovy
+++ b/regression-test/suites/compaction/test_compaction_dup_keys.groovy
@@ -34,13 +34,10 @@ suite("test_compaction_dup_keys") {
def configList = parseJson(out.trim())
assert configList instanceof List
- int cumulativeCompactionSkipWindowSeconds = -1
boolean disableAutoCompaction = true
for (Object ele in (List) configList) {
assert ele instanceof List<String>
- if (((List<String>) ele)[0] == "cumulative_compaction_skip_window_seconds") {
- cumulativeCompactionSkipWindowSeconds = Integer.parseInt(((List<String>) ele)[2])
- } else if (((List<String>) ele)[0] == "disable_auto_compaction") {
+ if (((List<String>) ele)[0] == "disable_auto_compaction") {
disableAutoCompaction = Boolean.parseBoolean(((List<String>) ele)[2])
}
}
@@ -98,11 +95,6 @@ suite("test_compaction_dup_keys") {
qt_select_default """ SELECT * FROM ${tableName} t ORDER BY user_id,date,city,age,sex,last_visit_date,last_update_date,last_visit_date_not_null,cost,max_dwell_time,min_dwell_time; """
String[][] tablets = sql """ show tablets from ${tableName}; """
- if (cumulativeCompactionSkipWindowSeconds > 0) {
- logger.info("Config `cumulative_compaction_skip_window_seconds` is set to " + cumulativeCompactionSkipWindowSeconds + " seconds so sleep for a while.")
- Thread.sleep(cumulativeCompactionSkipWindowSeconds * 1000)
- }
-
// trigger compactions for all tablets in ${tableName}
for (String[] tablet in tablets) {
String tablet_id = tablet[0]
diff --git a/regression-test/suites/compaction/test_compaction_uniq_keys.groovy b/regression-test/suites/compaction/test_compaction_uniq_keys.groovy
index 49676b274b..1960a98c18 100644
--- a/regression-test/suites/compaction/test_compaction_uniq_keys.groovy
+++ b/regression-test/suites/compaction/test_compaction_uniq_keys.groovy
@@ -34,13 +34,10 @@ suite("test_compaction_uniq_keys") {
def configList = parseJson(out.trim())
assert configList instanceof List
- int cumulativeCompactionSkipWindowSeconds = -1
boolean disableAutoCompaction = true
for (Object ele in (List) configList) {
assert ele instanceof List<String>
- if (((List<String>) ele)[0] == "cumulative_compaction_skip_window_seconds") {
- cumulativeCompactionSkipWindowSeconds = Integer.parseInt(((List<String>) ele)[2])
- } else if (((List<String>) ele)[0] == "disable_auto_compaction") {
+ if (((List<String>) ele)[0] == "disable_auto_compaction") {
disableAutoCompaction = Boolean.parseBoolean(((List<String>) ele)[2])
}
}
@@ -98,11 +95,6 @@ suite("test_compaction_uniq_keys") {
qt_select_default """ SELECT * FROM ${tableName} t ORDER BY user_id; """
String[][] tablets = sql """ show tablets from ${tableName}; """
- if (cumulativeCompactionSkipWindowSeconds > 0) {
- logger.info("Config `cumulative_compaction_skip_window_seconds` is set to " + cumulativeCompactionSkipWindowSeconds + " seconds so sleep for a while.")
- Thread.sleep(cumulativeCompactionSkipWindowSeconds * 1000)
- }
-
// trigger compactions for all tablets in ${tableName}
for (String[] tablet in tablets) {
String tablet_id = tablet[0]
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org