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 03d92962801 [fix](restore) Reset next version for remote table when
restore #40118 (#40166)
03d92962801 is described below
commit 03d929628014c4dfb3e85ca2286bfb10adec9e00
Author: walter <[email protected]>
AuthorDate: Fri Aug 30 14:18:26 2024 +0800
[fix](restore) Reset next version for remote table when restore #40118
(#40166)
cherry pick from #40118
Co-authored-by: smallx <[email protected]>
---
fe/fe-core/src/main/java/org/apache/doris/backup/RestoreJob.java | 3 +++
fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java | 6 ++++++
2 files changed, 9 insertions(+)
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 79e49a2b09c..c0d89ec1b62 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
@@ -728,6 +728,9 @@ public class RestoreJob extends AbstractJob {
return;
}
+ // reset next version to visible version + 1 for all
partitions
+ remoteOlapTbl.resetVersionForRestore();
+
// Reset properties to correct values.
remoteOlapTbl.resetPropertiesForRestore(reserveDynamicPartitionEnable,
reserveReplica,
replicaAlloc,
isBeingSynced);
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
index bf0b6bb62d6..fbd01606e62 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
@@ -549,6 +549,12 @@ public class OlapTable extends Table {
setColocateGroup(null);
}
+ public void resetVersionForRestore() {
+ for (Partition partition : idToPartition.values()) {
+ partition.setNextVersion(partition.getVisibleVersion() + 1);
+ }
+ }
+
public Status resetIdsForRestore(Env env, Database db, ReplicaAllocation
restoreReplicaAlloc,
boolean reserveReplica, String srcDbName) {
// ATTN: The meta of the restore may come from different clusters, so
the
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
