This is an automated email from the ASF dual-hosted git repository.
gavinchou 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 cf2d4de6975 [fix](cloud) Fix `getNormalReplicaBackendPathMapCloud`
function naming is confusing (#59791)
cf2d4de6975 is described below
commit cf2d4de6975f1c6fb13fc5f3905a811c27dac3ac
Author: deardeng <[email protected]>
AuthorDate: Tue Jan 13 14:41:04 2026 +0800
[fix](cloud) Fix `getNormalReplicaBackendPathMapCloud` function naming is
confusing (#59791)
---
fe/fe-core/src/main/java/org/apache/doris/catalog/Tablet.java | 11 ++---------
.../main/java/org/apache/doris/cloud/catalog/CloudTablet.java | 5 +++--
.../java/org/apache/doris/service/FrontendServiceImpl.java | 4 ++--
3 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Tablet.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/Tablet.java
index 96ae1f9b692..50ead1f0708 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Tablet.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Tablet.java
@@ -20,7 +20,6 @@ package org.apache.doris.catalog;
import org.apache.doris.catalog.Replica.ReplicaState;
import org.apache.doris.clone.TabletSchedCtx;
import org.apache.doris.clone.TabletSchedCtx.Priority;
-import org.apache.doris.cloud.catalog.CloudReplica;
import org.apache.doris.common.Config;
import org.apache.doris.common.FeConstants;
import org.apache.doris.common.Pair;
@@ -215,11 +214,11 @@ public class Tablet {
}
@FunctionalInterface
- interface BackendIdGetter {
+ protected interface BackendIdGetter {
long get(Replica rep, String be) throws UserException;
}
- private Multimap<Long, Long> getNormalReplicaBackendPathMapImpl(String
beEndpoint, BackendIdGetter idGetter)
+ protected Multimap<Long, Long> getNormalReplicaBackendPathMapImpl(String
beEndpoint, BackendIdGetter idGetter)
throws UserException {
Multimap<Long, Long> map = HashMultimap.create();
SystemInfoService infoService = Env.getCurrentSystemInfo();
@@ -250,12 +249,6 @@ public class Tablet {
return getNormalReplicaBackendPathMapImpl(null, (rep, be) ->
rep.getBackendId());
}
- // for cloud mode without ConnectContext. use BE IP to find replica
- protected Multimap<Long, Long> getNormalReplicaBackendPathMapCloud(String
beEndpoint) throws UserException {
- return getNormalReplicaBackendPathMapImpl(beEndpoint,
- (rep, be) -> ((CloudReplica) rep).getBackendId(be));
- }
-
// When a BE reports a missing version, lastFailedVersion is set. When a
write fails on a replica,
// lastFailedVersion is set.
// for query
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudTablet.java
b/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudTablet.java
index 5a6d30f8199..f85a2037648 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudTablet.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudTablet.java
@@ -64,8 +64,9 @@ public class CloudTablet extends Tablet {
return backendPathMapReprocess(pathMap);
}
- public Multimap<Long, Long> getNormalReplicaBackendPathMapCloud(String
beEndpoint) throws UserException {
- Multimap<Long, Long> pathMap =
super.getNormalReplicaBackendPathMapCloud(beEndpoint);
+ public Multimap<Long, Long> getNormalReplicaBackendPathMap(String
beEndpoint) throws UserException {
+ Multimap<Long, Long> pathMap =
getNormalReplicaBackendPathMapImpl(beEndpoint,
+ (rep, be) -> ((CloudReplica) rep).getBackendId(be));
return backendPathMapReprocess(pathMap);
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
index 90339962555..320c73936a8 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
@@ -3708,7 +3708,7 @@ public class FrontendServiceImpl implements
FrontendService.Iface {
try {
if (Config.isCloudMode() && request.isSetBeEndpoint())
{
bePathsMap = ((CloudTablet) tablet)
-
.getNormalReplicaBackendPathMapCloud(request.be_endpoint);
+
.getNormalReplicaBackendPathMap(request.be_endpoint);
} else {
bePathsMap =
tablet.getNormalReplicaBackendPathMap();
}
@@ -3969,7 +3969,7 @@ public class FrontendServiceImpl implements
FrontendService.Iface {
try {
if (Config.isCloudMode() && request.isSetBeEndpoint())
{
bePathsMap = ((CloudTablet) tablet)
-
.getNormalReplicaBackendPathMapCloud(request.be_endpoint);
+
.getNormalReplicaBackendPathMap(request.be_endpoint);
} else {
bePathsMap =
tablet.getNormalReplicaBackendPathMap();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
