GC a load of unused code. ByteBuffer towards read only.

6 files changed, 49 insertions, 106 deletions

diff --git a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h
index 79f7d7c0ccc..5582c0ea153 100644
--- a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h
+++ b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h
@@ -20,7 +20,6 @@ namespace documentapi {
 class LoadTypeSet;
 class RoutingPolicyRepository;
 class RoutableRepository;
-class SystemState;
 class IRoutingPolicyFactory;
 class IRoutableFactory;
 
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.cpp
index 411a7237cb5..08d631dc44b 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.cpp
@@ -4,11 +4,7 @@
 
 namespace documentapi {
 
-QueryResultMessage::QueryResultMessage() :
-    VisitorMessage(),
-    _searchResult(),
-    _summary()
-{}
+QueryResultMessage::QueryResultMessage() = default;
 
 QueryResultMessage::QueryResultMessage(const vdslib::SearchResult & result, const vdslib::DocumentSummary & summary) :
     VisitorMessage(),
@@ -16,7 +12,7 @@ QueryResultMessage::QueryResultMessage(const vdslib::SearchResult & result, cons
     _summary(summary)
 {}
 
-QueryResultMessage::~QueryResultMessage() {}
+QueryResultMessage::~QueryResultMessage() = default;
 
 DocumentReply::UP
 QueryResultMessage::doCreateReply() const
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.h
index 239ce6fefd5..6324e2664e4 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.h
@@ -25,7 +25,7 @@ public:
      * Constructs a new search result message for deserialization.
      */
     QueryResultMessage();
-    ~QueryResultMessage();
+    ~QueryResultMessage() override;
 
     /**
      * Constructs a new search result message for the given search result.
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp
index c891d9a316d..102a2308768 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp
@@ -1,9 +1,11 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "visitor.h"
-#include <climits>
 #include <vespa/document/bucket/fixed_bucket_spaces.h>
 #include <vespa/vespalib/objects/nbostream.h>
+#include <vespa/vespalib/util/growablebytebuffer.h>
+#include <vespa/document/util/bytebuffer.h>
+#include <climits>
 
 using document::FixedBucketSpaces;
 
@@ -79,7 +81,7 @@ DestroyVisitorMessage::~DestroyVisitorMessage() = default;
 DocumentReply::UP
 DestroyVisitorMessage::doCreateReply() const
 {
-    return DocumentReply::UP(new DocumentReply(DocumentProtocol::REPLY_DESTROYVISITOR));
+    return std::make_unique<DocumentReply>(DocumentProtocol::REPLY_DESTROYVISITOR);
 }
 
 uint32_t
@@ -115,11 +117,7 @@ VisitorInfoMessage::getType() const
     return DocumentProtocol::MESSAGE_VISITORINFO;
 }
 
-MapVisitorMessage::MapVisitorMessage() :
-    _data()
-{
-    // empty
-}
+MapVisitorMessage::MapVisitorMessage() = default;
 
 uint32_t
 MapVisitorMessage::getApproxSize() const
@@ -138,31 +136,17 @@ uint32_t MapVisitorMessage::getType() const
     return DocumentProtocol::MESSAGE_MAPVISITOR;
 }
 
-DocumentListMessage::Entry::Entry()
-{
-    // empty
-}
+DocumentListMessage::Entry::Entry() = default;
 
-DocumentListMessage::Entry::Entry(int64_t timestamp,
-                                  document::Document::SP doc,
-                                  bool removeEntry) :
+DocumentListMessage::Entry::Entry(int64_t timestamp, document::Document::SP doc, bool removeEntry) :
     _timestamp(timestamp),
     _document(std::move(doc)),
     _removeEntry(removeEntry)
-{
-    // empty
-}
+{ }
 
-DocumentListMessage::Entry::Entry(const Entry& other) :
-    _timestamp(other._timestamp),
-    _document(other._document),
-    _removeEntry(other._removeEntry)
-{
-    // empty
-}
+DocumentListMessage::Entry::Entry(const Entry& other) = default;
 
-DocumentListMessage::Entry::Entry(const document::DocumentTypeRepo &repo,
-                                  document::ByteBuffer& buf)
+DocumentListMessage::Entry::Entry(const document::DocumentTypeRepo &repo, document::ByteBuffer& buf)
 {
     buf.getLongNetwork(_timestamp);
     vespalib::nbostream stream(buf.getBufferAtPos(), buf.getRemaining());
@@ -174,26 +158,15 @@ DocumentListMessage::Entry::Entry(const document::DocumentTypeRepo &repo,
 }
 
 void
-DocumentListMessage::Entry::serialize(document::ByteBuffer& buf) const
+DocumentListMessage::Entry::serialize(vespalib::GrowableByteBuffer& buf) const
 {
-    buf.putLongNetwork(_timestamp);
-    _document->serialize(buf);
+    buf.putLong(_timestamp);
+    vespalib::nbostream nbo = _document->serialize();
+    buf.putBytes(nbo.c_str(), nbo.size());
     buf.putByte(_removeEntry ? 1 : 0);
 }
 
-uint32_t
-DocumentListMessage::Entry::getSerializedSize() const
-{
-    return sizeof(int64_t) + sizeof(uint8_t)
-        + _document->getSerializedSize();
-}
-
-DocumentListMessage::DocumentListMessage() :
-    _bucketId(),
-    _documents()
-{
-    // empty
-}
+DocumentListMessage::DocumentListMessage() = default;
 
 DocumentListMessage::DocumentListMessage(document::BucketId bid) :
     _bucketId(bid),
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h
index b18a4e985f3..f47fa48bd80 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h
@@ -52,7 +52,7 @@ public:
                          const string& instanceId,
                          const string& controlDestination,
                          const string& dataDestination);
-    ~CreateVisitorMessage();
+    ~CreateVisitorMessage() override;
 
     const string& getLibraryName() const { return _libName; }
     void setLibraryName(const string& value) { _libName = value; }
@@ -250,7 +250,7 @@ public:
         const document::Document::SP& getDocument() { return _document; }
         bool isRemoveEntry() { return _removeEntry; }
 
-        void serialize(document::ByteBuffer& buf) const;
+        void serialize(vespalib::GrowableByteBuffer& buf) const;
         uint32_t getSerializedSize() const;
     private:
         int64_t _timestamp;
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories60.cpp b/documentapi/src/vespa/documentapi/messagebus/routablefactories60.cpp
index 1f950ae166c..2fe9ffa3da9 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routablefactories60.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories60.cpp
@@ -20,7 +20,7 @@ namespace documentapi {
 bool
 RoutableFactories60::DocumentMessageFactory::encode(const mbus::Routable &obj, vespalib::GrowableByteBuffer &out) const
 {
-    const DocumentMessage &msg = static_cast<const DocumentMessage&>(obj);
+    const auto &msg = static_cast<const DocumentMessage&>(obj);
     out.putByte(msg.getPriority());
     out.putInt(msg.getLoadType().getId());
     return doEncode(msg, out);
@@ -93,7 +93,7 @@ RoutableFactories60::CreateVisitorMessageFactory::doDecode(document::ByteBuffer
     msg->setVisitRemoves(decodeBoolean(buf));
     msg->setFieldSet(decodeString(buf));
     msg->setVisitInconsistentBuckets(decodeBoolean(buf));
-    msg->getParameters().deserialize(_repo, buf);
+    msg->getParameters().deserialize(buf);
     msg->setVisitorDispatcherVersion(50);
     decodeInt(buf); // Unused legacy visitor ordering
     msg->setMaxBucketsPerVisitor(decodeInt(buf));
@@ -105,7 +105,7 @@ RoutableFactories60::CreateVisitorMessageFactory::doDecode(document::ByteBuffer
 bool
 RoutableFactories60::CreateVisitorMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
 {
-    const CreateVisitorMessage &msg = static_cast<const CreateVisitorMessage&>(obj);
+    const auto &msg = static_cast<const CreateVisitorMessage&>(obj);
 
     buf.putString(msg.getLibraryName());
     buf.putString(msg.getInstanceId());
@@ -126,10 +126,8 @@ RoutableFactories60::CreateVisitorMessageFactory::doEncode(const DocumentMessage
     buf.putString(msg.getFieldSet());
     buf.putBoolean(msg.visitInconsistentBuckets());
 
-    int len = msg.getParameters().getSerializedSize();
-    char *tmp = buf.allocate(len);
-    document::ByteBuffer dbuf(tmp, len);
-    msg.getParameters().serialize(dbuf);
+
+    msg.getParameters().serialize(buf);
 
     buf.putInt(0); // Unused legacy visitor ordering
     buf.putInt(msg.getMaxBucketsPerVisitor());
@@ -184,7 +182,7 @@ RoutableFactories60::CreateVisitorReplyFactory::doDecode(document::ByteBuffer &b
 bool
 RoutableFactories60::CreateVisitorReplyFactory::doEncode(const DocumentReply &obj, vespalib::GrowableByteBuffer &buf) const
 {
-    const CreateVisitorReply &reply = static_cast<const CreateVisitorReply&>(obj);
+    const auto &reply = static_cast<const CreateVisitorReply&>(obj);
     buf.putLong(reply.getLastBucket().getRawId());
     buf.putInt(reply.getVisitorStatistics().getBucketsVisited());
     buf.putLong(reply.getVisitorStatistics().getDocumentsVisited());
@@ -209,19 +207,14 @@ RoutableFactories60::DestroyVisitorReplyFactory::doEncode(const DocumentReply &,
 }
 
 DocumentReply::UP
-RoutableFactories60::DocumentIgnoredReplyFactory::doDecode(document::ByteBuffer& buf) const
+RoutableFactories60::DocumentIgnoredReplyFactory::doDecode(document::ByteBuffer& ) const
 {
-    (void) buf;
-    return DocumentReply::UP(new DocumentIgnoredReply());
+    return std::make_unique<DocumentIgnoredReply>();
 }
 
 bool
-RoutableFactories60::DocumentIgnoredReplyFactory::doEncode(
-        const DocumentReply& obj,
-        vespalib::GrowableByteBuffer& buf) const
+RoutableFactories60::DocumentIgnoredReplyFactory::doEncode(const DocumentReply&, vespalib::GrowableByteBuffer& ) const
 {
-    (void) obj;
-    (void) buf;
     return true;
 }
 
@@ -243,15 +236,12 @@ RoutableFactories60::DocumentListMessageFactory::doDecode(document::ByteBuffer &
 bool
 RoutableFactories60::DocumentListMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
 {
-    const DocumentListMessage &msg = static_cast<const DocumentListMessage&>(obj);
+    const auto &msg = static_cast<const DocumentListMessage&>(obj);
 
     buf.putLong(msg.getBucketId().getRawId());
     buf.putInt(msg.getDocuments().size());
     for (const auto & document : msg.getDocuments()) {
-        int len = document.getSerializedSize();
-        char *tmp = buf.allocate(len);
-        document::ByteBuffer dbuf(tmp, len);
-        document.serialize(dbuf);
+        document.serialize(buf);
     }
 
     return true;
@@ -283,11 +273,7 @@ bool
 RoutableFactories60::DocumentSummaryMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
 {
     const DocumentSummaryMessage &msg = static_cast<const DocumentSummaryMessage&>(obj);
-
-    int32_t len = msg.getSerializedSize();
-    char *tmp = buf.allocate(len);
-    document::ByteBuffer dbuf(tmp, len);
-    msg.serialize(dbuf);
+    msg.serialize(buf);
 
     return true;
 }
@@ -322,7 +308,7 @@ RoutableFactories60::EmptyBucketsMessageFactory::doDecode(document::ByteBuffer &
 bool
 RoutableFactories60::EmptyBucketsMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
 {
-    const EmptyBucketsMessage &msg = static_cast<const EmptyBucketsMessage&>(obj);
+    const auto &msg = static_cast<const EmptyBucketsMessage&>(obj);
 
     buf.putInt(msg.getBucketIds().size());
     for (const auto & bucketId : msg.getBucketIds()) {
@@ -367,7 +353,7 @@ RoutableFactories60::GetBucketListMessageFactory::doDecode(document::ByteBuffer
 bool
 RoutableFactories60::GetBucketListMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
 {
-    const GetBucketListMessage &msg = static_cast<const GetBucketListMessage&>(obj);
+    const auto &msg = static_cast<const GetBucketListMessage&>(obj);
     buf.putLong(msg.getBucketId().getRawId());
     return encodeBucketSpace(msg.getBucketSpace(), buf);
 }
@@ -392,7 +378,7 @@ RoutableFactories60::GetBucketListReplyFactory::doDecode(document::ByteBuffer &b
 bool
 RoutableFactories60::GetBucketListReplyFactory::doEncode(const DocumentReply &obj, vespalib::GrowableByteBuffer &buf) const
 {
-    const GetBucketListReply &reply = static_cast<const GetBucketListReply&>(obj);
+    const auto &reply = static_cast<const GetBucketListReply&>(obj);
 
     const std::vector<GetBucketListReply::BucketInfo> &buckets = reply.getBuckets();
     buf.putInt(buckets.size());
@@ -417,7 +403,7 @@ RoutableFactories60::GetBucketStateMessageFactory::doDecode(document::ByteBuffer
 bool
 RoutableFactories60::GetBucketStateMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
 {
-    const GetBucketStateMessage &msg = static_cast<const GetBucketStateMessage&>(obj);
+    const auto &msg = static_cast<const GetBucketStateMessage&>(obj);
     buf.putLong(msg.getBucketId().getRawId());
     return true;
 }
@@ -511,7 +497,7 @@ DocumentMessage::UP
 RoutableFactories60::MapVisitorMessageFactory::doDecode(document::ByteBuffer &buf) const
 {
     auto msg = std::make_unique<MapVisitorMessage>();
-    msg->getData().deserialize(_repo, buf);
+    msg->getData().deserialize(buf);
     return msg;
 }
 
@@ -519,11 +505,7 @@ bool
 RoutableFactories60::MapVisitorMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
 {
     const MapVisitorMessage &msg = static_cast<const MapVisitorMessage&>(obj);
-
-    int32_t len = msg.getData().getSerializedSize();
-    char *tmp = buf.allocate(len);
-    document::ByteBuffer dbuf(tmp, len);
-    msg.getData().serialize(dbuf);
+    msg.getData().serialize(buf);
 
     return true;
 }
@@ -660,12 +642,8 @@ RoutableFactories60::SearchResultMessageFactory::doDecode(document::ByteBuffer &
 bool
 RoutableFactories60::SearchResultMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
 {
-    const SearchResultMessage &msg = static_cast<const SearchResultMessage&>(obj);
-
-    int len = msg.getSerializedSize();
-    char *tmp = buf.allocate(len);
-    document::ByteBuffer dbuf(tmp, len);
-    msg.serialize(dbuf);
+    const auto & msg = static_cast<const SearchResultMessage&>(obj);
+    msg.serialize(buf);
 
     return true;
 }
@@ -683,13 +661,10 @@ RoutableFactories60::QueryResultMessageFactory::doDecode(document::ByteBuffer &b
 bool
 RoutableFactories60::QueryResultMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
 {
-    const QueryResultMessage &msg = static_cast<const QueryResultMessage&>(obj);
+    const auto &msg = static_cast<const QueryResultMessage&>(obj);
 
-    int len = msg.getSearchResult().getSerializedSize() + msg.getDocumentSummary().getSerializedSize();
-    char *tmp = buf.allocate(len);
-    document::ByteBuffer dbuf(tmp, len);
-    msg.getSearchResult().serialize(dbuf);
-    msg.getDocumentSummary().serialize(dbuf);
+    msg.getSearchResult().serialize(buf);
+    msg.getDocumentSummary().serialize(buf);
 
     return true;
 }
@@ -744,7 +719,7 @@ RoutableFactories60::StatBucketMessageFactory::doDecode(document::ByteBuffer &bu
 bool
 RoutableFactories60::StatBucketMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
 {
-    const StatBucketMessage &msg = static_cast<const StatBucketMessage&>(obj);
+    const auto &msg = static_cast<const StatBucketMessage&>(obj);
 
     buf.putLong(msg.getBucketId().getRawId());
     buf.putString(msg.getDocumentSelection());
@@ -762,7 +737,7 @@ RoutableFactories60::StatBucketReplyFactory::doDecode(document::ByteBuffer &buf)
 bool
 RoutableFactories60::StatBucketReplyFactory::doEncode(const DocumentReply &obj, vespalib::GrowableByteBuffer &buf) const
 {
-    const StatBucketReply &reply = static_cast<const StatBucketReply&>(obj);
+    const auto &reply = static_cast<const StatBucketReply&>(obj);
     buf.putString(reply.getResults());
     return true;
 }
@@ -802,7 +777,7 @@ RoutableFactories60::UpdateDocumentMessageFactory::decodeInto(UpdateDocumentMess
 bool
 RoutableFactories60::UpdateDocumentMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
 {
-    const UpdateDocumentMessage &msg = static_cast<const UpdateDocumentMessage&>(obj);
+    const auto &msg = static_cast<const UpdateDocumentMessage&>(obj);
 
     vespalib::nbostream stream;
     msg.getDocumentUpdate().serializeHEAD(stream);
@@ -826,7 +801,7 @@ RoutableFactories60::UpdateDocumentReplyFactory::doDecode(document::ByteBuffer &
 bool
 RoutableFactories60::UpdateDocumentReplyFactory::doEncode(const DocumentReply &obj, vespalib::GrowableByteBuffer &buf) const
 {
-    const UpdateDocumentReply &reply = static_cast<const UpdateDocumentReply&>(obj);
+    const auto &reply = static_cast<const UpdateDocumentReply&>(obj);
     buf.putBoolean(reply.getWasFound());
     buf.putLong(reply.getHighestModificationTimestamp());
     return true;
@@ -852,7 +827,7 @@ RoutableFactories60::VisitorInfoMessageFactory::doDecode(document::ByteBuffer &b
 bool
 RoutableFactories60::VisitorInfoMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
 {
-    const VisitorInfoMessage &msg = static_cast<const VisitorInfoMessage&>(obj);
+    const auto &msg = static_cast<const VisitorInfoMessage&>(obj);
 
     buf.putInt(msg.getFinishedBuckets().size());
     for (const auto & bucketId : msg.getFinishedBuckets()) {
@@ -887,7 +862,7 @@ RoutableFactories60::WrongDistributionReplyFactory::doDecode(document::ByteBuffe
 bool
 RoutableFactories60::WrongDistributionReplyFactory::doEncode(const DocumentReply &obj, vespalib::GrowableByteBuffer &buf) const
 {
-    const WrongDistributionReply &reply = static_cast<const WrongDistributionReply&>(obj);
+    const auto &reply = static_cast<const WrongDistributionReply&>(obj);
     buf.putString(reply.getSystemState());
     return true;
 }