From 1b392992faef7ca30c83de006eda2f405f6883ed Mon Sep 17 00:00:00 2001 From: morrySnow Date: Wed, 17 Apr 2024 11:50:10 +0800 Subject: [PATCH] [chore](variable) update nereids timeout second default value to 30 --- fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java | 4 ++++ .../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 93d265afcf920d..b1dd06cab4e2c4 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 @@ private void transferToMaster() { 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 4ab1009586632a..39e64794c27242 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 void setEnableLeftZigZag(boolean enableLeftZigZag) { 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;