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 index 0a016d3595a2b36..b1e42d343adf0e9 100644 --- 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 @@ -67,11 +67,8 @@ public final class FeMetaVersion { // For AnalysisInfo public static final int VERSION_123 = 123; - // For BackupMeta storage policy - public static final int VERSION_124 = 124; - // note: when increment meta version, should assign the latest version to VERSION_CURRENT - public static final int VERSION_CURRENT = VERSION_124; + public static final int VERSION_CURRENT = VERSION_123; // 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/BackupJobInfo.java b/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJobInfo.java index cfbc685b2488f18..a63c6f234cc07ef 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJobInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJobInfo.java @@ -335,7 +335,7 @@ public static class BriefBackupJobInfo { @SerializedName("s3_resource_list") public List s3ResourceList = Lists.newArrayList(); @SerializedName("storage_policy_list") - public List storagePolicyList = Lists.newArrayList(); + public List storagePolicyList = Lists.newArrayList(); public static BriefBackupJobInfo fromBackupJobInfo(BackupJobInfo backupJobInfo) { BriefBackupJobInfo briefBackupJobInfo = new BriefBackupJobInfo(); @@ -376,7 +376,7 @@ public static class NewBackupObjects { @SerializedName("s3_resources") public List s3Resources = Lists.newArrayList(); @SerializedName("storage_policy") - public List storagePolicies = Lists.newArrayList(); + public List storagePolicies = Lists.newArrayList(); } public static class BackupOlapTableInfo { @@ -500,11 +500,6 @@ public static class BackupS3ResourceInfo { public String name; } - public static class BackupStoragePolicyInfo { - @SerializedName("name") - public String name; - } - // eg: __db_10001/__tbl_10002/__part_10003/__idx_10002/__10004 public String getFilePath(String db, String tbl, String part, String idx, long tabletId) { if (!db.equalsIgnoreCase(dbName)) { @@ -708,9 +703,7 @@ public static BackupJobInfo fromCatalog(long backupTime, String label, String db // storage policies Collection storagePolicies = backupMeta.getStoragePolicyNameMap().values(); for (StoragePolicy storagePolicy : storagePolicies) { - BackupStoragePolicyInfo backupStoragePolicyInfo = new BackupStoragePolicyInfo(); - backupStoragePolicyInfo.name = storagePolicy.getName(); - jobInfo.newBackupObjects.storagePolicies.add(backupStoragePolicyInfo); + jobInfo.newBackupObjects.storagePolicies.add(storagePolicy.clone()); } return jobInfo; 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 index 03f31d4a56f3355..411ad7ddd580cdb 100644 --- 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 @@ -20,7 +20,6 @@ import org.apache.doris.catalog.Env; import org.apache.doris.catalog.Resource; import org.apache.doris.catalog.Table; -import org.apache.doris.common.FeMetaVersion; import org.apache.doris.common.io.Writable; import org.apache.doris.meta.MetaContext; import org.apache.doris.persist.gson.GsonUtils; @@ -54,7 +53,6 @@ public class BackupMeta implements Writable { @SerializedName(value = "resourceNameMap") private Map resourceNameMap = Maps.newHashMap(); // storagePolicy name -> resource - @SerializedName(value = "storagePolicyNameMap") private Map storagePolicyNameMap = Maps.newHashMap(); private BackupMeta() { @@ -108,10 +106,6 @@ public Resource getResource(String resourceName) { return resourceNameMap.get(resourceName); } - public StoragePolicy getStoragePolicy(String policyName) { - return storagePolicyNameMap.get(policyName); - } - public Table getTable(Long tblId) { return tblIdMap.get(tblId); } @@ -162,10 +156,6 @@ public void write(DataOutput out) throws IOException { for (Resource resource : resourceNameMap.values()) { resource.write(out); } - out.writeInt(storagePolicyNameMap.size()); - for (StoragePolicy storagePolicy : storagePolicyNameMap.values()) { - storagePolicy.write(out); - } } public void readFields(DataInput in) throws IOException { @@ -180,13 +170,6 @@ public void readFields(DataInput in) throws IOException { Resource resource = Resource.read(in); resourceNameMap.put(resource.getName(), resource); } - if (Env.getCurrentEnvJournalVersion() >= FeMetaVersion.VERSION_124) { - size = in.readInt(); - for (int i = 0; i < size; i++) { - StoragePolicy policy = StoragePolicy.read(in); - storagePolicyNameMap.put(policy.getName(), policy); - } - } } public String toJson() { diff --git a/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreJob.java b/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreJob.java index 28445d148ad1f69..43fbc68a0badb37 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreJob.java +++ b/fe/fe-core/src/main/java/org/apache/doris/backup/RestoreJob.java @@ -659,8 +659,8 @@ private void checkAndPrepareMeta() { } } - for (BackupJobInfo.BackupStoragePolicyInfo backupStoragePolicyInfo : jobInfo.newBackupObjects.storagePolicies) { - String backupStoragePoliceName = backupStoragePolicyInfo.name; + for (StoragePolicy backupStoargePolicy : jobInfo.newBackupObjects.storagePolicies) { + String backupStoragePoliceName = backupStoargePolicy.getName(); Optional localPolicy = Env.getCurrentEnv().getPolicyMgr().findPolicy(backupStoragePoliceName, PolicyTypeEnum.STORAGE); if (localPolicy.isPresent() && localPolicy.get().getType() != PolicyTypeEnum.STORAGE) { @@ -1343,11 +1343,10 @@ private void checkAndRestoreStoragePolicies() { return; } PolicyMgr policyMgr = Env.getCurrentEnv().getPolicyMgr(); - for (BackupJobInfo.BackupStoragePolicyInfo backupStoragePolicyInfo : jobInfo.newBackupObjects.storagePolicies) { - String backupStoragePoliceName = backupStoragePolicyInfo.name; + for (StoragePolicy backupStoargePolicy : jobInfo.newBackupObjects.storagePolicies) { + String backupStoragePoliceName = backupStoargePolicy.getName(); Optional localPolicy = policyMgr.findPolicy(backupStoragePoliceName, PolicyTypeEnum.STORAGE); - StoragePolicy backupStoargePolicy = backupMeta.getStoragePolicy(backupStoragePoliceName); // use specified storageResource if (StringUtils.isNotEmpty(storageResource)) {