Skip to content

[ISSUE #9926] Avoid redundant list allocation in parsePublishMessageQueues #10380

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

Open
wushiyuanmaimob wants to merge 1 commit into
base: develop
Choose a base branch
from
+37 −2
Open

[ISSUE #9926] Avoid redundant list allocation in parsePublishMessageQueues #10380

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
9 changes: 7 additions & 2 deletions client/src/main/java/org/apache/rocketmq/client/impl/MQAdminImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,14 @@ public List<MessageQueue> fetchPublishMessageQueues(String topic) throws MQClien
}

public List<MessageQueue> parsePublishMessageQueues(List<MessageQueue> messageQueueList) {
List<MessageQueue> resultQueues = new ArrayList<>();
String namespace = this.mQClientFactory.getClientConfig().getNamespace();
if (namespace == null || namespace.isEmpty()) {
return messageQueueList;
Copy link
Copy Markdown
Contributor

@RongtongJin RongtongJin May 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One concern about this change is that the method semantics change from “always returning a new list” to “returning the original list when namespace is empty”.

If any caller mutates the returned list, this could accidentally mutate the original message queue list, especially if that list is reused or cached elsewhere in the send path.

Could you confirm that the return value of parsePublishMessageQueues is treated as read-only by all callers, or that the original list is not reused as mutable shared state?

}

List<MessageQueue> resultQueues = new ArrayList<>(messageQueueList.size());
for (MessageQueue queue : messageQueueList) {
String userTopic = NamespaceUtil.withoutNamespace(queue.getTopic(), this.mQClientFactory.getClientConfig().getNamespace());
String userTopic = NamespaceUtil.withoutNamespace(queue.getTopic(), namespace);
resultQueues.add(new MessageQueue(userTopic, queue.getBrokerName(), queue.getQueueId()));
}

Expand Down
30 changes: 30 additions & 0 deletions client/src/test/java/org/apache/rocketmq/client/impl/MQAdminImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,15 @@
import java.net.SocketAddress;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Set;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
Expand Down Expand Up @@ -215,6 +217,34 @@ private TopicRouteData createRouteData() {
return result;
}

@Test
public void assertParsePublishMessageQueuesReturnsOriginalListWhenNoNamespace() {
ClientConfig clientConfig = mock(ClientConfig.class);
when(clientConfig.getNamespace()).thenReturn(null);
when(mQClientFactory.getClientConfig()).thenReturn(clientConfig);
MQAdminImpl adminNoNs = new MQAdminImpl(mQClientFactory);

List<MessageQueue> original = new ArrayList<>();
original.add(new MessageQueue("TopicA", "broker-0", 0));
original.add(new MessageQueue("TopicA", "broker-0", 1));

List<MessageQueue> result = adminNoNs.parsePublishMessageQueues(original);
assertSame(original, result);
}

@Test
public void assertParsePublishMessageQueuesStripsNamespace() {
List<MessageQueue> original = new ArrayList<>();
original.add(new MessageQueue("namespace%TopicA", "broker-0", 0));
original.add(new MessageQueue("namespace%TopicA", "broker-0", 1));

List<MessageQueue> result = mqAdminImpl.parsePublishMessageQueues(original);
assertEquals(2, result.size());
for (MessageQueue mq : result) {
assertEquals("TopicA", mq.getTopic());
}
}

private List<BrokerData> createBrokerData() {
HashMap<Long, String> brokerAddrs = new HashMap<>();
brokerAddrs.put(MixAll.MASTER_ID, defaultBrokerAddr);
Expand Down
Loading