(doris) branch master updated: [chore](variable) update nereids timeout second default value to 30 (#33749)

[morrysnow]

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

morrysnow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/master by this push:
     new dbf6295c640 [chore](variable) update nereids timeout second default 
value to 30 (#33749)
dbf6295c640 is described below

commit dbf6295c6406302a963dcba5699f8bac4e17e8d8
Author: morrySnow <101034200+morrys...@users.noreply.github.com>
AuthorDate: Wed Apr 17 15:07:38 2024 +0800

    [chore](variable) update nereids timeout second default value to 30 (#33749)
---
 fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java        | 4 ++++
 fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java 
b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
index 93d265afcf9..b1dd06cab4e 100755
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
@@ -1551,6 +1551,10 @@ public class Env {
                 VariableMgr.refreshDefaultSessionVariables("2.0 to 2.1", 
SessionVariable.ENABLE_NEREIDS_DML, "true");
                 VariableMgr.refreshDefaultSessionVariables("2.0 to 2.1",
                         
SessionVariable.FRAGMENT_TRANSMISSION_COMPRESSION_CODEC, "none");
+                if (VariableMgr.newSessionVariable().nereidsTimeoutSecond == 
5) {
+                    VariableMgr.refreshDefaultSessionVariables("2.0 to 2.1",
+                            SessionVariable.NEREIDS_TIMEOUT_SECOND, "30");
+                }
             }
         }
 
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 4ab10095866..39e64794c27 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
@@ -290,6 +290,7 @@ public class SessionVariable implements Serializable, 
Writable {
     public static final String ENABLE_NEW_COST_MODEL = "enable_new_cost_model";
     public static final String ENABLE_FALLBACK_TO_ORIGINAL_PLANNER = 
"enable_fallback_to_original_planner";
     public static final String ENABLE_NEREIDS_TIMEOUT = 
"enable_nereids_timeout";
+    public static final String NEREIDS_TIMEOUT_SECOND = 
"nereids_timeout_second";
 
     public static final String FORBID_UNKNOWN_COLUMN_STATS = 
"forbid_unknown_col_stats";
     public static final String BROADCAST_RIGHT_TABLE_SCALE_FACTOR = 
"broadcast_right_table_scale_factor";
@@ -1267,7 +1268,7 @@ public class SessionVariable implements Serializable, 
Writable {
     public boolean enableNereidsTimeout = true;
 
     @VariableMgr.VarAttr(name = "nereids_timeout_second", needForward = true)
-    public int nereidsTimeoutSecond = 5;
+    public int nereidsTimeoutSecond = 30;
 
     @VariableMgr.VarAttr(name = ENABLE_PUSH_DOWN_NO_GROUP_AGG)
     public boolean enablePushDownNoGroupAgg = true;


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