This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.1 by this push:
new 6ac47ac277b branch-4.1: [fix](cloud) show proc should display
partition cached version #60807 (#63460)
6ac47ac277b is described below
commit 6ac47ac277b96831342d2392d30411d58b6128b4
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu May 21 18:19:40 2026 +0800
branch-4.1: [fix](cloud) show proc should display partition cached version
#60807 (#63460)
Cherry-picked from #60807
Co-authored-by: deardeng <[email protected]>
---
.../apache/doris/common/proc/IndicesProcDir.java | 4 +-
.../common/proc/ProcReplicaVersionDisplay.java | 44 ++++
.../apache/doris/common/proc/ReplicasProcNode.java | 17 +-
.../apache/doris/common/proc/TabletsProcDir.java | 14 +-
.../common/proc/CloudProcVersionDisplayTest.java | 223 +++++++++++++++++++++
5 files changed, 295 insertions(+), 7 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/common/proc/IndicesProcDir.java
b/fe/fe-core/src/main/java/org/apache/doris/common/proc/IndicesProcDir.java
index 249eedffc47..5da51f238b8 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/IndicesProcDir.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/IndicesProcDir.java
@@ -23,6 +23,7 @@ import
org.apache.doris.catalog.MaterializedIndex.IndexExtState;
import org.apache.doris.catalog.OlapTable;
import org.apache.doris.catalog.Partition;
import org.apache.doris.common.AnalysisException;
+import org.apache.doris.common.Config;
import org.apache.doris.common.util.ListComparator;
import org.apache.doris.common.util.TimeUtils;
@@ -119,7 +120,8 @@ public class IndicesProcDir implements ProcDirInterface {
if (materializedIndex == null) {
throw new AnalysisException("Index[" + indexId + "] does not
exist.");
}
- return new TabletsProcDir(olapTable, materializedIndex);
+ long partitionCachedVisibleVersion = Config.isCloudMode() ?
partition.getCachedVisibleVersion() : -1L;
+ return new TabletsProcDir(olapTable, materializedIndex,
partitionCachedVisibleVersion);
} finally {
olapTable.readUnlock();
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/common/proc/ProcReplicaVersionDisplay.java
b/fe/fe-core/src/main/java/org/apache/doris/common/proc/ProcReplicaVersionDisplay.java
new file mode 100644
index 00000000000..2935d97ace4
--- /dev/null
+++
b/fe/fe-core/src/main/java/org/apache/doris/common/proc/ProcReplicaVersionDisplay.java
@@ -0,0 +1,44 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.common.proc;
+
+import org.apache.doris.catalog.Replica;
+import org.apache.doris.common.Config;
+
+final class ProcReplicaVersionDisplay {
+ private ProcReplicaVersionDisplay() {
+ }
+
+ static long getDisplayReplicaVersion(Replica replica, long
partitionVisibleVersion) {
+ if (!Config.isCloudMode()) {
+ return replica.getVersion();
+ }
+ return getCloudDisplayVersion(partitionVisibleVersion);
+ }
+
+ static long getDisplayReplicaLastSuccessVersion(Replica replica, long
partitionVisibleVersion) {
+ if (!Config.isCloudMode()) {
+ return replica.getLastSuccessVersion();
+ }
+ return getCloudDisplayVersion(partitionVisibleVersion);
+ }
+
+ private static long getCloudDisplayVersion(long partitionVisibleVersion) {
+ return partitionVisibleVersion >= 0 ? partitionVisibleVersion : -1L;
+ }
+}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/common/proc/ReplicasProcNode.java
b/fe/fe-core/src/main/java/org/apache/doris/common/proc/ReplicasProcNode.java
index 0ef67d74383..fb4d5cbd5d4 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/common/proc/ReplicasProcNode.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/common/proc/ReplicasProcNode.java
@@ -20,6 +20,7 @@ package org.apache.doris.common.proc;
import org.apache.doris.catalog.DiskInfo;
import org.apache.doris.catalog.Env;
import org.apache.doris.catalog.OlapTable;
+import org.apache.doris.catalog.Partition;
import org.apache.doris.catalog.Replica;
import org.apache.doris.catalog.Tablet;
import org.apache.doris.catalog.TabletMeta;
@@ -77,13 +78,18 @@ public class ReplicasProcNode implements ProcNodeInterface {
result.setNames(TITLE_NAMES);
TabletMeta tabletMeta =
Env.getCurrentInvertedIndex().getTabletMeta(tabletId);
Tablet tablet = null;
+ long partitionVisibleVersion = -1L;
try {
OlapTable table = (OlapTable)
Env.getCurrentInternalCatalog().getDbNullable(tabletMeta.getDbId())
.getTableNullable(tabletMeta.getTableId());
table.readLock();
try {
- tablet =
table.getPartition(tabletMeta.getPartitionId()).getIndex(tabletMeta.getIndexId())
- .getTablet(tabletId);
+ Partition partition =
table.getPartition(tabletMeta.getPartitionId());
+ if (partition == null) {
+ return result;
+ }
+ partitionVisibleVersion = Config.isCloudMode() ?
partition.getCachedVisibleVersion() : -1L;
+ tablet =
partition.getIndex(tabletMeta.getIndexId()).getTablet(tabletId);
} finally {
table.readUnlock();
}
@@ -126,10 +132,13 @@ public class ReplicasProcNode implements
ProcNodeInterface {
if (Config.enable_query_hit_stats) {
queryHits =
QueryStatsUtil.getMergedReplicaStats(replica.getId());
}
+ long displayVersion =
ProcReplicaVersionDisplay.getDisplayReplicaVersion(replica,
partitionVisibleVersion);
+ long displayLastSuccessVersion =
ProcReplicaVersionDisplay.getDisplayReplicaLastSuccessVersion(
+ replica, partitionVisibleVersion);
List<String> replicaInfo =
Lists.newArrayList(String.valueOf(replica.getId()),
String.valueOf(beId),
- String.valueOf(replica.getVersion()),
- String.valueOf(replica.getLastSuccessVersion()),
+ String.valueOf(displayVersion),
+ String.valueOf(displayLastSuccessVersion),
String.valueOf(replica.getLastFailedVersion()),
TimeUtils.longToTimeString(replica.getLastFailedTimestamp()),
String.valueOf(replica.getSchemaHash()),
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/common/proc/TabletsProcDir.java
b/fe/fe-core/src/main/java/org/apache/doris/common/proc/TabletsProcDir.java
index 34eff696fd0..cfce3db5c2b 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/TabletsProcDir.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/TabletsProcDir.java
@@ -76,10 +76,16 @@ public class TabletsProcDir implements ProcDirInterface {
private Table table;
private MaterializedIndex index;
+ private final long partitionVisibleVersion;
public TabletsProcDir(Table table, MaterializedIndex index) {
+ this(table, index, -1L);
+ }
+
+ public TabletsProcDir(Table table, MaterializedIndex index, long
partitionVisibleVersion) {
this.table = table;
this.index = index;
+ this.partitionVisibleVersion = partitionVisibleVersion;
}
public List<List<Comparable>> fetchComparableResult(long version, long
backendId, Replica.ReplicaState state)
@@ -172,14 +178,18 @@ public class TabletsProcDir implements ProcDirInterface {
|| (state != null && replica.getState() !=
state)) {
continue;
}
+ long displayVersion =
ProcReplicaVersionDisplay.getDisplayReplicaVersion(
+ replica, partitionVisibleVersion);
+ long displayLastSuccessVersion =
ProcReplicaVersionDisplay.getDisplayReplicaLastSuccessVersion(
+ replica, partitionVisibleVersion);
List<Comparable> tabletInfo = new
ArrayList<Comparable>();
// tabletId -- replicaId -- backendId -- version --
dataSize -- rowCount -- state
tabletInfo.add(tabletId);
tabletInfo.add(replica.getId());
tabletInfo.add(beId);
tabletInfo.add(replica.getSchemaHash());
- tabletInfo.add(replica.getVersion());
- tabletInfo.add(replica.getLastSuccessVersion());
+ tabletInfo.add(displayVersion);
+ tabletInfo.add(displayLastSuccessVersion);
tabletInfo.add(replica.getLastFailedVersion());
tabletInfo.add(TimeUtils.longToTimeString(replica.getLastFailedTimestamp()));
tabletInfo.add(replica.getDataSize());
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/common/proc/CloudProcVersionDisplayTest.java
b/fe/fe-core/src/test/java/org/apache/doris/common/proc/CloudProcVersionDisplayTest.java
new file mode 100644
index 00000000000..cc0b2e96ca6
--- /dev/null
+++
b/fe/fe-core/src/test/java/org/apache/doris/common/proc/CloudProcVersionDisplayTest.java
@@ -0,0 +1,223 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.common.proc;
+
+import org.apache.doris.catalog.Column;
+import org.apache.doris.catalog.DataProperty;
+import org.apache.doris.catalog.Database;
+import org.apache.doris.catalog.Env;
+import org.apache.doris.catalog.KeysType;
+import org.apache.doris.catalog.LocalTablet;
+import org.apache.doris.catalog.MaterializedIndex;
+import org.apache.doris.catalog.MaterializedIndex.IndexState;
+import org.apache.doris.catalog.OlapTable;
+import org.apache.doris.catalog.PartitionInfo;
+import org.apache.doris.catalog.PrimitiveType;
+import org.apache.doris.catalog.RandomDistributionInfo;
+import org.apache.doris.catalog.Replica;
+import org.apache.doris.catalog.ReplicaAllocation;
+import org.apache.doris.catalog.SinglePartitionInfo;
+import org.apache.doris.catalog.Tablet;
+import org.apache.doris.catalog.TabletInvertedIndex;
+import org.apache.doris.catalog.TabletMeta;
+import org.apache.doris.cloud.catalog.CloudPartition;
+import org.apache.doris.cloud.catalog.CloudReplica;
+import org.apache.doris.common.AnalysisException;
+import org.apache.doris.common.Config;
+import org.apache.doris.datasource.InternalCatalog;
+import org.apache.doris.system.SystemInfoService;
+import org.apache.doris.thrift.TStorageMedium;
+import org.apache.doris.thrift.TStorageType;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
+import mockit.Expectations;
+import mockit.Mocked;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class CloudProcVersionDisplayTest {
+ private static final long DB_ID = 10001L;
+ private static final long TABLE_ID = 20001L;
+ private static final long PARTITION_ID = 30001L;
+ private static final long INDEX_ID = 40001L;
+ private static final long TABLET_ID = 50001L;
+ private static final long REPLICA_ID = 60001L;
+
+ private static final long PARTITION_VISIBLE_VERSION = 88L;
+ private static final long STALE_REPLICA_VERSION = 1L;
+ private static final int SCHEMA_HASH = 123456789;
+
+ @Mocked
+ private Env env;
+ @Mocked
+ private SystemInfoService systemInfoService;
+ @Mocked
+ private TabletInvertedIndex invertedIndex;
+ @Mocked
+ private InternalCatalog internalCatalog;
+
+ private String originDeployMode;
+ private String originCloudUniqueId;
+ private boolean originEnableQueryHitStats;
+
+ @Before
+ public void setUp() throws AnalysisException {
+ originDeployMode = Config.deploy_mode;
+ originCloudUniqueId = Config.cloud_unique_id;
+ originEnableQueryHitStats = Config.enable_query_hit_stats;
+ Config.deploy_mode = "cloud";
+ Config.cloud_unique_id = "";
+ Config.enable_query_hit_stats = false;
+
+ new Expectations(env) {
+ {
+ Env.getServingEnv();
+ minTimes = 0;
+ result = env;
+
+ env.isReady();
+ minTimes = 0;
+ result = true;
+
+ Env.getCurrentSystemInfo();
+ minTimes = 0;
+ result = systemInfoService;
+
+ systemInfoService.getAllBackendsByAllCluster();
+ minTimes = 0;
+ result = ImmutableMap.of();
+ }
+ };
+ }
+
+ @After
+ public void tearDown() {
+ Config.deploy_mode = originDeployMode;
+ Config.cloud_unique_id = originCloudUniqueId;
+ Config.enable_query_hit_stats = originEnableQueryHitStats;
+ }
+
+ @Test
+ public void
testIndicesLookupPropagatesPartitionCachedVersionToTabletsProc() throws
AnalysisException {
+ ProcTestContext context = createProcTestContext();
+
+ IndicesProcDir indicesProcDir = new IndicesProcDir(context.db,
context.table, context.partition);
+ ProcNodeInterface procNode =
indicesProcDir.lookup(String.valueOf(INDEX_ID));
+ Assert.assertTrue(procNode instanceof TabletsProcDir);
+
+ ProcResult result = procNode.fetchResult();
+ Assert.assertEquals(1, result.getRows().size());
+ assertVersionColumns(result, PARTITION_VISIBLE_VERSION);
+ }
+
+ @Test
+ public void testReplicasProcNodeShowsPartitionCachedVersionInCloudMode()
throws AnalysisException {
+ ProcTestContext context = createProcTestContext();
+
+ new Expectations(env) {
+ {
+ Env.getCurrentInvertedIndex();
+ minTimes = 0;
+ result = invertedIndex;
+
+ invertedIndex.getTabletMeta(TABLET_ID);
+ minTimes = 0;
+ result = context.tabletMeta;
+
+ Env.getCurrentInternalCatalog();
+ minTimes = 0;
+ result = internalCatalog;
+
+ internalCatalog.getDbNullable(DB_ID);
+ minTimes = 0;
+ result = context.db;
+ }
+ };
+
+ ReplicasProcNode procNode = new ReplicasProcNode(TABLET_ID,
context.tablet.getReplicas());
+ ProcResult result = procNode.fetchResult();
+ Assert.assertEquals(1, result.getRows().size());
+ assertVersionColumns(result, PARTITION_VISIBLE_VERSION);
+ }
+
+ private void assertVersionColumns(ProcResult result, long expectedVersion)
{
+ int versionIndex = result.getColumnNames().indexOf("Version");
+ int lastSuccessVersionIndex =
result.getColumnNames().indexOf("LstSuccessVersion");
+ Assert.assertTrue(versionIndex >= 0);
+ Assert.assertTrue(lastSuccessVersionIndex >= 0);
+
+ String expected = String.valueOf(expectedVersion);
+ Assert.assertEquals(expected,
result.getRows().get(0).get(versionIndex));
+ Assert.assertEquals(expected,
result.getRows().get(0).get(lastSuccessVersionIndex));
+ }
+
+ private ProcTestContext createProcTestContext() {
+ Column keyColumn = new Column("k1", PrimitiveType.INT);
+ keyColumn.setIsKey(true);
+ RandomDistributionInfo distributionInfo = new
RandomDistributionInfo(1);
+
+ MaterializedIndex index = new MaterializedIndex(INDEX_ID,
IndexState.NORMAL);
+ Tablet tablet = new LocalTablet(TABLET_ID);
+ CloudReplica replica = new CloudReplica(REPLICA_ID, 1L,
Replica.ReplicaState.NORMAL,
+ STALE_REPLICA_VERSION, SCHEMA_HASH, DB_ID, TABLE_ID,
PARTITION_ID, INDEX_ID, 0L);
+ tablet.addReplica(replica, true);
+
+ TabletMeta tabletMeta = new TabletMeta(DB_ID, TABLE_ID, PARTITION_ID,
INDEX_ID, SCHEMA_HASH,
+ TStorageMedium.HDD);
+ index.addTablet(tablet, tabletMeta, true);
+
+ CloudPartition partition = new CloudPartition(PARTITION_ID, "p1",
index, distributionInfo, DB_ID, TABLE_ID);
+ partition.setCachedVisibleVersion(PARTITION_VISIBLE_VERSION,
System.currentTimeMillis());
+
+ PartitionInfo partitionInfo = new SinglePartitionInfo();
+ partitionInfo.setDataProperty(PARTITION_ID, new
DataProperty(DataProperty.DEFAULT_STORAGE_MEDIUM));
+ partitionInfo.setReplicaAllocation(PARTITION_ID, new
ReplicaAllocation((short) 1));
+
+ OlapTable table = new OlapTable(TABLE_ID, "tbl_cloud_proc",
Lists.newArrayList(keyColumn),
+ KeysType.DUP_KEYS, partitionInfo, distributionInfo);
+ table.addPartition(partition);
+ table.setIndexMeta(INDEX_ID, "base_index",
Lists.newArrayList(keyColumn), 0, SCHEMA_HASH, (short) 1,
+ TStorageType.COLUMN, KeysType.DUP_KEYS);
+ table.setBaseIndexId(INDEX_ID);
+
+ Database db = new Database(DB_ID, "db_cloud_proc");
+ db.registerTable(table);
+
+ return new ProcTestContext(db, table, partition, tablet, tabletMeta);
+ }
+
+ private static class ProcTestContext {
+ private final Database db;
+ private final OlapTable table;
+ private final CloudPartition partition;
+ private final Tablet tablet;
+ private final TabletMeta tabletMeta;
+
+ private ProcTestContext(Database db, OlapTable table, CloudPartition
partition, Tablet tablet,
+ TabletMeta tabletMeta) {
+ this.db = db;
+ this.table = table;
+ this.partition = partition;
+ this.tablet = tablet;
+ this.tabletMeta = tabletMeta;
+ }
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
