Merge pull request #30473 from vespa-engine/vekterli/document-serialization-version-cleanup

Minor cleanup of serialization versions and buffer sizes

4 files changed, 5 insertions, 8 deletions

diff --git a/document/src/main/java/com/yahoo/document/Document.java b/document/src/main/java/com/yahoo/document/Document.java
index 294750f40f3..15a898e76b1 100644
--- a/document/src/main/java/com/yahoo/document/Document.java
+++ b/document/src/main/java/com/yahoo/document/Document.java
@@ -123,8 +123,7 @@ public class Document extends StructuredFieldValue {
     }
 
     public int getSerializedSize() throws SerializationException {
-        // TODO shouldn't this be createHead()?
-        DocumentSerializer data = DocumentSerializerFactory.create6(new GrowableByteBuffer(64 * 1024, 2.0f));
+        DocumentSerializer data = DocumentSerializerFactory.createHead(new GrowableByteBuffer(8 * 1024, 2.0f));
         data.write(this);
         return data.getBuf().position();
     }
@@ -136,8 +135,7 @@ public class Document extends StructuredFieldValue {
     public final int getApproxSize() { return 4096; }
 
     public void serialize(OutputStream out) throws SerializationException {
-        // TODO shouldn't this be createHead()?
-        DocumentSerializer writer = DocumentSerializerFactory.create6(new GrowableByteBuffer(64 * 1024, 2.0f));
+        DocumentSerializer writer = DocumentSerializerFactory.createHead(new GrowableByteBuffer(8 * 1024, 2.0f));
         writer.write(this);
         GrowableByteBuffer data = writer.getBuf();
         byte[] array;
diff --git a/document/src/main/java/com/yahoo/document/DocumentUpdate.java b/document/src/main/java/com/yahoo/document/DocumentUpdate.java
index 26254f3c081..d3063b76feb 100644
--- a/document/src/main/java/com/yahoo/document/DocumentUpdate.java
+++ b/document/src/main/java/com/yahoo/document/DocumentUpdate.java
@@ -347,8 +347,7 @@ public class DocumentUpdate extends DocumentOperation implements Iterable<FieldP
     }
 
     public final void serialize(GrowableByteBuffer buf) {
-        // TODO shouldn't this be createHead()?!
-        serialize(DocumentSerializerFactory.create6(buf));
+        serialize(DocumentSerializerFactory.createHead(buf));
     }
 
     public void serialize(DocumentUpdateWriter data) {
diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentSerializerFactory.java b/document/src/main/java/com/yahoo/document/serialization/DocumentSerializerFactory.java
index 0e0dc837bdc..beacf5e367d 100644
--- a/document/src/main/java/com/yahoo/document/serialization/DocumentSerializerFactory.java
+++ b/document/src/main/java/com/yahoo/document/serialization/DocumentSerializerFactory.java
@@ -31,7 +31,7 @@ public class DocumentSerializerFactory {
      * This format is an extension of the 4.2 format.
      */
     public static DocumentSerializer create6() {
-        return new VespaDocumentSerializer6(new GrowableByteBuffer());
+        return new VespaDocumentSerializer6(new GrowableByteBuffer(8 * 1024, 2.0f));
     }
 
 }
diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer6.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer6.java
index e14d2fea0a2..17ab3890bcf 100644
--- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer6.java
+++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer6.java
@@ -690,7 +690,7 @@ public class VespaDocumentSerializer6 extends BufferSerializer implements Docume
      * @return The size in bytes.
      */
     public static long getSerializedSize(Document doc) {
-        DocumentSerializer serializer = new VespaDocumentSerializer6(new GrowableByteBuffer());
+        DocumentSerializer serializer = new VespaDocumentSerializer6(new GrowableByteBuffer(8 * 1024, 2.0f));
         serializer.write(doc);
         return serializer.getBuf().position();
     }