This is an automated email from the ASF dual-hosted git repository.
w41ter pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new f1e2b066370 [fix](backup) Read db name from BackupJobInfo #39855
(#39900)
f1e2b066370 is described below
commit f1e2b066370979eb76a6180b68d09329d545a0f3
Author: walter <[email protected]>
AuthorDate: Mon Aug 26 15:09:30 2024 +0800
[fix](backup) Read db name from BackupJobInfo #39855 (#39900)
cherry pick from #39855
---
.../src/main/java/org/apache/doris/backup/BackupJob.java | 2 +-
.../src/main/java/org/apache/doris/backup/BackupMeta.java | 10 +---------
.../src/main/java/org/apache/doris/backup/RestoreJob.java | 4 ++--
.../test/java/org/apache/doris/backup/BackupHandlerTest.java | 2 +-
.../src/test/java/org/apache/doris/backup/RestoreJobTest.java | 2 +-
5 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJob.java
b/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJob.java
index 4d8648bc664..97c6e4930e0 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJob.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/backup/BackupJob.java
@@ -471,7 +471,7 @@ public class BackupJob extends AbstractJob {
}
}
- backupMeta = new BackupMeta(db.getName(), copiedTables,
copiedResources);
+ backupMeta = new BackupMeta(copiedTables, copiedResources);
// send tasks
for (AgentTask task : batchTask.getAllTasks()) {
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 9e9da7a2764..6a973ea45a2 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
@@ -41,8 +41,6 @@ import java.util.Map;
public class BackupMeta implements Writable {
- @SerializedName(value = "db")
- private String dbName;
// tbl name -> tbl
@SerializedName(value = "tblNameMap")
private Map<String, Table> tblNameMap = Maps.newHashMap();
@@ -56,9 +54,7 @@ public class BackupMeta implements Writable {
private BackupMeta() {
}
- public BackupMeta(String dbName, List<Table> tables, List<Resource>
resources) {
- this.dbName = dbName;
-
+ public BackupMeta(List<Table> tables, List<Resource> resources) {
for (Table table : tables) {
tblNameMap.put(table.getName(), table);
tblIdMap.put(table.getId(), table);
@@ -68,10 +64,6 @@ public class BackupMeta implements Writable {
}
}
- public String getDbName() {
- return dbName;
- }
-
public Map<String, Table> getTables() {
return tblNameMap;
}
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 725fe392b1a..e52aab93823 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
@@ -721,7 +721,7 @@ public class RestoreJob extends AbstractJob {
}
// reset all ids in this table
- String srcDbName = backupMeta.getDbName();
+ String srcDbName = jobInfo.dbName;
Status st = remoteOlapTbl.resetIdsForRestore(env, db,
replicaAlloc, reserveReplica, srcDbName);
if (!st.ok()) {
status = st;
@@ -756,7 +756,7 @@ public class RestoreJob extends AbstractJob {
return;
}
} else {
- String srcDbName = backupMeta.getDbName();
+ String srcDbName = jobInfo.dbName;
remoteView.resetIdsForRestore(env, srcDbName,
db.getFullName());
restoredTbls.add(remoteView);
}
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/backup/BackupHandlerTest.java
b/fe/fe-core/src/test/java/org/apache/doris/backup/BackupHandlerTest.java
index 5de2be6c9ee..97e689b6972 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/backup/BackupHandlerTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/backup/BackupHandlerTest.java
@@ -212,7 +212,7 @@ public class BackupHandlerTest {
List<Table> tbls = Lists.newArrayList();
tbls.add(tbl);
List<Resource> resources = Lists.newArrayList();
- BackupMeta backupMeta = new BackupMeta(null, tbls, resources);
+ BackupMeta backupMeta = new BackupMeta(tbls, resources);
Map<Long, SnapshotInfo> snapshotInfos = Maps.newHashMap();
for (Partition part : tbl.getPartitions()) {
for (MaterializedIndex idx :
part.getMaterializedIndices(IndexExtState.VISIBLE)) {
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/backup/RestoreJobTest.java
b/fe/fe-core/src/test/java/org/apache/doris/backup/RestoreJobTest.java
index 839d11e8199..8026d47741c 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/backup/RestoreJobTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/backup/RestoreJobTest.java
@@ -256,7 +256,7 @@ public class RestoreJobTest {
List<Table> tbls = Lists.newArrayList();
List<Resource> resources = Lists.newArrayList();
tbls.add(expectedRestoreTbl);
- backupMeta = new BackupMeta(null, tbls, resources);
+ backupMeta = new BackupMeta(tbls, resources);
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
