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 #7543] Use "+" as the new separator for retry topic #7655

Merged
merged 1 commit into from
Dec 15, 2023
Merged

[ISSUE #7543] Use "+" as the new separator for retry topic #7655

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
11 changes: 6 additions & 5 deletions common/src/main/java/org/apache/rocketmq/common/KeyBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@

public class KeyBuilder {
public static final int POP_ORDER_REVIVE_QUEUE = 999;
private static final String POP_RETRY_SEPARATOR_V1 = "_";
private static final String POP_RETRY_SEPARATOR_V2 = ":";
private static final char POP_RETRY_SEPARATOR_V1 = '_';
private static final char POP_RETRY_SEPARATOR_V2 = '+';
private static final String POP_RETRY_REGEX_SEPARATOR_V2 = "\\+";

public static String buildPopRetryTopic(String topic, String cid) {
return MixAll.RETRY_GROUP_TOPIC_PREFIX + cid + POP_RETRY_SEPARATOR_V2 + topic;
Expand All @@ -42,7 +43,7 @@ public static String parseNormalTopic(String topic, String cid) {

public static String parseNormalTopic(String retryTopic) {
if (isPopRetryTopicV2(retryTopic)) {
String[] result = retryTopic.split(POP_RETRY_SEPARATOR_V2);
String[] result = retryTopic.split(POP_RETRY_REGEX_SEPARATOR_V2);
if (result.length == 2) {
return result[1];
}
Expand All @@ -52,7 +53,7 @@ public static String parseNormalTopic(String retryTopic) {

public static String parseGroup(String retryTopic) {
if (isPopRetryTopicV2(retryTopic)) {
String[] result = retryTopic.split(POP_RETRY_SEPARATOR_V2);
String[] result = retryTopic.split(POP_RETRY_REGEX_SEPARATOR_V2);
if (result.length == 2) {
return result[0].substring(MixAll.RETRY_GROUP_TOPIC_PREFIX.length());
}
Expand All @@ -65,6 +66,6 @@ public static String buildPollingKey(String topic, String cid, int queueId) {
}

public static boolean isPopRetryTopicV2(String retryTopic) {
return retryTopic.startsWith(MixAll.RETRY_GROUP_TOPIC_PREFIX) && retryTopic.contains(POP_RETRY_SEPARATOR_V2);
return retryTopic.startsWith(MixAll.RETRY_GROUP_TOPIC_PREFIX) && retryTopic.contains(String.valueOf(POP_RETRY_SEPARATOR_V2));
}
}
18 changes: 8 additions & 10 deletions common/src/test/java/org/apache/rocketmq/common/KeyBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,37 +26,35 @@ public class KeyBuilderTest {
String group = "test-group";

@Test
public void buildPopRetryTopic() {
assertThat(KeyBuilder.buildPopRetryTopic(topic, group)).isEqualTo(MixAll.RETRY_GROUP_TOPIC_PREFIX + group + ":" + topic);
public void testBuildPopRetryTopic() {
assertThat(KeyBuilder.buildPopRetryTopic(topic, group)).isEqualTo(MixAll.RETRY_GROUP_TOPIC_PREFIX + group + "+" + topic);
}

@Test
public void buildPopRetryTopicV1() {
public void testBuildPopRetryTopicV1() {
assertThat(KeyBuilder.buildPopRetryTopicV1(topic, group)).isEqualTo(MixAll.RETRY_GROUP_TOPIC_PREFIX + group + "_" + topic);
}

@Test
public void parseNormalTopic() {
public void testParseNormalTopic() {
String popRetryTopic = KeyBuilder.buildPopRetryTopic(topic, group);
assertThat(KeyBuilder.parseNormalTopic(popRetryTopic, group)).isEqualTo(topic);

String popRetryTopicV1 = KeyBuilder.buildPopRetryTopicV1(topic, group);
assertThat(KeyBuilder.parseNormalTopic(popRetryTopicV1, group)).isEqualTo(topic);
}

@Test
public void testParseNormalTopic() {
String popRetryTopic = KeyBuilder.buildPopRetryTopic(topic, group);
popRetryTopic = KeyBuilder.buildPopRetryTopic(topic, group);
assertThat(KeyBuilder.parseNormalTopic(popRetryTopic)).isEqualTo(topic);
}

@Test
public void parseGroup() {
public void testParseGroup() {
String popRetryTopic = KeyBuilder.buildPopRetryTopic(topic, group);
assertThat(KeyBuilder.parseGroup(popRetryTopic)).isEqualTo(group);
}

@Test
public void isPopRetryTopicV2() {
public void testIsPopRetryTopicV2() {
String popRetryTopic = KeyBuilder.buildPopRetryTopic(topic, group);
assertThat(KeyBuilder.isPopRetryTopicV2(popRetryTopic)).isEqualTo(true);
String popRetryTopicV1 = KeyBuilder.buildPopRetryTopicV1(topic, group);
Expand Down