Unify code layout

2 files changed, 15 insertions, 43 deletions

diff --git a/storage/src/vespa/storage/distributor/persistencemessagetracker.cpp b/storage/src/vespa/storage/distributor/persistencemessagetracker.cpp
index fe384a68d72..a4295613fd2 100644
--- a/storage/src/vespa/storage/distributor/persistencemessagetracker.cpp
+++ b/storage/src/vespa/storage/distributor/persistencemessagetracker.cpp
@@ -65,9 +65,7 @@ PersistenceMessageTrackerImpl::fail(MessageSender& sender, const api::ReturnCode
 }
 
 uint16_t
-PersistenceMessageTrackerImpl::receiveReply(
-        MessageSender& sender,
-        api::BucketInfoReply& reply)
+PersistenceMessageTrackerImpl::receiveReply(MessageSender& sender, api::BucketInfoReply& reply)
 {
     uint16_t node = handleReply(reply);
 
@@ -79,9 +77,7 @@ PersistenceMessageTrackerImpl::receiveReply(
 }
 
 void
-PersistenceMessageTrackerImpl::revert(
-        MessageSender& sender,
-        const std::vector<BucketNodePair>& revertNodes)
+PersistenceMessageTrackerImpl::revert(MessageSender& sender, const std::vector<BucketNodePair>& revertNodes)
 {
     if (_revertTimestamp != 0) {
         // Since we're reverting, all received bucket info is voided.
@@ -156,24 +152,18 @@ PersistenceMessageTrackerImpl::canSendReplyEarly() const
 }
 
 void
-PersistenceMessageTrackerImpl::addBucketInfoFromReply(
-        uint16_t node,
-        const api::BucketInfoReply& reply)
+PersistenceMessageTrackerImpl::addBucketInfoFromReply(uint16_t node, const api::BucketInfoReply& reply)
 {
     document::Bucket bucket(reply.getBucket());
     const api::BucketInfo& bucketInfo(reply.getBucketInfo());
 
     if (reply.hasBeenRemapped()) {
         LOG(debug, "Bucket %s: Received remapped bucket info %s from node %d",
-            bucket.toString().c_str(),
-            bucketInfo.toString().c_str(),
-            node);
+            bucket.toString().c_str(), bucketInfo.toString().c_str(), node);
         _remapBucketInfo[bucket].emplace_back(_op_ctx.generate_unique_timestamp(), node, bucketInfo);
     } else {
         LOG(debug, "Bucket %s: Received bucket info %s from node %d",
-            bucket.toString().c_str(),
-            bucketInfo.toString().c_str(),
-            node);
+            bucket.toString().c_str(), bucketInfo.toString().c_str(), node);
         _bucketInfo[bucket].emplace_back(_op_ctx.generate_unique_timestamp(), node, bucketInfo);
     }
 }
@@ -182,17 +172,12 @@ void
 PersistenceMessageTrackerImpl::logSuccessfulReply(uint16_t node, const api::BucketInfoReply& reply) const
 {
     LOG(spam, "Bucket %s: Received successful reply %s",
-        reply.getBucketId().toString().c_str(),
-        reply.toString().c_str());
+        reply.getBucketId().toString().c_str(), reply.toString().c_str());
     
     if (!reply.getBucketInfo().valid()) {
-        LOG(error,
-            "Reply %s from node %d contained invalid bucket "
-            "information %s. This is a bug! Please report "
-            "this to the Vespa team",
-            reply.toString().c_str(),
-            node,
-            reply.getBucketInfo().toString().c_str());
+        LOG(error, "Reply %s from node %d contained invalid bucket information %s. This is a bug! "
+                   "Please report this to the Vespa team",
+            reply.toString().c_str(), node, reply.getBucketInfo().toString().c_str());
     }
 }
 
@@ -236,12 +221,8 @@ void
 PersistenceMessageTrackerImpl::updateFailureResult(const api::BucketInfoReply& reply)
 {
     LOG(debug, "Bucket %s: Received failed reply %s with result %s",
-        reply.getBucketId().toString().c_str(),
-        reply.toString().c_str(),
-        reply.getResult().toString().c_str());
-    if (reply.getResult().getResult() >
-        _reply->getResult().getResult())
-    {
+        reply.getBucketId().toString().c_str(), reply.toString().c_str(), reply.getResult().toString().c_str());
+    if (reply.getResult().getResult() > _reply->getResult().getResult()) {
         _reply->setResult(reply.getResult());
     }
     
@@ -249,12 +230,9 @@ PersistenceMessageTrackerImpl::updateFailureResult(const api::BucketInfoReply& r
 }
 
 void
-PersistenceMessageTrackerImpl::handleCreateBucketReply(
-        api::BucketInfoReply& reply,
-        uint16_t node)
+PersistenceMessageTrackerImpl::handleCreateBucketReply(api::BucketInfoReply& reply, uint16_t node)
 {
-    LOG(spam, "Received CreateBucket reply for %s from node %u",
-        reply.getBucketId().toString().c_str(), node);
+    LOG(spam, "Received CreateBucket reply for %s from node %u", reply.getBucketId().toString().c_str(), node);
     if (!reply.getResult().success()
         && reply.getResult().getResult() != api::ReturnCode::EXISTS)
     {
@@ -271,9 +249,7 @@ PersistenceMessageTrackerImpl::handleCreateBucketReply(
 }
 
 void
-PersistenceMessageTrackerImpl::handlePersistenceReply(
-        api::BucketInfoReply& reply,
-        uint16_t node)
+PersistenceMessageTrackerImpl::handlePersistenceReply(api::BucketInfoReply& reply, uint16_t node)
 {
     ++_n_persistence_replies_total;
     if (reply.getBucketInfo().valid()) {
@@ -298,10 +274,7 @@ PersistenceMessageTrackerImpl::transfer_trace_state_to_reply()
 }
 
 void
-PersistenceMessageTrackerImpl::updateFromReply(
-        MessageSender& sender,
-        api::BucketInfoReply& reply,
-        uint16_t node)
+PersistenceMessageTrackerImpl::updateFromReply(MessageSender& sender, api::BucketInfoReply& reply, uint16_t node)
 {
     _trace.addChild(reply.steal_trace());
 
diff --git a/storage/src/vespa/storage/distributor/persistencemessagetracker.h b/storage/src/vespa/storage/distributor/persistencemessagetracker.h
index ecc4732696b..9b06547dd98 100644
--- a/storage/src/vespa/storage/distributor/persistencemessagetracker.h
+++ b/storage/src/vespa/storage/distributor/persistencemessagetracker.h
@@ -8,7 +8,6 @@
 #include <vespa/storageapi/messageapi/bucketinfocommand.h>
 #include <vespa/storageapi/messageapi/bucketinforeply.h>
 
-
 namespace storage::distributor {
 
 struct PersistenceMessageTracker {