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

2 files changed, 4 insertions, 6 deletions

diff --git a/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp b/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp
index 10f03b8f8e4..5c8b5b029d2 100644
--- a/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp
+++ b/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp
@@ -260,7 +260,7 @@ verifyDocs(const std::vector<DocAndTimestamp>& wanted,
                        << entry.getDocument()->toString(true);
             }
             EXPECT_EQ(wanted[wantedIdx].timestamp, entry.getTimestamp());
-            size_t serSize = wanted[wantedIdx].doc->getSerializedSize();
+            size_t serSize = wanted[wantedIdx].doc->serialize().size();
             EXPECT_EQ(serSize + sizeof(DocEntry), size_t(entry.getSize()));
             EXPECT_EQ(serSize, size_t(entry.getDocumentSize()));
             ++wantedIdx;
diff --git a/persistence/src/vespa/persistence/spi/docentry.cpp b/persistence/src/vespa/persistence/spi/docentry.cpp
index d482d144d73..f46be6f3a25 100644
--- a/persistence/src/vespa/persistence/spi/docentry.cpp
+++ b/persistence/src/vespa/persistence/spi/docentry.cpp
@@ -2,6 +2,7 @@
 
 #include "docentry.h"
 #include <vespa/document/fieldvalue/document.h>
+#include <vespa/vespalib/objects/nbostream.h>
 #include <sstream>
 #include <cassert>
 
@@ -10,16 +11,13 @@ namespace storage::spi {
 DocEntry::DocEntry(Timestamp t, int metaFlags, DocumentUP doc)
     : _timestamp(t),
       _metaFlags(metaFlags),
-      _persistedDocumentSize(doc->getSerializedSize()),
+      _persistedDocumentSize(doc->serialize().size()),
       _size(_persistedDocumentSize + sizeof(DocEntry)),
       _documentId(),
       _document(std::move(doc))
 { }
 
-DocEntry::DocEntry(Timestamp t,
-         int metaFlags,
-         DocumentUP doc,
-         size_t serializedDocumentSize)
+DocEntry::DocEntry(Timestamp t, int metaFlags, DocumentUP doc, size_t serializedDocumentSize)
     : _timestamp(t),
       _metaFlags(metaFlags),
       _persistedDocumentSize(serializedDocumentSize),