From 79ccb477c1fcf6e5bf2fef0e214e0ecab5bbbffa Mon Sep 17 00:00:00 2001 From: Arne H Juul Date: Mon, 10 Apr 2017 15:57:21 +0200 Subject: add override in storageapi module --- .../src/tests/mbusprot/storageprotocoltest.cpp | 8 +- .../src/vespa/storageapi/buckets/bucketinfo.h | 4 +- .../storageapi/mbusprot/protocolserialization4_2.h | 84 ++++++++--------- .../storageapi/mbusprot/protocolserialization5_0.h | 100 ++++++++++----------- .../storageapi/mbusprot/protocolserialization5_1.h | 26 +++--- .../src/vespa/storageapi/mbusprot/storagecommand.h | 10 +-- .../vespa/storageapi/mbusprot/storageprotocol.h | 8 +- .../src/vespa/storageapi/mbusprot/storagereply.h | 10 +-- storageapi/src/vespa/storageapi/message/batch.h | 24 +++-- storageapi/src/vespa/storageapi/message/bucket.h | 60 +++++-------- .../src/vespa/storageapi/message/bucketsplitting.h | 12 +-- storageapi/src/vespa/storageapi/message/datagram.h | 28 +++--- .../src/vespa/storageapi/message/documentsummary.h | 8 +- .../src/vespa/storageapi/message/multioperation.h | 8 +- .../src/vespa/storageapi/message/persistence.h | 48 ++++------ .../src/vespa/storageapi/message/queryresult.h | 8 +- .../src/vespa/storageapi/message/removelocation.h | 4 +- .../src/vespa/storageapi/message/searchresult.h | 8 +- storageapi/src/vespa/storageapi/message/stat.h | 15 ++-- storageapi/src/vespa/storageapi/message/state.h | 12 +-- storageapi/src/vespa/storageapi/message/visitor.h | 3 +- .../vespa/storageapi/messageapi/bucketcommand.h | 7 +- .../storageapi/messageapi/bucketinfocommand.h | 3 +- .../vespa/storageapi/messageapi/bucketinforeply.h | 3 +- .../src/vespa/storageapi/messageapi/bucketreply.h | 7 +- .../src/vespa/storageapi/messageapi/returncode.h | 11 ++- .../vespa/storageapi/messageapi/storagecommand.h | 4 +- .../src/vespa/storageapi/messageapi/storagereply.h | 4 +- 28 files changed, 224 insertions(+), 303 deletions(-) (limited to 'storageapi/src') diff --git a/storageapi/src/tests/mbusprot/storageprotocoltest.cpp b/storageapi/src/tests/mbusprot/storageprotocoltest.cpp index 5a7a2d65da8..bc71429032e 100644 --- a/storageapi/src/tests/mbusprot/storageprotocoltest.cpp +++ b/storageapi/src/tests/mbusprot/storageprotocoltest.cpp @@ -835,10 +835,9 @@ namespace { struct MyCommand : public api::InternalCommand { MyCommand() : InternalCommand(101) {} - api::StorageReply::UP makeReply(); + api::StorageReply::UP makeReply() override; - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override { out << "MyCommand()"; if (verbose) { @@ -851,8 +850,7 @@ namespace { struct MyReply : public api::InternalReply { MyReply(const MyCommand& cmd) : InternalReply(102, cmd) {} - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override { out << "MyReply()"; if (verbose) { diff --git a/storageapi/src/vespa/storageapi/buckets/bucketinfo.h b/storageapi/src/vespa/storageapi/buckets/bucketinfo.h index 4b5a5a724d0..692cc171250 100644 --- a/storageapi/src/vespa/storageapi/buckets/bucketinfo.h +++ b/storageapi/src/vespa/storageapi/buckets/bucketinfo.h @@ -79,11 +79,11 @@ public: } void print(std::ostream& out, bool verbose, - const std::string& indent) const + const std::string& indent) const override { vespalib::AsciiPrintable::print(out, verbose, indent); } - virtual void print(vespalib::asciistream&, const PrintProperties&) const; + virtual void print(vespalib::asciistream&, const PrintProperties&) const override; void printXml(vespalib::XmlOutputStream&) const; }; diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization4_2.h b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization4_2.h index 97a56b5da22..9fa125b1159 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization4_2.h +++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization4_2.h @@ -11,29 +11,29 @@ public: ProtocolSerialization4_2(const document::DocumentTypeRepo::SP&); protected: - virtual void onEncode(GBBuf&, const api::GetCommand&) const; - virtual void onEncode(GBBuf&, const api::RemoveCommand&) const; - virtual void onEncode(GBBuf&, const api::RevertCommand&) const; - virtual void onEncode(GBBuf&, const api::CreateBucketCommand&) const; - virtual void onEncode(GBBuf&, const api::MergeBucketCommand&) const; - virtual void onEncode(GBBuf&, const api::GetBucketDiffCommand&) const; - virtual void onEncode(GBBuf&, const api::ApplyBucketDiffCommand&) const; - virtual void onEncode(GBBuf&, const api::RequestBucketInfoReply&) const; - virtual void onEncode(GBBuf&, const api::NotifyBucketChangeCommand&) const; - virtual void onEncode(GBBuf&, const api::NotifyBucketChangeReply&) const; - virtual void onEncode(GBBuf&, const api::SplitBucketCommand&) const; - virtual void onEncode(GBBuf&, const api::MultiOperationCommand&) const; - virtual void onEncode(GBBuf&, const api::CreateVisitorCommand&) const; - virtual void onEncode(GBBuf&, const api::DestroyVisitorCommand&) const; - virtual void onEncode(GBBuf&, const api::DestroyVisitorReply&) const; - virtual void onEncode(GBBuf&, const api::RemoveLocationCommand&) const; - virtual void onEncode(GBBuf&, const api::RemoveLocationReply&) const; + virtual void onEncode(GBBuf&, const api::GetCommand&) const override; + virtual void onEncode(GBBuf&, const api::RemoveCommand&) const override; + virtual void onEncode(GBBuf&, const api::RevertCommand&) const override; + virtual void onEncode(GBBuf&, const api::CreateBucketCommand&) const override; + virtual void onEncode(GBBuf&, const api::MergeBucketCommand&) const override; + virtual void onEncode(GBBuf&, const api::GetBucketDiffCommand&) const override; + virtual void onEncode(GBBuf&, const api::ApplyBucketDiffCommand&) const override; + virtual void onEncode(GBBuf&, const api::RequestBucketInfoReply&) const override; + virtual void onEncode(GBBuf&, const api::NotifyBucketChangeCommand&) const override; + virtual void onEncode(GBBuf&, const api::NotifyBucketChangeReply&) const override; + virtual void onEncode(GBBuf&, const api::SplitBucketCommand&) const override; + virtual void onEncode(GBBuf&, const api::MultiOperationCommand&) const override; + virtual void onEncode(GBBuf&, const api::CreateVisitorCommand&) const override; + virtual void onEncode(GBBuf&, const api::DestroyVisitorCommand&) const override; + virtual void onEncode(GBBuf&, const api::DestroyVisitorReply&) const override; + virtual void onEncode(GBBuf&, const api::RemoveLocationCommand&) const override; + virtual void onEncode(GBBuf&, const api::RemoveLocationReply&) const override; // Not supported on 4.2, but implemented here for simplicity. - virtual void onEncode(GBBuf&, const api::BatchPutRemoveCommand&) const; - virtual void onEncode(GBBuf&, const api::BatchPutRemoveReply&) const; - virtual void onEncode(GBBuf&, const api::SetBucketStateCommand&) const; - virtual void onEncode(GBBuf&, const api::SetBucketStateReply&) const; + virtual void onEncode(GBBuf&, const api::BatchPutRemoveCommand&) const override; + virtual void onEncode(GBBuf&, const api::BatchPutRemoveReply&) const override; + virtual void onEncode(GBBuf&, const api::SetBucketStateCommand&) const override; + virtual void onEncode(GBBuf&, const api::SetBucketStateReply&) const override; virtual void onEncodeBucketInfoCommand(GBBuf&, const api::BucketInfoCommand&) const; virtual void onEncodeBucketInfoReply(GBBuf&, const api::BucketInfoReply&) const = 0; @@ -42,29 +42,29 @@ protected: virtual void onEncodeDiffEntry(GBBuf&, const api::GetBucketDiffCommand::Entry&) const; virtual void onEncode(GBBuf&, const api::ReturnCode&) const; - virtual SCmd::UP onDecodeGetCommand(BBuf&) const; - virtual SCmd::UP onDecodeRemoveCommand(BBuf&) const; - virtual SCmd::UP onDecodeRevertCommand(BBuf&) const; - virtual SCmd::UP onDecodeCreateBucketCommand(BBuf&) const; - virtual SCmd::UP onDecodeMergeBucketCommand(BBuf&) const; - virtual SCmd::UP onDecodeGetBucketDiffCommand(BBuf&) const; - virtual SCmd::UP onDecodeApplyBucketDiffCommand(BBuf&) const; - virtual SRep::UP onDecodeRequestBucketInfoReply(const SCmd&, BBuf&) const; - virtual SCmd::UP onDecodeNotifyBucketChangeCommand(BBuf&) const; - virtual SRep::UP onDecodeNotifyBucketChangeReply(const SCmd&, BBuf&) const; - virtual SCmd::UP onDecodeSplitBucketCommand(BBuf&) const; - virtual SCmd::UP onDecodeSetBucketStateCommand(BBuf&) const; - virtual SRep::UP onDecodeSetBucketStateReply(const SCmd&, BBuf&) const; - virtual SCmd::UP onDecodeMultiOperationCommand(BBuf&) const; - virtual SCmd::UP onDecodeCreateVisitorCommand(BBuf&) const; - virtual SCmd::UP onDecodeDestroyVisitorCommand(BBuf&) const; - virtual SRep::UP onDecodeDestroyVisitorReply(const SCmd&, BBuf&) const; - virtual SCmd::UP onDecodeRemoveLocationCommand(BBuf&) const; - virtual SRep::UP onDecodeRemoveLocationReply(const SCmd&, BBuf&) const; + virtual SCmd::UP onDecodeGetCommand(BBuf&) const override; + virtual SCmd::UP onDecodeRemoveCommand(BBuf&) const override; + virtual SCmd::UP onDecodeRevertCommand(BBuf&) const override; + virtual SCmd::UP onDecodeCreateBucketCommand(BBuf&) const override; + virtual SCmd::UP onDecodeMergeBucketCommand(BBuf&) const override; + virtual SCmd::UP onDecodeGetBucketDiffCommand(BBuf&) const override; + virtual SCmd::UP onDecodeApplyBucketDiffCommand(BBuf&) const override; + virtual SRep::UP onDecodeRequestBucketInfoReply(const SCmd&, BBuf&) const override; + virtual SCmd::UP onDecodeNotifyBucketChangeCommand(BBuf&) const override; + virtual SRep::UP onDecodeNotifyBucketChangeReply(const SCmd&, BBuf&) const override; + virtual SCmd::UP onDecodeSplitBucketCommand(BBuf&) const override; + virtual SCmd::UP onDecodeSetBucketStateCommand(BBuf&) const override; + virtual SRep::UP onDecodeSetBucketStateReply(const SCmd&, BBuf&) const override; + virtual SCmd::UP onDecodeMultiOperationCommand(BBuf&) const override; + virtual SCmd::UP onDecodeCreateVisitorCommand(BBuf&) const override; + virtual SCmd::UP onDecodeDestroyVisitorCommand(BBuf&) const override; + virtual SRep::UP onDecodeDestroyVisitorReply(const SCmd&, BBuf&) const override; + virtual SCmd::UP onDecodeRemoveLocationCommand(BBuf&) const override; + virtual SRep::UP onDecodeRemoveLocationReply(const SCmd&, BBuf&) const override; // Not supported on 4.2, but implemented here for simplicity. - virtual SCmd::UP onDecodeBatchPutRemoveCommand(BBuf&) const; - virtual SRep::UP onDecodeBatchPutRemoveReply(const SCmd&, BBuf&) const; + virtual SCmd::UP onDecodeBatchPutRemoveCommand(BBuf&) const override; + virtual SRep::UP onDecodeBatchPutRemoveReply(const SCmd&, BBuf&) const override; virtual void onDecodeBucketInfoCommand(BBuf&, api::BucketInfoCommand&) const; virtual void onDecodeBucketInfoReply(BBuf&, api::BucketInfoReply&) const = 0; diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.h b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.h index 61de1d97d37..c5a26987a08 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.h +++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.h @@ -15,64 +15,64 @@ public: ProtocolSerialization5_0(const document::DocumentTypeRepo::SP&, const documentapi::LoadTypeSet& loadTypes); - virtual api::BucketInfo getBucketInfo(document::ByteBuffer& buf) const; + virtual api::BucketInfo getBucketInfo(document::ByteBuffer& buf) const override; virtual void putBucketInfo(const api::BucketInfo& info, - vespalib::GrowableByteBuffer& buf) const; + vespalib::GrowableByteBuffer& buf) const override; - virtual void onEncode(GBBuf&, const api::PutCommand&) const; - virtual void onEncode(GBBuf&, const api::PutReply&) const; - virtual void onEncode(GBBuf&, const api::UpdateCommand&) const; - virtual void onEncode(GBBuf&, const api::UpdateReply&) const; - virtual void onEncode(GBBuf&, const api::GetReply&) const; - virtual void onEncode(GBBuf&, const api::RemoveReply&) const; - virtual void onEncode(GBBuf&, const api::RevertReply&) const; - virtual void onEncode(GBBuf&, const api::CreateBucketReply&) const; - virtual void onEncode(GBBuf&, const api::DeleteBucketCommand&) const; - virtual void onEncode(GBBuf&, const api::DeleteBucketReply&) const; - virtual void onEncode(GBBuf&, const api::MergeBucketCommand&) const; - virtual void onEncode(GBBuf&, const api::MergeBucketReply&) const; - virtual void onEncode(GBBuf&, const api::GetBucketDiffReply&) const; - virtual void onEncode(GBBuf&, const api::ApplyBucketDiffReply&) const; - virtual void onEncode(GBBuf&, const api::SplitBucketReply&) const; - virtual void onEncode(GBBuf&, const api::MultiOperationReply&) const; - virtual void onEncode(GBBuf&, const api::JoinBucketsCommand&) const; - virtual void onEncode(GBBuf&, const api::JoinBucketsReply&) const; - virtual void onEncode(GBBuf&, const api::RequestBucketInfoCommand&) const; + virtual void onEncode(GBBuf&, const api::PutCommand&) const override; + virtual void onEncode(GBBuf&, const api::PutReply&) const override; + virtual void onEncode(GBBuf&, const api::UpdateCommand&) const override; + virtual void onEncode(GBBuf&, const api::UpdateReply&) const override; + virtual void onEncode(GBBuf&, const api::GetReply&) const override; + virtual void onEncode(GBBuf&, const api::RemoveReply&) const override; + virtual void onEncode(GBBuf&, const api::RevertReply&) const override; + virtual void onEncode(GBBuf&, const api::CreateBucketReply&) const override; + virtual void onEncode(GBBuf&, const api::DeleteBucketCommand&) const override; + virtual void onEncode(GBBuf&, const api::DeleteBucketReply&) const override; + virtual void onEncode(GBBuf&, const api::MergeBucketCommand&) const override; + virtual void onEncode(GBBuf&, const api::MergeBucketReply&) const override; + virtual void onEncode(GBBuf&, const api::GetBucketDiffReply&) const override; + virtual void onEncode(GBBuf&, const api::ApplyBucketDiffReply&) const override; + virtual void onEncode(GBBuf&, const api::SplitBucketReply&) const override; + virtual void onEncode(GBBuf&, const api::MultiOperationReply&) const override; + virtual void onEncode(GBBuf&, const api::JoinBucketsCommand&) const override; + virtual void onEncode(GBBuf&, const api::JoinBucketsReply&) const override; + virtual void onEncode(GBBuf&, const api::RequestBucketInfoCommand&) const override; - virtual void onEncodeBucketInfoReply(GBBuf&, const api::BucketInfoReply&) const; + virtual void onEncodeBucketInfoReply(GBBuf&, const api::BucketInfoReply&) const override; virtual void onEncodeBucketReply(GBBuf&, const api::BucketReply&) const; - virtual void onEncode(GBBuf&, const api::CreateVisitorCommand& msg) const; - virtual void onEncode(GBBuf&, const api::CreateVisitorReply& msg) const; - virtual void onEncodeCommand(GBBuf&, const api::StorageCommand&) const; - virtual void onEncodeReply(GBBuf&, const api::StorageReply&) const; + virtual void onEncode(GBBuf&, const api::CreateVisitorCommand& msg) const override; + virtual void onEncode(GBBuf&, const api::CreateVisitorReply& msg) const override; + virtual void onEncodeCommand(GBBuf&, const api::StorageCommand&) const override; + virtual void onEncodeReply(GBBuf&, const api::StorageReply&) const override; - virtual SCmd::UP onDecodePutCommand(BBuf&) const; - virtual SRep::UP onDecodePutReply(const SCmd&, BBuf&) const; - virtual SCmd::UP onDecodeUpdateCommand(BBuf&) const; - virtual SRep::UP onDecodeUpdateReply(const SCmd&, BBuf&) const; - virtual SRep::UP onDecodeGetReply(const SCmd&, BBuf&) const; - virtual SRep::UP onDecodeRemoveReply(const SCmd&, BBuf&) const; - virtual SRep::UP onDecodeRevertReply(const SCmd&, BBuf&) const; - virtual SRep::UP onDecodeCreateBucketReply(const SCmd&, BBuf&) const; - virtual SCmd::UP onDecodeDeleteBucketCommand(BBuf&) const; - virtual SRep::UP onDecodeDeleteBucketReply(const SCmd&, BBuf&) const; - virtual SCmd::UP onDecodeMergeBucketCommand(BBuf&) const; - virtual SRep::UP onDecodeMergeBucketReply(const SCmd&, BBuf&) const; - virtual SRep::UP onDecodeGetBucketDiffReply(const SCmd&, BBuf&) const; - virtual SRep::UP onDecodeApplyBucketDiffReply(const SCmd&, BBuf&) const; - virtual SRep::UP onDecodeSplitBucketReply(const SCmd&, BBuf&) const; - virtual SRep::UP onDecodeMultiOperationReply(const SCmd&, BBuf&) const; - virtual SCmd::UP onDecodeJoinBucketsCommand(BBuf& buf) const; - virtual SRep::UP onDecodeJoinBucketsReply(const SCmd& cmd, BBuf& buf) const; - virtual SCmd::UP onDecodeCreateVisitorCommand(BBuf&) const; - virtual SCmd::UP onDecodeRequestBucketInfoCommand(BBuf& buf) const; + virtual SCmd::UP onDecodePutCommand(BBuf&) const override; + virtual SRep::UP onDecodePutReply(const SCmd&, BBuf&) const override; + virtual SCmd::UP onDecodeUpdateCommand(BBuf&) const override; + virtual SRep::UP onDecodeUpdateReply(const SCmd&, BBuf&) const override; + virtual SRep::UP onDecodeGetReply(const SCmd&, BBuf&) const override; + virtual SRep::UP onDecodeRemoveReply(const SCmd&, BBuf&) const override; + virtual SRep::UP onDecodeRevertReply(const SCmd&, BBuf&) const override; + virtual SRep::UP onDecodeCreateBucketReply(const SCmd&, BBuf&) const override; + virtual SCmd::UP onDecodeDeleteBucketCommand(BBuf&) const override; + virtual SRep::UP onDecodeDeleteBucketReply(const SCmd&, BBuf&) const override; + virtual SCmd::UP onDecodeMergeBucketCommand(BBuf&) const override; + virtual SRep::UP onDecodeMergeBucketReply(const SCmd&, BBuf&) const override; + virtual SRep::UP onDecodeGetBucketDiffReply(const SCmd&, BBuf&) const override; + virtual SRep::UP onDecodeApplyBucketDiffReply(const SCmd&, BBuf&) const override; + virtual SRep::UP onDecodeSplitBucketReply(const SCmd&, BBuf&) const override; + virtual SRep::UP onDecodeMultiOperationReply(const SCmd&, BBuf&) const override; + virtual SCmd::UP onDecodeJoinBucketsCommand(BBuf& buf) const override; + virtual SRep::UP onDecodeJoinBucketsReply(const SCmd& cmd, BBuf& buf) const override; + virtual SCmd::UP onDecodeCreateVisitorCommand(BBuf&) const override; + virtual SCmd::UP onDecodeRequestBucketInfoCommand(BBuf& buf) const override; - virtual void onDecodeBucketInfoReply(BBuf&, api::BucketInfoReply&) const; + virtual void onDecodeBucketInfoReply(BBuf&, api::BucketInfoReply&) const override; virtual void onDecodeBucketReply(BBuf&, api::BucketReply&) const; - virtual SRep::UP onDecodeCreateVisitorReply(const SCmd& cmd, BBuf& buf) const; - virtual void onDecodeCommand(BBuf& buf, api::StorageCommand& msg) const; - virtual void onDecodeReply(BBuf&, api::StorageReply&) const; + virtual SRep::UP onDecodeCreateVisitorReply(const SCmd& cmd, BBuf& buf) const override; + virtual void onDecodeCommand(BBuf& buf, api::StorageCommand& msg) const override; + virtual void onDecodeReply(BBuf&, api::StorageReply&) const override; }; } // mbusprot diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_1.h b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_1.h index 491dd5e02eb..393596046c2 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_1.h +++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_1.h @@ -17,22 +17,22 @@ public: ProtocolSerialization5_1(const document::DocumentTypeRepo::SP&, const documentapi::LoadTypeSet& loadTypes); - virtual api::BucketInfo getBucketInfo(document::ByteBuffer& buf) const; + virtual api::BucketInfo getBucketInfo(document::ByteBuffer& buf) const override; virtual void putBucketInfo(const api::BucketInfo& info, - vespalib::GrowableByteBuffer& buf) const; + vespalib::GrowableByteBuffer& buf) const override; protected: - virtual void onEncode(GBBuf&, const api::SetBucketStateCommand&) const; - virtual void onEncode(GBBuf&, const api::SetBucketStateReply&) const; - virtual void onEncode(GBBuf&, const api::GetCommand&) const; - virtual void onEncode(GBBuf&, const api::CreateVisitorCommand&) const; - virtual void onEncode(GBBuf&, const api::CreateBucketCommand&) const; - - virtual SCmd::UP onDecodeSetBucketStateCommand(BBuf&) const; - virtual SRep::UP onDecodeSetBucketStateReply(const SCmd&, BBuf&) const; - virtual SCmd::UP onDecodeGetCommand(BBuf&) const; - virtual SCmd::UP onDecodeCreateVisitorCommand(BBuf&) const; - virtual SCmd::UP onDecodeCreateBucketCommand(BBuf&) const; + virtual void onEncode(GBBuf&, const api::SetBucketStateCommand&) const override; + virtual void onEncode(GBBuf&, const api::SetBucketStateReply&) const override; + virtual void onEncode(GBBuf&, const api::GetCommand&) const override; + virtual void onEncode(GBBuf&, const api::CreateVisitorCommand&) const override; + virtual void onEncode(GBBuf&, const api::CreateBucketCommand&) const override; + + virtual SCmd::UP onDecodeSetBucketStateCommand(BBuf&) const override; + virtual SRep::UP onDecodeSetBucketStateReply(const SCmd&, BBuf&) const override; + virtual SCmd::UP onDecodeGetCommand(BBuf&) const override; + virtual SCmd::UP onDecodeCreateVisitorCommand(BBuf&) const override; + virtual SCmd::UP onDecodeCreateBucketCommand(BBuf&) const override; }; } // mbusprot diff --git a/storageapi/src/vespa/storageapi/mbusprot/storagecommand.h b/storageapi/src/vespa/storageapi/mbusprot/storagecommand.h index 11ef23a1254..8549df6077f 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/storagecommand.h +++ b/storageapi/src/vespa/storageapi/mbusprot/storagecommand.h @@ -15,16 +15,16 @@ public: StorageCommand(const storage::api::StorageCommand::SP&); - const mbus::string & getProtocol() const { return StorageProtocol::NAME; } + const mbus::string & getProtocol() const override { return StorageProtocol::NAME; } - uint32_t getType() const { return _cmd->getType().getId(); } + uint32_t getType() const override { return _cmd->getType().getId(); } const api::StorageCommand::SP& getCommand() { return _cmd; } api::StorageCommand::CSP getCommand() const { return _cmd; } - virtual api::StorageMessage::SP getInternalMessage() { return _cmd; } - virtual api::StorageMessage::CSP getInternalMessage() const { return _cmd; } + virtual api::StorageMessage::SP getInternalMessage() override { return _cmd; } + virtual api::StorageMessage::CSP getInternalMessage() const override { return _cmd; } - virtual uint8_t priority() const { + virtual uint8_t priority() const override { return ((getInternalMessage()->getPriority()) / 255) * 16; } diff --git a/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.h b/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.h index c490a17555a..8c10ab1dfe1 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.h +++ b/storageapi/src/vespa/storageapi/mbusprot/storageprotocol.h @@ -22,17 +22,17 @@ public: const documentapi::LoadTypeSet& loadTypes); // Implements IProtocol. - const mbus::string& getName() const { return NAME; } + const mbus::string& getName() const override { return NAME; } // Implements IProtocol. mbus::IRoutingPolicy::UP createPolicy(const mbus::string& name, - const mbus::string& param) const; + const mbus::string& param) const override; // Implements IProtocol. - mbus::Blob encode(const vespalib::Version&, const mbus::Routable&) const; + mbus::Blob encode(const vespalib::Version&, const mbus::Routable&) const override; // Implements IProtocol. - mbus::Routable::UP decode(const vespalib::Version&, mbus::BlobRef) const; + mbus::Routable::UP decode(const vespalib::Version&, mbus::BlobRef) const override; private: ProtocolSerialization5_0 _serializer5_0; diff --git a/storageapi/src/vespa/storageapi/mbusprot/storagereply.h b/storageapi/src/vespa/storageapi/mbusprot/storagereply.h index 429833bf08b..aa7c827a32a 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/storagereply.h +++ b/storageapi/src/vespa/storageapi/mbusprot/storagereply.h @@ -22,19 +22,19 @@ public: StorageReply(const api::StorageReply::SP& reply); virtual ~StorageReply(); - virtual const mbus::string& getProtocol() const + virtual const mbus::string& getProtocol() const override { return StorageProtocol::NAME; } - uint32_t getType() const { return _mbusType; } + uint32_t getType() const override { return _mbusType; } const api::StorageReply::SP& getReply() { deserialize(); return _reply; } api::StorageReply::CSP getReply() const { deserialize(); return _reply; } - virtual api::StorageMessage::SP getInternalMessage() + virtual api::StorageMessage::SP getInternalMessage() override { deserialize(); return _reply; } - virtual api::StorageMessage::CSP getInternalMessage() const + virtual api::StorageMessage::CSP getInternalMessage() const override { deserialize(); return _reply; } - virtual uint8_t priority() const { + virtual uint8_t priority() const override { if (_reply.get()) { return _reply->getPriority(); } diff --git a/storageapi/src/vespa/storageapi/message/batch.h b/storageapi/src/vespa/storageapi/message/batch.h index b4788a5ae75..85e7a8df9ee 100644 --- a/storageapi/src/vespa/storageapi/message/batch.h +++ b/storageapi/src/vespa/storageapi/message/batch.h @@ -43,7 +43,7 @@ public: document::Document::SP document; - const document::DocumentId& getDocumentId() const { + const document::DocumentId& getDocumentId() const override { return document->getId(); } }; @@ -55,7 +55,7 @@ public: document::Document::SP document; uint64_t timestampToUpdate; - const document::DocumentId& getDocumentId() const { + const document::DocumentId& getDocumentId() const override { return document->getId(); } }; @@ -66,7 +66,7 @@ public: document::DocumentId documentId; - const document::DocumentId& getDocumentId() const { + const document::DocumentId& getDocumentId() const override { return documentId; } }; @@ -110,10 +110,9 @@ public: /** Returns an approximate size of this message. */ - uint32_t getMemoryFootprint() const { return _approxSize + 20; } + uint32_t getMemoryFootprint() const override { return _approxSize + 20; } - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGECOMMAND(BatchPutRemoveCommand, onBatchPutRemove) @@ -135,8 +134,7 @@ private: public: explicit BatchPutRemoveReply(const BatchPutRemoveCommand&); - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; const std::vector& getDocumentsNotFound() const { return _documentsNotFound; } std::vector& getDocumentsNotFound() { return _documentsNotFound; } @@ -159,14 +157,13 @@ public: */ const UpdateList& getUpdates() const { return _updates; }; - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; /** Returns a bucket id suitable for routing this message. */ - document::BucketId getBucketId() const { return _bucketId; } - virtual bool hasSingleBucketId() const { return true; } + document::BucketId getBucketId() const override { return _bucketId; } + virtual bool hasSingleBucketId() const override { return true; } DECLARE_STORAGECOMMAND(BatchDocumentUpdateCommand, onBatchDocumentUpdate) @@ -187,8 +184,7 @@ class BatchDocumentUpdateReply : public StorageReply { public: explicit BatchDocumentUpdateReply(const BatchDocumentUpdateCommand&); - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; const std::vector& getDocumentsNotFound() const { return _documentsNotFound; } std::vector& getDocumentsNotFound() { return _documentsNotFound; } diff --git a/storageapi/src/vespa/storageapi/message/bucket.h b/storageapi/src/vespa/storageapi/message/bucket.h index d5c4584fe4e..c78591eca61 100644 --- a/storageapi/src/vespa/storageapi/message/bucket.h +++ b/storageapi/src/vespa/storageapi/message/bucket.h @@ -36,8 +36,7 @@ public: void setActive(bool active) { _active = active; } bool getActive() const { return _active; } - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGECOMMAND(CreateBucketCommand, onCreateBucket) }; @@ -52,8 +51,7 @@ class CreateBucketReply : public BucketInfoReply { public: explicit CreateBucketReply(const CreateBucketCommand& cmd); - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGEREPLY(CreateBucketReply, onCreateBucketReply); }; @@ -72,8 +70,7 @@ public: const BucketInfo& getBucketInfo() const { return _info; } void setBucketInfo(const BucketInfo& info) { _info = info; } - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGECOMMAND(DeleteBucketCommand, onDeleteBucket) }; @@ -88,8 +85,7 @@ class DeleteBucketReply : public BucketInfoReply { public: explicit DeleteBucketReply(const DeleteBucketCommand& cmd); - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGEREPLY(DeleteBucketReply, onDeleteBucketReply) }; @@ -146,8 +142,7 @@ public: void setClusterStateVersion(uint32_t version) { _clusterStateVersion = version; } void setChain(const std::vector& chain) { _chain = chain; } - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGECOMMAND(MergeBucketCommand, onMergeBucket) }; @@ -179,8 +174,7 @@ public: const std::vector& getChain() const { return _chain; } uint32_t getClusterStateVersion() const { return _clusterStateVersion; } - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGEREPLY(MergeBucketReply, onMergeBucketReply) }; @@ -205,8 +199,7 @@ public: Entry(); - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; bool operator==(const Entry&) const; bool operator<(const Entry& e) const { return (_timestamp < e._timestamp); } @@ -226,8 +219,7 @@ public: const std::vector& getDiff() const { return _diff; } std::vector& getDiff() { return _diff; } - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGECOMMAND(GetBucketDiffCommand, onGetBucketDiff) }; @@ -256,8 +248,7 @@ public: const std::vector& getDiff() const { return _diff; } std::vector& getDiff() { return _diff; } - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGEREPLY(GetBucketDiffReply, onGetBucketDiffReply) }; @@ -284,8 +275,7 @@ public: bool filled() const; - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; bool operator==(const Entry&) const; }; private: @@ -307,8 +297,7 @@ public: std::vector& getDiff() { return _diff; } uint32_t getMaxBufferSize() const { return _maxBufferSize; } - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGECOMMAND(ApplyBucketDiffCommand, onApplyBucketDiff) }; @@ -337,8 +326,7 @@ public: std::vector& getDiff() { return _diff; } uint32_t getMaxBufferSize() const { return _maxBufferSize; } - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGEREPLY(ApplyBucketDiffReply, onApplyBucketDiffReply) }; @@ -381,8 +369,7 @@ public: const vespalib::string& getDistributionHash() const { return _distributionHash; } - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGECOMMAND(RequestBucketInfoCommand, onRequestBucketInfo) }; @@ -419,10 +406,9 @@ public: const EntryVector & getBucketInfo() const { return _buckets; } EntryVector & getBucketInfo() { return _buckets; } - uint32_t getMemoryFootprint() const; + uint32_t getMemoryFootprint() const override; - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGEREPLY(RequestBucketInfoReply, onRequestBucketInfoReply) }; @@ -447,8 +433,7 @@ public: const BucketInfo& getBucketInfo() const { return _info; } - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGECOMMAND(NotifyBucketChangeCommand, onNotifyBucketChange) }; @@ -467,8 +452,7 @@ class NotifyBucketChangeReply : public BucketReply { public: explicit NotifyBucketChangeReply(const NotifyBucketChangeCommand& cmd); - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGEREPLY(NotifyBucketChangeReply, onNotifyBucketChangeReply) }; @@ -493,15 +477,13 @@ public: SetBucketStateCommand(const document::BucketId& bucket, BUCKET_STATE state); - void print(std::ostream& out, - bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; BUCKET_STATE getState() const { return _state; } DECLARE_STORAGECOMMAND(SetBucketStateCommand, onSetBucketState) private: - virtual vespalib::string getSummary() const; + virtual vespalib::string getSummary() const override; }; /** @@ -515,9 +497,7 @@ class SetBucketStateReply : public BucketInfoReply public: explicit SetBucketStateReply(const SetBucketStateCommand&); - void print(std::ostream& out, - bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGEREPLY(SetBucketStateReply, onSetBucketStateReply) }; diff --git a/storageapi/src/vespa/storageapi/message/bucketsplitting.h b/storageapi/src/vespa/storageapi/message/bucketsplitting.h index cbddfc8eaf6..6188a7cc44f 100644 --- a/storageapi/src/vespa/storageapi/message/bucketsplitting.h +++ b/storageapi/src/vespa/storageapi/message/bucketsplitting.h @@ -57,8 +57,7 @@ public: void setMinByteSize(uint32_t v) { _minByteSize = v; } void setMinDocCount(uint32_t v) { _minDocCount = v; } - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGECOMMAND(SplitBucketCommand, onSplitBucket) }; @@ -82,8 +81,7 @@ public: std::vector& getSplitInfo() { return _result; } const std::vector& getSplitInfo() const { return _result; } - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGEREPLY(SplitBucketReply, onSplitBucketReply) }; @@ -110,8 +108,7 @@ public: void setMinJoinBits(uint8_t minJoinBits) { _minJoinBits = minJoinBits; } uint8_t getMinJoinBits() const { return _minJoinBits; } - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGECOMMAND(JoinBucketsCommand, onJoinBuckets) }; @@ -133,8 +130,7 @@ public: const std::vector& getSourceBuckets() const { return _sources; } - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGEREPLY(JoinBucketsReply, onJoinBucketsReply) }; diff --git a/storageapi/src/vespa/storageapi/message/datagram.h b/storageapi/src/vespa/storageapi/message/datagram.h index 415c7c97908..040f925f98a 100644 --- a/storageapi/src/vespa/storageapi/message/datagram.h +++ b/storageapi/src/vespa/storageapi/message/datagram.h @@ -38,11 +38,10 @@ public: _docBlock = block; } - document::BucketId getBucketId() const { return _bucketId; } - virtual bool hasSingleBucketId() const { return true; } + document::BucketId getBucketId() const override { return _bucketId; } + virtual bool hasSingleBucketId() const override { return true; } - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; bool keepTimeStamps() const { return _keepTimeStamps; } void keepTimeStamps(bool keepTime) { _keepTimeStamps = keepTime; } @@ -60,8 +59,7 @@ class DocBlockReply : public StorageReply { public: explicit DocBlockReply(const DocBlockCommand&); - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGEREPLY(DocBlockReply, onDocBlockReply) }; @@ -85,8 +83,7 @@ public: vdslib::Parameters& getData() { return _statistics; }; const vdslib::Parameters& getData() const { return _statistics; }; - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGECOMMAND(MapVisitorCommand, onMapVisitor) }; @@ -101,8 +98,7 @@ class MapVisitorReply : public StorageReply { public: explicit MapVisitorReply(const MapVisitorCommand&); - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGEREPLY(MapVisitorReply, onMapVisitorReply) }; @@ -144,8 +140,7 @@ public: std::vector& getDocuments() { return _documents; } const std::vector& getDocuments() const { return _documents; } - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGECOMMAND(DocumentListCommand, onDocumentList) @@ -163,8 +158,7 @@ class DocumentListReply : public StorageReply { public: explicit DocumentListReply(const DocumentListCommand&); - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGEREPLY(DocumentListReply, onDocumentListReply) }; @@ -189,8 +183,7 @@ public: const std::vector& getBuckets() const { return _buckets; } - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGECOMMAND(EmptyBucketsCommand, onEmptyBuckets) @@ -207,8 +200,7 @@ class EmptyBucketsReply : public StorageReply { public: explicit EmptyBucketsReply(const EmptyBucketsCommand&); - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGEREPLY(EmptyBucketsReply, onEmptyBucketsReply) }; diff --git a/storageapi/src/vespa/storageapi/message/documentsummary.h b/storageapi/src/vespa/storageapi/message/documentsummary.h index 2aa3c4765c5..b32723c6ddb 100644 --- a/storageapi/src/vespa/storageapi/message/documentsummary.h +++ b/storageapi/src/vespa/storageapi/message/documentsummary.h @@ -19,10 +19,9 @@ class DocumentSummaryCommand : public StorageCommand, public: explicit DocumentSummaryCommand(); - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; - uint32_t getMemoryFootprint() const { + uint32_t getMemoryFootprint() const override { return getSerializedSize(); } @@ -39,8 +38,7 @@ class DocumentSummaryReply : public StorageReply { public: explicit DocumentSummaryReply(const DocumentSummaryCommand& command); - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGEREPLY(DocumentSummaryReply, onDocumentSummaryReply) }; diff --git a/storageapi/src/vespa/storageapi/message/multioperation.h b/storageapi/src/vespa/storageapi/message/multioperation.h index 31db78458f9..a4defc6078c 100644 --- a/storageapi/src/vespa/storageapi/message/multioperation.h +++ b/storageapi/src/vespa/storageapi/message/multioperation.h @@ -50,15 +50,14 @@ public: _operations = operations; } - uint32_t getMemoryFootprint() const { + uint32_t getMemoryFootprint() const override { return _buffer.size() + 20; } bool keepTimeStamps() const { return _keepTimeStamps; } void keepTimeStamps(bool keepTime) { _keepTimeStamps = keepTime; } - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGECOMMAND(MultiOperationCommand, onMultiOperation) }; @@ -77,8 +76,7 @@ private: public: explicit MultiOperationReply(const MultiOperationCommand&); - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; void setHighestModificationTimestamp(uint64_t highestModificationTimestamp) { _highestModificationTimestamp = highestModificationTimestamp; diff --git a/storageapi/src/vespa/storageapi/message/persistence.h b/storageapi/src/vespa/storageapi/message/persistence.h index d0961266cfe..470acca566b 100644 --- a/storageapi/src/vespa/storageapi/message/persistence.h +++ b/storageapi/src/vespa/storageapi/message/persistence.h @@ -64,17 +64,15 @@ public: const document::DocumentId& getDocumentId() const override { return _doc->getId(); } Timestamp getTimestamp() const { return _timestamp; } - uint32_t getMemoryFootprint() const { + uint32_t getMemoryFootprint() const override { return (_doc.get() ? 4096 : 0) + 20; } vespalib::string getSummary() const override; - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; - virtual StorageCommand::UP createCopyToForward( - const document::BucketId& bucket, uint64_t timestamp) const; + virtual StorageCommand::UP createCopyToForward(const document::BucketId& bucket, uint64_t timestamp) const override; DECLARE_STORAGECOMMAND(PutCommand, onPut); }; @@ -105,8 +103,7 @@ public: bool isHeadersOnlyPut() const { return (_updateTimestamp != 0); } bool wasFound() const { return _wasFound; } - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGEREPLY(PutReply, onPutReply) }; @@ -136,17 +133,15 @@ public: Timestamp getTimestamp() const { return _timestamp; } Timestamp getOldTimestamp() const { return _oldTimestamp; } - uint32_t getMemoryFootprint() const { + uint32_t getMemoryFootprint() const override { return (_update.get() ? 1024 : 0) + 30; } vespalib::string getSummary() const override; - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; - virtual StorageCommand::UP createCopyToForward( - const document::BucketId& bucket, uint64_t timestamp) const; + virtual StorageCommand::UP createCopyToForward(const document::BucketId& bucket, uint64_t timestamp) const override; DECLARE_STORAGECOMMAND(UpdateCommand, onUpdate); }; @@ -175,8 +170,7 @@ public: bool wasFound() const { return (_oldTimestamp != 0); } - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; /** * If this update was inconsistent (multiple different timestamps returned), @@ -218,11 +212,9 @@ public: void setFieldSet(const vespalib::stringref & fieldSet) { _fieldSet = fieldSet; } vespalib::string getSummary() const override; - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; - virtual StorageCommand::UP createCopyToForward( - const document::BucketId& bucket, uint64_t timestamp) const; + virtual StorageCommand::UP createCopyToForward(const document::BucketId& bucket, uint64_t timestamp) const override; DECLARE_STORAGECOMMAND(GetCommand, onGet) }; @@ -255,12 +247,11 @@ public: bool wasFound() const { return (_doc.get() != 0); } - uint32_t getMemoryFootprint() const { + uint32_t getMemoryFootprint() const override { return (_doc.get() ? 4096 : 0) + 30; } - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGEREPLY(GetReply, onGetReply) }; @@ -286,11 +277,9 @@ public: Timestamp getTimestamp() const { return _timestamp; } vespalib::string getSummary() const override; - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; - virtual StorageCommand::UP createCopyToForward( - const document::BucketId& bucket, uint64_t timestamp) const; + virtual StorageCommand::UP createCopyToForward(const document::BucketId& bucket, uint64_t timestamp) const override; DECLARE_STORAGECOMMAND(RemoveCommand, onRemove) }; @@ -318,8 +307,7 @@ public: bool wasFound() const { return (_oldTimestamp != 0); } - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGEREPLY(RemoveReply, onRemoveReply) }; @@ -340,8 +328,7 @@ public: const std::vector& getRevertTokens() const { return _tokens; } - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGECOMMAND(RevertCommand, onRevert) }; @@ -361,8 +348,7 @@ public: const std::vector& getRevertTokens() const { return _tokens; } - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGEREPLY(RevertReply, onRevertReply) }; diff --git a/storageapi/src/vespa/storageapi/message/queryresult.h b/storageapi/src/vespa/storageapi/message/queryresult.h index c0bed1eee54..8020fa22dea 100644 --- a/storageapi/src/vespa/storageapi/message/queryresult.h +++ b/storageapi/src/vespa/storageapi/message/queryresult.h @@ -18,10 +18,9 @@ class QueryResultCommand : public StorageCommand { public: QueryResultCommand(); - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; - uint32_t getMemoryFootprint() const { + uint32_t getMemoryFootprint() const override { return getSearchResult().getSerializedSize() + getDocumentSummary().getSerializedSize(); } const vdslib::SearchResult & getSearchResult() const { return _searchResult; } @@ -45,8 +44,7 @@ class QueryResultReply : public StorageReply { public: explicit QueryResultReply(const QueryResultCommand& command); - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGEREPLY(QueryResultReply, onQueryResultReply) }; diff --git a/storageapi/src/vespa/storageapi/message/removelocation.h b/storageapi/src/vespa/storageapi/message/removelocation.h index 77e8d42b052..08b5663e2d6 100644 --- a/storageapi/src/vespa/storageapi/message/removelocation.h +++ b/storageapi/src/vespa/storageapi/message/removelocation.h @@ -16,9 +16,9 @@ public: const document::BucketId&); void print(std::ostream& out, bool verbose, - const std::string& indent) const; + const std::string& indent) const override; - uint32_t getMemoryFootprint() const { + uint32_t getMemoryFootprint() const override { return _documentSelection.length(); } diff --git a/storageapi/src/vespa/storageapi/message/searchresult.h b/storageapi/src/vespa/storageapi/message/searchresult.h index ea5a47cf37c..b2662800a9d 100644 --- a/storageapi/src/vespa/storageapi/message/searchresult.h +++ b/storageapi/src/vespa/storageapi/message/searchresult.h @@ -17,10 +17,9 @@ class SearchResultCommand : public StorageCommand, public vdslib::SearchResult { public: SearchResultCommand(); - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; - uint32_t getMemoryFootprint() const { + uint32_t getMemoryFootprint() const override { return getSerializedSize(); } @@ -37,8 +36,7 @@ class SearchResultReply : public StorageReply { public: explicit SearchResultReply(const SearchResultCommand& command); - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGEREPLY(SearchResultReply, onSearchResultReply) }; diff --git a/storageapi/src/vespa/storageapi/message/stat.h b/storageapi/src/vespa/storageapi/message/stat.h index 063aa579057..3ee4afbb4ba 100644 --- a/storageapi/src/vespa/storageapi/message/stat.h +++ b/storageapi/src/vespa/storageapi/message/stat.h @@ -27,11 +27,9 @@ public: const vespalib::string& getDocumentSelection() const { return _docSelection; } - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; - virtual StorageCommand::UP createCopyToForward( - const document::BucketId&, uint64_t timestamp) const; + virtual StorageCommand::UP createCopyToForward(const document::BucketId&, uint64_t timestamp) const override; DECLARE_STORAGECOMMAND(StatBucketCommand, onStatBucket); }; @@ -44,8 +42,7 @@ public: const vespalib::string& getResults() { return _results; } - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGEREPLY(StatBucketReply, onStatBucketReply) }; @@ -64,8 +61,7 @@ class GetBucketListCommand : public BucketCommand { public: GetBucketListCommand(const document::BucketId& bucket); - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGECOMMAND(GetBucketListCommand, onGetBucketList); }; @@ -98,8 +94,7 @@ public: std::vector& getBuckets() { return _buckets; } const std::vector& getBuckets() const { return _buckets; } - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGEREPLY(GetBucketListReply, onGetBucketListReply) diff --git a/storageapi/src/vespa/storageapi/message/state.h b/storageapi/src/vespa/storageapi/message/state.h index d3120943619..12a357c1b40 100644 --- a/storageapi/src/vespa/storageapi/message/state.h +++ b/storageapi/src/vespa/storageapi/message/state.h @@ -28,8 +28,7 @@ public: const lib::NodeState* getExpectedState() const { return _expectedState.get(); } - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGECOMMAND(GetNodeStateCommand, onGetNodeState) }; @@ -51,8 +50,7 @@ public: bool hasNodeState() const { return (_state.get() != 0); } const lib::NodeState& getNodeState() const { return *_state; } - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; void setNodeInfo(const std::string& info) { _nodeInfo = info; } const std::string& getNodeInfo() const { return _nodeInfo; } @@ -76,8 +74,7 @@ public: const lib::ClusterState& getSystemState() const { return _state; } - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGECOMMAND(SetSystemStateCommand, onSetSystemState) }; @@ -97,8 +94,7 @@ public: // Not serialized. Available locally const lib::ClusterState& getSystemState() const { return _state; } - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; DECLARE_STORAGEREPLY(SetSystemStateReply, onSetSystemStateReply) }; diff --git a/storageapi/src/vespa/storageapi/message/visitor.h b/storageapi/src/vespa/storageapi/message/visitor.h index 91e1278ecc4..a9d1de402da 100644 --- a/storageapi/src/vespa/storageapi/message/visitor.h +++ b/storageapi/src/vespa/storageapi/message/visitor.h @@ -115,8 +115,7 @@ public: void print(std::ostream& out, bool verbose, const std::string& indent) const override; - virtual StorageCommand::UP createCopyToForward( - const document::BucketId&, uint64_t timestamp) const; + virtual StorageCommand::UP createCopyToForward(const document::BucketId&, uint64_t timestamp) const override; DECLARE_STORAGECOMMAND(CreateVisitorCommand, onCreateVisitor) }; diff --git a/storageapi/src/vespa/storageapi/messageapi/bucketcommand.h b/storageapi/src/vespa/storageapi/messageapi/bucketcommand.h index f4f5909fccd..7c078b9545a 100644 --- a/storageapi/src/vespa/storageapi/messageapi/bucketcommand.h +++ b/storageapi/src/vespa/storageapi/messageapi/bucketcommand.h @@ -30,15 +30,14 @@ public: _bucket = bucket; } - document::BucketId getBucketId() const { return _bucket; } + document::BucketId getBucketId() const override { return _bucket; } bool hasBeenRemapped() const { return (_originalBucket.getRawId() != 0); } const document::BucketId& getOriginalBucketId() const { return _originalBucket; } - virtual void print(std::ostream& out, - bool verbose, const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; - virtual bool hasSingleBucketId() const { return true; } + virtual bool hasSingleBucketId() const override { return true; } }; diff --git a/storageapi/src/vespa/storageapi/messageapi/bucketinfocommand.h b/storageapi/src/vespa/storageapi/messageapi/bucketinfocommand.h index 4579d83cfed..62171a9e3c0 100644 --- a/storageapi/src/vespa/storageapi/messageapi/bucketinfocommand.h +++ b/storageapi/src/vespa/storageapi/messageapi/bucketinfocommand.h @@ -25,8 +25,7 @@ protected: public: DECLARE_POINTER_TYPEDEFS(BucketInfoCommand); - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; }; } // api diff --git a/storageapi/src/vespa/storageapi/messageapi/bucketinforeply.h b/storageapi/src/vespa/storageapi/messageapi/bucketinforeply.h index 0a5c435ade3..d39a6a5eaf8 100644 --- a/storageapi/src/vespa/storageapi/messageapi/bucketinforeply.h +++ b/storageapi/src/vespa/storageapi/messageapi/bucketinforeply.h @@ -33,8 +33,7 @@ public: void setBucketInfo(const BucketInfo& info) { _result = info; } /** Overload this to get more descriptive message output. */ - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; }; } // api diff --git a/storageapi/src/vespa/storageapi/messageapi/bucketreply.h b/storageapi/src/vespa/storageapi/messageapi/bucketreply.h index d2605604568..833f1396c49 100644 --- a/storageapi/src/vespa/storageapi/messageapi/bucketreply.h +++ b/storageapi/src/vespa/storageapi/messageapi/bucketreply.h @@ -27,8 +27,8 @@ protected: public: DECLARE_POINTER_TYPEDEFS(BucketReply); - document::BucketId getBucketId() const { return _bucket; } - virtual bool hasSingleBucketId() const { return true; } + document::BucketId getBucketId() const override { return _bucket; } + virtual bool hasSingleBucketId() const override { return true; } bool hasBeenRemapped() const { return (_originalBucket.getRawId() != 0); } const document::BucketId& getOriginalBucketId() const @@ -40,8 +40,7 @@ public: _bucket = bucket; } - virtual void print(std::ostream& out, bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; }; } // api diff --git a/storageapi/src/vespa/storageapi/messageapi/returncode.h b/storageapi/src/vespa/storageapi/messageapi/returncode.h index 997487853e8..a7be570e8f4 100644 --- a/storageapi/src/vespa/storageapi/messageapi/returncode.h +++ b/storageapi/src/vespa/storageapi/messageapi/returncode.h @@ -70,8 +70,8 @@ private: vespalib::string _message; void onDeserialize(const document::DocumentTypeRepo &repo, - document::ByteBuffer& buffer); - void onSerialize(document::ByteBuffer& buffer) const; + document::ByteBuffer& buffer) override; + void onSerialize(document::ByteBuffer& buffer) const override; public: ReturnCode(); @@ -79,17 +79,16 @@ public: ReturnCode(const document::DocumentTypeRepo &repo, document::ByteBuffer& buffer); - ReturnCode* clone() const { return new ReturnCode(*this); } + ReturnCode* clone() const override { return new ReturnCode(*this); } - size_t getSerializedSize() const; + size_t getSerializedSize() const override; const vespalib::string& getMessage() const { return _message; } void setMessage(const vespalib::stringref & message) { _message = message; } Result getResult() const { return _result; } - void print(std::ostream& out, bool verbose, - const std::string& indent) const; + void print(std::ostream& out, bool verbose, const std::string& indent) const override; /** * Translate from status code to human-readable string diff --git a/storageapi/src/vespa/storageapi/messageapi/storagecommand.h b/storageapi/src/vespa/storageapi/messageapi/storagecommand.h index 73616936aec..00f17458e6a 100644 --- a/storageapi/src/vespa/storageapi/messageapi/storagecommand.h +++ b/storageapi/src/vespa/storageapi/messageapi/storagecommand.h @@ -46,9 +46,7 @@ public: void setNewId() { StorageMessage::setNewMsgId(); } /** Overload this to get more descriptive message output. */ - virtual void print(std::ostream& out, - bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; /** * A way for someone to make a reply to a storage message without diff --git a/storageapi/src/vespa/storageapi/messageapi/storagereply.h b/storageapi/src/vespa/storageapi/messageapi/storagereply.h index 518c5474b34..eab6470f463 100644 --- a/storageapi/src/vespa/storageapi/messageapi/storagereply.h +++ b/storageapi/src/vespa/storageapi/messageapi/storagereply.h @@ -36,9 +36,7 @@ public: const ReturnCode& getResult() const { return _result; } /** Overload this to get more descriptive output. */ - virtual void print(std::ostream& out, - bool verbose, - const std::string& indent) const; + virtual void print(std::ostream& out, bool verbose, const std::string& indent) const override; }; } // api -- cgit v1.2.3