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 2021/12/20 11:57:02 UTC
[pulsar] 12/22: fix a typo in UnAckedMessageTracker (#12467)
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 4d6eb22f949b0658ca2e3ddc6e25e97a6f1eb364
Author: ZhangJian He <sh...@gmail.com>
AuthorDate: Sun Oct 24 12:32:29 2021 +0800
fix a typo in UnAckedMessageTracker (#12467)
(cherry picked from commit 52336c8d0253ca16d51105abc180dcc81e65a5e3)
---
.../org/apache/pulsar/client/impl/NegativeAcksTracker.java | 4 ++--
.../org/apache/pulsar/client/impl/UnAckedMessageTracker.java | 11 +++++------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/NegativeAcksTracker.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/NegativeAcksTracker.java
index b5e6fd1..a062009 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/NegativeAcksTracker.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/NegativeAcksTracker.java
@@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.pulsar.client.api.MessageId;
import org.apache.pulsar.client.impl.conf.ConsumerConfigurationData;
-import static org.apache.pulsar.client.impl.UnAckedMessageTracker.addChunkedMessageIdsAndRemoveFromSequnceMap;
+import static org.apache.pulsar.client.impl.UnAckedMessageTracker.addChunkedMessageIdsAndRemoveFromSequenceMap;
class NegativeAcksTracker implements Closeable {
@@ -64,7 +64,7 @@ class NegativeAcksTracker implements Closeable {
long now = System.nanoTime();
nackedMessages.forEach((msgId, timestamp) -> {
if (timestamp < now) {
- addChunkedMessageIdsAndRemoveFromSequnceMap(msgId, messagesToRedeliver, this.consumer);
+ addChunkedMessageIdsAndRemoveFromSequenceMap(msgId, messagesToRedeliver, this.consumer);
messagesToRedeliver.add(msgId);
}
});
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/UnAckedMessageTracker.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/UnAckedMessageTracker.java
index db616f2..ff07156 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/UnAckedMessageTracker.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/UnAckedMessageTracker.java
@@ -30,6 +30,7 @@ import org.slf4j.LoggerFactory;
import java.io.Closeable;
import java.util.ArrayDeque;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
@@ -130,7 +131,7 @@ public class UnAckedMessageTracker implements Closeable {
if (!headPartition.isEmpty()) {
log.warn("[{}] {} messages have timed-out", consumerBase, headPartition.size());
headPartition.forEach(messageId -> {
- addChunkedMessageIdsAndRemoveFromSequnceMap(messageId, messageIds, consumerBase);
+ addChunkedMessageIdsAndRemoveFromSequenceMap(messageId, messageIds, consumerBase);
messageIds.add(messageId);
messageIdPartitionMap.remove(messageId);
});
@@ -150,14 +151,12 @@ public class UnAckedMessageTracker implements Closeable {
}, this.tickDurationInMs, TimeUnit.MILLISECONDS);
}
- public static void addChunkedMessageIdsAndRemoveFromSequnceMap(MessageId messageId, Set<MessageId> messageIds,
- ConsumerBase<?> consumerBase) {
+ public static void addChunkedMessageIdsAndRemoveFromSequenceMap(MessageId messageId, Set<MessageId> messageIds,
+ ConsumerBase<?> consumerBase) {
if (messageId instanceof MessageIdImpl) {
MessageIdImpl[] chunkedMsgIds = consumerBase.unAckedChunkedMessageIdSequenceMap.get((MessageIdImpl) messageId);
if (chunkedMsgIds != null && chunkedMsgIds.length > 0) {
- for (MessageIdImpl msgId : chunkedMsgIds) {
- messageIds.add(msgId);
- }
+ Collections.addAll(messageIds, chunkedMsgIds);
}
consumerBase.unAckedChunkedMessageIdSequenceMap.remove((MessageIdImpl) messageId);
}