You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2021/03/12 12:46:03 UTC
[iotdb] branch master updated: Rename timeout parameter (#2824)
This is an automated email from the ASF dual-hosted git repository.
xiangweiwei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 251c979 Rename timeout parameter (#2824)
251c979 is described below
commit 251c979f71e72be7284c5c333afb282f806a10c5
Author: Xiangwei Wei <34...@users.noreply.github.com>
AuthorDate: Fri Mar 12 20:45:37 2021 +0800
Rename timeout parameter (#2824)
Co-authored-by: Alima777 <wx...@gmail.com>
---
docs/UserGuide/Operation Manual/Kill Query.md | 2 +-
docs/zh/UserGuide/Operation Manual/Kill Query.md | 2 +-
server/src/assembly/resources/conf/iotdb-engine.properties | 2 +-
server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 10 +++++-----
.../main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java | 4 ++--
.../org/apache/iotdb/db/query/control/QueryTimeManager.java | 2 +-
.../main/java/org/apache/iotdb/db/service/TSServiceImpl.java | 2 +-
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/docs/UserGuide/Operation Manual/Kill Query.md b/docs/UserGuide/Operation Manual/Kill Query.md
index 13c4368..9b4e543 100644
--- a/docs/UserGuide/Operation Manual/Kill Query.md
+++ b/docs/UserGuide/Operation Manual/Kill Query.md
@@ -30,7 +30,7 @@ For queries that take too long to execute, IoTDB will forcibly interrupt the que
-The default timeout of the system is 60000 ms，which can be customized in the configuration file through the `query_time_threshold` parameter.
+The default timeout of the system is 60000 ms，which can be customized in the configuration file through the `query_timeout_threshold` parameter.
If you use JDBC or Session, we also support setting a timeout for a single query（Unit: ms）：
diff --git a/docs/zh/UserGuide/Operation Manual/Kill Query.md b/docs/zh/UserGuide/Operation Manual/Kill Query.md
index 8755f05..13917ec 100644
--- a/docs/zh/UserGuide/Operation Manual/Kill Query.md
+++ b/docs/zh/UserGuide/Operation Manual/Kill Query.md
@@ -31,7 +31,7 @@
-系统默认的超时时间为 60000 ms，可以在配置文件中通过 `query_time_threshold` 参数进行自定义配置。
+系统默认的超时时间为 60000 ms，可以在配置文件中通过 `query_timeout_threshold` 参数进行自定义配置。
如果您使用 JDBC 或 Session，还支持对单个查询设置超时时间（单位为 ms）：
diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties b/server/src/assembly/resources/conf/iotdb-engine.properties
index eb527ae..8c4c6fb 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -380,7 +380,7 @@ compaction_thread_num=10
merge_write_throughput_mb_per_sec=8
# The max executing time of query. unit: ms
-query_time_threshold=60000
+query_timeout_threshold=60000
####################
### Metadata Cache Configuration
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 146533e..44addbc 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
@@ -363,7 +363,7 @@ public class IoTDBConfig {
private long cacheFileReaderClearPeriod = 100000;
/** the max executing time of query in ms. */
- private int queryTimeThreshold = 60000;
+ private int queryTimeoutThreshold = 60000;
/** Replace implementation class of JDBC service */
private String rpcImplClassName = TSServiceImpl.class.getName();
@@ -1119,12 +1119,12 @@ public class IoTDBConfig {
this.cacheFileReaderClearPeriod = cacheFileReaderClearPeriod;
}
- public int getQueryTimeThreshold() {
- return queryTimeThreshold;
+ public int getQueryTimeoutThreshold() {
+ return queryTimeoutThreshold;
}
- public void setQueryTimeThreshold(int queryTimeThreshold) {
- this.queryTimeThreshold = queryTimeThreshold;
+ public void setQueryTimeoutThreshold(int queryTimeoutThreshold) {
+ this.queryTimeoutThreshold = queryTimeoutThreshold;
}
public boolean isReadOnly() {
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 86b6134..2ef9347 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
@@ -342,10 +342,10 @@ public class IoTDBDescriptor {
"unseq_file_num_in_each_level",
Integer.toString(conf.getUnseqFileNumInEachLevel()))));
- conf.setQueryTimeThreshold(
+ conf.setQueryTimeoutThreshold(
Integer.parseInt(
properties.getProperty(
- "query_time_threshold", Integer.toString(conf.getQueryTimeThreshold()))));
+ "query_timeout_threshold", Integer.toString(conf.getQueryTimeoutThreshold()))));
conf.setSyncEnable(
Boolean.parseBoolean(
diff --git a/server/src/main/java/org/apache/iotdb/db/query/control/QueryTimeManager.java b/server/src/main/java/org/apache/iotdb/db/query/control/QueryTimeManager.java
index 6f2cebd..59e646f 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/control/QueryTimeManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/control/QueryTimeManager.java
@@ -61,7 +61,7 @@ public class QueryTimeManager implements IService {
}
public void registerQuery(long queryId, long startTime, String sql, long timeout) {
- final long finalTimeout = timeout == 0 ? config.getQueryTimeThreshold() : timeout;
+ final long finalTimeout = timeout == 0 ? config.getQueryTimeoutThreshold() : timeout;
queryInfoMap.put(queryId, new QueryInfo(startTime, sql));
// submit a scheduled task to judge whether query is still running after timeout
ScheduledFuture<?> scheduledFuture =
diff --git a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
index ad60bfc..edc0725 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
@@ -580,7 +580,7 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
req.statementId,
physicalPlan,
req.fetchSize,
- config.getQueryTimeThreshold(),
+ config.getQueryTimeoutThreshold(),
sessionIdUsernameMap.get(req.getSessionId()))
: RpcUtils.getTSExecuteStatementResp(
TSStatusCode.EXECUTE_STATEMENT_ERROR, "Statement is not a query statement.");