Add stream method and use memcpy over casting.

8 files changed, 12 insertions, 13 deletions

diff --git a/storage/src/tests/common/message_sender_stub.cpp b/storage/src/tests/common/message_sender_stub.cpp
index f4e64e07955..a82d45b0b99 100644
--- a/storage/src/tests/common/message_sender_stub.cpp
+++ b/storage/src/tests/common/message_sender_stub.cpp
@@ -36,7 +36,7 @@ MessageSenderStub::dumpMessage(const api::StorageMessage& msg, bool includeAddre
         ost << " => " << msg.getAddress()->getIndex();
     }
     if (verbose && msg.getType().isReply()) {
-        ost << " " << dynamic_cast<const api::StorageReply&>(msg).getResult().toString();
+        ost << " " << dynamic_cast<const api::StorageReply&>(msg).getResult();
     }
 
     return ost.str();
diff --git a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
index 64306fa7c24..4576f8a08f8 100644
--- a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
+++ b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
@@ -1501,7 +1501,7 @@ TEST_F(FileStorManagerTest, visiting) {
         for (uint32_t i=3; i<docCount; ++i) {
             auto reply = std::dynamic_pointer_cast<api::BucketInfoReply>(top.getReply(i));
             ASSERT_TRUE(reply.get());
-            ASSERT_TRUE(reply->getResult().success()) << reply->getResult().toString();
+            ASSERT_TRUE(reply->getResult().success()) << reply->getResult();
 
             info = reply->getBucketInfo();
         }
diff --git a/storage/src/tests/visiting/visitormanagertest.cpp b/storage/src/tests/visiting/visitormanagertest.cpp
index 62dbce890cc..20934d04eaa 100644
--- a/storage/src/tests/visiting/visitormanagertest.cpp
+++ b/storage/src/tests/visiting/visitormanagertest.cpp
@@ -654,7 +654,7 @@ TEST_F(VisitorManagerTest, visitor_cleanup) {
                 if (api::ReturnCode::ILLEGAL_PARAMETERS == reply->getResult().getResult()) {
                     failures++;
                 } else {
-                    std::cerr << reply->getResult().toString() << "\n";
+                    std::cerr << reply->getResult() << "\n";
                 }
             } else {
                 if (api::ReturnCode::BUSY == reply->getResult().getResult()) {
diff --git a/storage/src/vespa/storage/common/bucketmessages.cpp b/storage/src/vespa/storage/common/bucketmessages.cpp
index c80b7bbb17a..1a4dc61a3ce 100644
--- a/storage/src/vespa/storage/common/bucketmessages.cpp
+++ b/storage/src/vespa/storage/common/bucketmessages.cpp
@@ -214,8 +214,7 @@ void
 BucketDiskMoveReply::print(std::ostream& out, bool, const std::string&) const
 {
     out << "BucketDiskMoveReply(" << _bucket.getBucketId() << ", source " << _srcDisk
-        << ", target " << _dstDisk << ", " << _bucketInfo << ", "
-        << getResult().toString() << ")";
+        << ", target " << _dstDisk << ", " << _bucketInfo << ", " << getResult() << ")";
 }
 
 std::unique_ptr<api::StorageReply>
diff --git a/storage/src/vespa/storage/common/storagelink.cpp b/storage/src/vespa/storage/common/storagelink.cpp
index d9612eb48a0..431c90b27f2 100644
--- a/storage/src/vespa/storage/common/storagelink.cpp
+++ b/storage/src/vespa/storage/common/storagelink.cpp
@@ -142,7 +142,7 @@ void StorageLink::sendDown(const StorageMessage::SP& msg)
                 sendUp(reply);
             }
         } else {
-            ost << " Return code: " << static_cast<const StorageReply&>(*msg).getResult().toString();
+            ost << " Return code: " << static_cast<const StorageReply&>(*msg).getResult();
             LOGBP(warning, "%s", ost.str().c_str());
         }
     } else if (!_down->onDown(msg)) {
@@ -182,7 +182,7 @@ void StorageLink::sendUp(const shared_ptr<StorageMessage> & msg)
                 sendDown(reply);
             }
         } else {
-            ost << " Return code: " << static_cast<const StorageReply&>(*msg).getResult().toString();
+            ost << " Return code: " << static_cast<const StorageReply&>(*msg).getResult();
             LOGBP(warning, "%s", ost.str().c_str());
         }
     } else if (!_up->onUp(msg)) {
diff --git a/storage/src/vespa/storage/distributor/operations/external/statbucketoperation.cpp b/storage/src/vespa/storage/distributor/operations/external/statbucketoperation.cpp
index c19168ca6e1..60c1137bd6d 100644
--- a/storage/src/vespa/storage/distributor/operations/external/statbucketoperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/external/statbucketoperation.cpp
@@ -81,7 +81,7 @@ StatBucketOperation::onReceive(DistributorMessageSender& sender, const std::shar
         if (myreply.getResult().getResult() == api::ReturnCode::OK) {
             ost << "\tBucket information from node " << found->second << ":\n" << myreply.getResults() << "\n\n";
         } else {
-            ost << "\tBucket information retrieval failed on node " << found->second << ": " << myreply.getResult().toString() << "\n\n";
+            ost << "\tBucket information retrieval failed on node " << found->second << ": " << myreply.getResult() << "\n\n";
         }
         _results[found->second] = ost.str();
 
diff --git a/storage/src/vespa/storage/storageserver/opslogger.cpp b/storage/src/vespa/storage/storageserver/opslogger.cpp
index 6fc9795993e..b6bceabf7a1 100644
--- a/storage/src/vespa/storage/storageserver/opslogger.cpp
+++ b/storage/src/vespa/storage/storageserver/opslogger.cpp
@@ -77,7 +77,7 @@ OpsLogger::onPutReply(const std::shared_ptr<api::PutReply>& msg)
     std::ostringstream ost;
     ost << _component.getClock().getTimeInSeconds().getTime()
         << "\tPUT\t" << msg->getDocumentId() << "\t"
-        << msg->getResult().toString() << "\n";
+        << msg->getResult() << "\n";
     {
         vespalib::LockGuard lock(_lock);
         if (_targetFile == nullptr) return false;
@@ -94,7 +94,7 @@ OpsLogger::onUpdateReply(const std::shared_ptr<api::UpdateReply>& msg)
     std::ostringstream ost;
     ost << _component.getClock().getTimeInSeconds().getTime()
         << "\tUPDATE\t" << msg->getDocumentId() << "\t"
-        << msg->getResult().toString() << "\n";
+        << msg->getResult() << "\n";
     {
         vespalib::LockGuard lock(_lock);
         if (_targetFile == nullptr) return false;
@@ -111,7 +111,7 @@ OpsLogger::onRemoveReply(const std::shared_ptr<api::RemoveReply>& msg)
     std::ostringstream ost;
     ost << _component.getClock().getTimeInSeconds().getTime()
         << "\tREMOVE\t" << msg->getDocumentId() << "\t"
-        << msg->getResult().toString() << "\n";
+        << msg->getResult() << "\n";
     {
         vespalib::LockGuard lock(_lock);
         if (_targetFile == nullptr) return false;
@@ -128,7 +128,7 @@ OpsLogger::onGetReply(const std::shared_ptr<api::GetReply>& msg)
     std::ostringstream ost;
     ost << _component.getClock().getTimeInSeconds().getTime()
         << "\tGET\t" << msg->getDocumentId() << "\t"
-        << msg->getResult().toString() << "\n";
+        << msg->getResult() << "\n";
     {
         vespalib::LockGuard lock(_lock);
         if (_targetFile == nullptr) return false;
diff --git a/storage/src/vespa/storage/visiting/visitor.cpp b/storage/src/vespa/storage/visiting/visitor.cpp
index 153d75fd50e..bdd066e8a4a 100644
--- a/storage/src/vespa/storage/visiting/visitor.cpp
+++ b/storage/src/vespa/storage/visiting/visitor.cpp
@@ -969,7 +969,7 @@ Visitor::getStatus(std::ostream& out, bool verbose) const
         << "</td></tr>\n";
 
     out << "<tr><td>Current status</td><td>"
-        << _result.toString() << "</td></tr>\n";
+        << _result << "</td></tr>\n";
 
     out << "<tr><td>Failed</td><td>" << (failed() ? "true" : "false")
         << "</td></tr>\n";