diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-04-05 20:59:01 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-04-23 13:31:24 +0200 |
commit | 40bddbaac34ece542a057aa97eb63db6f1c5775e (patch) | |
tree | 5de3547eee329ed1b064722a697d2cda9eb53476 /documentapi | |
parent | b57308e4a134fb6139d2cb52a031d3e7185f16cf (diff) |
Including storage now builds fine with override enforcement.
Diffstat (limited to 'documentapi')
35 files changed, 63 insertions, 228 deletions
diff --git a/documentapi/src/tests/loadtypes/testrunner.cpp b/documentapi/src/tests/loadtypes/testrunner.cpp index 71200f84224..bdcdcdab944 100644 --- a/documentapi/src/tests/loadtypes/testrunner.cpp +++ b/documentapi/src/tests/loadtypes/testrunner.cpp @@ -1,12 +1,11 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> #include <vespa/vdstestlib/cppunit/cppunittestrunner.h> +#include <vespa/log/log.h> LOG_SETUP("storagecppunittests"); int -main(int argc, char **argv) +main(int argc, const char *argv[]) { vdstestlib::CppUnitTestRunner testRunner; return testRunner.run(argc, argv); diff --git a/documentapi/src/tests/policies/testframe.cpp b/documentapi/src/tests/policies/testframe.cpp index 8d5b6585529..db8a1b48924 100644 --- a/documentapi/src/tests/policies/testframe.cpp +++ b/documentapi/src/tests/policies/testframe.cpp @@ -1,7 +1,4 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP(".testframe"); #include "testframe.h" #include <vespa/messagebus/emptyreply.h> @@ -11,6 +8,9 @@ LOG_SETUP(".testframe"); #include <vespa/messagebus/testlib/simpleprotocol.h> #include <vespa/messagebus/testlib/simplereply.h> +#include <vespa/log/log.h> +LOG_SETUP(".testframe"); + using document::DocumentTypeRepo; using namespace documentapi; diff --git a/documentapi/src/tests/policies/testframe.h b/documentapi/src/tests/policies/testframe.h index e0780733331..f0e37d979f3 100644 --- a/documentapi/src/tests/policies/testframe.h +++ b/documentapi/src/tests/policies/testframe.h @@ -197,8 +197,6 @@ public: * @return Handle to the system state. */ documentapi::SystemStateHandle getSystemState(); - - // Implements IReplyHandler. void handleReply(mbus::Reply::UP reply) override; }; diff --git a/documentapi/src/tests/replymerger/replymerger_test.cpp b/documentapi/src/tests/replymerger/replymerger_test.cpp index 8803994b0cf..b26290e0bcd 100644 --- a/documentapi/src/tests/replymerger/replymerger_test.cpp +++ b/documentapi/src/tests/replymerger/replymerger_test.cpp @@ -1,8 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP("replymerger_test"); -#include <vespa/fastos/fastos.h> #include <iostream> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/documentapi/messagebus/replymerger.h> diff --git a/documentapi/src/tests/routablefactory/routablefactory.cpp b/documentapi/src/tests/routablefactory/routablefactory.cpp index 620142e803b..b4449891af2 100644 --- a/documentapi/src/tests/routablefactory/routablefactory.cpp +++ b/documentapi/src/tests/routablefactory/routablefactory.cpp @@ -1,5 +1,4 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/documentapi/messagebus/documentprotocol.h> #include <vespa/documentapi/messagebus/routablefactories51.h> diff --git a/documentapi/src/tests/systemstate/systemstate.cpp b/documentapi/src/tests/systemstate/systemstate.cpp index a797f55c625..e3163937a3f 100644 --- a/documentapi/src/tests/systemstate/systemstate.cpp +++ b/documentapi/src/tests/systemstate/systemstate.cpp @@ -1,12 +1,12 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/log/log.h> -LOG_SETUP("systemstate_test"); #include <vespa/documentapi/messagebus/systemstate/systemstate.h> #include <vespa/documentapi/messagebus/systemstate/systemstatehandle.h> #include <vespa/vespalib/testkit/testapp.h> +#include <vespa/log/log.h> +LOG_SETUP("systemstate_test"); + using namespace documentapi; class Test : public vespalib::TestApp { diff --git a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h index b35cce81b40..e1c2b7f4f35 100644 --- a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h +++ b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h @@ -303,17 +303,9 @@ public: * @return The system state. */ SystemState &getSystemState() { return *_systemState; } - - // Implements IProtocol. const mbus::string &getName() const override { return NAME; } - - // Implements IProtocol. mbus::IRoutingPolicy::UP createPolicy(const mbus::string &name, const mbus::string ¶m) const override; - - // Implements IProtocol. mbus::Blob encode(const vespalib::Version &version, const mbus::Routable &routable) const override; - - // Implements IProtocol. mbus::Routable::UP decode(const vespalib::Version &version, mbus::BlobRef data) const override; }; diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/documentmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/documentmessage.h index b4adf41ca79..2887c8435e1 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/documentmessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/documentmessage.h @@ -82,7 +82,6 @@ public: _approxSize = approxSize; } - // Implements mbus::Message. const mbus::string& getProtocol() const override; }; diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/documentreply.h b/documentapi/src/vespa/documentapi/messagebus/messages/documentreply.h index 2850c412807..69563bcc63b 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/documentreply.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/documentreply.h @@ -32,7 +32,7 @@ public: /** * Virtual destructor required for inheritance. */ - virtual ~DocumentReply() { } + ~DocumentReply() { } /** * Returns the priority tag for this message. This is an optional tag added for VDS that is not interpreted by the @@ -41,7 +41,6 @@ public: * @return The priority. */ Priority::Value getPriority() const { return _priority; } - uint8_t priority() const override { return (uint8_t)_priority; } /** @@ -50,13 +49,8 @@ public: * @param priority The priority to set. */ void setPriority(Priority::Value p) { _priority = p; } - - // Implements mbus::Reply. const mbus::string& getProtocol() const override; - - // Implements mbus::Reply. uint32_t getType() const override { return _type; } }; } - diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/documentsummarymessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/documentsummarymessage.h index ac5e141da23..0c9c8b09a0c 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/documentsummarymessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/documentsummarymessage.h @@ -1,8 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once +#include "visitor.h" #include <vespa/vdslib/container/documentsummary.h> -#include <vespa/documentapi/messagebus/messages/visitor.h> namespace documentapi { @@ -30,15 +30,9 @@ public: * @param summary The document summary to contain. */ DocumentSummaryMessage(const vdslib::DocumentSummary &summary); - - // Overrides VisitorMessage. uint32_t getApproxSize() const override; - - // Implements VisitorMessage. uint32_t getType() const override; - string toString() const override { return "documentsummarymessage"; } }; } - diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/emptybucketsmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/emptybucketsmessage.h index 54ce4e8de4c..bd1805a4a17 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/emptybucketsmessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/emptybucketsmessage.h @@ -1,8 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once +#include "visitor.h" #include <vespa/document/bucket/bucketid.h> -#include <vespa/documentapi/messagebus/messages/visitor.h> namespace documentapi { @@ -21,18 +21,14 @@ protected: public: EmptyBucketsMessage(); // must be serialized into - EmptyBucketsMessage(const std::vector<document::BucketId> &bucketIds); std::vector<document::BucketId> &getBucketIds() { return _bucketIds; } const std::vector<document::BucketId> &getBucketIds() const { return _bucketIds; } void setBucketIds(const std::vector<document::BucketId> &bucketIds); - void resize(uint32_t size); - uint32_t getType() const override; - string toString() const override { return "emptybucketsmessage"; } }; diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistmessage.h index c08e36aa3fd..2e1e92652d9 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistmessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistmessage.h @@ -40,18 +40,10 @@ public: * @param id The bucket id to set. */ void setBucketId(const document::BucketId& id) { _bucketId = id; } - - // Overrides DocumentMessage. bool hasSequenceId() const override; - - // Overrides DocumentMessage. uint64_t getSequenceId() const override; - - // Implements DocumentMessage. uint32_t getType() const override; - string toString() const override { return "getbucketlistmessage"; } }; } - diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistreply.h b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistreply.h index a207ef206e4..0b7df089bce 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistreply.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketlistreply.h @@ -1,7 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/documentapi/messagebus/messages/documentreply.h> +#include "documentreply.h" #include <vespa/document/bucket/bucketid.h> namespace documentapi { diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketstatemessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketstatemessage.h index ed27ed11212..62129a79003 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/getbucketstatemessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/getbucketstatemessage.h @@ -1,8 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once +#include "documentmessage.h" #include <vespa/document/bucket/bucketid.h> -#include <vespa/documentapi/messagebus/messages/documentmessage.h> namespace documentapi { @@ -40,16 +40,9 @@ public: * @param bucket The bucket id to set. */ void setBucketId(document::BucketId bucket) { _bucket = bucket; } - - // Overrides DocumentMessage. bool hasSequenceId() const override; - - // Overrides DocumentMessage. uint64_t getSequenceId() const override; - - // Implements DocumentMessage. uint32_t getType() const override; - string toString() const override { return "getbucketstatemessage"; } }; diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/multioperationmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/multioperationmessage.h index ac78aea6251..4c6f8bf9de7 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/multioperationmessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/multioperationmessage.h @@ -1,12 +1,12 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once +#include "visitor.h" +#include "documentreply.h" #include <vespa/vdslib/container/parameters.h> #include <vespa/vdslib/container/documentlist.h> #include <vespa/vdslib/container/operationlist.h> #include <vespa/document/bucket/bucketid.h> -#include <vespa/documentapi/messagebus/messages/visitor.h> -#include <vespa/documentapi/messagebus/messages/documentreply.h> #include <vespa/documentapi/messagebus/documentprotocol.h> namespace documentapi { diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/putdocumentmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/putdocumentmessage.h index 46af0dfb7a4..4537da0fb6e 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/putdocumentmessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/putdocumentmessage.h @@ -1,8 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once +#include "testandsetmessage.h" #include <vespa/document/fieldvalue/document.h> -#include <vespa/documentapi/messagebus/messages/testandsetmessage.h> namespace documentapi { diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentmessage.h index 3904cf0f243..a47e35f3098 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentmessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentmessage.h @@ -1,8 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once +#include "testandsetmessage.h" #include <vespa/document/base/documentid.h> -#include <vespa/documentapi/messagebus/messages/testandsetmessage.h> namespace documentapi { diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/removelocationmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/removelocationmessage.h index acaf3357d4d..ce15fe4eda0 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/removelocationmessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/removelocationmessage.h @@ -1,7 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/documentapi/messagebus/messages/documentmessage.h> +#include "documentmessage.h" #include <vespa/document/bucket/bucketid.h> #include <vespa/document/bucket/bucketselector.h> #include <vespa/document/select/parser.h> @@ -17,13 +17,9 @@ public: RemoveLocationMessage(const document::BucketIdFactory& factory, document::select::Parser& parser, const string& documentSelection); const string& getDocumentSelection() const { return _documentSelection; } - - uint32_t getType() const override; - const document::BucketId& getBucketId() const { return _bucketId; }; - + uint32_t getType() const override; string toString() const override { return "removelocationmessage"; } - protected: DocumentReply::UP doCreateReply() const override; diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h index 43045fd44c6..ce30be3ecc2 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h @@ -1,20 +1,16 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/** - * @file persistence.h - * - * Persistence related commands, like put, get & remove - */ + #pragma once +#include "writedocumentreply.h" +#include "documentmessage.h" +#include "documentreply.h" #include <vespa/vdslib/container/parameters.h> #include <vespa/vdslib/container/documentlist.h> #include <vespa/vdslib/container/visitorstatistics.h> #include <vespa/document/bucket/bucketid.h> -#include <vespa/documentapi/messagebus/messages/documentmessage.h> -#include <vespa/documentapi/messagebus/messages/documentreply.h> #include <vespa/documentapi/messagebus/documentprotocol.h> #include <vespa/document/select/orderingspecification.h> -#include <vespa/documentapi/messagebus/messages/writedocumentreply.h> namespace documentapi { @@ -139,14 +135,12 @@ public: typedef std::unique_ptr<DestroyVisitorMessage> UP; DestroyVisitorMessage(); // must be deserialized into - DestroyVisitorMessage(const string &instanceId); const string& getInstanceId() const { return _instanceId; } void setInstanceId(const string& id) { _instanceId = id; } uint32_t getType() const override; - string toString() const override { return "destroyvisitormessage"; } }; @@ -214,7 +208,6 @@ public: void setErrorMessage(const string& errorMessage) { _errorMessage = errorMessage; }; uint32_t getType() const override; - string toString() const override { return "visitorinfomessage"; } }; @@ -241,7 +234,6 @@ public: uint32_t getApproxSize() const override; uint32_t getType() const override; - string toString() const override { return "mapvisitormessage"; } }; @@ -256,12 +248,9 @@ public: class Entry { public: Entry(); - Entry(int64_t timestamp, - document::Document::SP doc, - bool removeEntry); + Entry(int64_t timestamp, document::Document::SP doc, bool removeEntry); Entry(const Entry& other); - Entry(const document::DocumentTypeRepo &repo, - document::ByteBuffer& buf); + Entry(const document::DocumentTypeRepo &repo, document::ByteBuffer& buf); int64_t getTimestamp() { return _timestamp; } const document::Document::SP& getDocument() { return _document; } @@ -293,7 +282,6 @@ public: const std::vector<Entry>& getDocuments() const { return _documents; }; uint32_t getType() const override; - string toString() const override { return "documentlistmessage"; } }; diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/andpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/andpolicy.h index 0edba2c0872..a5dc1872e44 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/andpolicy.h +++ b/documentapi/src/vespa/documentapi/messagebus/policies/andpolicy.h @@ -1,7 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vector> #include <vespa/messagebus/routing/hop.h> #include <vespa/messagebus/routing/iroutingpolicy.h> #include <vespa/documentapi/common.h> @@ -26,19 +25,9 @@ public: * @param param A string of recipients to select unless recipients have been configured. */ ANDPolicy(const string& param); - - /** - * Destructor. - * - * Frees all allocated resources. - */ - virtual ~ANDPolicy(); - - // Inherit doc from IRoutingPolicy. - virtual void select(mbus::RoutingContext &context) override; - - // Inherit doc from IRoutingPolicy. - virtual void merge(mbus::RoutingContext &context) override; + ~ANDPolicy(); + void select(mbus::RoutingContext &context) override; + void merge(mbus::RoutingContext &context) override; private: ANDPolicy(const ANDPolicy &); // hide diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/contentpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/contentpolicy.h index 2f901ebad2d..bf17a77ca6a 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/contentpolicy.h +++ b/documentapi/src/vespa/documentapi/messagebus/policies/contentpolicy.h @@ -10,7 +10,7 @@ class ContentPolicy : public StoragePolicy public: ContentPolicy(const string& param); private: - virtual string createConfigId(const string & clusterName) const override; + string createConfigId(const string & clusterName) const override; }; } diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/documentrouteselectorpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/documentrouteselectorpolicy.h index 678210b1416..362185576ff 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/documentrouteselectorpolicy.h +++ b/documentapi/src/vespa/documentapi/messagebus/policies/documentrouteselectorpolicy.h @@ -1,11 +1,11 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once +#include "config-documentrouteselectorpolicy.h" #include <vespa/document/select/node.h> #include <map> #include <vespa/messagebus/routing/iroutingpolicy.h> #include <vespa/vespalib/util/sync.h> -#include <vespa/documentapi/messagebus/policies/config-documentrouteselectorpolicy.h> #include <vespa/documentapi/common.h> #include <vespa/config/config.h> #include <vespa/config/helper/configfetcher.h> @@ -64,14 +64,8 @@ public: * @return The error string, or null if no error. */ const string &getError() const; - - // Implements Subscriber. void configure(std::unique_ptr<messagebus::protocol::DocumentrouteselectorpolicyConfig> cfg) override; - - // Implements IRoutingPolicy. void select(mbus::RoutingContext &context) override; - - // Implements IRoutingPolicy. void merge(mbus::RoutingContext &context) override; }; diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/errorpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/errorpolicy.h index 790e0ab923c..fddccb1e3d9 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/errorpolicy.h +++ b/documentapi/src/vespa/documentapi/messagebus/policies/errorpolicy.h @@ -22,11 +22,7 @@ public: * @param msg The message of the error to assign. */ ErrorPolicy(const string &msg); - - // Implements IRoutingPolicy. void select(mbus::RoutingContext &context) override; - - // Implements IRoutingPolicy. void merge(mbus::RoutingContext &context) override; }; diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.h index d1e01cdbe59..9dd400f69c3 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.h +++ b/documentapi/src/vespa/documentapi/messagebus/policies/externpolicy.h @@ -51,13 +51,7 @@ public: * @param param The address to use for this, if empty this will resolve to hostname. */ ExternPolicy(const string ¶m); - - /** - * Destructor. - * - * Frees all allocated resources. - */ - virtual ~ExternPolicy(); + ~ExternPolicy(); /** * This is a safety mechanism to allow the constructor to fail and signal that it can not be used. @@ -74,11 +68,7 @@ public: * @return The mirror pointer. */ slobrok::api::IMirrorAPI &getMirror() { return *_mirror; } - - // Overrides IRoutingPolicy. void select(mbus::RoutingContext &ctx) override; - - // Overrides IRoutingPolicy. void merge(mbus::RoutingContext &ctx) override; }; diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/externslobrokpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/externslobrokpolicy.h index 6a2a673807f..825c4a85d35 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/externslobrokpolicy.h +++ b/documentapi/src/vespa/documentapi/messagebus/policies/externslobrokpolicy.h @@ -1,7 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/documentapi/messagebus/policies/asyncinitializationpolicy.h> +#include "asyncinitializationpolicy.h" #include <vespa/config-slobroks.h> #include <vespa/vdslib/distribution/distribution.h> #include <vespa/slobrok/imirrorapi.h> @@ -29,20 +29,15 @@ protected: public: ExternSlobrokPolicy(const std::map<string, string>& params); - virtual ~ExternSlobrokPolicy(); + ~ExternSlobrokPolicy(); /** * @return a pointer to the slobrok mirror owned by this policy, if any. * If the policy uses the default mirror API, NULL is returned. */ const slobrok::api::IMirrorAPI* getMirror() const { return _mirror.get(); } - slobrok::api::IMirrorAPI::SpecList lookup(mbus::RoutingContext &context, const string& pattern); - - /** - * Initializes the policy - */ - virtual string init() override; + string init() override; }; } diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/loadbalancerpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/loadbalancerpolicy.h index 0541b784b1f..7b0e7e1f110 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/loadbalancerpolicy.h +++ b/documentapi/src/vespa/documentapi/messagebus/policies/loadbalancerpolicy.h @@ -1,8 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/documentapi/messagebus/policies/loadbalancer.h> -#include <vespa/documentapi/messagebus/policies/externslobrokpolicy.h> +#include "loadbalancer.h" +#include "externslobrokpolicy.h" namespace documentapi { @@ -10,8 +10,7 @@ class LoadBalancerPolicy : public ExternSlobrokPolicy { public: LoadBalancerPolicy(const string& param); - - virtual void doSelect(mbus::RoutingContext &context) override; + void doSelect(mbus::RoutingContext &context) override; /** Finds the TCP address of the target docproc. @@ -22,7 +21,7 @@ public: return _loadBalancer->getRecipient(lookup(context, _pattern)); } - virtual void merge(mbus::RoutingContext &context) override; + void merge(mbus::RoutingContext &context) override; private: string _pattern; diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/localservicepolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/localservicepolicy.h index af63403a8b1..d471e3051c8 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/localservicepolicy.h +++ b/documentapi/src/vespa/documentapi/messagebus/policies/localservicepolicy.h @@ -74,19 +74,9 @@ public: * @param param The address to use for this, if empty this will resolve to hostname. */ LocalServicePolicy(const string ¶m); - - /** - * Destructor. - * - * Frees all allocated resources. - */ - virtual ~LocalServicePolicy(); - - // Inherit doc from IRoutingPolicy. - virtual void select(mbus::RoutingContext &context) override; - - // Inherit doc from IRoutingPolicy. - virtual void merge(mbus::RoutingContext &context) override; + ~LocalServicePolicy(); + void select(mbus::RoutingContext &context) override; + void merge(mbus::RoutingContext &context) override; }; } diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/messagetypepolicy.cpp b/documentapi/src/vespa/documentapi/messagebus/policies/messagetypepolicy.cpp index f55967b1c09..4d260a8e81f 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/messagetypepolicy.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/policies/messagetypepolicy.cpp @@ -18,6 +18,8 @@ MessageTypePolicy::MessageTypePolicy(const config::ConfigUri & configUri) : _fetcher.start(); } +MessageTypePolicy::~MessageTypePolicy() {} + void MessageTypePolicy::configure(std::unique_ptr<MessagetyperouteselectorpolicyConfig> cfg) { diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/messagetypepolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/messagetypepolicy.h index d29439db50c..d9a324a79c5 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/messagetypepolicy.h +++ b/documentapi/src/vespa/documentapi/messagebus/policies/messagetypepolicy.h @@ -43,16 +43,10 @@ public: * @param configUri The configuration uri to subscribe with. */ MessageTypePolicy(const config::ConfigUri & configUri); - - // Implements Subscriber. + ~MessageTypePolicy(); void configure(std::unique_ptr<vespa::config::content::MessagetyperouteselectorpolicyConfig> cfg) override; - - // Implements IRoutingPolicy. void select(mbus::RoutingContext &context) override; - - // Implements IRoutingPolicy. void merge(mbus::RoutingContext &context) override; }; } - diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.h index 3a3a22090f9..a14c2afdbc7 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.h +++ b/documentapi/src/vespa/documentapi/messagebus/policies/roundrobinpolicy.h @@ -61,19 +61,9 @@ public: * in slobrok. */ RoundRobinPolicy(const string ¶m); - - /** - * Destructor. - * - * Frees all allocated resources. - */ - virtual ~RoundRobinPolicy(); - - // Inherit doc from IRoutingPolicy. - virtual void select(mbus::RoutingContext &context) override; - - // Inherit doc from IRoutingPolicy. - virtual void merge(mbus::RoutingContext &context) override; + ~RoundRobinPolicy(); + void select(mbus::RoutingContext &context) override; + void merge(mbus::RoutingContext &context) override; }; } diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/storagepolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/storagepolicy.h index ef6478e368a..c73c4c8560d 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/storagepolicy.h +++ b/documentapi/src/vespa/documentapi/messagebus/policies/storagepolicy.h @@ -39,13 +39,9 @@ private: public: StoragePolicy(const string& param); - virtual ~StoragePolicy(); - - // Inherit doc from IRoutingPolicy. - virtual void doSelect(mbus::RoutingContext &context) override; - - // Inherit doc from IRoutingPolicy. - virtual void merge(mbus::RoutingContext &context) override; + ~StoragePolicy(); + void doSelect(mbus::RoutingContext &context) override; + void merge(mbus::RoutingContext &context) override; void updateStateFromReply(WrongDistributionReply& reply); @@ -56,7 +52,6 @@ public: const storage::lib::ClusterState* getSystemState() const { return _state.get(); } virtual void configure(std::unique_ptr<storage::lib::Distribution::DistributionConfig> config); - string init() override; private: diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/subsetservicepolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/subsetservicepolicy.h index 49724785361..4d6dadb7156 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/subsetservicepolicy.h +++ b/documentapi/src/vespa/documentapi/messagebus/policies/subsetservicepolicy.h @@ -65,20 +65,9 @@ public: * @param param The number of services to include in the set. */ SubsetServicePolicy(const string ¶m); - - /** - * Destructor. - * - * Frees all allocated resources. - */ - virtual ~SubsetServicePolicy(); - - // Inherit doc from IRoutingPolicy. - virtual void select(mbus::RoutingContext &context) override; - - // Inherit doc from IRoutingPolicy. - virtual void merge(mbus::RoutingContext &context) override; + ~SubsetServicePolicy(); + void select(mbus::RoutingContext &context) override; + void merge(mbus::RoutingContext &context) override; }; } - diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories50.h b/documentapi/src/vespa/documentapi/messagebus/routablefactories50.h index aed43b8b2e5..c715792f263 100644 --- a/documentapi/src/vespa/documentapi/messagebus/routablefactories50.h +++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories50.h @@ -99,11 +99,7 @@ public: */ typedef std::unique_ptr<IRoutableFactory> UP; typedef std::shared_ptr<IRoutableFactory> SP; - - // Implements IRoutableFactory. bool encode(const mbus::Routable &obj, vespalib::GrowableByteBuffer &out) const override; - - // Implements IRoutableFactory. mbus::Routable::UP decode(document::ByteBuffer &in, const LoadTypeSet& loadTypes) const override; }; @@ -143,10 +139,7 @@ public: typedef std::unique_ptr<IRoutableFactory> UP; typedef std::shared_ptr<IRoutableFactory> SP; - // Implements IRoutableFactory. bool encode(const mbus::Routable &obj, vespalib::GrowableByteBuffer &out) const override; - - // Implements IRoutableFactory. mbus::Routable::UP decode(document::ByteBuffer &in, const LoadTypeSet& loadTypes) const override; }; @@ -180,8 +173,7 @@ public: DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override; bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; public: - BatchDocumentUpdateMessageFactory(const document::DocumentTypeRepo &r) - : _repo(r) {} + BatchDocumentUpdateMessageFactory(const document::DocumentTypeRepo &r) : _repo(r) {} }; class BatchDocumentUpdateReplyFactory : public DocumentReplyFactory { protected: @@ -194,8 +186,7 @@ public: DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override; bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; public: - CreateVisitorMessageFactory(const document::DocumentTypeRepo &r) - : _repo(r) {} + CreateVisitorMessageFactory(const document::DocumentTypeRepo &r) : _repo(r) {} }; class CreateVisitorReplyFactory : public DocumentReplyFactory { protected: @@ -285,8 +276,7 @@ public: DocumentReply::UP doDecode(document::ByteBuffer &buf) const override; bool doEncode(const DocumentReply &msg, vespalib::GrowableByteBuffer &buf) const override; public: - GetDocumentReplyFactory(const document::DocumentTypeRepo &r) - : _repo(r) {} + GetDocumentReplyFactory(const document::DocumentTypeRepo &r) : _repo(r) {} }; class MapVisitorMessageFactory : public DocumentMessageFactory { const document::DocumentTypeRepo &_repo; @@ -294,8 +284,7 @@ public: DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override; bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; public: - MapVisitorMessageFactory(const document::DocumentTypeRepo &r) - : _repo(r) {} + MapVisitorMessageFactory(const document::DocumentTypeRepo &r) : _repo(r) {} }; class MapVisitorReplyFactory : public DocumentReplyFactory { protected: @@ -308,8 +297,7 @@ public: DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override; bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; public: - MultiOperationMessageFactory(const document::DocumentTypeRepo::SP &r) - : _repo(r) {} + MultiOperationMessageFactory(const document::DocumentTypeRepo::SP &r) : _repo(r) {} }; class MultiOperationReplyFactory : public DocumentReplyFactory { protected: @@ -326,8 +314,7 @@ public: bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; public: void decodeInto(PutDocumentMessage & msg, document::ByteBuffer & buf) const; - PutDocumentMessageFactory(const document::DocumentTypeRepo &r) - : _repo(r) {} + PutDocumentMessageFactory(const document::DocumentTypeRepo &r) : _repo(r) {} }; class PutDocumentReplyFactory : public DocumentReplyFactory { protected: @@ -354,8 +341,7 @@ public: DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override; bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; public: - RemoveLocationMessageFactory(const document::DocumentTypeRepo &r) - : _repo(r) {} + RemoveLocationMessageFactory(const document::DocumentTypeRepo &r) : _repo(r) {} }; class RemoveLocationReplyFactory : public DocumentReplyFactory { protected: @@ -402,8 +388,7 @@ public: bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; public: void decodeInto(UpdateDocumentMessage & msg, document::ByteBuffer & buf) const; - UpdateDocumentMessageFactory(const document::DocumentTypeRepo &r) - : _repo(r) {} + UpdateDocumentMessageFactory(const document::DocumentTypeRepo &r) : _repo(r) {} }; class UpdateDocumentReplyFactory : public DocumentReplyFactory { protected: diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories51.h b/documentapi/src/vespa/documentapi/messagebus/routablefactories51.h index bfa25c21d84..429c86e5049 100644 --- a/documentapi/src/vespa/documentapi/messagebus/routablefactories51.h +++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories51.h @@ -58,10 +58,7 @@ public: typedef std::unique_ptr<IRoutableFactory> UP; typedef std::shared_ptr<IRoutableFactory> SP; - // Implements IRoutableFactory. bool encode(const mbus::Routable &obj, vespalib::GrowableByteBuffer &out) const override; - - // Implements IRoutableFactory. mbus::Routable::UP decode(document::ByteBuffer &in, const LoadTypeSet& loadTypes) const override; }; @@ -101,10 +98,7 @@ public: typedef std::unique_ptr<IRoutableFactory> UP; typedef std::shared_ptr<IRoutableFactory> SP; - // Implements IRoutableFactory. bool encode(const mbus::Routable &obj, vespalib::GrowableByteBuffer &out) const override; - - // Implements IRoutableFactory. mbus::Routable::UP decode(document::ByteBuffer &in, const LoadTypeSet& loadTypes) const override; }; @@ -145,8 +139,7 @@ public: DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override; bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override; public: - CreateVisitorMessageFactory(const document::DocumentTypeRepo &r) - : _repo(r) {} + CreateVisitorMessageFactory(const document::DocumentTypeRepo &r) : _repo(r) {} }; class GetDocumentMessageFactory : public DocumentMessageFactory { diff --git a/documentapi/src/vespa/documentapi/messagebus/routingpolicyfactories.h b/documentapi/src/vespa/documentapi/messagebus/routingpolicyfactories.h index 906fc508bd7..a41ae155170 100644 --- a/documentapi/src/vespa/documentapi/messagebus/routingpolicyfactories.h +++ b/documentapi/src/vespa/documentapi/messagebus/routingpolicyfactories.h @@ -36,9 +36,7 @@ public: const document::DocumentTypeRepo &_repo; string _configId; public: - DocumentRouteSelectorPolicyFactory( - const document::DocumentTypeRepo &repo, - const string &configId); + DocumentRouteSelectorPolicyFactory(const document::DocumentTypeRepo &repo, const string &configId); mbus::IRoutingPolicy::UP createPolicy(const string ¶m) const override; }; class ExternPolicyFactory : public IRoutingPolicyFactory { @@ -68,4 +66,3 @@ public: }; } - |