mattday9 commented on code in PR #25681:
URL: https://github.com/apache/pulsar/pull/25681#discussion_r3205356384
##########
pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/InMemoryDelayedDeliveryTracker.java:
##########
@@ -122,21 +122,29 @@ private static long trimLowerBit(long timestamp, int
bits) {
}
@Override
- public boolean addMessage(long ledgerId, long entryId, long deliverAt) {
+ public synchronized boolean addMessage(long ledgerId, long entryId, long
deliverAt) {
if (deliverAt < 0 || deliverAt <= getCutoffTime()) {
messagesHaveFixedDelay = false;
return false;
}
- log.debug()
- .attr("ledgerId", ledgerId)
- .attr("entryId", entryId)
- .attr("deliveryInMs", () -> deliverAt - clock.millis())
- .log("Add message");
- long timestamp = trimLowerBit(deliverAt,
timestampPrecisionBitCnt);
- delayedMessageMap.computeIfAbsent(timestamp, k -> new TreeMap<>())
- .computeIfAbsent(ledgerId, k -> new Roaring64Bitmap())
- .add(entryId);
- delayedMessagesCount.incrementAndGet();
+
+ log.debug()
+ .attr("ledgerId", ledgerId)
+ .attr("entryId", entryId)
+ .attr("deliveryInMs", () -> deliverAt - clock.millis())
+ .log("Add message");
+ long timestamp = trimLowerBit(deliverAt, timestampPrecisionBitCnt);
+
+ Roaring64Bitmap bitmap = delayedMessageMap.computeIfAbsent(timestamp,
k -> new TreeMap<>())
+ .computeIfAbsent(ledgerId, k -> new Roaring64Bitmap());
+ // Roaring64Bitmap does not store duplicates, so track if it a new
element
+ // so we can keep delayedMessagesCount in sync
+ boolean isNew = !bitmap.contains(entryId);
Review Comment:
nit: unnecessary to declare new variable here that's only being used once.
##########
pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/InMemoryDelayedDeliveryTracker.java:
##########
@@ -122,21 +122,29 @@ private static long trimLowerBit(long timestamp, int
bits) {
}
@Override
- public boolean addMessage(long ledgerId, long entryId, long deliverAt) {
+ public synchronized boolean addMessage(long ledgerId, long entryId, long
deliverAt) {
if (deliverAt < 0 || deliverAt <= getCutoffTime()) {
messagesHaveFixedDelay = false;
return false;
}
- log.debug()
- .attr("ledgerId", ledgerId)
- .attr("entryId", entryId)
- .attr("deliveryInMs", () -> deliverAt - clock.millis())
- .log("Add message");
- long timestamp = trimLowerBit(deliverAt,
timestampPrecisionBitCnt);
- delayedMessageMap.computeIfAbsent(timestamp, k -> new TreeMap<>())
- .computeIfAbsent(ledgerId, k -> new Roaring64Bitmap())
- .add(entryId);
- delayedMessagesCount.incrementAndGet();
+
+ log.debug()
+ .attr("ledgerId", ledgerId)
+ .attr("entryId", entryId)
+ .attr("deliveryInMs", () -> deliverAt - clock.millis())
+ .log("Add message");
+ long timestamp = trimLowerBit(deliverAt, timestampPrecisionBitCnt);
+
+ Roaring64Bitmap bitmap = delayedMessageMap.computeIfAbsent(timestamp,
k -> new TreeMap<>())
+ .computeIfAbsent(ledgerId, k -> new Roaring64Bitmap());
+ // Roaring64Bitmap does not store duplicates, so track if it a new
element
+ // so we can keep delayedMessagesCount in sync
+ boolean isNew = !bitmap.contains(entryId);
+
+ if (isNew) {
+ bitmap.add(entryId);
Review Comment:
Nit: This is ok and its readable but could collapse under the same lambda
expression above for conciseness. Something like:
```
delayedMessageMap.computeIfAbsent(timestamp, k -> new TreeMap<>())
.compute(ledgerId, (k, bitmap) -> {
if (bitmap == null) {
bitmap = new Roaring64Bitmap();
}
if (!bitmap.contains(entryId)) {
bitmap.add(entryId);
delayedMessagesCount.incrementAndGet();
}
return bitmap;
});
--
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]
