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 9336aa3c7fc Revert "[enhancement](stmt-exec) make CTAS use insert
timeout fix forward timeout (#25731)"
9336aa3c7fc is described below
commit 9336aa3c7fc19c6ade14d8f0605fa8822003f787
Author: Kang <[email protected]>
AuthorDate: Tue Oct 24 10:21:35 2023 +0800
Revert "[enhancement](stmt-exec) make CTAS use insert timeout fix forward
timeout (#25731)"
This reverts commit 22962c3b15a73a2769dc966eac6d4a64c4a10dc5.
---
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 | 9 +++------
2 files changed, 5 insertions(+), 8 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 cfb41d3b819..90d04c8a2dd 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.isSyncLoadKindStmt()) {
+ if (executor != null && executor.isInsertStmt()) {
timeoutTag = "insert";
}
//to ms
@@ -714,7 +714,7 @@ public class ConnectContext {
* @return exact execution timeout
*/
public int getExecTimeout() {
- if (executor != null && executor.isSyncLoadKindStmt()) {
+ if (executor != null && executor.isInsertStmt()) {
// 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 24e8f553a8e..5dcb392fb62 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
@@ -121,7 +121,6 @@ import org.apache.doris.nereids.minidump.MinidumpUtils;
import org.apache.doris.nereids.parser.NereidsParser;
import org.apache.doris.nereids.stats.StatsErrorEstimator;
import org.apache.doris.nereids.trees.plans.commands.Command;
-import org.apache.doris.nereids.trees.plans.commands.CreateTableCommand;
import org.apache.doris.nereids.trees.plans.commands.Forward;
import org.apache.doris.nereids.trees.plans.commands.InsertIntoTableCommand;
import org.apache.doris.nereids.trees.plans.logical.LogicalPlan;
@@ -387,17 +386,15 @@ public class StmtExecutor {
return masterOpExecutor.getProxyStatus();
}
- public boolean isSyncLoadKindStmt() {
+ public boolean isInsertStmt() {
if (parsedStmt == null) {
return false;
}
if (parsedStmt instanceof LogicalPlanAdapter) {
LogicalPlan logicalPlan = ((LogicalPlanAdapter)
parsedStmt).getLogicalPlan();
- return logicalPlan instanceof InsertIntoTableCommand
- || (logicalPlan instanceof CreateTableCommand
- && ((CreateTableCommand) logicalPlan).isCtasCommand());
+ return logicalPlan instanceof InsertIntoTableCommand;
}
- return parsedStmt instanceof InsertStmt || parsedStmt instanceof
CreateTableAsSelectStmt;
+ return parsedStmt instanceof InsertStmt;
}
public boolean isAnalyzeStmt() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
