You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by GitBox <gi...@apache.org> on 2018/03/26 17:13:26 UTC

[GitHub] merlimat closed pull request #1443: Fixed C++ formatting

merlimat closed pull request #1443: Fixed C++ formatting
URL: https://github.com/apache/incubator-pulsar/pull/1443
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/pulsar-client-cpp/lib/BatchAcknowledgementTracker.cc b/pulsar-client-cpp/lib/BatchAcknowledgementTracker.cc
index 0dcf3be95..e780e2742 100644
--- a/pulsar-client-cpp/lib/BatchAcknowledgementTracker.cc
+++ b/pulsar-client-cpp/lib/BatchAcknowledgementTracker.cc
@@ -108,11 +108,12 @@ bool BatchAcknowledgementTracker::isBatchReady(const MessageId& msgID,
                                                const proto::CommandAck_AckType ackType) {
     Lock lock(mutex_);
     // Remove batch index
-    MessageId batchMessageId = MessageId(msgID.partition(), msgID.ledgerId(), msgID.entryId(),
-                                         -1 /* Batch index */);
+    MessageId batchMessageId =
+        MessageId(msgID.partition(), msgID.ledgerId(), msgID.entryId(), -1 /* Batch index */);
 
     TrackerMap::iterator pos = trackerMap_.find(batchMessageId);
-    if (pos == trackerMap_.end() || std::find(sendList_.begin(), sendList_.end(), batchMessageId) != sendList_.end()) {
+    if (pos == trackerMap_.end() ||
+        std::find(sendList_.begin(), sendList_.end(), batchMessageId) != sendList_.end()) {
         LOG_DEBUG(
             "Batch is ready since message present in sendList_ or not present in trackerMap_ [message ID = "
             << batchMessageId << "]");
@@ -146,8 +147,8 @@ const MessageId BatchAcknowledgementTracker::getGreatestCumulativeAckReady(const
     Lock lock(mutex_);
 
     // Remove batch index
-    MessageId batchMessageId = MessageId(messageId.partition(), messageId.ledgerId(),
-                                         messageId.entryId(), -1 /* Batch index */);
+    MessageId batchMessageId =
+        MessageId(messageId.partition(), messageId.ledgerId(), messageId.entryId(), -1 /* Batch index */);
     TrackerMap::iterator pos = trackerMap_.find(batchMessageId);
 
     // element not found


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services