deinline destructors.

9 files changed, 25 insertions, 41 deletions

diff --git a/documentapi/src/tests/policies/testframe.h b/documentapi/src/tests/policies/testframe.h
index 3b2af060a45..a609e4b5b5c 100644
--- a/documentapi/src/tests/policies/testframe.h
+++ b/documentapi/src/tests/policies/testframe.h
@@ -31,8 +31,8 @@ public:
      *
      * @param identity The identity to use for the server.
      */
-    TestFrame(const std::shared_ptr<const document::DocumentTypeRepo> &repo,
-              const string &ident = "anonymous");
+    explicit TestFrame(const std::shared_ptr<const document::DocumentTypeRepo> &repo,
+                       const string &ident = "anonymous");
 
     TestFrame &operator=(const TestFrame &) = delete;
 
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistreply.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistreply.cpp
index cbac3e2c4d0..fb15b8b47ab 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistreply.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistreply.cpp
@@ -23,12 +23,12 @@ GetBucketListReply::BucketInfo::operator==(const GetBucketListReply::BucketInfo
     return _bucket == rhs._bucket && _bucketInformation == rhs._bucketInformation;
 }
 
-GetBucketListReply::GetBucketListReply() :
+GetBucketListReply::GetBucketListReply() noexcept :
     DocumentReply(DocumentProtocol::REPLY_GETBUCKETLIST),
     _buckets()
-{
-    // empty
-}
+{ }
+
+GetBucketListReply::~GetBucketListReply() = default;
 
 std::ostream &
 operator<<(std::ostream &out, const GetBucketListReply::BucketInfo &info)
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistreply.h b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistreply.h
index 4b8b8179857..a78ef5c3a61 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistreply.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistreply.h
@@ -23,10 +23,8 @@ private:
     std::vector<BucketInfo> _buckets;
 
 public:
-    /**
-     * Constructs a new reply with no content.
-     */
-    GetBucketListReply();
+    GetBucketListReply() noexcept;
+    ~GetBucketListReply() override;
 
     /**
      * Returns the bucket state contained in this.
@@ -40,9 +38,9 @@ public:
      *
      * @return The state object.
      */
-    const std::vector<BucketInfo> &getBuckets() const { return _buckets; }
+    [[nodiscard]] const std::vector<BucketInfo> &getBuckets() const { return _buckets; }
 
-    string toString() const override { return "getbucketlistreply"; }
+    [[nodiscard]] string toString() const override { return "getbucketlistreply"; }
 };
 
 std::ostream & operator<<(std::ostream &out, const GetBucketListReply::BucketInfo &info);
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.cpp
index f79b552a89d..4948fd7bc4d 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.cpp
@@ -6,9 +6,9 @@ namespace documentapi {
 
 QueryResultMessage::QueryResultMessage() = default;
 
-QueryResultMessage::QueryResultMessage(const vdslib::SearchResult & result, const vdslib::DocumentSummary & summary) :
+QueryResultMessage::QueryResultMessage(vdslib::SearchResult && result, const vdslib::DocumentSummary & summary) :
     VisitorMessage(),
-    _searchResult(result),
+    _searchResult(std::move(result)),
     _summary(summary)
 {}
 
@@ -17,7 +17,7 @@ QueryResultMessage::~QueryResultMessage() = default;
 DocumentReply::UP
 QueryResultMessage::doCreateReply() const
 {
-    return DocumentReply::UP(new VisitorReply(DocumentProtocol::REPLY_QUERYRESULT));
+    return std::make_unique<VisitorReply>(DocumentProtocol::REPLY_QUERYRESULT);
 }
 
 uint32_t
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.h
index 561fc909e86..eb839bdf21f 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.h
@@ -32,7 +32,7 @@ public:
      *
      * @param result The result to set.
      */
-    QueryResultMessage(const vdslib::SearchResult & result, const vdslib::DocumentSummary & summary);
+    QueryResultMessage(vdslib::SearchResult && result, const vdslib::DocumentSummary & summary);
 
     uint32_t getApproxSize() const override;
     uint32_t getType() const override;
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/searchresultmessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/searchresultmessage.cpp
index b71adec745a..8e25e70d749 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/searchresultmessage.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/searchresultmessage.cpp
@@ -13,9 +13,9 @@ SearchResultMessage::SearchResultMessage() :
     // empty
 }
 
-SearchResultMessage::SearchResultMessage(const SearchResult &result) :
+SearchResultMessage::SearchResultMessage(SearchResult &&result) :
     VisitorMessage(),
-    SearchResult(result)
+    SearchResult(std::move(result))
 {
     // empty
 }
@@ -23,7 +23,7 @@ SearchResultMessage::SearchResultMessage(const SearchResult &result) :
 DocumentReply::UP
 SearchResultMessage::doCreateReply() const
 {
-    return DocumentReply::UP(new VisitorReply(DocumentProtocol::REPLY_SEARCHRESULT));
+    return std::make_unique<VisitorReply>(DocumentProtocol::REPLY_SEARCHRESULT);
 }
 
 uint32_t
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/searchresultmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/searchresultmessage.h
index a464aa6218b..d22f8197534 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/searchresultmessage.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/searchresultmessage.h
@@ -12,23 +12,11 @@ protected:
     DocumentReply::UP doCreateReply() const override;
 
 public:
-    /**
-     * Convenience typedefs.
-     */
     using UP = std::unique_ptr<SearchResultMessage>;
     using SP = std::shared_ptr<SearchResultMessage>;
 
-    /**
-     * Constructs a new search result message for deserialization.
-     */
     SearchResultMessage();
-
-    /**
-     * Constructs a new search result message for the given search result.
-     *
-     * @param result The result to set.
-     */
-    SearchResultMessage(const vdslib::SearchResult &result);
+    SearchResultMessage(vdslib::SearchResult &&result);
 
     uint32_t getApproxSize() const override;
     uint32_t getType() const override;
@@ -36,4 +24,3 @@ public:
 };
 
 }
-
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp
index 1717b687322..d7bca6cab7c 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp
@@ -168,14 +168,12 @@ DocumentListMessage::Entry::serialize(vespalib::GrowableByteBuffer& buf) const
     buf.putByte(_removeEntry ? 1 : 0);
 }
 
-DocumentListMessage::DocumentListMessage() = default;
-
-DocumentListMessage::DocumentListMessage(document::BucketId bid) :
+DocumentListMessage::DocumentListMessage() noexcept = default;
+DocumentListMessage::~DocumentListMessage() = default;
+DocumentListMessage::DocumentListMessage(document::BucketId bid) noexcept :
     _bucketId(bid),
     _documents()
-{
-    // empty
-}
+{ }
 
 DocumentReply::UP
 DocumentListMessage::doCreateReply() const
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h
index 234c4ce1812..00667d006fe 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h
@@ -265,8 +265,9 @@ protected:
     DocumentReply::UP doCreateReply() const override;
 
 public:
-    DocumentListMessage();
-    DocumentListMessage(document::BucketId bid);
+    DocumentListMessage() noexcept;
+    DocumentListMessage(document::BucketId bid) noexcept;
+    ~DocumentListMessage() override;
 
     const document::BucketId& getBucketId() const { return _bucketId; };
     void setBucketId(const document::BucketId& id) { _bucketId = id; };