Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ISSUE #7875] Add constructor for ProxyTopicRouteData #7876

Merged
merged 1 commit into from
Feb 29, 2024
Merged

[ISSUE #7875] Add constructor for ProxyTopicRouteData #7876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 2 additions & 17 deletions proxy/src/main/java/org/apache/rocketmq/proxy/service/route/ClusterTopicRouteService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@
package org.apache.rocketmq.proxy.service.route;

import java.util.List;
import org.apache.rocketmq.client.impl.mqclient.MQClientAPIFactory;
import org.apache.rocketmq.common.message.MessageQueue;
import org.apache.rocketmq.proxy.common.Address;
import org.apache.rocketmq.client.impl.mqclient.MQClientAPIFactory;
import org.apache.rocketmq.proxy.common.ProxyContext;
import org.apache.rocketmq.remoting.protocol.route.BrokerData;
import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;

public class ClusterTopicRouteService extends TopicRouteService {
Expand All @@ -39,21 +38,7 @@ public MessageQueueView getCurrentMessageQueueView(ProxyContext ctx, String topi
public ProxyTopicRouteData getTopicRouteForProxy(ProxyContext ctx, List<Address> requestHostAndPortList,
String topicName) throws Exception {
TopicRouteData topicRouteData = getAllMessageQueueView(ctx, topicName).getTopicRouteData();

ProxyTopicRouteData proxyTopicRouteData = new ProxyTopicRouteData();
proxyTopicRouteData.setQueueDatas(topicRouteData.getQueueDatas());

for (BrokerData brokerData : topicRouteData.getBrokerDatas()) {
ProxyTopicRouteData.ProxyBrokerData proxyBrokerData = new ProxyTopicRouteData.ProxyBrokerData();
proxyBrokerData.setCluster(brokerData.getCluster());
proxyBrokerData.setBrokerName(brokerData.getBrokerName());
for (Long brokerId : brokerData.getBrokerAddrs().keySet()) {
proxyBrokerData.getBrokerAddrs().put(brokerId, requestHostAndPortList);
}
proxyTopicRouteData.getBrokerDatas().add(proxyBrokerData);
}

return proxyTopicRouteData;
return new ProxyTopicRouteData(topicRouteData, requestHostAndPortList);
}

@Override
Expand Down
23 changes: 2 additions & 21 deletions proxy/src/main/java/org/apache/rocketmq/proxy/service/route/LocalTopicRouteService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,17 @@
package org.apache.rocketmq.proxy.service.route;

import com.google.common.collect.Lists;
import com.google.common.net.HostAndPort;
import java.util.HashMap;
import java.util.List;
import org.apache.rocketmq.broker.BrokerController;
import org.apache.rocketmq.client.impl.mqclient.MQClientAPIFactory;
import org.apache.rocketmq.common.BrokerConfig;
import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.common.TopicConfig;
import org.apache.rocketmq.common.message.MessageQueue;
import org.apache.rocketmq.proxy.common.Address;
import org.apache.rocketmq.proxy.common.ProxyContext;
import org.apache.rocketmq.proxy.config.ConfigurationManager;
import org.apache.rocketmq.client.impl.mqclient.MQClientAPIFactory;
import org.apache.rocketmq.remoting.protocol.route.BrokerData;
import org.apache.rocketmq.remoting.protocol.route.QueueData;
import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
Expand Down Expand Up @@ -62,25 +61,7 @@ public ProxyTopicRouteData getTopicRouteForProxy(ProxyContext ctx, List<Address>
String topicName) throws Exception {
MessageQueueView messageQueueView = getAllMessageQueueView(ctx, topicName);
TopicRouteData topicRouteData = messageQueueView.getTopicRouteData();

ProxyTopicRouteData proxyTopicRouteData = new ProxyTopicRouteData();
proxyTopicRouteData.setQueueDatas(topicRouteData.getQueueDatas());

for (BrokerData brokerData : topicRouteData.getBrokerDatas()) {
ProxyTopicRouteData.ProxyBrokerData proxyBrokerData = new ProxyTopicRouteData.ProxyBrokerData();
proxyBrokerData.setCluster(brokerData.getCluster());
proxyBrokerData.setBrokerName(brokerData.getBrokerName());
for (Long brokerId : brokerData.getBrokerAddrs().keySet()) {
String brokerAddr = brokerData.getBrokerAddrs().get(brokerId);
HostAndPort brokerHostAndPort = HostAndPort.fromString(brokerAddr);
HostAndPort grpcHostAndPort = HostAndPort.fromParts(brokerHostAndPort.getHost(), grpcPort);

proxyBrokerData.getBrokerAddrs().put(brokerId, Lists.newArrayList(new Address(Address.AddressScheme.IPv4, grpcHostAndPort)));
}
proxyTopicRouteData.getBrokerDatas().add(proxyBrokerData);
}

return proxyTopicRouteData;
return new ProxyTopicRouteData(topicRouteData, grpcPort);
}

@Override
Expand Down
56 changes: 56 additions & 0 deletions proxy/src/main/java/org/apache/rocketmq/proxy/service/route/ProxyTopicRouteData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
*/
package org.apache.rocketmq.proxy.service.route;

import com.google.common.collect.Lists;
import com.google.common.net.HostAndPort;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
Expand All @@ -27,6 +29,60 @@
import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;

public class ProxyTopicRouteData {
public ProxyTopicRouteData() {
}

public ProxyTopicRouteData(TopicRouteData topicRouteData) {
this.queueDatas = topicRouteData.getQueueDatas();
this.brokerDatas = new ArrayList<>();

for (BrokerData brokerData : topicRouteData.getBrokerDatas()) {
ProxyTopicRouteData.ProxyBrokerData proxyBrokerData = new ProxyTopicRouteData.ProxyBrokerData();
proxyBrokerData.setCluster(brokerData.getCluster());
proxyBrokerData.setBrokerName(brokerData.getBrokerName());
for (Long brokerId : brokerData.getBrokerAddrs().keySet()) {
String brokerAddr = brokerData.getBrokerAddrs().get(brokerId);
HostAndPort hostAndPort = HostAndPort.fromString(brokerAddr);

proxyBrokerData.getBrokerAddrs().put(brokerId, Lists.newArrayList(new Address(Address.AddressScheme.IPv4, hostAndPort)));
}
this.brokerDatas.add(proxyBrokerData);
}
}

public ProxyTopicRouteData(TopicRouteData topicRouteData, int port) {
this.queueDatas = topicRouteData.getQueueDatas();
this.brokerDatas = new ArrayList<>();

for (BrokerData brokerData : topicRouteData.getBrokerDatas()) {
ProxyTopicRouteData.ProxyBrokerData proxyBrokerData = new ProxyTopicRouteData.ProxyBrokerData();
proxyBrokerData.setCluster(brokerData.getCluster());
proxyBrokerData.setBrokerName(brokerData.getBrokerName());
for (Long brokerId : brokerData.getBrokerAddrs().keySet()) {
String brokerAddr = brokerData.getBrokerAddrs().get(brokerId);
HostAndPort brokerHostAndPort = HostAndPort.fromString(brokerAddr);
HostAndPort hostAndPort = HostAndPort.fromParts(brokerHostAndPort.getHost(), port);

proxyBrokerData.getBrokerAddrs().put(brokerId, Lists.newArrayList(new Address(Address.AddressScheme.IPv4, hostAndPort)));
}
this.brokerDatas.add(proxyBrokerData);
}
}

public ProxyTopicRouteData(TopicRouteData topicRouteData, List<Address> requestHostAndPortList) {
this.queueDatas = topicRouteData.getQueueDatas();
this.brokerDatas = new ArrayList<>();

for (BrokerData brokerData : topicRouteData.getBrokerDatas()) {
ProxyTopicRouteData.ProxyBrokerData proxyBrokerData = new ProxyTopicRouteData.ProxyBrokerData();
proxyBrokerData.setCluster(brokerData.getCluster());
proxyBrokerData.setBrokerName(brokerData.getBrokerName());
for (Long brokerId : brokerData.getBrokerAddrs().keySet()) {
proxyBrokerData.getBrokerAddrs().put(brokerId, requestHostAndPortList);
}
this.brokerDatas.add(proxyBrokerData);
}
}

public static class ProxyBrokerData {
private String cluster;
Expand Down
Loading