diff options
author | Arne H Juul <arnej@yahoo-inc.com> | 2017-04-10 15:57:19 +0200 |
---|---|---|
committer | Arne H Juul <arnej@yahoo-inc.com> | 2017-04-10 15:57:19 +0200 |
commit | a47fadc86827ec7ad33df82d0a295921f67aa3fc (patch) | |
tree | b60fdd6dd399aa59813ee7337478bd86e2de4d11 /persistence | |
parent | a55e5a9fe0d87ed267eb8f6ddbddf66568b81d41 (diff) |
add override in persistence module
Diffstat (limited to 'persistence')
8 files changed, 51 insertions, 64 deletions
diff --git a/persistence/src/tests/dummyimpl/dummyimpltest.cpp b/persistence/src/tests/dummyimpl/dummyimpltest.cpp index 764eb08af83..4b107fde324 100644 --- a/persistence/src/tests/dummyimpl/dummyimpltest.cpp +++ b/persistence/src/tests/dummyimpl/dummyimpltest.cpp @@ -14,19 +14,13 @@ namespace spi { struct DummyImplTest : public ConformanceTest { struct Factory : public PersistenceFactory { using Repo = document::DocumentTypeRepo; + PersistenceProvider::UP - getPersistenceImplementation(const Repo::SP& repo, const Repo::DocumenttypesConfig&) { + getPersistenceImplementation(const Repo::SP& repo, const Repo::DocumenttypesConfig&) override { return PersistenceProvider::UP(new dummy::DummyPersistence(repo, 4)); } - bool - supportsActiveState() const - { - return true; - } - bool - supportsRevert() const - { + bool supportsActiveState() const override { return true; } }; diff --git a/persistence/src/tests/proxy/dummy_provider_factory.h b/persistence/src/tests/proxy/dummy_provider_factory.h index 8330b4a917b..61cb6f02874 100644 --- a/persistence/src/tests/proxy/dummy_provider_factory.h +++ b/persistence/src/tests/proxy/dummy_provider_factory.h @@ -22,7 +22,7 @@ struct DummyProviderFactory : ProviderStub::PersistenceProviderFactory DummyProviderFactory(std::unique_ptr<Provider> p) : provider(std::move(p)) {} - std::unique_ptr<Provider> create() const { + std::unique_ptr<Provider> create() const override { ASSERT_TRUE(provider.get() != 0); std::unique_ptr<Provider> ret = std::move(provider); ASSERT_TRUE(provider.get() == 0); diff --git a/persistence/src/tests/proxy/mockprovider.h b/persistence/src/tests/proxy/mockprovider.h index fa15334625d..b7019239847 100644 --- a/persistence/src/tests/proxy/mockprovider.h +++ b/persistence/src/tests/proxy/mockprovider.h @@ -20,35 +20,34 @@ struct MockProvider : PersistenceProvider { MockProvider() : last_called(NONE) {} - virtual Result initialize() { + virtual Result initialize() override { last_called = INITIALIZE; return Result(); } - virtual PartitionStateListResult getPartitionStates() const { + virtual PartitionStateListResult getPartitionStates() const override { last_called = GET_PARTITION_STATES; return PartitionStateListResult(PartitionStateList(1u)); } - virtual BucketIdListResult listBuckets(PartitionId id) const { + virtual BucketIdListResult listBuckets(PartitionId id) const override { last_called = LIST_BUCKETS; BucketIdListResult::List result; result.push_back(document::BucketId(id)); return BucketIdListResult(result); } - virtual Result setClusterState(const ClusterState &) { + virtual Result setClusterState(const ClusterState &) override { last_called = SET_CLUSTER_STATE; return Result(); } - virtual Result setActiveState(const Bucket &, - BucketInfo::ActiveState) { + virtual Result setActiveState(const Bucket &, BucketInfo::ActiveState) override { last_called = SET_ACTIVE_STATE; return Result(); } - virtual BucketInfoResult getBucketInfo(const Bucket &bucket) const { + virtual BucketInfoResult getBucketInfo(const Bucket &bucket) const override { last_called = GET_BUCKET_INFO; return BucketInfoResult(BucketInfo(BucketChecksum(1), 2, 3, bucket.getBucketId().getRawId(), @@ -57,19 +56,17 @@ struct MockProvider : PersistenceProvider { BucketInfo::ACTIVE)); } - virtual Result put(const Bucket &, Timestamp, const DocumentSP&, Context&) { + virtual Result put(const Bucket &, Timestamp, const DocumentSP&, Context&) override { last_called = PUT; return Result(); } - virtual RemoveResult remove(const Bucket &, Timestamp, - const DocumentId &, Context&) { + virtual RemoveResult remove(const Bucket &, Timestamp, const DocumentId &, Context&) override { last_called = REMOVE_BY_ID; return RemoveResult(true); } - virtual RemoveResult removeIfFound(const Bucket &, Timestamp, - const DocumentId &, Context&) { + virtual RemoveResult removeIfFound(const Bucket &, Timestamp, const DocumentId &, Context&) override { last_called = REMOVE_IF_FOUND; return RemoveResult(true); } @@ -80,19 +77,17 @@ struct MockProvider : PersistenceProvider { return RemoveResult(true); } - virtual UpdateResult update(const Bucket &, Timestamp timestamp, - const DocumentUpdateSP&, Context&) { + virtual UpdateResult update(const Bucket &, Timestamp timestamp, const DocumentUpdateSP&, Context&) override { last_called = UPDATE; return UpdateResult(Timestamp(timestamp - 10)); } - virtual Result flush(const Bucket&, Context&) { + virtual Result flush(const Bucket&, Context&) override { last_called = FLUSH; return Result(); } - virtual GetResult get(const Bucket &, const document::FieldSet&, - const DocumentId&, Context&) const { + virtual GetResult get(const Bucket &, const document::FieldSet&, const DocumentId&, Context&) const override { last_called = GET; return GetResult(Document::UP(new Document), Timestamp(6u)); @@ -102,34 +97,34 @@ struct MockProvider : PersistenceProvider { const document::FieldSet&, const Selection&, IncludedVersions, - Context&) + Context&) override { last_called = CREATE_ITERATOR; return CreateIteratorResult(IteratorId(bucket.getPartition())); } - virtual IterateResult iterate(IteratorId, uint64_t, Context&) const { + virtual IterateResult iterate(IteratorId, uint64_t, Context&) const override { last_called = ITERATE; IterateResult::List result; result.push_back(DocEntry::UP(new DocEntry(Timestamp(1), 0))); return IterateResult(std::move(result), true); } - virtual Result destroyIterator(IteratorId, Context&) { + virtual Result destroyIterator(IteratorId, Context&) override { last_called = DESTROY_ITERATOR; return Result(); } - virtual Result createBucket(const Bucket&, Context&) { + virtual Result createBucket(const Bucket&, Context&) override { last_called = CREATE_BUCKET; return Result(); } - virtual Result deleteBucket(const Bucket&, Context&) { + virtual Result deleteBucket(const Bucket&, Context&) override { last_called = DELETE_BUCKET; return Result(); } - virtual BucketIdListResult getModifiedBuckets() const { + virtual BucketIdListResult getModifiedBuckets() const override { last_called = GET_MODIFIED_BUCKETS; BucketIdListResult::List list; list.push_back(document::BucketId(2)); @@ -137,32 +132,30 @@ struct MockProvider : PersistenceProvider { return BucketIdListResult(list); } - virtual Result split(const Bucket &, const Bucket &, const Bucket &, - Context&) + virtual Result split(const Bucket &, const Bucket &, const Bucket &, Context&) override { last_called = SPLIT; return Result(); } - virtual Result join(const Bucket &, const Bucket &, const Bucket &, - Context&) + virtual Result join(const Bucket &, const Bucket &, const Bucket &, Context&) override { last_called = JOIN; return Result(); } - virtual Result move(const Bucket &, PartitionId, Context&) { + virtual Result move(const Bucket &, PartitionId, Context&) override { last_called = MOVE; return Result(); } - virtual Result maintain(const Bucket &, MaintenanceLevel) { + virtual Result maintain(const Bucket &, MaintenanceLevel) override { last_called = MAINTAIN; return Result(); } - virtual Result removeEntry(const Bucket &, Timestamp, Context&) { + virtual Result removeEntry(const Bucket &, Timestamp, Context&) override { last_called = REMOVE_ENTRY; return Result(); } diff --git a/persistence/src/tests/proxy/providerproxy_conformancetest.cpp b/persistence/src/tests/proxy/providerproxy_conformancetest.cpp index 8fca5303a53..a33b736a12d 100644 --- a/persistence/src/tests/proxy/providerproxy_conformancetest.cpp +++ b/persistence/src/tests/proxy/providerproxy_conformancetest.cpp @@ -17,12 +17,12 @@ namespace { struct DummyFactory : Factory { PersistenceProvider::UP getPersistenceImplementation(const Repo::SP& repo, - const Repo::DocumenttypesConfig &) { + const Repo::DocumenttypesConfig &) override { return PersistenceProvider::UP(new dummy::DummyPersistence(repo, 4)); } virtual bool - supportsActiveState() const + supportsActiveState() const override { return true; } diff --git a/persistence/src/tests/proxy/proxy_factory_wrapper.h b/persistence/src/tests/proxy/proxy_factory_wrapper.h index 19f763201c4..5d7899e7ff9 100644 --- a/persistence/src/tests/proxy/proxy_factory_wrapper.h +++ b/persistence/src/tests/proxy/proxy_factory_wrapper.h @@ -48,7 +48,7 @@ struct ProxyFactoryWrapper : ConformanceTest::PersistenceFactory } virtual bool - supportsActiveState() const + supportsActiveState() const override { return factory->supportsActiveState(); } diff --git a/persistence/src/tests/proxy/proxyfactory.h b/persistence/src/tests/proxy/proxyfactory.h index dd19a80dc35..3a18440a6e7 100644 --- a/persistence/src/tests/proxy/proxyfactory.h +++ b/persistence/src/tests/proxy/proxyfactory.h @@ -26,12 +26,12 @@ struct ProxyFactory : ConformanceTest::PersistenceFactory ProxyFactory() {} Provider::UP - getPersistenceImplementation(const Repo::SP &repo, const Repo::DocumenttypesConfig &) { + getPersistenceImplementation(const Repo::SP &repo, const Repo::DocumenttypesConfig &) override { return Provider::UP(new Client("tcp/localhost:3456", *repo)); } virtual bool - supportsActiveState() const + supportsActiveState() const override { return false; } diff --git a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h index 940e72d1668..1dee3fb60c3 100644 --- a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h +++ b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h @@ -132,8 +132,8 @@ public: DummyPersistence(const document::DocumentTypeRepo::SP& repo, uint16_t partitionCount = 1); - PartitionStateListResult getPartitionStates() const; - BucketIdListResult listBuckets(PartitionId) const; + PartitionStateListResult getPartitionStates() const override; + BucketIdListResult listBuckets(PartitionId) const override; void setModifiedBuckets(const BucketIdListResult::List& result); @@ -141,52 +141,52 @@ public: * Returns the list set by setModifiedBuckets(), then clears * the list. */ - BucketIdListResult getModifiedBuckets() const; + BucketIdListResult getModifiedBuckets() const override; - Result setClusterState(const ClusterState& newState); + Result setClusterState(const ClusterState& newState) override; Result setActiveState(const Bucket& bucket, - BucketInfo::ActiveState newState); + BucketInfo::ActiveState newState) override; - BucketInfoResult getBucketInfo(const Bucket&) const; + BucketInfoResult getBucketInfo(const Bucket&) const override; + + Result put(const Bucket&, Timestamp, const DocumentSP&, Context&) override; - Result put(const Bucket&, Timestamp, const DocumentSP&, Context&); GetResult get(const Bucket&, const document::FieldSet& fieldSet, const DocumentId&, - Context&) const; + Context&) const override; RemoveResult remove(const Bucket& b, Timestamp t, const DocumentId& did, - Context&); + Context&) override; CreateIteratorResult createIterator(const Bucket&, const document::FieldSet& fs, const Selection&, IncludedVersions, - Context&); + Context&) override; - IterateResult iterate(IteratorId, uint64_t maxByteSize, Context&) const; - Result destroyIterator(IteratorId, Context&); + IterateResult iterate(IteratorId, uint64_t maxByteSize, Context&) const override; + Result destroyIterator(IteratorId, Context&) override; - Result createBucket(const Bucket&, Context&); - Result deleteBucket(const Bucket&, Context&); + Result createBucket(const Bucket&, Context&) override; + Result deleteBucket(const Bucket&, Context&) override; Result split(const Bucket& source, const Bucket& target1, const Bucket& target2, - Context&); + Context&) override; Result join(const Bucket& source1, const Bucket& source2, const Bucket& target, - Context&); + Context&) override; Result revert(const Bucket&, Timestamp, Context&); - Result maintain(const Bucket& bucket, - MaintenanceLevel level); + Result maintain(const Bucket& bucket, MaintenanceLevel level) override; /** * The following methods are used only for unit testing. diff --git a/persistence/src/vespa/persistence/proxy/providerstub.h b/persistence/src/vespa/persistence/proxy/providerstub.h index 3d946845fa5..27e726ca538 100644 --- a/persistence/src/vespa/persistence/proxy/providerstub.h +++ b/persistence/src/vespa/persistence/proxy/providerstub.h @@ -29,7 +29,7 @@ private: vespalib::ThreadStackExecutor &e, std::unique_ptr<PersistenceProvider> &p) : FNET_Task(s), executor(e), provider(p) {} - virtual void PerformTask() { + virtual void PerformTask() override { executor.sync(); assert(provider.get() != 0); provider.reset(); |