You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2022/11/25 14:10:22 UTC
[iotdb] branch CQConfig created (now abfd459bfb)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch CQConfig
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at abfd459bfb Update CQ docs
This branch includes the following new commits:
new abfd459bfb Update CQ docs
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 01/01: Update CQ docs
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch CQConfig
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit abfd459bfb485d1debb6bff8795a8b8f967734b1
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Fri Nov 25 22:09:18 2022 +0800
Update CQ docs
---
docs/UserGuide/Reference/Common-Config-Manual.md | 9 -------
.../zh/UserGuide/Reference/Common-Config-Manual.md | 9 -------
.../resources/conf/iotdb-common.properties | 11 --------
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 29 ----------------------
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 14 -----------
5 files changed, 72 deletions(-)
diff --git a/docs/UserGuide/Reference/Common-Config-Manual.md b/docs/UserGuide/Reference/Common-Config-Manual.md
index aa8426bbf9..6c45ddd481 100644
--- a/docs/UserGuide/Reference/Common-Config-Manual.md
+++ b/docs/UserGuide/Reference/Common-Config-Manual.md
@@ -1078,15 +1078,6 @@ IoTDB common files for ConfigNode and DataNode are under `conf`.
| Default | max(1, the / 2) |
| Effective | After restarting system |
-* max\_pending\_continuous\_query\_tasks
-
-| Name | max\_pending\_continuous\_query\_tasks |
-| :---------: | :------------------------------------------------------------------------- |
-| Description | Maximum number of continuous query tasks that can be pending for execution |
-| Type | int32 |
-| Default | 64 |
-| Effective | After restarting system |
-
* continuous\_query\_min\_every\_interval
| Name | continuous\_query\_min\_every\_interval |
diff --git a/docs/zh/UserGuide/Reference/Common-Config-Manual.md b/docs/zh/UserGuide/Reference/Common-Config-Manual.md
index 0187a52df5..739684e889 100644
--- a/docs/zh/UserGuide/Reference/Common-Config-Manual.md
+++ b/docs/zh/UserGuide/Reference/Common-Config-Manual.md
@@ -1238,15 +1238,6 @@ IoTDB ConfigNode 和 DataNode 的通用配置参数位于 `conf` 目录下。
### 连续查询配置
-* max\_pending\_continuous\_query\_tasks
-
-| 名字 | max\_pending\_continuous\_query\_tasks |
-| :----------: | :--------------------------------- |
-| 描述 | 队列中连续查询最大任务堆积数 |
-| 类型 | int32 |
-| 默认值 | 64 |
-| 改后生效方式 | 重启服务生效 |
-
* continuous\_query\_submit\_thread\_count
| 名字 | continuous\_query\_execution\_thread |
diff --git a/node-commons/src/assembly/resources/conf/iotdb-common.properties b/node-commons/src/assembly/resources/conf/iotdb-common.properties
index ba9bad3726..6041db9e7d 100644
--- a/node-commons/src/assembly/resources/conf/iotdb-common.properties
+++ b/node-commons/src/assembly/resources/conf/iotdb-common.properties
@@ -897,17 +897,6 @@
### Continuous Query Configuration
####################
-# Maximum number of continuous query tasks that can be pending for execution. When <= 0, the value is
-# 64 by default.
-# Datatype: int
-# max_pending_continuous_query_tasks=64
-
-# The size of log buffer for every CQ management operation plan. If the size of a CQ
-# management operation plan is larger than this parameter, the CQ management operation plan
-# will be rejected by CQManager.
-# Datatype: int
-# cqlog_buffer_size=1048576
-
# The number of threads in the scheduled thread pool that submit continuous query tasks periodically
# Datatype: int
# continuous_query_submit_thread_count=2
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index 98bafe5c69..dc11dc1460 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -671,25 +671,12 @@ public class IoTDBConfig {
private int continuousQueryThreadNum =
Math.max(1, Runtime.getRuntime().availableProcessors() / 2);
- /*
- * Maximum number of continuous query tasks that can be pending for execution. When <= 0, the value is
- * 64 by default.
- */
- private int maxPendingContinuousQueryTasks = 64;
-
/*
* Minimum every interval to perform continuous query.
* The every interval of continuous query instances should not be lower than this limit.
*/
private long continuousQueryMinimumEveryInterval = 1000;
- /**
- * The size of log buffer for every CQ management operation plan. If the size of a CQ management
- * operation plan is larger than this parameter, the CQ management operation plan will be rejected
- * by CQManager. Unit: byte
- */
- private int cqlogBufferSize = 1024 * 1024;
-
/**
* The maximum number of rows can be processed in insert-tablet-plan when executing select-into
* statements.
@@ -1894,14 +1881,6 @@ public class IoTDBConfig {
this.continuousQueryThreadNum = continuousQueryThreadNum;
}
- public int getMaxPendingContinuousQueryTasks() {
- return maxPendingContinuousQueryTasks;
- }
-
- public void setMaxPendingContinuousQueryTasks(int maxPendingContinuousQueryTasks) {
- this.maxPendingContinuousQueryTasks = maxPendingContinuousQueryTasks;
- }
-
public long getContinuousQueryMinimumEveryInterval() {
return continuousQueryMinimumEveryInterval;
}
@@ -1910,14 +1889,6 @@ public class IoTDBConfig {
this.continuousQueryMinimumEveryInterval = minimumEveryInterval;
}
- public int getCqlogBufferSize() {
- return cqlogBufferSize;
- }
-
- public void setCqlogBufferSize(int cqlogBufferSize) {
- this.cqlogBufferSize = cqlogBufferSize;
- }
-
public void setSelectIntoInsertTabletPlanRowLimit(int selectIntoInsertTabletPlanRowLimit) {
this.selectIntoInsertTabletPlanRowLimit = selectIntoInsertTabletPlanRowLimit;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index 855572a43e..a085ff229c 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -1827,24 +1827,10 @@ public class IoTDBDescriptor {
conf.setContinuousQueryThreadNum(Runtime.getRuntime().availableProcessors() / 2);
}
- conf.setMaxPendingContinuousQueryTasks(
- Integer.parseInt(
- properties.getProperty(
- "max_pending_continuous_query_tasks",
- Integer.toString(conf.getMaxPendingContinuousQueryTasks()))));
- if (conf.getMaxPendingContinuousQueryTasks() <= 0) {
- conf.setMaxPendingContinuousQueryTasks(64);
- }
-
conf.setContinuousQueryMinimumEveryInterval(
DateTimeUtils.convertDurationStrToLong(
properties.getProperty("continuous_query_minimum_every_interval", "1s"),
conf.getTimestampPrecision()));
-
- conf.setCqlogBufferSize(
- Integer.parseInt(
- properties.getProperty(
- "cqlog_buffer_size", Integer.toString(conf.getCqlogBufferSize()))));
}
public void loadClusterProps(Properties properties) {