This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 96f3945385 [parameter](query timeout) change default query timeout to
15min (#24480)
96f3945385 is described below
commit 96f3945385f09ea4de9fe628a3c83d22ed06baa0
Author: yiguolei <676222...@qq.com>
AuthorDate: Sat Sep 16 18:17:58 2023 +0800
[parameter](query timeout) change default query timeout to 15min (#24480)
Co-authored-by: yiguolei <yiguo...@gmail.com>
---
docs/en/docs/advanced/variables.md | 2 +-
docs/en/docs/data-table/advance-usage.md | 2 +-
docs/zh-CN/docs/advanced/variables.md | 2 +-
fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/en/docs/advanced/variables.md
b/docs/en/docs/advanced/variables.md
index 3f68dd9d4a..33ed664be4 100644
--- a/docs/en/docs/advanced/variables.md
+++ b/docs/en/docs/advanced/variables.md
@@ -365,7 +365,7 @@ Translated with www.DeepL.com/Translator (free version)
* `query_timeout`
- Used to set the query timeout. This variable applies to all query
statements in the current connection. Particularly, timeout of INSERT
statements is recommended to be managed by the insert_timeout below. The
default is 5 minutes, in seconds.
+ Used to set the query timeout. This variable applies to all query
statements in the current connection. Particularly, timeout of INSERT
statements is recommended to be managed by the insert_timeout below. The
default is 15 minutes, in seconds.
* `insert_timeout`
diff --git a/docs/en/docs/data-table/advance-usage.md
b/docs/en/docs/data-table/advance-usage.md
index 270883f78f..233ce4d195 100644
--- a/docs/en/docs/data-table/advance-usage.md
+++ b/docs/en/docs/data-table/advance-usage.md
@@ -207,7 +207,7 @@ mysql> SHOW VARIABLES LIKE "%query_timeout%";
+---------------+-------+
| Variable_name | Value |
+---------------+-------+
-| QUERY_TIMEOUT | 300 |
+| QUERY_TIMEOUT | 900 |
+---------------+-------+
1 row in set (0.00 sec)
```
diff --git a/docs/zh-CN/docs/advanced/variables.md
b/docs/zh-CN/docs/advanced/variables.md
index 0f92bca9e9..d2fc29a8fd 100644
--- a/docs/zh-CN/docs/advanced/variables.md
+++ b/docs/zh-CN/docs/advanced/variables.md
@@ -362,7 +362,7 @@ SELECT /*+ SET_VAR(query_timeout = 1,
enable_partition_cache=true) */ sleep(3);
- `query_timeout`
- 用于设置查询超时。该变量会作用于当前连接中所有的查询语句，对于 INSERT 语句推荐使用insert_timeout。默认为 5 分钟，单位为秒。
+ 用于设置查询超时。该变量会作用于当前连接中所有的查询语句，对于 INSERT 语句推荐使用insert_timeout。默认为 15 分钟，单位为秒。
- `insert_timeout`
<version since="dev"></version>用于设置针对 INSERT 语句的超时。该变量仅作用于 INSERT 语句，建议在
INSERT 行为易持续较长时间的场景下设置。默认为 4 小时，单位为秒。由于旧版本用户会通过延长 query_timeout 来防止 INSERT
语句超时，insert_timeout 在 query_timeout 大于自身的情况下将会失效, 以兼容旧版本用户的习惯。
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
index 70d8ef31e2..65f1c202d8 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
@@ -438,7 +438,7 @@ public class SessionVariable implements Serializable,
Writable {
// query timeout in second.
@VariableMgr.VarAttr(name = QUERY_TIMEOUT)
- public int queryTimeoutS = 300;
+ public int queryTimeoutS = 900;
// The global max_execution_time value provides the default for the
session value for new connections.
// The session value applies to SELECT executions executed within the
session that include
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
