Unify towards nbostream

3 files changed, 11 insertions, 19 deletions

diff --git a/storage/src/tests/visiting/visitormanagertest.cpp b/storage/src/tests/visiting/visitormanagertest.cpp
index b7eb7fee3ec..3f111bb53f7 100644
--- a/storage/src/tests/visiting/visitormanagertest.cpp
+++ b/storage/src/tests/visiting/visitormanagertest.cpp
@@ -337,7 +337,7 @@ int getTotalSerializedSize(const std::vector<document::Document::SP>& docs)
 {
     int total = 0;
     for (size_t i = 0; i < docs.size(); ++i) {
-        total += int(docs[i]->serialize()->getLength());
+        total += int(docs[i]->getSerializedSize());
     }
     return total;
 }
diff --git a/storage/src/vespa/storage/persistence/mergehandler.cpp b/storage/src/vespa/storage/persistence/mergehandler.cpp
index 37e1d818bb8..1ef26a969ed 100644
--- a/storage/src/vespa/storage/persistence/mergehandler.cpp
+++ b/storage/src/vespa/storage/persistence/mergehandler.cpp
@@ -506,18 +506,11 @@ MergeHandler::fetchLocalData(
             assert(doc != 0);
             assertContainedInBucket(doc->getId(), bucket, idFactory);
             e._docName = doc->getId().toString();
-            {
-                vespalib::nbostream stream;
-                doc->serializeHeader(stream);
-                e._headerBlob.resize(stream.size());
-                memcpy(&e._headerBlob[0], stream.peek(), stream.size());
-            }
-            {
-                vespalib::nbostream stream;
-                doc->serializeBody(stream);
-                e._bodyBlob.resize(stream.size());
-                memcpy(&e._bodyBlob[0], stream.peek(), stream.size());
-            }
+            vespalib::nbostream stream;
+            doc->serialize(stream);
+            e._headerBlob.resize(stream.size());
+            memcpy(&e._headerBlob[0], stream.peek(), stream.size());
+            e._bodyBlob.clear();
         } else {
             const DocumentId* docId = docEntry.getDocumentId();
             assert(docId != 0);
@@ -556,11 +549,10 @@ MergeHandler::deserializeDiffDocument(
         const api::ApplyBucketDiffCommand::Entry& e,
         const document::DocumentTypeRepo& repo) const
 {
-    Document::UP doc(new Document);
-    using document::ByteBuffer;
-    ByteBuffer hbuf(&e._headerBlob[0], e._headerBlob.size());
+    auto doc = std::make_unique<Document>();
+    vespalib::nbostream hbuf(&e._headerBlob[0], e._headerBlob.size());
     if (e._bodyBlob.size() > 0) {
-        ByteBuffer bbuf(&e._bodyBlob[0], e._bodyBlob.size());
+        vespalib::nbostream bbuf(&e._bodyBlob[0], e._bodyBlob.size());
         doc->deserialize(repo, hbuf, bbuf);
     } else {
         doc->deserialize(repo, hbuf);
diff --git a/storage/src/vespa/storage/visiting/recoveryvisitor.cpp b/storage/src/vespa/storage/visiting/recoveryvisitor.cpp
index 7c69a232af0..f9e0fa17d66 100644
--- a/storage/src/vespa/storage/visiting/recoveryvisitor.cpp
+++ b/storage/src/vespa/storage/visiting/recoveryvisitor.cpp
@@ -39,7 +39,7 @@ RecoveryVisitor::handleDocuments(const document::BucketId& bid,
     LOG(debug, "Visitor %s handling block of %zu documents.",
                _id.c_str(), entries.size());
 
-    documentapi::DocumentListMessage* cmd = NULL;
+    documentapi::DocumentListMessage* cmd = nullptr;
 
     {
         CommandMap::iterator iter = _activeCommands.find(bid);
@@ -71,7 +71,7 @@ RecoveryVisitor::handleDocuments(const document::BucketId& bid,
             }
         }
 
-        hitCounter.addHit(doc->getId(), doc->serialize()->getLength());
+        hitCounter.addHit(doc->getId(), doc->getSerializedSize());
 
         int64_t timestamp = doc->getLastModified();
         cmd->getDocuments().push_back(documentapi::DocumentListMessage::Entry(