This is an automated email from the ASF dual-hosted git repository.

morningman 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 702184bd924 [fix](tvf) fix that FE OOM when using tvf #40981 (#42119)
702184bd924 is described below

commit 702184bd924947d347caa78779086caa569ff1dc
Author: Rayner Chen <morning...@163.com>
AuthorDate: Sat Oct 19 08:34:38 2024 +0800

    [fix](tvf) fix that FE OOM when using tvf #40981 (#42119)
    
    cherry pick from #40981
    
    Co-authored-by: Tiewei Fang <43782773+bepppo...@users.noreply.github.com>
---
 .../src/main/java/org/apache/doris/datasource/FileQueryScanNode.java    | 1 +
 fe/fe-core/src/main/java/org/apache/doris/datasource/FileScanNode.java  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/FileQueryScanNode.java 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/FileQueryScanNode.java
index f8048b5fb66..b4a31611a73 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/FileQueryScanNode.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/FileQueryScanNode.java
@@ -111,6 +111,7 @@ public abstract class FileQueryScanNode extends 
FileScanNode {
             
ConnectContext.get().getExecutor().getSummaryProfile().setInitScanNodeStartTime();
         }
         super.init(analyzer);
+        initFileSplitSize();
         doInitialize();
         if (ConnectContext.get().getExecutor() != null) {
             
ConnectContext.get().getExecutor().getSummaryProfile().setInitScanNodeFinishTime();
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/FileScanNode.java 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/FileScanNode.java
index a8392a948ed..73acb46e2de 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/FileScanNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/FileScanNode.java
@@ -81,7 +81,7 @@ public abstract class FileScanNode extends ExternalScanNode {
         initFileSplitSize();
     }
 
-    private void initFileSplitSize() {
+    protected void initFileSplitSize() {
         this.fileSplitSize = 
ConnectContext.get().getSessionVariable().getFileSplitSize();
         this.isSplitSizeSetBySession = this.fileSplitSize > 0;
         if (this.fileSplitSize <= 0) {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org

Reply via email to