diff options
16 files changed, 40 insertions, 44 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; }; diff --git a/messagebus/src/vespa/messagebus/iconfighandler.h b/messagebus/src/vespa/messagebus/iconfighandler.h index 91398629ca8..5cfd26b6440 100644 --- a/messagebus/src/vespa/messagebus/iconfighandler.h +++ b/messagebus/src/vespa/messagebus/iconfighandler.h @@ -15,7 +15,7 @@ class RoutingSpec; class IConfigHandler { public: - virtual ~IConfigHandler() {} + virtual ~IConfigHandler() = default; /** * This method will be invoked to initialize or change the routing diff --git a/messagebus/src/vespa/messagebus/network/rpcsendv2.cpp b/messagebus/src/vespa/messagebus/network/rpcsendv2.cpp index c211ff83110..18e29451a0d 100644 --- a/messagebus/src/vespa/messagebus/network/rpcsendv2.cpp +++ b/messagebus/src/vespa/messagebus/network/rpcsendv2.cpp @@ -88,11 +88,12 @@ namespace { class OutputBuf : public vespalib::Output { public: explicit OutputBuf(size_t estimatedSize) : _buf(estimatedSize) { } + ~OutputBuf() override; DataBuffer & getBuf() { return _buf; } private: vespalib::WritableMemory reserve(size_t bytes) override { _buf.ensureFree(bytes); - return vespalib::WritableMemory(_buf.getFree(), _buf.getFreeLen()); + return {_buf.getFree(), _buf.getFreeLen()}; } Output &commit(size_t bytes) override { _buf.moveFreeToData(bytes); @@ -100,6 +101,8 @@ private: } DataBuffer _buf; }; +OutputBuf::~OutputBuf() = default; + } void diff --git a/messagebus/src/vespa/messagebus/testlib/slobrok.cpp b/messagebus/src/vespa/messagebus/testlib/slobrok.cpp index bcf6f829605..889daf538a3 100644 --- a/messagebus/src/vespa/messagebus/testlib/slobrok.cpp +++ b/messagebus/src/vespa/messagebus/testlib/slobrok.cpp @@ -18,6 +18,7 @@ private: std::condition_variable _cond; public: explicit WaitTask(FNET_Scheduler *s) : FNET_Task(s), _done(false), _mon() {} + ~WaitTask() override; void wait() { std::unique_lock guard(_mon); while (!_done) { @@ -31,6 +32,8 @@ public: _cond.notify_one(); } }; + +WaitTask::~WaitTask() = default; } // namespace <unnamed> namespace mbus { diff --git a/messagebus/src/vespa/messagebus/testlib/testserver.cpp b/messagebus/src/vespa/messagebus/testlib/testserver.cpp index d289c372fda..4393dfccccc 100644 --- a/messagebus/src/vespa/messagebus/testlib/testserver.cpp +++ b/messagebus/src/vespa/messagebus/testlib/testserver.cpp @@ -13,6 +13,8 @@ VersionedRPCNetwork::VersionedRPCNetwork(const RPCNetworkParams ¶ms) : _version(vespalib::Vtag::currentVersion) {} +VersionedRPCNetwork::~VersionedRPCNetwork() = default; + void VersionedRPCNetwork::setVersion(const vespalib::Version &version) { diff --git a/messagebus/src/vespa/messagebus/testlib/testserver.h b/messagebus/src/vespa/messagebus/testlib/testserver.h index 1ea96c3e13f..f3f349e52b9 100644 --- a/messagebus/src/vespa/messagebus/testlib/testserver.h +++ b/messagebus/src/vespa/messagebus/testlib/testserver.h @@ -23,6 +23,7 @@ protected: public: VersionedRPCNetwork(const RPCNetworkParams ¶ms); + ~VersionedRPCNetwork() override; void setVersion(const vespalib::Version &version); }; diff --git a/vdslib/src/vespa/vdslib/container/searchresult.cpp b/vdslib/src/vespa/vdslib/container/searchresult.cpp index 6989fbca8e0..3d7ae1631af 100644 --- a/vdslib/src/vespa/vdslib/container/searchresult.cpp +++ b/vdslib/src/vespa/vdslib/container/searchresult.cpp @@ -121,9 +121,11 @@ SearchResult::SearchResult(document::ByteBuffer & buf) : deserialize(buf); } +SearchResult::SearchResult(SearchResult &&) noexcept = default; SearchResult::~SearchResult() = default; -void SearchResult::deserialize(document::ByteBuffer & buf) +void +SearchResult::deserialize(document::ByteBuffer & buf) { int32_t tmp; buf.getIntNetwork(tmp); _totalHits = tmp; diff --git a/vdslib/src/vespa/vdslib/container/searchresult.h b/vdslib/src/vespa/vdslib/container/searchresult.h index 90fb282c8fd..2be2e5ee1c6 100644 --- a/vdslib/src/vespa/vdslib/container/searchresult.h +++ b/vdslib/src/vespa/vdslib/container/searchresult.h @@ -52,6 +52,7 @@ public: * @param buf A byte buffer that contains a serialized message. */ SearchResult(document::ByteBuffer & buf); + SearchResult(SearchResult &&) noexcept; ~SearchResult(); AggregatorList & getGroupingList() { return _groupingList; } |