lhotari commented on code in PR #25089:
URL: https://github.com/apache/pulsar/pull/25089#discussion_r2642242646
##########
managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java:
##########
@@ -1282,7 +1282,69 @@ public int
getNonContiguousDeletedMessagesRangeSerializedSize() {
@Override
public long getEstimatedSizeSinceMarkDeletePosition() {
- return ledger.estimateBacklogFromPosition(markDeletePosition);
+ long totalSize =
ledger.estimateBacklogFromPosition(markDeletePosition);
+
+ // Need to subtract size of individual deleted messages
+ if (log.isDebugEnabled()) {
+ log.debug("[{}] Calculating backlog size for cursor {} from
position {}, totalSize: {}",
+ ledger.getName(), name, markDeletePosition, totalSize);
+ }
+
+ // Get count of individually deleted entries in the backlog range
+ long deletedCount = 0;
+ lock.readLock().lock();
+ try {
+ Range<Position> backlogRange =
Range.openClosed(markDeletePosition, ledger.getLastPosition());
+
+ if (getConfig().isUnackedRangesOpenCacheSetEnabled()) {
+ deletedCount = individualDeletedMessages.cardinality(
+ backlogRange.lowerEndpoint().getLedgerId(),
backlogRange.lowerEndpoint().getEntryId(),
+ backlogRange.upperEndpoint().getLedgerId(),
backlogRange.upperEndpoint().getEntryId());
+ } else {
+ AtomicLong deletedCounter = new AtomicLong(0);
+ individualDeletedMessages.forEach((r) -> {
+ if (r.isConnected(backlogRange)) {
+ Range<Position> intersection =
r.intersection(backlogRange);
+ long countInRange =
ledger.getNumberOfEntries(intersection);
+ deletedCounter.addAndGet(countInRange);
+ }
+ return true;
+ }, recyclePositionRangeConverter);
+ deletedCount = deletedCounter.get();
+ }
+ } finally {
+ lock.readLock().unlock();
+ }
Review Comment:
This part seems to duplicate logic that currently exists in
`getNumberOfEntries` method. Avoiding code duplication would be preferred.
Would it be possible to extract a common method that is used in both
`getEstimatedSizeSinceMarkDeletePosition` and `getNumberOfEntries`?
--
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]
