diff options
author | Arne H Juul <arnej@yahoo-inc.com> | 2017-04-11 11:45:21 +0200 |
---|---|---|
committer | Arne H Juul <arnej@yahoo-inc.com> | 2017-04-11 11:45:21 +0200 |
commit | a7747a035821de936c9bf9eba05c2c9c4ac1291f (patch) | |
tree | 08db1917653e817856c313166fa3cf0998c76c8f /storage | |
parent | 1dea035474644a3432035b4ff8c30c780e4bc1f8 (diff) |
add override in storage/visiting module
Diffstat (limited to 'storage')
9 files changed, 41 insertions, 46 deletions
diff --git a/storage/src/vespa/storage/visiting/countvisitor.h b/storage/src/vespa/storage/visiting/countvisitor.h index 75e0e866553..ecf51035a03 100644 --- a/storage/src/vespa/storage/visiting/countvisitor.h +++ b/storage/src/vespa/storage/visiting/countvisitor.h @@ -18,12 +18,12 @@ public: CountVisitor(StorageComponent&, const vdslib::Parameters& params); - virtual void completedVisiting(HitCounter&); + virtual void completedVisiting(HitCounter&) override; private: void handleDocuments(const document::BucketId& bucketId, std::vector<spi::DocEntry::UP>& entries, - HitCounter& hitCounter); + HitCounter& hitCounter) override; bool _doScheme; std::map<std::string, int> _schemeCount; @@ -43,13 +43,13 @@ private: struct CountVisitorFactory : public VisitorFactory { VisitorEnvironment::UP - makeVisitorEnvironment(StorageComponent&) { + makeVisitorEnvironment(StorageComponent&) override { return VisitorEnvironment::UP(new VisitorEnvironment); }; Visitor* makeVisitor(StorageComponent& c, VisitorEnvironment&, - const vdslib::Parameters& params) + const vdslib::Parameters& params) override { return new CountVisitor(c, params); } diff --git a/storage/src/vespa/storage/visiting/dumpvisitor.h b/storage/src/vespa/storage/visiting/dumpvisitor.h index 0aa690ce3c0..31ff8ef0638 100644 --- a/storage/src/vespa/storage/visiting/dumpvisitor.h +++ b/storage/src/vespa/storage/visiting/dumpvisitor.h @@ -27,7 +27,7 @@ private: void handleDocuments(const document::BucketId& bucketId, std::vector<spi::DocEntry::UP>& entries, - HitCounter& hitCounter); + HitCounter& hitCounter) override; std::unique_ptr<std::set<std::string> > _requestedFields; std::unique_ptr<std::set<std::string> > _requestedDocuments; @@ -40,13 +40,13 @@ public: DumpVisitorFactory() {} VisitorEnvironment::UP - makeVisitorEnvironment(StorageComponent&) { + makeVisitorEnvironment(StorageComponent&) override { return VisitorEnvironment::UP(new VisitorEnvironment); }; storage::Visitor* makeVisitor(StorageComponent& component, storage::VisitorEnvironment&, - const vdslib::Parameters& params) + const vdslib::Parameters& params) override { return new DumpVisitor(component, params); } diff --git a/storage/src/vespa/storage/visiting/dumpvisitorsingle.h b/storage/src/vespa/storage/visiting/dumpvisitorsingle.h index eab10ad2653..d7f7b63d851 100644 --- a/storage/src/vespa/storage/visiting/dumpvisitorsingle.h +++ b/storage/src/vespa/storage/visiting/dumpvisitorsingle.h @@ -20,20 +20,19 @@ public: private: void handleDocuments(const document::BucketId&, - std::vector<spi::DocEntry::UP>&, - HitCounter&); + std::vector<spi::DocEntry::UP>&, HitCounter&) override; }; struct DumpVisitorSingleFactory : public VisitorFactory { VisitorEnvironment::UP - makeVisitorEnvironment(StorageComponent&) { + makeVisitorEnvironment(StorageComponent&) override { return VisitorEnvironment::UP(new VisitorEnvironment); }; Visitor* - makeVisitor(StorageComponent& c, VisitorEnvironment&, - const vdslib::Parameters& params) + makeVisitor(StorageComponent& c, + VisitorEnvironment&, const vdslib::Parameters& params) override { return new DumpVisitorSingle(c, params); } diff --git a/storage/src/vespa/storage/visiting/messages.h b/storage/src/vespa/storage/visiting/messages.h index ab5628b6669..d646355895f 100644 --- a/storage/src/vespa/storage/visiting/messages.h +++ b/storage/src/vespa/storage/visiting/messages.h @@ -28,11 +28,11 @@ public: : api::InternalCommand(ID), _config(config) {} - std::unique_ptr<api::StorageReply> makeReply(); + std::unique_ptr<api::StorageReply> makeReply() override; const vespa::config::content::core::StorVisitorConfig& getConfig() const { return _config; } - 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 << "PropagateVisitorConfig()"; @@ -57,7 +57,7 @@ public: } - 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 << "PropagateVisitorConfigReply()"; diff --git a/storage/src/vespa/storage/visiting/recoveryvisitor.h b/storage/src/vespa/storage/visiting/recoveryvisitor.h index b8c64e7d0fd..dac6996028b 100644 --- a/storage/src/vespa/storage/visiting/recoveryvisitor.h +++ b/storage/src/vespa/storage/visiting/recoveryvisitor.h @@ -26,9 +26,9 @@ public: private: void handleDocuments(const document::BucketId& bucketId, std::vector<spi::DocEntry::UP>& entries, - HitCounter& hitCounter); + HitCounter& hitCounter) override; - void completedBucket(const document::BucketId&, HitCounter&); + void completedBucket(const document::BucketId&, HitCounter&) override; std::set<std::string> _requestedFields; @@ -42,13 +42,13 @@ private: struct RecoveryVisitorFactory : public VisitorFactory { VisitorEnvironment::UP - makeVisitorEnvironment(StorageComponent&) { + makeVisitorEnvironment(StorageComponent&) override { return VisitorEnvironment::UP(new VisitorEnvironment); }; Visitor* makeVisitor(StorageComponent& c, VisitorEnvironment&, - const vdslib::Parameters& params) + const vdslib::Parameters& params) override { return new RecoveryVisitor(c, params); } diff --git a/storage/src/vespa/storage/visiting/testvisitor.h b/storage/src/vespa/storage/visiting/testvisitor.h index 9d4bb498ae0..c2740b11d56 100644 --- a/storage/src/vespa/storage/visiting/testvisitor.h +++ b/storage/src/vespa/storage/visiting/testvisitor.h @@ -17,21 +17,21 @@ public: TestVisitor(StorageComponent&, const vdslib::Parameters&); private: - void startingVisitor(const std::vector<document::BucketId>& buckets); + void startingVisitor(const std::vector<document::BucketId>& buckets) override; void handleDocuments(const document::BucketId& bucketId, std::vector<spi::DocEntry::UP>& entries, - HitCounter& hitCounter); + HitCounter& hitCounter) override; - void completedBucket(const document::BucketId& bucket, HitCounter& hitCounter); + void completedBucket(const document::BucketId& bucket, HitCounter& hitCounter) override; spi::ReadConsistency getRequiredReadConsistency() const override { return spi::ReadConsistency::WEAK; } - void completedVisiting(HitCounter& hitCounter); + void completedVisiting(HitCounter& hitCounter) override; - void abortedVisiting(); + void abortedVisiting() override; // Send datagram with message back to client void report(const std::string& message); @@ -42,13 +42,13 @@ private: struct TestVisitorFactory : public VisitorFactory { VisitorEnvironment::UP - makeVisitorEnvironment(StorageComponent&) { + makeVisitorEnvironment(StorageComponent&) override { return VisitorEnvironment::UP(new VisitorEnvironment); }; Visitor* makeVisitor(StorageComponent& c, VisitorEnvironment&, - const vdslib::Parameters& params) { + const vdslib::Parameters& params) override { return new TestVisitor(c, params); } diff --git a/storage/src/vespa/storage/visiting/visitor.h b/storage/src/vespa/storage/visiting/visitor.h index a392374ed5d..3d5e9fc2c53 100644 --- a/storage/src/vespa/storage/visiting/visitor.h +++ b/storage/src/vespa/storage/visiting/visitor.h @@ -174,8 +174,7 @@ private: bool hasPendingIterators() const { return _pendingIterators > 0; } - void print(std::ostream& out, bool /*verbose*/, - const std::string& /*indent*/) const + void print(std::ostream& out, bool, const std::string& /*indent*/) const override { out << "BucketIterationState(" << _bucketId diff --git a/storage/src/vespa/storage/visiting/visitormanager.h b/storage/src/vespa/storage/visiting/visitormanager.h index aa9ecf37647..9b750e3af4f 100644 --- a/storage/src/vespa/storage/visiting/visitormanager.h +++ b/storage/src/vespa/storage/visiting/visitormanager.h @@ -92,10 +92,9 @@ public: const VisitorFactory::Map& external = VisitorFactory::Map()); virtual ~VisitorManager(); - virtual void onClose(); + virtual void onClose() 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; uint32_t getActiveVisitorCount() const; @@ -126,8 +125,8 @@ public: void enforceQueueUsage() { _enforceQueueUse = true; } private: - void configure(std::unique_ptr<vespa::config::content::core::StorVisitorConfig>); - virtual void run(framework::ThreadHandle&); + void configure(std::unique_ptr<vespa::config::content::core::StorVisitorConfig>) override; + virtual void run(framework::ThreadHandle&) override; /** * Schedules a visitor for running. onCreateVisitor will typically call @@ -139,10 +138,10 @@ private: bool scheduleVisitor(const std::shared_ptr<api::CreateVisitorCommand>&, bool skipQueue, vespalib::MonitorGuard& visitorLock); - bool onCreateVisitor(const std::shared_ptr<api::CreateVisitorCommand>&); + bool onCreateVisitor(const std::shared_ptr<api::CreateVisitorCommand>&) override; - bool onDown(const std::shared_ptr<api::StorageMessage>& r); - bool onInternalReply(const std::shared_ptr<api::InternalReply>& r); + bool onDown(const std::shared_ptr<api::StorageMessage>& r) override; + bool onInternalReply(const std::shared_ptr<api::InternalReply>& r) override; bool processReply(const std::shared_ptr<api::StorageReply>&); /** @@ -159,14 +158,12 @@ private: bool attemptScheduleQueuedVisitor(vespalib::MonitorGuard& visitorLock); // VisitorMessageHandler implementation - void send(const std::shared_ptr<api::StorageCommand>& cmd, - Visitor& visitor); - void send(const std::shared_ptr<api::StorageReply>& reply); - void closed(api::VisitorId id); + void send(const std::shared_ptr<api::StorageCommand>& cmd, Visitor& visitor) override; + void send(const std::shared_ptr<api::StorageReply>& reply) override; + void closed(api::VisitorId id) override; // Status::Reporter implementation - virtual void reportHtmlStatus(std::ostream&, - const framework::HttpUrlPath&) const; + virtual void reportHtmlStatus(std::ostream&, const framework::HttpUrlPath&) const override; /** * The maximum amount of concurrent visitors for a priority is given diff --git a/storage/src/vespa/storage/visiting/visitorthread.h b/storage/src/vespa/storage/visiting/visitorthread.h index fdfef7b2073..2f0a125d6ce 100644 --- a/storage/src/vespa/storage/visiting/visitorthread.h +++ b/storage/src/vespa/storage/visiting/visitorthread.h @@ -117,7 +117,7 @@ public: } private: - virtual void run(framework::ThreadHandle&); + virtual void run(framework::ThreadHandle&) override; /** * Attempt to fetch an event from the visitor thread's queue. If an event * was available, pop it from the queue and return it. If not, return @@ -134,11 +134,11 @@ private: const vdslib::Parameters& params, vespalib::asciistream & error); - bool onCreateVisitor(const std::shared_ptr<api::CreateVisitorCommand>&); + bool onCreateVisitor(const std::shared_ptr<api::CreateVisitorCommand>&) override; bool onVisitorReply(const std::shared_ptr<api::StorageReply>& reply); - bool onInternal(const std::shared_ptr<api::InternalCommand>&); - bool onInternalReply(const std::shared_ptr<api::InternalReply>&); + bool onInternal(const std::shared_ptr<api::InternalCommand>&) override; + bool onInternalReply(const std::shared_ptr<api::InternalReply>&) override; /** Deletes a visitor instance. */ void close(); |