diff options
author | Arne H Juul <arnej@yahoo-inc.com> | 2017-04-11 11:45:18 +0200 |
---|---|---|
committer | Arne H Juul <arnej@yahoo-inc.com> | 2017-04-11 11:45:18 +0200 |
commit | 5d765d002d0faaf410a5387c9e3aa537b6442286 (patch) | |
tree | 0db226b363b371e706c52ecb3eb93fb8131bc235 /storage/src | |
parent | 6c74ff47fcaa7d19aba4257f5933490207edb1ba (diff) |
add override in storage/distributor module
Diffstat (limited to 'storage/src')
17 files changed, 101 insertions, 103 deletions
diff --git a/storage/src/vespa/storage/distributor/activecopy.h b/storage/src/vespa/storage/distributor/activecopy.h index 00a7bf3d4f6..7f8fbedb61c 100644 --- a/storage/src/vespa/storage/distributor/activecopy.h +++ b/storage/src/vespa/storage/distributor/activecopy.h @@ -37,7 +37,7 @@ public: bool contains(uint16_t) const; bool empty() const { return _v.empty(); } size_t size() const { return _v.size(); } - void print(std::ostream&, bool verbose, const std::string& indent) const; + void print(std::ostream&, bool verbose, const std::string& indent) const override; }; } // distributor diff --git a/storage/src/vespa/storage/distributor/bucketdbupdater.h b/storage/src/vespa/storage/distributor/bucketdbupdater.h index 8f050d87d95..b87f0e5f898 100644 --- a/storage/src/vespa/storage/distributor/bucketdbupdater.h +++ b/storage/src/vespa/storage/distributor/bucketdbupdater.h @@ -43,14 +43,14 @@ public: void recheckBucketInfo(uint32_t nodeIdx, const document::BucketId& bid); - bool onSetSystemState(const std::shared_ptr<api::SetSystemStateCommand>& cmd); + bool onSetSystemState(const std::shared_ptr<api::SetSystemStateCommand>& cmd) override; bool onRequestBucketInfoReply( - const std::shared_ptr<api::RequestBucketInfoReply> & repl); + const std::shared_ptr<api::RequestBucketInfoReply> & repl) override; - bool onMergeBucketReply(const std::shared_ptr<api::MergeBucketReply>& reply); + bool onMergeBucketReply(const std::shared_ptr<api::MergeBucketReply>& reply) override; - bool onNotifyBucketChange(const std::shared_ptr<api::NotifyBucketChangeCommand>&); + bool onNotifyBucketChange(const std::shared_ptr<api::NotifyBucketChangeCommand>&) override; void resendDelayedMessages(); @@ -60,8 +60,8 @@ public: const framework::HttpUrlPath&) const; vespalib::string getReportContentType( - const framework::HttpUrlPath&) const; - bool reportStatus(std::ostream&, const framework::HttpUrlPath&) const; + const framework::HttpUrlPath&) const override; + bool reportStatus(std::ostream&, const framework::HttpUrlPath&) const override; virtual void print(std::ostream& out, bool verbose, const std::string& indent) const; @@ -241,7 +241,7 @@ private: ~NodeRemover(); - virtual bool process(BucketDatabase::Entry& e); + virtual bool process(BucketDatabase::Entry& e) override; void logRemove(const document::BucketId& bucketId, const char* msg) const; diff --git a/storage/src/vespa/storage/distributor/distributor.cpp b/storage/src/vespa/storage/distributor/distributor.cpp index d1e64406ef6..fdda56cea55 100644 --- a/storage/src/vespa/storage/distributor/distributor.cpp +++ b/storage/src/vespa/storage/distributor/distributor.cpp @@ -462,7 +462,7 @@ public: MaintenanceChecker() : found(false) {}; - bool check(uint32_t msgType, uint16_t node, uint8_t pri) { + bool check(uint32_t msgType, uint16_t node, uint8_t pri) override { (void) node; (void) pri; for (uint32_t i = 0; @@ -486,7 +486,7 @@ public: SplitChecker(uint8_t maxP) : found(false), maxPri(maxP) {}; - bool check(uint32_t msgType, uint16_t node, uint8_t pri) { + bool check(uint32_t msgType, uint16_t node, uint8_t pri) override { (void) node; (void) pri; if (msgType == api::MessageType::SPLITBUCKET_ID && pri <= maxPri) { diff --git a/storage/src/vespa/storage/distributor/distributor.h b/storage/src/vespa/storage/distributor/distributor.h index c56f4f9456a..40d6ee76e07 100644 --- a/storage/src/vespa/storage/distributor/distributor.h +++ b/storage/src/vespa/storage/distributor/distributor.h @@ -56,23 +56,23 @@ public: ~Distributor(); - void onOpen(); + void onOpen() override; - void onClose(); + void onClose() override; - bool onDown(const std::shared_ptr<api::StorageMessage>&); + bool onDown(const std::shared_ptr<api::StorageMessage>&) override; - void sendUp(const std::shared_ptr<api::StorageMessage>&); + void sendUp(const std::shared_ptr<api::StorageMessage>&) override; - void sendDown(const std::shared_ptr<api::StorageMessage>&); + void sendDown(const std::shared_ptr<api::StorageMessage>&) override; - virtual ChainedMessageSender& getMessageSender() { + virtual ChainedMessageSender& getMessageSender() override { return (_messageSender == 0 ? *this : *_messageSender); } - DistributorMetricSet& getMetrics() { return *_metrics; } + DistributorMetricSet& getMetrics() override { return *_metrics; } - PendingMessageTracker& getPendingMessageTracker() { + PendingMessageTracker& getPendingMessageTracker() override { return _pendingMessageTracker; } @@ -82,7 +82,7 @@ public: * Enables a new cluster state. Called after the bucket db updater has * retrieved all bucket info related to the change. */ - void enableClusterState(const lib::ClusterState& clusterState); + void enableClusterState(const lib::ClusterState& clusterState) override; /** * Invoked when a pending cluster state for a distribution (config) @@ -90,39 +90,39 @@ public: * will eventually cause this method to be called, assuming the pending * cluster state completed successfully. */ - void notifyDistributionChangeEnabled(); + void notifyDistributionChangeEnabled() override; - void storageDistributionChanged(); + void storageDistributionChanged() override; - void recheckBucketInfo(uint16_t nodeIdx, const document::BucketId& bid); + void recheckBucketInfo(uint16_t nodeIdx, const document::BucketId& bid) override; - bool handleReply(const std::shared_ptr<api::StorageReply>& reply); + bool handleReply(const std::shared_ptr<api::StorageReply>& reply) override; // StatusReporter implementation vespalib::string getReportContentType( - const framework::HttpUrlPath&) const; - bool reportStatus(std::ostream&, const framework::HttpUrlPath&) const; + const framework::HttpUrlPath&) const override; + bool reportStatus(std::ostream&, const framework::HttpUrlPath&) const override; - bool handleStatusRequest(const DelegatedStatusRequest& request) const; + bool handleStatusRequest(const DelegatedStatusRequest& request) const override; uint32_t pendingMaintenanceCount() const; std::string getActiveIdealStateOperations() const; std::string getActiveOperations() const; - virtual framework::ThreadWaitInfo doCriticalTick(framework::ThreadIndex); - virtual framework::ThreadWaitInfo doNonCriticalTick(framework::ThreadIndex); + virtual framework::ThreadWaitInfo doCriticalTick(framework::ThreadIndex) override; + virtual framework::ThreadWaitInfo doNonCriticalTick(framework::ThreadIndex) override; /** * Checks whether a bucket needs to be split, and sends a split * if so. */ void checkBucketForSplit(const BucketDatabase::Entry& e, - uint8_t priority); + uint8_t priority) override; - const lib::Distribution& getDistribution() const; + const lib::Distribution& getDistribution() const override; - const lib::ClusterState& getClusterState() const { + const lib::ClusterState& getClusterState() const override { return _clusterState; } @@ -130,7 +130,7 @@ public: * @return Returns the states in which the distributors consider * storage nodes to be up. */ - const char* getStorageNodeUpStates() const + const char* getStorageNodeUpStates() const override { return _initializingIsUp ? "uri" : "ur"; } /** @@ -138,14 +138,14 @@ public: * request bucket info operations have been performed as well. Passes the * merge back to the operation that created it. */ - void handleCompletedMerge(const std::shared_ptr<api::MergeBucketReply>& reply); + void handleCompletedMerge(const std::shared_ptr<api::MergeBucketReply>& reply) override; - bool initializing() const { + bool initializing() const override { return !_doneInitializing; } - const DistributorConfiguration& getConfig() const { + const DistributorConfiguration& getConfig() const override { return _component.getTotalDistributorConfig(); } @@ -153,14 +153,14 @@ public: return _schedulingMode == MaintenanceScheduler::RECOVERY_SCHEDULING_MODE; } - int getDistributorIndex() const; + int getDistributorIndex() const override; - const std::string& getClusterName() const; + const std::string& getClusterName() const override; - const PendingMessageTracker& getPendingMessageTracker() const; + const PendingMessageTracker& getPendingMessageTracker() const override; - virtual void sendCommand(const std::shared_ptr<api::StorageCommand>&); - virtual void sendReply(const std::shared_ptr<api::StorageReply>&); + virtual void sendCommand(const std::shared_ptr<api::StorageCommand>&) override; + virtual void sendReply(const std::shared_ptr<api::StorageReply>&) override; const BucketGcTimeCalculator::BucketIdHasher& getBucketIdHasher() const override { diff --git a/storage/src/vespa/storage/distributor/idealstatemanager.h b/storage/src/vespa/storage/distributor/idealstatemanager.h index b177278bd20..3b468a64024 100644 --- a/storage/src/vespa/storage/distributor/idealstatemanager.h +++ b/storage/src/vespa/storage/distributor/idealstatemanager.h @@ -130,7 +130,7 @@ private: StatusBucketVisitor(const IdealStateManager& ism, std::ostream& out) : _ism(ism), _out(out) {} - bool process(const BucketDatabase::Entry& e) { + bool process(const BucketDatabase::Entry& e) override { _ism.getBucketStatus(e, _statsTracker, _out); return true; } diff --git a/storage/src/vespa/storage/distributor/operations/external/getoperation.h b/storage/src/vespa/storage/distributor/operations/external/getoperation.h index 88f9300a112..ecdfb1e677a 100644 --- a/storage/src/vespa/storage/distributor/operations/external/getoperation.h +++ b/storage/src/vespa/storage/distributor/operations/external/getoperation.h @@ -29,15 +29,15 @@ public: const std::shared_ptr<api::GetCommand> & msg, PersistenceOperationMetricSet& metric); - void onClose(DistributorMessageSender& sender); + void onClose(DistributorMessageSender& sender) override; - void onStart(DistributorMessageSender& sender); + void onStart(DistributorMessageSender& sender) override; - void onReceive(DistributorMessageSender& sender, const std::shared_ptr<api::StorageReply> & msg); + void onReceive(DistributorMessageSender& sender, const std::shared_ptr<api::StorageReply> & msg) override; - const char* getName() const { return "get"; } + const char* getName() const override { return "get"; } - std::string getStatus() const { return ""; } + std::string getStatus() const override { return ""; } bool hasConsistentCopies() const; diff --git a/storage/src/vespa/storage/distributor/operations/external/putoperation.h b/storage/src/vespa/storage/distributor/operations/external/putoperation.h index 677b2f85d4e..5043fed307f 100644 --- a/storage/src/vespa/storage/distributor/operations/external/putoperation.h +++ b/storage/src/vespa/storage/distributor/operations/external/putoperation.h @@ -27,16 +27,16 @@ public: const std::shared_ptr<api::PutCommand> & msg, PersistenceOperationMetricSet& metric); - void onStart(DistributorMessageSender& sender); + void onStart(DistributorMessageSender& sender) override; - const char* getName() const { return "put"; }; + const char* getName() const override { return "put"; } - std::string getStatus() const { return ""; }; + std::string getStatus() const override { return ""; } void onReceive(DistributorMessageSender& sender, - const std::shared_ptr<api::StorageReply> &); + const std::shared_ptr<api::StorageReply> &) override; - void onClose(DistributorMessageSender& sender); + void onClose(DistributorMessageSender& sender) override; /** * Gets the ideal state of the given bucket, and adds all nodes from the diff --git a/storage/src/vespa/storage/distributor/operations/external/statbucketlistoperation.h b/storage/src/vespa/storage/distributor/operations/external/statbucketlistoperation.h index 8e092a96f88..25cc0825b7d 100644 --- a/storage/src/vespa/storage/distributor/operations/external/statbucketlistoperation.h +++ b/storage/src/vespa/storage/distributor/operations/external/statbucketlistoperation.h @@ -25,17 +25,15 @@ public: const std::shared_ptr<api::GetBucketListCommand>& cmd); virtual ~StatBucketListOperation() {} - virtual const char* getName() const { return "statBucketList"; } - virtual std::string getStatus() const { return ""; } + virtual const char* getName() const override { return "statBucketList"; } + virtual std::string getStatus() const override { return ""; } - virtual void onStart(DistributorMessageSender& sender); - virtual void onReceive(DistributorMessageSender&, - const std::shared_ptr<api::StorageReply>&) - { + virtual void onStart(DistributorMessageSender& sender) override; + virtual void onReceive(DistributorMessageSender&, const std::shared_ptr<api::StorageReply>&) override { // Never called. assert(false); } - void onClose(DistributorMessageSender&) { + void onClose(DistributorMessageSender&) override { } private: diff --git a/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.cpp b/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.cpp index d0a1e98f0c8..15f8d06965a 100644 --- a/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.cpp +++ b/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.cpp @@ -52,24 +52,24 @@ struct IntermediateMessageSender : DistributorMessageSender { DistributorMessageSender & fwd); ~IntermediateMessageSender(); - virtual void sendCommand(const std::shared_ptr<api::StorageCommand>& cmd) { + virtual void sendCommand(const std::shared_ptr<api::StorageCommand>& cmd) override { msgMap.insert(cmd->getMsgId(), callback); forward.sendCommand(cmd); }; - virtual void sendReply(const std::shared_ptr<api::StorageReply>& reply) { + virtual void sendReply(const std::shared_ptr<api::StorageReply>& reply) override { _reply = reply; } - virtual int getDistributorIndex() const { + virtual int getDistributorIndex() const override { return forward.getDistributorIndex(); } - virtual const std::string& getClusterName() const { + virtual const std::string& getClusterName() const override { return forward.getClusterName(); } - virtual const PendingMessageTracker& getPendingMessageTracker() const { + virtual const PendingMessageTracker& getPendingMessageTracker() const override { return forward.getPendingMessageTracker(); } }; diff --git a/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.h b/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.h index 361fcd03037..7cff0aba493 100644 --- a/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.h +++ b/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.h @@ -52,16 +52,16 @@ public: DistributorMetricSet& metrics); ~TwoPhaseUpdateOperation(); - void onStart(DistributorMessageSender& sender); + void onStart(DistributorMessageSender& sender) override; - const char* getName() const { return "twophaseupdate"; } + const char* getName() const override { return "twophaseupdate"; } - std::string getStatus() const { return ""; } + std::string getStatus() const override { return ""; } void onReceive(DistributorMessageSender&, - const std::shared_ptr<api::StorageReply>&); + const std::shared_ptr<api::StorageReply>&) override; - void onClose(DistributorMessageSender& sender); + void onClose(DistributorMessageSender& sender) override; bool canSendHeaderOnly() const; diff --git a/storage/src/vespa/storage/distributor/operations/external/updateoperation.h b/storage/src/vespa/storage/distributor/operations/external/updateoperation.h index b990e953623..0a2a9e564a0 100644 --- a/storage/src/vespa/storage/distributor/operations/external/updateoperation.h +++ b/storage/src/vespa/storage/distributor/operations/external/updateoperation.h @@ -24,16 +24,16 @@ public: const std::shared_ptr<api::UpdateCommand> & msg, PersistenceOperationMetricSet& metric); - void onStart(DistributorMessageSender& sender); + void onStart(DistributorMessageSender& sender) override; - const char* getName() const { return "update"; }; + const char* getName() const override { return "update"; } - std::string getStatus() const { return ""; }; + std::string getStatus() const override { return ""; } void onReceive(DistributorMessageSender& sender, - const std::shared_ptr<api::StorageReply> & msg); + const std::shared_ptr<api::StorageReply> & msg) override; - void onClose(DistributorMessageSender& sender); + void onClose(DistributorMessageSender& sender) override; std::pair<document::BucketId, uint16_t> getNewestTimestampLocation() const { return _newestTimestampLocation; diff --git a/storage/src/vespa/storage/distributor/operations/external/visitoroperation.cpp b/storage/src/vespa/storage/distributor/operations/external/visitoroperation.cpp index ec165b0ee25..295512d579c 100644 --- a/storage/src/vespa/storage/distributor/operations/external/visitoroperation.cpp +++ b/storage/src/vespa/storage/distributor/operations/external/visitoroperation.cpp @@ -481,7 +481,7 @@ struct NextEntryFinder : public BucketDatabase::EntryProcessor { NextEntryFinder(const document::BucketId& id) : _first(true), _last(id), _next() {} - bool process(const BucketDatabase::Entry& e) { + bool process(const BucketDatabase::Entry& e) override { document::BucketId bucket(e.getBucketId()); if (_first && bucket == _last) { diff --git a/storage/src/vespa/storage/distributor/operationtargetresolverimpl.h b/storage/src/vespa/storage/distributor/operationtargetresolverimpl.h index d5a4731c0de..802bb0f4bac 100644 --- a/storage/src/vespa/storage/distributor/operationtargetresolverimpl.h +++ b/storage/src/vespa/storage/distributor/operationtargetresolverimpl.h @@ -23,7 +23,7 @@ struct BucketInstance : public vespalib::AsciiPrintable { lib::Node node, uint16_t idealLocationPriority, bool trusted, bool exist = true); - void print(vespalib::asciistream& out, const PrintProperties&) const; + void print(vespalib::asciistream& out, const PrintProperties&) const override; }; class BucketInstanceList : public vespalib::AsciiPrintable { @@ -104,7 +104,7 @@ public: } virtual OperationTargetList getTargets(OperationType type, - const document::BucketId& id) + const document::BucketId& id) override { return getInstances(type, id).createTargets(); } }; diff --git a/storage/src/vespa/storage/distributor/persistence_operation_metric_set.h b/storage/src/vespa/storage/distributor/persistence_operation_metric_set.h index b50ca0cb798..b1353e1c498 100644 --- a/storage/src/vespa/storage/distributor/persistence_operation_metric_set.h +++ b/storage/src/vespa/storage/distributor/persistence_operation_metric_set.h @@ -29,7 +29,7 @@ public: metrics::LongCountMetric notfound; MetricSet * clone(std::vector<Metric::UP>& ownerList, CopyType copyType, - metrics::MetricSet* owner, bool includeUnused) const; + metrics::MetricSet* owner, bool includeUnused) const override; }; class PersistenceOperationMetricSet : public metrics::MetricSet diff --git a/storage/src/vespa/storage/distributor/statechecker.cpp b/storage/src/vespa/storage/distributor/statechecker.cpp index 64a80117fe3..d257663e261 100644 --- a/storage/src/vespa/storage/distributor/statechecker.cpp +++ b/storage/src/vespa/storage/distributor/statechecker.cpp @@ -33,15 +33,15 @@ public: _priority(priority) {} - IdealStateOperation::UP createOperation() { + IdealStateOperation::UP createOperation() override { return std::move(_operation); } - MaintenancePriority getPriority() const { + MaintenancePriority getPriority() const override { return _priority; } - MaintenanceOperation::Type getType() const { + MaintenanceOperation::Type getType() const override { assert(_operation.get()); return _operation->getType(); } diff --git a/storage/src/vespa/storage/distributor/statecheckers.h b/storage/src/vespa/storage/distributor/statecheckers.h index 8edf04f3bf7..0113749f2fd 100644 --- a/storage/src/vespa/storage/distributor/statecheckers.h +++ b/storage/src/vespa/storage/distributor/statecheckers.h @@ -10,21 +10,21 @@ namespace distributor { class SynchronizeAndMoveStateChecker : public StateChecker { public: - std::string getStatusText() const { return "Synchronization and moving"; } + std::string getStatusText() const override { return "Synchronization and moving"; } - Result check(Context& c); + Result check(Context& c) override; - const char* getName() const { return "SynchronizeAndMove"; } + const char* getName() const override { return "SynchronizeAndMove"; } }; class DeleteExtraCopiesStateChecker : public StateChecker { public: - std::string getStatusText() const { return "Delete extra copies"; } + std::string getStatusText() const override { return "Delete extra copies"; } - Result check(Context& c); + Result check(Context& c) override; - const char* getName() const { return "DeleteExtraCopies"; } + const char* getName() const override { return "DeleteExtraCopies"; } private: bool bucketHasNoData(const StateChecker::Context& c); @@ -48,11 +48,11 @@ private: class JoinBucketsStateChecker : public StateChecker { public: - std::string getStatusText() const { return "Join buckets"; } + std::string getStatusText() const override { return "Join buckets"; } - Result check(Context& c); + Result check(Context& c) override; - const char* getName() const { return "JoinBuckets"; } + const char* getName() const override { return "JoinBuckets"; } private: uint64_t getTotalUsedFileSize(const Context& c) const; uint64_t getTotalMetaCount(const Context& c) const; @@ -68,11 +68,11 @@ private: class SplitBucketStateChecker : public StateChecker { public: - std::string getStatusText() const { return "Split buckets"; } + std::string getStatusText() const override { return "Split buckets"; } - Result check(Context& c); + Result check(Context& c) override; - const char* getName() const { return "SplitBucket"; } + const char* getName() const override { return "SplitBucket"; } private: @@ -86,12 +86,12 @@ private: class SplitInconsistentStateChecker : public StateChecker { public: - std::string getStatusText() const + std::string getStatusText() const override { return "Fix inconsistently split buckets"; } - Result check(Context& c); + Result check(Context& c) override; - const char* getName() const { return "SplitInconsistentBuckets"; } + const char* getName() const override { return "SplitInconsistentBuckets"; } private: typedef std::pair<document::BucketId, uint16_t> BucketAndNode; @@ -114,23 +114,23 @@ class BucketStateStateChecker : public StateChecker const ActiveList& activeList, const StateChecker::Context& c) const; public: - std::string getStatusText() const { return "Set bucket copy state"; } + std::string getStatusText() const override { return "Set bucket copy state"; } - Result check(Context& c); + Result check(Context& c) override; - const char* getName() const { return "SetBucketState"; } + const char* getName() const override { return "SetBucketState"; } }; class GarbageCollectionStateChecker : public StateChecker { public: - std::string getStatusText() const { return "Garbage collection"; } + std::string getStatusText() const override { return "Garbage collection"; } bool needsGarbageCollection(const Context& c) const; - Result check(Context& c); + Result check(Context& c) override; - const char* getName() const { return "GarbageCollection"; } + const char* getName() const override { return "GarbageCollection"; } }; } diff --git a/storage/src/vespa/storage/distributor/statusreporterdelegate.h b/storage/src/vespa/storage/distributor/statusreporterdelegate.h index 7f66554b091..0c836910765 100644 --- a/storage/src/vespa/storage/distributor/statusreporterdelegate.h +++ b/storage/src/vespa/storage/distributor/statusreporterdelegate.h @@ -22,8 +22,8 @@ public: void registerStatusPage(); vespalib::string getReportContentType( - const framework::HttpUrlPath&) const; - bool reportStatus(std::ostream&, const framework::HttpUrlPath&) const; + const framework::HttpUrlPath&) const override; + bool reportStatus(std::ostream&, const framework::HttpUrlPath&) const override; }; } // distributor |