Skip to content

Commit

Permalink
[fix][broker] Support deleting partitioned topics with the keyword `-…
Browse files Browse the repository at this point in the history
…partition-` (#19230)
  • Loading branch information
mattisonchao authored and Technoboy- committed Feb 7, 2023
1 parent 58bfadd commit 138fcf4
Show file tree
Hide file tree
Showing 2 changed files with 78 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -993,7 +993,7 @@ public void deletePartitionedTopic(
@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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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));
}
}

0 comments on commit 138fcf4

Please sign in to comment.