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 ab1e8fe4cc0 [enhancement](stmt-exec) make CTAS use insert timeout fix
forward timeout (#25731) (#26234)
ab1e8fe4cc0 is described below
commit ab1e8fe4cc0b0d426db071eca823e3a1dd85c800
Author: Siyang Tang <[email protected]>
AuthorDate: Wed Nov 1 21:58:11 2023 +0800
[enhancement](stmt-exec) make CTAS use insert timeout fix forward timeout
(#25731) (#26234)
---
fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java | 4 ++--
fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
index 90d04c8a2dd..cfb41d3b819 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
@@ -660,7 +660,7 @@ public class ConnectContext {
} else {
String timeoutTag = "query";
// insert stmt particularly
- if (executor != null && executor.isInsertStmt()) {
+ if (executor != null && executor.isSyncLoadKindStmt()) {
timeoutTag = "insert";
}
//to ms
@@ -714,7 +714,7 @@ public class ConnectContext {
* @return exact execution timeout
*/
public int getExecTimeout() {
- if (executor != null && executor.isInsertStmt()) {
+ if (executor != null && executor.isSyncLoadKindStmt()) {
// particular for insert stmt, we can expand other type of timeout
in the same way
return Math.max(sessionVariable.getInsertTimeoutS(),
sessionVariable.getQueryTimeoutS());
} else if (executor != null && executor.isAnalyzeStmt()) {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
index 5dcb392fb62..f790d0805f9 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
@@ -386,7 +386,7 @@ public class StmtExecutor {
return masterOpExecutor.getProxyStatus();
}
- public boolean isInsertStmt() {
+ public boolean isSyncLoadKindStmt() {
if (parsedStmt == null) {
return false;
}
@@ -394,7 +394,7 @@ public class StmtExecutor {
LogicalPlan logicalPlan = ((LogicalPlanAdapter)
parsedStmt).getLogicalPlan();
return logicalPlan instanceof InsertIntoTableCommand;
}
- return parsedStmt instanceof InsertStmt;
+ return parsedStmt instanceof InsertStmt || parsedStmt instanceof
CreateTableAsSelectStmt;
}
public boolean isAnalyzeStmt() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
