RobertIndie commented on code in PR #1459:
URL: https://github.com/apache/pulsar-client-go/pull/1459#discussion_r2745191084
##########
pulsar/consumer_impl.go:
##########
@@ -150,32 +150,40 @@ func newConsumer(client *client, options ConsumerOptions)
(Consumer, error) {
oldRetryTopic := tn.Domain + "://" + tn.Namespace + "/" +
options.SubscriptionName + RetryTopicSuffix
oldDlqTopic := tn.Domain + "://" + tn.Namespace + "/" +
options.SubscriptionName + DlqTopicSuffix
- if r, err :=
client.lookupService.GetPartitionedTopicMetadata(oldRetryTopic); err == nil &&
- r != nil &&
- r.Partitions > 0 {
- retryTopic = oldRetryTopic
- }
-
- if r, err :=
client.lookupService.GetPartitionedTopicMetadata(oldDlqTopic); err == nil &&
- r != nil &&
- r.Partitions > 0 {
- dlqTopic = oldDlqTopic
+ CheckTopicIsExists := func(topic string) bool {
+ r, err :=
client.lookupService.GetPartitionedTopicMetadata(topic)
+ return err == nil && r != nil && r.Partitions > 0
}
+ //If the retryTopic or DLQTopic has already been set,
+ //there is no need to perform GetPartitiondTopicMetadata
operation on oldRetroTopic or oldDLQTopic
if options.DLQ == nil {
+ if CheckTopicIsExists(oldRetryTopic) {
+ retryTopic = oldRetryTopic
+ }
+ if CheckTopicIsExists(oldDlqTopic) {
+ dlqTopic = oldDlqTopic
+ }
options.DLQ = &DLQPolicy{
MaxDeliveries: MaxReconsumeTimes,
DeadLetterTopic: dlqTopic,
RetryLetterTopic: retryTopic,
}
} else {
if options.DLQ.DeadLetterTopic == "" {
+ if CheckTopicIsExists(oldDlqTopic) {
+ dlqTopic = oldDlqTopic
+ }
options.DLQ.DeadLetterTopic = dlqTopic
}
if options.DLQ.RetryLetterTopic == "" {
+ if CheckTopicIsExists(oldRetryTopic) {
+ retryTopic = oldRetryTopic
+ }
options.DLQ.RetryLetterTopic = retryTopic
}
}
Review Comment:
Maybe we can abstrct the logic like this to reduce duplicate codes:
```suggestion
resolveTopic := func(current, old string) string {
if current != "" {
return current
}
if CheckTopicIsExists(old) {
return old
}
return current
}
if options.DLQ == nil {
options.DLQ = &DLQPolicy{
MaxDeliveries: MaxReconsumeTimes,
}
}
options.DLQ.DeadLetterTopic = resolveTopic(
options.DLQ.DeadLetterTopic,
oldDlqTopic,
)
options.DLQ.RetryLetterTopic = resolveTopic(
options.DLQ.RetryLetterTopic,
oldRetryTopic,
)
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
