This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 379e00f4211 [improve](group commit) set internal group commit timeout
(#41404) (#41688)
379e00f4211 is described below
commit 379e00f4211540f06ee6f03ee2c23ff497c824c1
Author: meiyi <[email protected]>
AuthorDate: Fri Oct 11 17:55:43 2024 +0800
[improve](group commit) set internal group commit timeout (#41404) (#41688)
pick https://github.com/apache/doris/pull/41404
---
fe/fe-common/src/main/java/org/apache/doris/common/Config.java | 5 +++++
.../doris/tablefunction/GroupCommitTableValuedFunction.java | 9 +++++++++
2 files changed, 14 insertions(+)
diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
index 3426fd645b2..101f662aff5 100644
--- a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
+++ b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
@@ -557,6 +557,11 @@ public class Config extends ConfigBase {
"Default commit data bytes for group commit"})
public static int group_commit_data_bytes_default_value = 134217728;
+ @ConfField(mutable = true, masterOnly = true, description = {
+ "内部攒批的超时时间为table的group_commit_interval_ms的倍数",
+ "The internal group commit timeout is the multiple of table's
group_commit_interval_ms"})
+ public static int group_commit_timeout_multipler = 10;
+
@ConfField(mutable = true, masterOnly = true, description = {"Stream load
的默认超时时间，单位是秒。",
"Default timeout for stream load job, in seconds."})
public static int stream_load_default_timeout_second = 86400 * 3; // 3days
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/tablefunction/GroupCommitTableValuedFunction.java
b/fe/fe-core/src/main/java/org/apache/doris/tablefunction/GroupCommitTableValuedFunction.java
index db3622c11af..3bd262f467d 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/tablefunction/GroupCommitTableValuedFunction.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/tablefunction/GroupCommitTableValuedFunction.java
@@ -25,9 +25,11 @@ import org.apache.doris.catalog.Env;
import org.apache.doris.catalog.OlapTable;
import org.apache.doris.catalog.Table;
import org.apache.doris.common.AnalysisException;
+import org.apache.doris.common.Config;
import org.apache.doris.planner.GroupCommitScanNode;
import org.apache.doris.planner.PlanNodeId;
import org.apache.doris.planner.ScanNode;
+import org.apache.doris.qe.ConnectContext;
import org.apache.doris.thrift.TFileType;
import java.util.ArrayList;
@@ -66,6 +68,13 @@ public class GroupCommitTableValuedFunction extends
ExternalFileTableValuedFunct
throw new AnalysisException("Only support OLAP table, but table
type of table_id "
+ tableId + " is " + table.getType());
}
+ if (Config.group_commit_timeout_multipler > 0) {
+ int timeoutS = Math.max((int) (((OlapTable)
table).getGroupCommitIntervalMs() / 1000.0
+ * Config.group_commit_timeout_multipler), 600);
+
ConnectContext.get().getSessionVariable().setInsertTimeoutS(timeoutS);
+
ConnectContext.get().getSessionVariable().setQueryTimeoutS(timeoutS);
+ }
+
List<Column> tableColumns = table.getBaseSchema(true);
for (int i = 1; i <= tableColumns.size(); i++) {
fileColumns.add(new Column("c" + i, tableColumns.get(i -
1).getType(), true));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
