update FeMetaVersion.VERSION_130

apache · Nov 18, 2024 · bf24504 · bf24504
1 parent 2258d89
commit bf24504
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/FeMetaVersion.java b/fe/fe-common/src/main/java/org/apache/doris/common/FeMetaVersion.java
@@ -103,9 +103,10 @@ public final class FeMetaVersion {
 
     public static final int VERSION_140 = 140;
 
+    // For BackupMeta storage policy
+    public static final int VERSION_141 = 141;
     // note: when increment meta version, should assign the latest version to VERSION_CURRENT
-    public static final int VERSION_CURRENT = VERSION_140;
-
+    public static final int VERSION_CURRENT = VERSION_141;
 
     // all logs meta version should >= the minimum version, so that we could remove many if clause, for example
     // if (FE_METAVERSION < VERSION_94) ...

diff --git a/fe/fe-core/src/main/java/org/apache/doris/backup/BackupMeta.java b/fe/fe-core/src/main/java/org/apache/doris/backup/BackupMeta.java
@@ -184,10 +184,13 @@ public void readFields(DataInput in) throws IOException {
             Resource resource = Resource.read(in);
             resourceNameMap.put(resource.getName(), resource);
         }
-        size = in.readInt();
-        for (int i = 0; i < size; i++) {
-            StoragePolicy policy = StoragePolicy.read(in);
-            storagePolicyNameMap.put(policy.getName(), policy);
+
+        if (Env.getCurrentEnvJournalVersion() >= FeMetaVersion.VERSION_130) {
+            size = in.readInt();
+            for (int i = 0; i < size; i++) {
+                StoragePolicy policy = StoragePolicy.read(in);
+                storagePolicyNameMap.put(policy.getName(), policy);
+            }
         }
     }