morrySnow commented on code in PR #49341:
URL: https://github.com/apache/doris/pull/49341#discussion_r2086096096
##########
fe/fe-core/src/main/java/org/apache/doris/qe/VariableMgr.java:
##########
@@ -945,57 +945,65 @@ private static ImmutableSortedMap.Builder<String,
VarContext> getStringVarContex
public static void forceUpdateVariables() {
int currentVariableVersion = GlobalVariable.variableVersion;
+ String updateInfo = currentVariableVersion + "to" +
GlobalVariable.CURRENT_VARIABLE_VERSION;
if (currentVariableVersion == GlobalVariable.VARIABLE_VERSION_0) {
// update from 2.0.15 or below to 2.0.16 or higher
if (VariableMgr.newSessionVariable().nereidsTimeoutSecond == 5) {
- VariableMgr.refreshDefaultSessionVariables("update variable
version",
+ VariableMgr.refreshDefaultSessionVariables(updateInfo,
SessionVariable.NEREIDS_TIMEOUT_SECOND, "30");
}
}
if (currentVariableVersion < GlobalVariable.VARIABLE_VERSION_100) {
// update from 2.1.6 or below to 2.1.7 or higher
- VariableMgr.refreshDefaultSessionVariables("update variable
version",
+ VariableMgr.refreshDefaultSessionVariables(updateInfo,
SessionVariable.ENABLE_NEREIDS_DML,
String.valueOf(true));
- VariableMgr.refreshDefaultSessionVariables("update variable
version",
+ VariableMgr.refreshDefaultSessionVariables(updateInfo,
SessionVariable.ENABLE_NEREIDS_DML_WITH_PIPELINE,
String.valueOf(true));
- VariableMgr.refreshDefaultSessionVariables("update variable
version",
+ VariableMgr.refreshDefaultSessionVariables(updateInfo,
SessionVariable.ENABLE_NEREIDS_PLANNER,
String.valueOf(true));
- VariableMgr.refreshDefaultSessionVariables("update variable
version",
+ VariableMgr.refreshDefaultSessionVariables(updateInfo,
SessionVariable.ENABLE_FALLBACK_TO_ORIGINAL_PLANNER,
String.valueOf(true));
- VariableMgr.refreshDefaultSessionVariables("update variable
version",
+ VariableMgr.refreshDefaultSessionVariables(updateInfo,
SessionVariable.ENABLE_PIPELINE_X_ENGINE,
String.valueOf(true));
}
if (currentVariableVersion < GlobalVariable.VARIABLE_VERSION_101) {
if (StatisticsUtil.getAutoAnalyzeTableWidthThreshold()
< StatisticConstants.AUTO_ANALYZE_TABLE_WIDTH_THRESHOLD) {
- VariableMgr.refreshDefaultSessionVariables("update variable
version",
+ VariableMgr.refreshDefaultSessionVariables(updateInfo,
SessionVariable.AUTO_ANALYZE_TABLE_WIDTH_THRESHOLD,
String.valueOf(StatisticConstants.AUTO_ANALYZE_TABLE_WIDTH_THRESHOLD));
}
if (StatisticsUtil.getTableStatsHealthThreshold()
< StatisticConstants.TABLE_STATS_HEALTH_THRESHOLD) {
- VariableMgr.refreshDefaultSessionVariables("update variable
version",
+ VariableMgr.refreshDefaultSessionVariables(updateInfo,
SessionVariable.TABLE_STATS_HEALTH_THRESHOLD,
String.valueOf(StatisticConstants.TABLE_STATS_HEALTH_THRESHOLD));
}
}
if (currentVariableVersion < GlobalVariable.VARIABLE_VERSION_200) {
// update from 3.0.2 or below to 3.0.3 or higher
- VariableMgr.refreshDefaultSessionVariables("update variable
version",
+ VariableMgr.refreshDefaultSessionVariables(updateInfo,
SessionVariable.ENABLE_FALLBACK_TO_ORIGINAL_PLANNER,
String.valueOf(false));
}
if (currentVariableVersion < GlobalVariable.VARIABLE_VERSION_300) {
// update to master
- // do nothing
+ long sqlMode = defaultSessionVariable.sqlMode;
+ if ((sqlMode & SqlModeHelper.MODE_DEFAULT) != 0) {
+ sqlMode ^= SqlModeHelper.MODE_DEFAULT;
+ }
Review Comment:
yes
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
