This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 80508fb595d [fix](restore) Reset next version for remote table when
restore #40118 (#40165)
80508fb595d is described below
commit 80508fb595d058a0df58ac0210706752b201d0e7
Author: walter <[email protected]>
AuthorDate: Fri Aug 30 13:22:23 2024 +0800
[fix](restore) Reset next version for remote table when restore #40118
(#40165)
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 5420764fe68..cb091bf0e06 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
@@ -751,6 +751,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 0fcde599088..9e2b0bca56c 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
@@ -577,6 +577,12 @@ public class OlapTable extends Table implements
MTMVRelatedTableIf {
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]
