You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2022/07/18 00:43:06 UTC
[pulsar] branch master updated: [cleanup][broker]Cleanup sync method getTopicReference (#16630)
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new e9ccaf3f76a [cleanup][broker]Cleanup sync method getTopicReference (#16630)
e9ccaf3f76a is described below
commit e9ccaf3f76ac21ad762f48e2b3fd69caa5251bc6
Author: Xiaoyu Hou <An...@gmail.com>
AuthorDate: Mon Jul 18 08:42:58 2022 +0800
[cleanup][broker]Cleanup sync method getTopicReference (#16630)
---
.../broker/admin/impl/PersistentTopicsBase.java | 37 ----------------------
1 file changed, 37 deletions(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
index 3782cf1ab43..84356d8ee22 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
@@ -69,7 +69,6 @@ import org.apache.pulsar.broker.admin.AdminResource;
import org.apache.pulsar.broker.authentication.AuthenticationDataSource;
import org.apache.pulsar.broker.authorization.AuthorizationService;
import org.apache.pulsar.broker.service.BrokerServiceException.AlreadyRunningException;
-import org.apache.pulsar.broker.service.BrokerServiceException.NotAllowedException;
import org.apache.pulsar.broker.service.BrokerServiceException.SubscriptionBusyException;
import org.apache.pulsar.broker.service.BrokerServiceException.SubscriptionInvalidCursorPosition;
import org.apache.pulsar.broker.service.Subscription;
@@ -4176,24 +4175,6 @@ public class PersistentTopicsBase extends AdminResource {
return metadataFuture;
}
- /**
- * Get the Topic object reference from the Pulsar broker.
- */
- private Topic getTopicReference(TopicName topicName) {
- try {
- return pulsar().getBrokerService().getTopicIfExists(topicName.toString())
- .get(pulsar().getConfiguration().getMetadataStoreOperationTimeoutSeconds(), TimeUnit.SECONDS)
- .orElseThrow(() -> topicNotFoundReason(topicName));
- } catch (RestException e) {
- throw e;
- } catch (Exception e) {
- if (e.getCause() instanceof NotAllowedException) {
- throw new RestException(Status.BAD_REQUEST, e.getCause());
- }
- throw new RestException(e.getCause() == null ? e : e.getCause());
- }
- }
-
private CompletableFuture<Topic> getTopicReferenceAsync(TopicName topicName) {
return pulsar().getBrokerService().getTopicIfExists(topicName.toString())
.thenCompose(optTopic -> optTopic
@@ -4201,24 +4182,6 @@ public class PersistentTopicsBase extends AdminResource {
.orElseGet(() -> topicNotFoundReasonAsync(topicName)));
}
- private RestException topicNotFoundReason(TopicName topicName) {
- if (!topicName.isPartitioned()) {
- return new RestException(Status.NOT_FOUND, getTopicNotFoundErrorMessage(topicName.toString()));
- }
-
- PartitionedTopicMetadata partitionedTopicMetadata = getPartitionedTopicMetadata(
- TopicName.get(topicName.getPartitionedTopicName()), false, false);
- if (partitionedTopicMetadata == null || partitionedTopicMetadata.partitions == 0) {
- final String topicErrorType = partitionedTopicMetadata
- == null ? "has no metadata" : "has zero partitions";
- return new RestException(Status.NOT_FOUND, String.format(
- "Partitioned Topic not found: %s %s", topicName.toString(), topicErrorType));
- } else if (!internalGetList(Optional.empty()).contains(topicName.toString())) {
- return new RestException(Status.NOT_FOUND, "Topic partitions were not yet created");
- }
- return new RestException(Status.NOT_FOUND, getPartitionedTopicNotFoundErrorMessage(topicName.toString()));
- }
-
private CompletableFuture<Topic> topicNotFoundReasonAsync(TopicName topicName) {
if (!topicName.isPartitioned()) {
return FutureUtil.failedFuture(new RestException(Status.NOT_FOUND,