branch-3.0: [fix](variable) variable version not persist in image #46463

(#46497) Cherry-picked from #46463 Co-authored-by: morrySnow <[email protected]>
apache · Jan 8, 2025 · 6e0afa4 · 6e0afa4
1 parent e108101
commit 6e0afa4
Showing 1 changed file with 2 additions and 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
@@ -91,7 +91,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)
@@ -199,8 +199,7 @@ public static List<String> getPersistentGlobalVarNames() {
         List<String> 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());
             }
         }