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

Jump to bottom

[fix] [broker] Fix wrong logic of method TopicName.getPartition(int index) #19841

Merged
merged 5 commits into from
Apr 23, 2023
Merged

[fix] [broker] Fix wrong logic of method TopicName.getPartition(int index) #19841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3cf0dd9
rewrite test
poorbarcode Apr 23, 2023
70d98a9
fix test
poorbarcode Mar 20, 2023
d3ec723
add another case to reproduce the issue
poorbarcode Mar 20, 2023
8f75607
fix test
poorbarcode Mar 20, 2023
73cb806
delete test TopicNameForInfiniteHttpCallGetSubscriptionsTest
poorbarcode Apr 23, 2023
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
3 changes: 2 additions & 1 deletion ...t/java/org/apache/pulsar/broker/service/persistent/PartitionKeywordCompatibilityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.apache.pulsar.client.api.Consumer;
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.api.SubscriptionType;
import org.apache.pulsar.common.naming.TopicName;
import org.apache.pulsar.common.policies.data.AutoTopicCreationOverride;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
Expand Down Expand Up @@ -66,7 +67,7 @@ public void testAutoCreatePartitionTopicWithKeywordAndDeleteIt()
.subscribe();
List<String> topics = admin.topics().getList("public/default");
List<String> partitionedTopicList = admin.topics().getPartitionedTopicList("public/default");
Assert.assertTrue(topics.contains(topicName));
Assert.assertTrue(topics.contains(TopicName.get(topicName).getPartition(0).toString()));
Assert.assertTrue(partitionedTopicList.contains(topicName));
consumer.close();
admin.topics().deletePartitionedTopic(topicName);
Expand Down
143 changes: 0 additions & 143 deletions ...t/java/org/apache/pulsar/client/api/TopicNameForInfiniteHttpCallGetSubscriptionsTest.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion pulsar-common/src/main/java/org/apache/pulsar/common/naming/TopicName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ public String getEncodedLocalName() {
}

public TopicName getPartition(int index) {
if (index == -1 || this.toString().contains(PARTITIONED_TOPIC_SUFFIX)) {
if (index == -1 || this.toString().endsWith(PARTITIONED_TOPIC_SUFFIX + index)) {
Copy link
Contributor

Choose a reason for hiding this comment

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

What I thought was the PR intent to allow the partitioned name can contain -partition- keyword to resolve the issue. But it will introduce a new unreasonable rule to the partitioned topic.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

we will not automatically create a partitioned topic for the DLQ topic even if users are enabled partitioned topic auto-creation.

Yes, PIP-263: Just auto-create no-partitioned DLQ And Prevent auto-create a DLQ for a DLQ try to do this.

Copy link
Contributor Author

@poorbarcode poorbarcode Apr 7, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

What I thought was the PR intent to allow the partitioned name can contain -partition- keyword to resolve the issue. But it will introduce a new unreasonable rule to the partitioned topic.

I think there are three separate things:

  • Our rule for a partition name and how to check which index it is: end with -partition-x or contain -partition-x
    • The current logic is incorrect, and the current PR can fix it.
  • Whether to allow to create a topic whose name contains -paritition-
    • the behavior is denied for Admin API
      -the behavior is allowed for client(such as create by a cmd-subscribe), you can see the tests testInfiniteHttpCallGetSubscriptions2, testInfiniteHttpCallGetSubscriptions3 in current PR
  • Whether only create non-partitioned topics for the Dead Letter or Retry Letter

return this;
}
String partitionName = this.toString() + PARTITIONED_TOPIC_SUFFIX + index;
Expand Down
8 changes: 8 additions & 0 deletions pulsar-common/src/test/java/org/apache/pulsar/common/naming/TopicNameTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,4 +289,12 @@ public void testShortTopicName() throws Exception {
// Ok
}
}

@Test
public void testTwoKeyWordPartition(){
TopicName tp1 = TopicName.get("tenant1/namespace1/tp1-partition-0-DLQ");
TopicName tp2 = tp1.getPartition(0);
assertNotEquals(tp2.toString(), tp1.toString());
assertEquals(tp2.toString(), "persistent://tenant1/namespace1/tp1-partition-0-DLQ-partition-0");
}
}