You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by ji...@apache.org on 2023/02/16 02:47:03 UTC
[rocketmq] branch develop updated: [ISSUE #5947] Optimize RouteInfoManager#pickupTopicRouteData create BrokerData code (#5948)
This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new 3f14b2bbd [ISSUE #5947] Optimize RouteInfoManager#pickupTopicRouteData create BrokerData code (#5948)
3f14b2bbd is described below
commit 3f14b2bbd21adb519128c783c7f23bd3d04af257
Author: mxsm <lj...@gmail.com>
AuthorDate: Thu Feb 16 10:46:56 2023 +0800
[ISSUE #5947] Optimize RouteInfoManager#pickupTopicRouteData create BrokerData code (#5948)
---
.../org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java | 5 +----
.../org/apache/rocketmq/remoting/protocol/route/BrokerData.java | 7 +++++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/namesrv/src/main/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java b/namesrv/src/main/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java
index fc36a8c8e..3200a6974 100644
--- a/namesrv/src/main/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java
+++ b/namesrv/src/main/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java
@@ -678,10 +678,7 @@ public class RouteInfoManager {
if (null == brokerData) {
continue;
}
- BrokerData brokerDataClone = new BrokerData(brokerData.getCluster(),
- brokerData.getBrokerName(),
- (HashMap<Long, String>) brokerData.getBrokerAddrs().clone(),
- brokerData.isEnableActingMaster(), brokerData.getZoneName());
+ BrokerData brokerDataClone = new BrokerData(brokerData);
brokerDataList.add(brokerDataClone);
foundBrokerData = true;
diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/route/BrokerData.java b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/route/BrokerData.java
index eb50d6f4a..de911d17c 100644
--- a/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/route/BrokerData.java
+++ b/remoting/src/main/java/org/apache/rocketmq/remoting/protocol/route/BrokerData.java
@@ -55,6 +55,7 @@ public class BrokerData implements Comparable<BrokerData> {
if (brokerData.brokerAddrs != null) {
this.brokerAddrs = new HashMap<>(brokerData.brokerAddrs);
}
+ this.zoneName = brokerData.zoneName;
this.enableActingMaster = brokerData.enableActingMaster;
}
@@ -64,14 +65,16 @@ public class BrokerData implements Comparable<BrokerData> {
this.brokerAddrs = brokerAddrs;
}
- public BrokerData(String cluster, String brokerName, HashMap<Long, String> brokerAddrs, boolean enableActingMaster) {
+ public BrokerData(String cluster, String brokerName, HashMap<Long, String> brokerAddrs,
+ boolean enableActingMaster) {
this.cluster = cluster;
this.brokerName = brokerName;
this.brokerAddrs = brokerAddrs;
this.enableActingMaster = enableActingMaster;
}
- public BrokerData(String cluster, String brokerName, HashMap<Long, String> brokerAddrs, boolean enableActingMaster, String zoneName) {
+ public BrokerData(String cluster, String brokerName, HashMap<Long, String> brokerAddrs, boolean enableActingMaster,
+ String zoneName) {
this.cluster = cluster;
this.brokerName = brokerName;
this.brokerAddrs = brokerAddrs;