From 6b816198bd0d8a518465c8015e6dc9ee40399cd2 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Thu, 16 Jan 2020 10:42:38 +0000
Subject: Just use the stream method.

---
 storage/src/tests/persistence/testandsettest.cpp            | 4 ++--
 storage/src/vespa/storage/persistence/processallhandler.cpp | 4 ++--
 storage/src/vespa/storage/persistence/splitbitdetector.cpp  | 2 +-
 storage/src/vespa/storage/storageserver/opslogger.cpp       | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'storage')

diff --git a/storage/src/tests/persistence/testandsettest.cpp b/storage/src/tests/persistence/testandsettest.cpp
index fe10d346ba7..1507f0e8f0d 100644
--- a/storage/src/tests/persistence/testandsettest.cpp
+++ b/storage/src/tests/persistence/testandsettest.cpp
@@ -294,9 +294,9 @@ std::string TestAndSetTest::expectedDocEntryString(
 
     ss << "DocEntry(" << timestamp << ", " << removeFlag << ", ";
     if (removeFlag == spi::REMOVE_ENTRY) {
-        ss << docId.toString() << ")\n";
+        ss << docId << ")\n";
     } else {
-       ss << "Doc(" << docId.toString() << "))\n";
+       ss << "Doc(" << docId << "))\n";
     }
 
     return ss.str();
diff --git a/storage/src/vespa/storage/persistence/processallhandler.cpp b/storage/src/vespa/storage/persistence/processallhandler.cpp
index 39708f33793..8c951a9f50d 100644
--- a/storage/src/vespa/storage/persistence/processallhandler.cpp
+++ b/storage/src/vespa/storage/persistence/processallhandler.cpp
@@ -57,11 +57,11 @@ public:
     void process(spi::DocEntry& e) override {
         ost << "  Timestamp: " << e.getTimestamp() << ", ";
         if (e.getDocument() != nullptr) {
-            ost << "Doc(" << e.getDocument()->getId().toString() << ")"
+            ost << "Doc(" << e.getDocument()->getId() << ")"
                 << ", " << e.getDocument()->getId().getGlobalId().toString()
                 << ", size: " << e.getPersistedDocumentSize();
         } else if (e.getDocumentId() != nullptr) {
-            ost << e.getDocumentId()->toString()
+            ost << *e.getDocumentId()
                 << ", " << e.getDocumentId()->getGlobalId().toString();
         } else {
             ost << "metadata only";
diff --git a/storage/src/vespa/storage/persistence/splitbitdetector.cpp b/storage/src/vespa/storage/persistence/splitbitdetector.cpp
index 3b91b5a52ea..0208b220b79 100644
--- a/storage/src/vespa/storage/persistence/splitbitdetector.cpp
+++ b/storage/src/vespa/storage/persistence/splitbitdetector.cpp
@@ -91,7 +91,7 @@ struct BucketVisitor : public BucketProcessor::EntryProcessor {
         for (uint32_t i=0; i<_firstDocs.size(); ++i) {
             out << "\n" << _firstDocs[i].timestamp << ' '
                 << _firstDocs[i].bucketId << ' '
-                << _firstDocs[i].docId.toString();
+                << _firstDocs[i].docId;
         }
     }
 
diff --git a/storage/src/vespa/storage/storageserver/opslogger.cpp b/storage/src/vespa/storage/storageserver/opslogger.cpp
index c67f956904d..6fc9795993e 100644
--- a/storage/src/vespa/storage/storageserver/opslogger.cpp
+++ b/storage/src/vespa/storage/storageserver/opslogger.cpp
@@ -76,7 +76,7 @@ OpsLogger::onPutReply(const std::shared_ptr<api::PutReply>& msg)
     if (_targetFile == nullptr) return false;
     std::ostringstream ost;
     ost << _component.getClock().getTimeInSeconds().getTime()
-        << "\tPUT\t" << msg->getDocumentId().toString() << "\t"
+        << "\tPUT\t" << msg->getDocumentId() << "\t"
         << msg->getResult().toString() << "\n";
     {
         vespalib::LockGuard lock(_lock);
@@ -93,7 +93,7 @@ OpsLogger::onUpdateReply(const std::shared_ptr<api::UpdateReply>& msg)
     if (_targetFile == nullptr) return false;
     std::ostringstream ost;
     ost << _component.getClock().getTimeInSeconds().getTime()
-        << "\tUPDATE\t" << msg->getDocumentId().toString() << "\t"
+        << "\tUPDATE\t" << msg->getDocumentId() << "\t"
         << msg->getResult().toString() << "\n";
     {
         vespalib::LockGuard lock(_lock);
@@ -110,7 +110,7 @@ OpsLogger::onRemoveReply(const std::shared_ptr<api::RemoveReply>& msg)
     if (_targetFile == nullptr) return false;
     std::ostringstream ost;
     ost << _component.getClock().getTimeInSeconds().getTime()
-        << "\tREMOVE\t" << msg->getDocumentId().toString() << "\t"
+        << "\tREMOVE\t" << msg->getDocumentId() << "\t"
         << msg->getResult().toString() << "\n";
     {
         vespalib::LockGuard lock(_lock);
@@ -127,7 +127,7 @@ OpsLogger::onGetReply(const std::shared_ptr<api::GetReply>& msg)
     if (_targetFile == nullptr) return false;
     std::ostringstream ost;
     ost << _component.getClock().getTimeInSeconds().getTime()
-        << "\tGET\t" << msg->getDocumentId().toString() << "\t"
+        << "\tGET\t" << msg->getDocumentId() << "\t"
         << msg->getResult().toString() << "\n";
     {
         vespalib::LockGuard lock(_lock);
-- 
cgit v1.2.3