This is an automated email from the ASF dual-hosted git repository.
dataroaring 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 bb5cbcea284 [fix](replay) fix replay ReplicaPersistInfo no update
lastFailedVersion and lastSuccVersion #39918 (#39950)
bb5cbcea284 is described below
commit bb5cbcea284cfc988ec214c27372ae077d5c11a4
Author: yujun <[email protected]>
AuthorDate: Tue Aug 27 11:59:16 2024 +0800
[fix](replay) fix replay ReplicaPersistInfo no update lastFailedVersion and
lastSuccVersion #39918 (#39950)
cherry pick from #39918
---
.../java/org/apache/doris/alter/AlterHandler.java | 3 +-
.../java/org/apache/doris/backup/RestoreJob.java | 3 +-
.../java/org/apache/doris/catalog/Replica.java | 44 +++++++++-------------
.../org/apache/doris/catalog/TabletStatMgr.java | 9 +++--
.../org/apache/doris/clone/TabletSchedCtx.java | 6 ++-
.../apache/doris/datasource/InternalCatalog.java | 6 ++-
.../org/apache/doris/master/ReportHandler.java | 5 ++-
.../doris/transaction/DatabaseTransactionMgr.java | 2 +-
.../org/apache/doris/alter/RollupJobV2Test.java | 10 +----
.../apache/doris/alter/SchemaChangeJobV2Test.java | 6 +--
.../org/apache/doris/analysis/ShowReplicaTest.java | 3 +-
.../java/org/apache/doris/catalog/ReplicaTest.java | 18 +++++----
.../doris/clone/DiskReblanceWhenSchedulerIdle.java | 3 +-
.../org/apache/doris/clone/RebalancerTestUtil.java | 5 ++-
.../org/apache/doris/clone/RepairVersionTest.java | 2 +-
.../org/apache/doris/planner/QueryPlanTest.java | 18 ++++++---
16 files changed, 74 insertions(+), 69 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/AlterHandler.java
b/fe/fe-core/src/main/java/org/apache/doris/alter/AlterHandler.java
index dbc43059e5b..21329ad832f 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/alter/AlterHandler.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/alter/AlterHandler.java
@@ -241,8 +241,7 @@ public abstract class AlterHandler extends MasterDaemon {
task.getSignature(), replica, task.getVersion());
boolean versionChanged = false;
if (replica.getVersion() < task.getVersion()) {
- replica.updateVersionInfo(task.getVersion(),
replica.getDataSize(), replica.getRemoteDataSize(),
- replica.getRowCount());
+ replica.updateVersion(task.getVersion());
versionChanged = true;
}
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 e52aab93823..79e49a2b09c 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
@@ -1765,8 +1765,7 @@ public class RestoreJob extends AbstractJob {
for (Tablet tablet : idx.getTablets()) {
for (Replica replica : tablet.getReplicas()) {
if
(!replica.checkVersionCatchUp(part.getVisibleVersion(), false)) {
-
replica.updateVersionInfo(part.getVisibleVersion(), replica.getDataSize(),
- replica.getRemoteDataSize(),
replica.getRowCount());
+
replica.updateVersion(part.getVisibleVersion());
}
}
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Replica.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/Replica.java
index 0d36228e999..70dffaa16ec 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Replica.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Replica.java
@@ -223,14 +223,26 @@ public class Replica implements Writable {
return dataSize;
}
+ public void setDataSize(long dataSize) {
+ this.dataSize = dataSize;
+ }
+
public long getRemoteDataSize() {
return remoteDataSize;
}
+ public void setRemoteDataSize(long remoteDataSize) {
+ this.remoteDataSize = remoteDataSize;
+ }
+
public long getRowCount() {
return rowCount;
}
+ public void setRowCount(long rowCount) {
+ this.rowCount = rowCount;
+ }
+
public long getLastFailedVersion() {
return lastFailedVersion;
}
@@ -311,28 +323,13 @@ public class Replica implements Writable {
this.furtherRepairWatermarkTxnTd = furtherRepairWatermarkTxnTd;
}
- // for compatibility
- public synchronized void updateStat(long dataSize, long rowNum) {
- this.dataSize = dataSize;
- this.rowCount = rowNum;
- }
-
- public synchronized void updateStat(long dataSize, long remoteDataSize,
long rowNum, long versionCount) {
- this.dataSize = dataSize;
- this.remoteDataSize = remoteDataSize;
- this.rowCount = rowNum;
- this.versionCount = versionCount;
- }
-
- public synchronized void updateVersionInfo(long newVersion, long
newDataSize, long newRemoteDataSize,
- long newRowCount) {
- updateReplicaInfo(newVersion, this.lastFailedVersion,
this.lastSuccessVersion, newDataSize, newRemoteDataSize,
- newRowCount);
+ public synchronized void updateVersion(long newVersion) {
+ updateReplicaVersion(newVersion, this.lastFailedVersion,
this.lastSuccessVersion);
}
- public synchronized void updateVersionWithFailedInfo(
+ public synchronized void updateVersionWithFailed(
long newVersion, long lastFailedVersion, long lastSuccessVersion) {
- updateReplicaInfo(newVersion, lastFailedVersion, lastSuccessVersion,
dataSize, remoteDataSize, rowCount);
+ updateReplicaVersion(newVersion, lastFailedVersion,
lastSuccessVersion);
}
public synchronized void adminUpdateVersionInfo(Long version, Long
lastFailedVersion, Long lastSuccessVersion,
@@ -395,9 +392,7 @@ public class Replica implements Writable {
* the V(hash) equals to LSV(hash), and V equals to LFV, but LFV hash
is 0 or some unknown number.
* We just reset the LFV(hash) to recovery this replica.
*/
- private void updateReplicaInfo(long newVersion,
- long lastFailedVersion, long lastSuccessVersion,
- long newDataSize, long newRemoteDataSize, long newRowCount) {
+ private void updateReplicaVersion(long newVersion, long lastFailedVersion,
long lastSuccessVersion) {
if (LOG.isDebugEnabled()) {
LOG.debug("before update: {}", this.toString());
}
@@ -422,9 +417,6 @@ public class Replica implements Writable {
long oldLastFailedVersion = this.lastFailedVersion;
this.version = newVersion;
- this.dataSize = newDataSize;
- this.remoteDataSize = newRemoteDataSize;
- this.rowCount = newRowCount;
// just check it
if (lastSuccessVersion <= this.version) {
@@ -485,7 +477,7 @@ public class Replica implements Writable {
}
public synchronized void updateLastFailedVersion(long lastFailedVersion) {
- updateReplicaInfo(this.version, lastFailedVersion,
this.lastSuccessVersion, dataSize, remoteDataSize, rowCount);
+ updateReplicaVersion(this.version, lastFailedVersion,
this.lastSuccessVersion);
}
/*
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/catalog/TabletStatMgr.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/TabletStatMgr.java
index feae4f589fd..092bf84a661 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/TabletStatMgr.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/TabletStatMgr.java
@@ -144,8 +144,10 @@ public class TabletStatMgr extends MasterDaemon {
if (invertedIndex.getTabletMeta(stat.getTabletId()) != null) {
Replica replica =
invertedIndex.getReplica(stat.getTabletId(), beId);
if (replica != null) {
- replica.updateStat(stat.getDataSize(),
stat.getRemoteDataSize(), stat.getRowNum(),
- stat.getVersionCount());
+ replica.setDataSize(stat.getDataSize());
+ replica.setRemoteDataSize(stat.getRemoteDataSize());
+ replica.setRowCount(stat.getRowNum());
+ replica.setVersionCount(stat.getVersionCount());
}
}
}
@@ -161,7 +163,8 @@ public class TabletStatMgr extends MasterDaemon {
continue;
}
// TODO(cmy) no db lock protected. I think it is ok even we
get wrong row num
- replica.updateStat(entry.getValue().getDataSize(),
entry.getValue().getRowNum());
+ replica.setDataSize(entry.getValue().getDataSize());
+ replica.setRowCount(entry.getValue().getRowNum());
}
}
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/clone/TabletSchedCtx.java
b/fe/fe-core/src/main/java/org/apache/doris/clone/TabletSchedCtx.java
index 3544da69e88..747457ce813 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/clone/TabletSchedCtx.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/clone/TabletSchedCtx.java
@@ -1136,8 +1136,10 @@ public class TabletSchedCtx implements
Comparable<TabletSchedCtx> {
"replica does not exist. backend id: " +
destBackendId);
}
- replica.updateVersionInfo(reportedTablet.getVersion(),
reportedTablet.getDataSize(),
- reportedTablet.getRemoteDataSize(),
reportedTablet.getRowCount());
+ replica.updateVersion(reportedTablet.getVersion());
+ replica.setDataSize(reportedTablet.getDataSize());
+ replica.setRemoteDataSize(reportedTablet.getRemoteDataSize());
+ replica.setRowCount(reportedTablet.getRowCount());
if (replica.getLastFailedVersion() >
partition.getCommittedVersion()
&& reportedTablet.getVersion() >=
partition.getCommittedVersion()
//&& !(reportedTablet.isSetVersionMiss() &&
reportedTablet.isVersionMiss()
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
index 7a123e50fad..d89abe34889 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
@@ -1046,7 +1046,11 @@ public class InternalCatalog implements
CatalogIf<Database> {
Tablet tablet = materializedIndex.getTablet(info.getTabletId());
Replica replica = tablet.getReplicaByBackendId(info.getBackendId());
Preconditions.checkNotNull(replica, info);
- replica.updateVersionInfo(info.getVersion(), info.getDataSize(),
info.getRemoteDataSize(), info.getRowCount());
+ replica.updateVersionWithFailed(info.getVersion(),
info.getLastFailedVersion(),
+ info.getLastSuccessVersion());
+ replica.setDataSize(info.getDataSize());
+ replica.setRemoteDataSize(info.getRemoteDataSize());
+ replica.setRowCount(info.getRowCount());
replica.setBad(false);
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/master/ReportHandler.java
b/fe/fe-core/src/main/java/org/apache/doris/master/ReportHandler.java
index 125f2553ec9..9ead1a56ff8 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/master/ReportHandler.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/master/ReportHandler.java
@@ -681,7 +681,10 @@ public class ReportHandler extends Daemon {
// happens when
// 1. PUSH finished in BE but failed or not yet
report to FE
// 2. repair for VERSION_INCOMPLETE finished in
BE, but failed or not yet report to FE
- replica.updateVersionInfo(backendVersion,
dataSize, remoteDataSize, rowCount);
+ replica.updateVersion(backendVersion);
+ replica.setDataSize(dataSize);
+ replica.setRemoteDataSize(remoteDataSize);
+ replica.setRowCount(rowCount);
if (replica.getLastFailedVersion() < 0) {
if (replica.setBad(false)) {
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java
b/fe/fe-core/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java
index d99f9ba60f6..b83d4c9c98b 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java
@@ -1933,7 +1933,7 @@ public class DatabaseTransactionMgr {
lastFailedVersion = newCommitVersion;
}
}
- replica.updateVersionWithFailedInfo(newVersion,
lastFailedVersion, lastSuccessVersion);
+ replica.updateVersionWithFailed(newVersion,
lastFailedVersion, lastSuccessVersion);
}
}
} // end for indices
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/alter/RollupJobV2Test.java
b/fe/fe-core/src/test/java/org/apache/doris/alter/RollupJobV2Test.java
index 9c60846a4de..8eb693b4700 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/alter/RollupJobV2Test.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/alter/RollupJobV2Test.java
@@ -221,10 +221,7 @@ public class RollupJobV2Test {
MaterializedIndex shadowIndex =
testPartition.getMaterializedIndices(IndexExtState.SHADOW).get(0);
for (Tablet shadowTablet : shadowIndex.getTablets()) {
for (Replica shadowReplica : shadowTablet.getReplicas()) {
-
shadowReplica.updateVersionInfo(testPartition.getVisibleVersion(),
- shadowReplica.getDataSize(),
- shadowReplica.getRemoteDataSize(),
- shadowReplica.getRowCount());
+ shadowReplica.updateVersion(testPartition.getVisibleVersion());
}
}
@@ -301,10 +298,7 @@ public class RollupJobV2Test {
MaterializedIndex shadowIndex =
testPartition.getMaterializedIndices(IndexExtState.SHADOW).get(0);
for (Tablet shadowTablet : shadowIndex.getTablets()) {
for (Replica shadowReplica : shadowTablet.getReplicas()) {
-
shadowReplica.updateVersionInfo(testPartition.getVisibleVersion(),
- shadowReplica.getDataSize(),
- shadowReplica.getRemoteDataSize(),
- shadowReplica.getRowCount());
+ shadowReplica.updateVersion(testPartition.getVisibleVersion());
}
}
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/alter/SchemaChangeJobV2Test.java
b/fe/fe-core/src/test/java/org/apache/doris/alter/SchemaChangeJobV2Test.java
index 2d3a9aac5ae..002247e8c76 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/alter/SchemaChangeJobV2Test.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/alter/SchemaChangeJobV2Test.java
@@ -213,8 +213,7 @@ public class SchemaChangeJobV2Test {
MaterializedIndex shadowIndex =
testPartition.getMaterializedIndices(IndexExtState.SHADOW).get(0);
for (Tablet shadowTablet : shadowIndex.getTablets()) {
for (Replica shadowReplica : shadowTablet.getReplicas()) {
-
shadowReplica.updateVersionInfo(testPartition.getVisibleVersion(),
shadowReplica.getDataSize(),
- shadowReplica.getRemoteDataSize(),
shadowReplica.getRowCount());
+ shadowReplica.updateVersion(testPartition.getVisibleVersion());
}
}
@@ -296,8 +295,7 @@ public class SchemaChangeJobV2Test {
MaterializedIndex shadowIndex =
testPartition.getMaterializedIndices(IndexExtState.SHADOW).get(0);
for (Tablet shadowTablet : shadowIndex.getTablets()) {
for (Replica shadowReplica : shadowTablet.getReplicas()) {
-
shadowReplica.updateVersionInfo(testPartition.getVisibleVersion(),
shadowReplica.getDataSize(),
- shadowReplica.getRemoteDataSize(),
shadowReplica.getRowCount());
+ shadowReplica.updateVersion(testPartition.getVisibleVersion());
}
}
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowReplicaTest.java
b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowReplicaTest.java
index 56e66631f84..afadd8f805f 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowReplicaTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowReplicaTest.java
@@ -73,7 +73,8 @@ public class ShowReplicaTest extends TestWithFeService {
for (MaterializedIndex index :
partition.getMaterializedIndices(MaterializedIndex.IndexExtState.VISIBLE)) {
for (Tablet tablet : index.getTablets()) {
for (Replica replica : tablet.getReplicas()) {
- replica.updateStat(1024, 2);
+ replica.setDataSize(1024L);
+ replica.setRowCount(2L);
}
}
}
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/ReplicaTest.java
b/fe/fe-core/src/test/java/org/apache/doris/catalog/ReplicaTest.java
index d6a81cdd883..fb194d1ba9e 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/ReplicaTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/ReplicaTest.java
@@ -67,7 +67,9 @@ public class ReplicaTest {
long newVersion = version + 1;
long newDataSize = dataSize + 100;
long newRowCount = rowCount + 10;
- replica.updateVersionInfo(newVersion, newDataSize, 0, newRowCount);
+ replica.updateVersion(newVersion);
+ replica.setDataSize(newDataSize);
+ replica.setRowCount(newRowCount);
Assert.assertEquals(newVersion, replica.getVersion());
Assert.assertEquals(newDataSize, replica.getDataSize());
Assert.assertEquals(newRowCount, replica.getRowCount());
@@ -132,14 +134,14 @@ public class ReplicaTest {
public void testUpdateVersion1() {
Replica originalReplica = new Replica(10000, 20000, 3, 0, 100, 0, 78,
ReplicaState.NORMAL, 0, 3);
// new version is little than original version, it is invalid the
version will not update
- originalReplica.updateVersionInfo(2, 100, 0, 78);
+ originalReplica.updateVersion(2L);
Assert.assertEquals(3, originalReplica.getVersion());
}
@Test
public void testUpdateVersion2() {
Replica originalReplica = new Replica(10000, 20000, 3, 0, 100, 0, 78,
ReplicaState.NORMAL, 0, 0);
- originalReplica.updateVersionInfo(3, 100, 0, 78);
+ originalReplica.updateVersion(3L);
// if new version >= current version and last success version <= new
version, then last success version should be updated
Assert.assertEquals(3, originalReplica.getLastSuccessVersion());
Assert.assertEquals(3, originalReplica.getVersion());
@@ -155,7 +157,7 @@ public class ReplicaTest {
Assert.assertEquals(8, originalReplica.getLastFailedVersion());
// update last success version 10
-
originalReplica.updateVersionWithFailedInfo(originalReplica.getVersion(),
+ originalReplica.updateVersionWithFailed(originalReplica.getVersion(),
originalReplica.getLastFailedVersion(),
10);
Assert.assertEquals(10, originalReplica.getLastSuccessVersion());
@@ -163,7 +165,7 @@ public class ReplicaTest {
Assert.assertEquals(8, originalReplica.getLastFailedVersion());
// update version to 8, the last success version and version should be
10
- originalReplica.updateVersionInfo(8, 100, 0, 78);
+ originalReplica.updateVersion(8);
Assert.assertEquals(10, originalReplica.getLastSuccessVersion());
Assert.assertEquals(10, originalReplica.getVersion());
Assert.assertEquals(-1, originalReplica.getLastFailedVersion());
@@ -175,7 +177,7 @@ public class ReplicaTest {
Assert.assertEquals(12, originalReplica.getLastFailedVersion());
// update last success version to 15
-
originalReplica.updateVersionWithFailedInfo(originalReplica.getVersion(),
+ originalReplica.updateVersionWithFailed(originalReplica.getVersion(),
originalReplica.getLastFailedVersion(),
15);
Assert.assertEquals(15, originalReplica.getLastSuccessVersion());
@@ -189,13 +191,13 @@ public class ReplicaTest {
Assert.assertEquals(18, originalReplica.getLastFailedVersion());
// update version to 17 then version and success version is 17
- originalReplica.updateVersionInfo(17, 100, 0, 78);
+ originalReplica.updateVersion(17L);
Assert.assertEquals(17, originalReplica.getLastSuccessVersion());
Assert.assertEquals(17, originalReplica.getVersion());
Assert.assertEquals(18, originalReplica.getLastFailedVersion());
// update version to 18, then version and last success version should
be 18 and failed version should be -1
- originalReplica.updateVersionInfo(18, 100, 0, 78);
+ originalReplica.updateVersion(18L);
Assert.assertEquals(18, originalReplica.getLastSuccessVersion());
Assert.assertEquals(18, originalReplica.getVersion());
Assert.assertEquals(-1, originalReplica.getLastFailedVersion());
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/clone/DiskReblanceWhenSchedulerIdle.java
b/fe/fe-core/src/test/java/org/apache/doris/clone/DiskReblanceWhenSchedulerIdle.java
index 8d65bffd10b..9c32d9b0a35 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/clone/DiskReblanceWhenSchedulerIdle.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/clone/DiskReblanceWhenSchedulerIdle.java
@@ -108,7 +108,8 @@ public class DiskReblanceWhenSchedulerIdle extends
TestWithFeService {
Lists.newArrayList(tablet.getReplicas()).forEach(
replica -> {
if (replica.getBackendId() == backends.get(1).getId()) {
- replica.updateStat(totalCapacity / 4, 1);
+ replica.setDataSize(totalCapacity / 4);
+ replica.setRowCount(1L);
tablet.deleteReplica(replica);
replica.setBackendId(backends.get(0).getId());
replica.setPathHash(diskInfo0.getPathHash());
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/clone/RebalancerTestUtil.java
b/fe/fe-core/src/test/java/org/apache/doris/clone/RebalancerTestUtil.java
index da03d42a644..2883c88d07b 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/clone/RebalancerTestUtil.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/clone/RebalancerTestUtil.java
@@ -103,7 +103,7 @@ public class RebalancerTestUtil {
replica.setPathHash(beIds.get(i));
if (replicaSizes != null) {
// for disk rebalancer, every beId corresponding to a
replicaSize
- replica.updateStat(replicaSizes.get(i), 0);
+ replica.setDataSize(replicaSizes.get(i));
}
// isRestore set true, to avoid modifying
Catalog.getCurrentInvertedIndex
tablet.addReplica(replica, true);
@@ -164,7 +164,8 @@ public class RebalancerTestUtil {
for (Tablet tablet : idx.getTablets()) {
long tabletSize = tableBaseSize * (1 +
random.nextInt(tabletSkew));
for (Replica replica : tablet.getReplicas()) {
- replica.updateStat(tabletSize, 1000L);
+ replica.setDataSize(tabletSize);
+ replica.setRowCount(1000L);
}
}
}
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/clone/RepairVersionTest.java
b/fe/fe-core/src/test/java/org/apache/doris/clone/RepairVersionTest.java
index 7564ba1d6f5..f182131315a 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/clone/RepairVersionTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/clone/RepairVersionTest.java
@@ -89,7 +89,7 @@ public class RepairVersionTest extends TestWithFeService {
long visibleVersion = 2L;
partition.updateVisibleVersion(visibleVersion);
partition.setNextVersion(visibleVersion + 1);
- tablet.getReplicas().forEach(replica ->
replica.updateVersionInfo(visibleVersion, 1L, 1L, 1L));
+ tablet.getReplicas().forEach(replica ->
replica.updateVersion(visibleVersion));
Replica replica = tablet.getReplicas().iterator().next();
Assertions.assertEquals(visibleVersion, replica.getVersion());
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java
b/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java
index 2e44dcec9e2..e56fe7c5de7 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java
@@ -1099,7 +1099,9 @@ public class QueryPlanTest extends TestWithFeService {
mIndex.setRowCount(10000);
for (Tablet tablet : mIndex.getTablets()) {
for (Replica replica : tablet.getReplicas()) {
- replica.updateVersionInfo(2, 200000, 0, 10000);
+ replica.updateVersion(2L);
+ replica.setDataSize(200000L);
+ replica.setRowCount(10000L);
}
}
}
@@ -1113,7 +1115,9 @@ public class QueryPlanTest extends TestWithFeService {
mIndex.setRowCount(10000);
for (Tablet tablet : mIndex.getTablets()) {
for (Replica replica : tablet.getReplicas()) {
- replica.updateVersionInfo(2, 200000, 0, 10000);
+ replica.updateVersion(2L);
+ replica.setDataSize(200000L);
+ replica.setRowCount(10000L);
}
}
}
@@ -1197,7 +1201,9 @@ public class QueryPlanTest extends TestWithFeService {
mIndex.setRowCount(10000);
for (Tablet tablet : mIndex.getTablets()) {
for (Replica replica : tablet.getReplicas()) {
- replica.updateVersionInfo(2, 200000, 0, 10000);
+ replica.updateVersion(2L);
+ replica.setDataSize(200000L);
+ replica.setRowCount(10000L);
}
}
}
@@ -1227,7 +1233,7 @@ public class QueryPlanTest extends TestWithFeService {
mIndex.setRowCount(0);
for (Tablet tablet : mIndex.getTablets()) {
for (Replica replica : tablet.getReplicas()) {
- replica.updateVersionInfo(2, 0, 0, 0);
+ replica.updateVersion(2L);
}
}
}
@@ -1247,7 +1253,7 @@ public class QueryPlanTest extends TestWithFeService {
mIndex.setRowCount(10000);
for (Tablet tablet : mIndex.getTablets()) {
for (Replica replica : tablet.getReplicas()) {
- replica.updateVersionInfo(2, 200000, 0, 10000);
+ replica.updateVersion(2L);
}
}
}
@@ -1276,7 +1282,7 @@ public class QueryPlanTest extends TestWithFeService {
mIndex.setRowCount(0);
for (Tablet tablet : mIndex.getTablets()) {
for (Replica replica : tablet.getReplicas()) {
- replica.updateVersionInfo(2, 0, 0, 0);
+ replica.updateVersion(2L);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
