Make it known that getting serialized size will always be expensive.

2 files changed, 9 insertions, 2 deletions

diff --git a/storageapi/src/vespa/storageapi/message/persistence.cpp b/storageapi/src/vespa/storageapi/message/persistence.cpp
index 8b8dedda231..bd8195c2feb 100644
--- a/storageapi/src/vespa/storageapi/message/persistence.cpp
+++ b/storageapi/src/vespa/storageapi/message/persistence.cpp
@@ -60,7 +60,7 @@ PutCommand::print(std::ostream& out, bool verbose, const std::string& indent) co
 {
     out << "Put(" << getBucketId() << ", " << _doc->getId()
         << ", timestamp " << _timestamp << ", size "
-        << _doc->getSerializedSize() << ")";
+        << _doc->serialize().size() << ")";
     if (verbose) {
         out << " {\n" << indent << "  ";
         _doc->print(out, verbose, indent + "  ");
diff --git a/storageapi/src/vespa/storageapi/messageapi/returncode.cpp b/storageapi/src/vespa/storageapi/messageapi/returncode.cpp
index 9b497a297a1..634a7166d74 100644
--- a/storageapi/src/vespa/storageapi/messageapi/returncode.cpp
+++ b/storageapi/src/vespa/storageapi/messageapi/returncode.cpp
@@ -26,7 +26,14 @@ vespalib::string ReturnCode::getResultString(Result result) {
 
 vespalib::string
 ReturnCode::toString() const {
-    return getResultString(_result) + " : " + _message;
+    vespalib::string ret = "ReturnCode(";
+    ret += getResultString(_result);
+    if ( ! _message.empty()) {
+        ret += ", ";
+        ret += _message;
+    }
+    ret += ")";
+    return ret;
 }
 
 bool