Skip to content

Commit aad6962

Browse files
committed
[fix][client] Fix clang-format violations in ConsumerImpl and MessageChunkingTest
1 parent 7623401 commit aad6962

2 files changed

Lines changed: 10 additions & 11 deletions

File tree

lib/ConsumerImpl.cc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -627,17 +627,17 @@ optional<SharedBuffer> ConsumerImpl::processMessageChunk(const SharedBuffer& pay
627627
<< uuid << ", messageId: " << messageId);
628628
acknowledgeAsync(messageId, [uuid, messageId](Result result) {
629629
if (result != ResultOk) {
630-
LOG_WARN("Failed to acknowledge duplicated chunk, uuid: "
631-
<< uuid << ", messageId: " << messageId);
630+
LOG_WARN("Failed to acknowledge duplicated chunk, uuid: " << uuid << ", messageId: "
631+
<< messageId);
632632
}
633633
});
634634
}
635635
return {};
636636
}
637637
// chunkId > lastChunkedMessageId + 1, the chunked message is corrupted.
638-
LOG_WARN("Received unexpected chunk (uuid: "
639-
<< uuid << " chunkId: " << chunkId << ", lastChunkedMessageId: " << lastChunkedMessageId
640-
<< ", messageId: " << messageId << ")");
638+
LOG_WARN("Received unexpected chunk (uuid: " << uuid << " chunkId: " << chunkId
639+
<< ", lastChunkedMessageId: " << lastChunkedMessageId
640+
<< ", messageId: " << messageId << ")");
641641
chunkedMessageCache_.remove(uuid);
642642
// If this is the last chunk, its permit was not returned at the entry of processMessageChunk,
643643
// so we need to return it here to avoid permit leak.
@@ -648,8 +648,8 @@ optional<SharedBuffer> ConsumerImpl::processMessageChunk(const SharedBuffer& pay
648648
if (expireTimeOfIncompleteChunkedMessageMs_ > 0 &&
649649
TimeUtils::currentTimeMillis() >
650650
static_cast<long>(metadata.publish_time()) + expireTimeOfIncompleteChunkedMessageMs_) {
651-
LOG_INFO("Acking corrupted gap chunk to avoid ack hole, uuid: "
652-
<< uuid << ", messageId: " << messageId);
651+
LOG_INFO("Acking corrupted gap chunk to avoid ack hole, uuid: " << uuid
652+
<< ", messageId: " << messageId);
653653
acknowledgeAsync(messageId, [uuid, messageId](Result result) {
654654
if (result != ResultOk) {
655655
LOG_WARN("Failed to acknowledge gap chunk, uuid: " << uuid

tests/MessageChunkingTest.cc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -338,8 +338,8 @@ TEST_P(MessageChunkingTest, testResendChunkMessagesWithoutAckHole) {
338338
if (toString(GetParam()) != "None") {
339339
return;
340340
}
341-
const std::string topic = "MessageChunkingTest-testResendChunkMessagesWithoutAckHole-" +
342-
std::to_string(time(nullptr));
341+
const std::string topic =
342+
"MessageChunkingTest-testResendChunkMessagesWithoutAckHole-" + std::to_string(time(nullptr));
343343
Consumer consumer;
344344
ConsumerConfiguration consumerConf;
345345
consumerConf.setMaxPendingChunkedMessage(10);
@@ -379,8 +379,7 @@ TEST_P(MessageChunkingTest, testResendChunkMessages) {
379379
if (toString(GetParam()) != "None") {
380380
return;
381381
}
382-
const std::string topic =
383-
"MessageChunkingTest-testResendChunkMessages-" + std::to_string(time(nullptr));
382+
const std::string topic = "MessageChunkingTest-testResendChunkMessages-" + std::to_string(time(nullptr));
384383
Consumer consumer;
385384
ConsumerConfiguration consumerConf;
386385
consumerConf.setMaxPendingChunkedMessage(10);

0 commit comments

Comments
 (0)