This is an automated email from the ASF dual-hosted git repository.
technoboy pushed a commit to branch branch-2.11
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.11 by this push:
new 138fcf44e0d [fix][broker] Support deleting partitioned topics with the
keyword `-partition-` (#19230)
138fcf44e0d is described below
commit 138fcf44e0d3aa6d4be5bef2c315263b5f1862ba
Author: Qiang Zhao <[email protected]>
AuthorDate: Sat Jan 14 11:55:18 2023 +0800
[fix][broker] Support deleting partitioned topics with the keyword
`-partition-` (#19230)
---
.../pulsar/broker/admin/v2/PersistentTopics.java | 2 +-
.../PartitionKeywordCompatibilityTest.java | 77 ++++++++++++++++++++++
2 files changed, 78 insertions(+), 1 deletion(-)
diff --git
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/PersistentTopics.java
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/PersistentTopics.java
index 2118d52a365..e60baa1c2dd 100644
---
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/PersistentTopics.java
+++
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/PersistentTopics.java
@@ -993,7 +993,7 @@ public class PersistentTopics extends PersistentTopicsBase {
@ApiParam(value = "Whether leader broker redirected this call to
this broker. For internal use.")
@QueryParam("authoritative") @DefaultValue("false") boolean
authoritative) {
try {
- validatePartitionedTopicName(tenant, namespace, encodedTopic);
+ validateTopicName(tenant, namespace, encodedTopic);
internalDeletePartitionedTopic(asyncResponse, authoritative,
force);
} catch (WebApplicationException wae) {
asyncResponse.resume(wae);
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PartitionKeywordCompatibilityTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PartitionKeywordCompatibilityTest.java
new file mode 100644
index 00000000000..58b9dcee628
--- /dev/null
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PartitionKeywordCompatibilityTest.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.broker.service.persistent;
+
+
+import lombok.Cleanup;
+import org.apache.pulsar.broker.service.BrokerTestBase;
+import org.apache.pulsar.client.admin.PulsarAdminException;
+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.policies.data.AutoTopicCreationOverride;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+import java.util.List;
+
+@Test
+public class PartitionKeywordCompatibilityTest extends BrokerTestBase {
+
+ @BeforeClass(alwaysRun = true)
+ @Override
+ protected void setup() throws Exception {
+ baseSetup();
+ setupDefaultTenantAndNamespace();
+ }
+
+ @AfterClass(alwaysRun = true)
+ @Override
+ protected void cleanup() throws Exception {
+ internalCleanup();
+ }
+
+ public void testAutoCreatePartitionTopicWithKeywordAndDeleteIt()
+ throws PulsarAdminException, PulsarClientException {
+ AutoTopicCreationOverride override =
AutoTopicCreationOverride.builder()
+ .allowAutoTopicCreation(true)
+ .topicType("partitioned")
+ .defaultNumPartitions(1)
+ .build();
+ admin.namespaces().setAutoTopicCreation("public/default", override);
+ String topicName = "persistent://public/default/XXX-partition-0-dd";
+ @Cleanup
+ Consumer<byte[]> consumer = pulsarClient.newConsumer()
+ .topic(topicName)
+ .subscriptionName("sub-1")
+ .subscriptionType(SubscriptionType.Exclusive)
+ .subscribe();
+ List<String> topics = admin.topics().getList("public/default");
+ List<String> partitionedTopicList =
admin.topics().getPartitionedTopicList("public/default");
+ Assert.assertTrue(topics.contains(topicName));
+ Assert.assertTrue(partitionedTopicList.contains(topicName));
+ consumer.close();
+ admin.topics().deletePartitionedTopic(topicName);
+ topics = admin.topics().getList("public/default");
+ partitionedTopicList =
admin.topics().getPartitionedTopicList("public/default");
+ Assert.assertFalse(topics.contains(topicName));
+ Assert.assertFalse(partitionedTopicList.contains(topicName));
+ }
+}
