From 6bf31a2a0d535e5e7268b49e99913dc9cf29d0ee Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 16:41:49 +0800 Subject: [PATCH] branch-2.1: [fix](variable) variable version not persist in image #46463 (#46499) Cherry-picked from #46463 Co-authored-by: morrySnow --- .../src/main/java/org/apache/doris/qe/GlobalVariable.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/GlobalVariable.java b/fe/fe-core/src/main/java/org/apache/doris/qe/GlobalVariable.java index 4b91c907bf..40ac152abc 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/qe/GlobalVariable.java +++ b/fe/fe-core/src/main/java/org/apache/doris/qe/GlobalVariable.java @@ -85,7 +85,7 @@ public final class GlobalVariable { // 0: table names are stored as specified and comparisons are case sensitive. // 1: table names are stored in lowercase on disk and comparisons are not case sensitive. // 2: table names are stored as given but compared in lowercase. - @VariableMgr.VarAttr(name = LOWER_CASE_TABLE_NAMES, flag = VariableMgr.READ_ONLY) + @VariableMgr.VarAttr(name = LOWER_CASE_TABLE_NAMES, flag = VariableMgr.READ_ONLY | VariableMgr.GLOBAL) public static int lowerCaseTableNames = 0; @VariableMgr.VarAttr(name = LICENSE, flag = VariableMgr.READ_ONLY) @@ -181,8 +181,7 @@ public final class GlobalVariable { List varNames = Lists.newArrayList(); for (Field field : GlobalVariable.class.getDeclaredFields()) { VariableMgr.VarAttr attr = field.getAnnotation(VariableMgr.VarAttr.class); - // Since the flag of lower_case_table_names is READ_ONLY, it is handled separately here. - if (attr != null && (attr.flag() == VariableMgr.GLOBAL || attr.name().equals(LOWER_CASE_TABLE_NAMES))) { + if (attr != null && (attr.flag() & VariableMgr.GLOBAL) != 0) { varNames.add(attr.name()); } }