This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 0e76e080136 [fix](restore) Reset next version for restored partitions
(#38321)
0e76e080136 is described below
commit 0e76e0801362a6c68a6826a158c52da006a82a4d
Author: walter <[email protected]>
AuthorDate: Thu Jul 25 10:18:55 2024 +0800
[fix](restore) Reset next version for restored partitions (#38321)
---
.../java/org/apache/doris/backup/RestoreJob.java | 7 ++++--
.../org/apache/doris/backup/RestoreJobTest.java | 27 ++++++++++++++++++++++
2 files changed, 32 insertions(+), 2 deletions(-)
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 2dda271595f..587a27c9e14 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
@@ -86,6 +86,7 @@ import org.apache.doris.thrift.TStorageMedium;
import org.apache.doris.thrift.TStorageType;
import org.apache.doris.thrift.TTaskType;
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.collect.ArrayListMultimap;
@@ -1139,8 +1140,9 @@ public class RestoreJob extends AbstractJob implements
GsonPostProcessable {
// reset remote partition.
// reset all id in remote partition, but DO NOT modify any exist catalog
objects.
- private Partition resetPartitionForRestore(OlapTable localTbl, OlapTable
remoteTbl, String partName,
- ReplicaAllocation replicaAlloc)
{
+ @VisibleForTesting
+ protected Partition resetPartitionForRestore(OlapTable localTbl, OlapTable
remoteTbl, String partName,
+ ReplicaAllocation
replicaAlloc) {
Preconditions.checkState(localTbl.getPartition(partName) == null);
Partition remotePart = remoteTbl.getPartition(partName);
Preconditions.checkNotNull(remotePart);
@@ -1170,6 +1172,7 @@ public class RestoreJob extends AbstractJob implements
GsonPostProcessable {
// save version info for creating replicas
long visibleVersion = remotePart.getVisibleVersion();
+ remotePart.setNextVersion(visibleVersion + 1);
LOG.info("reset partition {} for restore, visible version: {}, old
partition id: {}",
newPartId, visibleVersion, oldPartId);
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 43bdc5c2675..81f21d5a6a2 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
@@ -24,10 +24,13 @@ import
org.apache.doris.backup.BackupJobInfo.BackupPartitionInfo;
import org.apache.doris.backup.BackupJobInfo.BackupTabletInfo;
import org.apache.doris.catalog.Database;
import org.apache.doris.catalog.Env;
+import org.apache.doris.catalog.HashDistributionInfo;
import org.apache.doris.catalog.MaterializedIndex;
import org.apache.doris.catalog.MaterializedIndex.IndexExtState;
import org.apache.doris.catalog.OlapTable;
import org.apache.doris.catalog.Partition;
+import org.apache.doris.catalog.PartitionInfo;
+import org.apache.doris.catalog.PartitionType;
import org.apache.doris.catalog.ReplicaAllocation;
import org.apache.doris.catalog.Resource;
import org.apache.doris.catalog.Table;
@@ -306,4 +309,28 @@ public class RestoreJobTest {
in.close();
Files.delete(path);
}
+
+ @Test
+ public void testResetPartitionVisibleAndNextVersionForRestore() throws
Exception {
+ long visibleVersion = 1234;
+ long remotePartId = 123;
+ String partName = "p20240723";
+ MaterializedIndex index = new MaterializedIndex();
+ Partition remotePart = new Partition(remotePartId, partName, index,
new HashDistributionInfo());
+ remotePart.setVisibleVersionAndTime(visibleVersion, 0);
+ remotePart.setNextVersion(visibleVersion + 10);
+
+ OlapTable localTbl = new OlapTable();
+ localTbl.setPartitionInfo(new PartitionInfo(PartitionType.RANGE));
+ OlapTable remoteTbl = new OlapTable();
+ remoteTbl.addPartition(remotePart);
+ remoteTbl.setPartitionInfo(new PartitionInfo(PartitionType.RANGE));
+
+ ReplicaAllocation alloc = new ReplicaAllocation();
+ job.resetPartitionForRestore(localTbl, remoteTbl, partName, alloc);
+
+ Partition localPart = remoteTbl.getPartition(partName);
+ Assert.assertEquals(localPart.getVisibleVersion(), visibleVersion);
+ Assert.assertEquals(localPart.getNextVersion(), visibleVersion + 1);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
