From e12f3f8bafd8258ae091890f42709b64948a462e Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Thu, 24 Aug 2017 17:47:41 +0200
Subject: Separate interface with a const getXXX for readonly and another
 getXXXSP when you really need the SP.

---
 storageserver/src/tests/storageservertest.cpp | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'storageserver/src')

diff --git a/storageserver/src/tests/storageservertest.cpp b/storageserver/src/tests/storageservertest.cpp
index 2564c500cbc..f3595afe1e7 100644
--- a/storageserver/src/tests/storageservertest.cpp
+++ b/storageserver/src/tests/storageservertest.cpp
@@ -6,7 +6,6 @@
 #include <vespa/document/base/testdocman.h>
 #include <vespa/documentapi/documentapi.h>
 #include <vespa/messagebus/rpcmessagebus.h>
-#include <fstream>
 #include <vespa/memfilepersistence/spi/memfilepersistenceprovider.h>
 #include <vespa/messagebus/staticthrottlepolicy.h>
 #include <vespa/messagebus/testlib/slobrok.h>
@@ -14,17 +13,15 @@
 #include <vespa/storageapi/mbusprot/storagereply.h>
 #include <vespa/storageapi/message/bucketsplitting.h>
 #include <vespa/storageapi/message/state.h>
-#include <vespa/storage/common/nodestateupdater.h>
 #include <vespa/storage/common/statusmetricconsumer.h>
-#include <vespa/memfilepersistence/memfile/memfilecache.h>
 #include <tests/testhelper.h>
-#include <vespa/vdstestlib/cppunit/macros.h>
 #include <tests/dummystoragelink.h>
 #include <vespa/slobrok/sbmirror.h>
 #include <vespa/storageserver/app/distributorprocess.h>
 #include <vespa/storageserver/app/memfileservicelayerprocess.h>
 #include <vespa/vespalib/util/exceptions.h>
 #include <sys/time.h>
+#include <fstream>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".storageservertest");
@@ -388,9 +385,8 @@ namespace {
                     if (msg->getType() == DocumentProtocol::MESSAGE_PUTDOCUMENT)
                     {
                         documentapi::PutDocumentMessage& putMsg(
-                                static_cast<documentapi::PutDocumentMessage&>(
-                                    *msg));
-                        std::cerr << " - " << putMsg.getDocument()->getId();
+                                static_cast<documentapi::PutDocumentMessage&>(*msg));
+                        std::cerr << " - " << putMsg.getDocument().getId();
                     }
                     std::cerr << "\n";
                 }
@@ -419,8 +415,7 @@ namespace {
                 }
                 FastOS_Thread::Sleep(1);
             }
-            LOG(info, "Currently, we have received %u ok replies and have %u "
-                      "pending ones.",
+            LOG(info, "Currently, we have received %u ok replies and have %u pending ones.",
                 _processedOk, _currentPending);
         }
     };
-- 
cgit v1.2.3