Skip to content

Fixed C++ batch acks tracker to evict message from sendList array #3618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merlimat merged 2 commits into from
Feb 19, 2019
Merged

Fixed C++ batch acks tracker to evict message from sendList array #3618

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e14e82
Fixed C++ batch acks tracker to evict message from sendList array
merlimat Feb 17, 2019
85b137c
Fixed formatting
merlimat Feb 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions pulsar-client-cpp/lib/BatchAcknowledgementTracker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ void BatchAcknowledgementTracker::receivedMessage(const Message& message) {
std::find(sendList_.begin(), sendList_.end(), msgID) != sendList_.end()) {
return;
}
LOG_DEBUG("Initializing the trackerMap_ with Message ID = " << msgID);
LOG_DEBUG("Initializing the trackerMap_ with Message ID = "
<< msgID << " -- Map size: " << trackerMap_.size() << " -- List size: " << sendList_.size());

// Since dynamic_set (this version) doesn't have all() function, initializing all bits with 1 and then
// reseting them to 0 and using any()
Expand All @@ -67,6 +68,9 @@ void BatchAcknowledgementTracker::deleteAckedMessage(const MessageId& messageId,
return;
}

MessageId batchMessageId =
MessageId(messageId.partition(), messageId.ledgerId(), messageId.entryId(), -1 /* Batch index */);

Lock lock(mutex_);
if (ackType == proto::CommandAck_AckType_Cumulative) {
// delete from trackerMap and sendList all messageIDs less than or equal to this one
Expand All @@ -85,8 +89,9 @@ void BatchAcknowledgementTracker::deleteAckedMessage(const MessageId& messageId,
// std::remove shifts all to be deleted items to the end of the vector and returns an iterator to the
// first
// instance of item, then we erase all elements from this iterator to the end of the list
sendList_.erase(std::remove_if(sendList_.begin(), sendList_.end(), SendRemoveCriteria(messageId)),
sendList_.end());
sendList_.erase(
std::remove_if(sendList_.begin(), sendList_.end(), SendRemoveCriteria(batchMessageId)),
sendList_.end());

if (greatestCumulativeAckSent_ < messageId) {
greatestCumulativeAckSent_ = messageId;
Expand All @@ -100,7 +105,7 @@ void BatchAcknowledgementTracker::deleteAckedMessage(const MessageId& messageId,
<< messageId);
}

sendList_.erase(std::remove(sendList_.begin(), sendList_.end(), messageId), sendList_.end());
sendList_.erase(std::remove(sendList_.begin(), sendList_.end(), batchMessageId), sendList_.end());
}
}

Expand Down