diff options
author | Arne H Juul <arnej27959@users.noreply.github.com> | 2017-04-24 12:10:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-24 12:10:42 +0200 |
commit | 9ff4bdb407ed8d855a3f86a17c99906ff738177b (patch) | |
tree | fc2b050224d7dde92d57e1f9cac12c1e5aaf6b90 /persistence/src | |
parent | 32ae190acc9ac5081049e1c7008d1602c68cf821 (diff) |
Revert "Balder/enforce override 2"
Diffstat (limited to 'persistence/src')
8 files changed, 64 insertions, 37 deletions
diff --git a/persistence/src/tests/dummyimpl/dummyimpltest.cpp b/persistence/src/tests/dummyimpl/dummyimpltest.cpp index 9348d90c05a..4b107fde324 100644 --- a/persistence/src/tests/dummyimpl/dummyimpltest.cpp +++ b/persistence/src/tests/dummyimpl/dummyimpltest.cpp @@ -1,9 +1,13 @@ // 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/macros.h> #include <vespa/persistence/conformancetest/conformancetest.h> #include <vespa/persistence/dummyimpl/dummypersistence.h> +LOG_SETUP(".test.dummyimpl"); + namespace storage { namespace spi { @@ -16,7 +20,9 @@ struct DummyImplTest : public ConformanceTest { return PersistenceProvider::UP(new dummy::DummyPersistence(repo, 4)); } - bool supportsActiveState() const override { return true; } + bool supportsActiveState() const override { + return true; + } }; DummyImplTest() diff --git a/persistence/src/tests/proxy/mockprovider.h b/persistence/src/tests/proxy/mockprovider.h index a90b4cc27f7..b7019239847 100644 --- a/persistence/src/tests/proxy/mockprovider.h +++ b/persistence/src/tests/proxy/mockprovider.h @@ -20,34 +20,34 @@ struct MockProvider : PersistenceProvider { MockProvider() : last_called(NONE) {} - Result initialize() override { + virtual Result initialize() override { last_called = INITIALIZE; return Result(); } - PartitionStateListResult getPartitionStates() const override { + virtual PartitionStateListResult getPartitionStates() const override { last_called = GET_PARTITION_STATES; return PartitionStateListResult(PartitionStateList(1u)); } - BucketIdListResult listBuckets(PartitionId id) const override { + virtual BucketIdListResult listBuckets(PartitionId id) const override { last_called = LIST_BUCKETS; BucketIdListResult::List result; result.push_back(document::BucketId(id)); return BucketIdListResult(result); } - Result setClusterState(const ClusterState &) override { + virtual Result setClusterState(const ClusterState &) override { last_called = SET_CLUSTER_STATE; return Result(); } - Result setActiveState(const Bucket &, BucketInfo::ActiveState) override { + virtual Result setActiveState(const Bucket &, BucketInfo::ActiveState) override { last_called = SET_ACTIVE_STATE; return Result(); } - BucketInfoResult getBucketInfo(const Bucket &bucket) const override { + virtual BucketInfoResult getBucketInfo(const Bucket &bucket) const override { last_called = GET_BUCKET_INFO; return BucketInfoResult(BucketInfo(BucketChecksum(1), 2, 3, bucket.getBucketId().getRawId(), @@ -56,17 +56,17 @@ struct MockProvider : PersistenceProvider { BucketInfo::ACTIVE)); } - Result put(const Bucket &, Timestamp, const DocumentSP&, Context&) override { + virtual Result put(const Bucket &, Timestamp, const DocumentSP&, Context&) override { last_called = PUT; return Result(); } - RemoveResult remove(const Bucket &, Timestamp, const DocumentId &, Context&) override { + virtual RemoveResult remove(const Bucket &, Timestamp, const DocumentId &, Context&) override { last_called = REMOVE_BY_ID; return RemoveResult(true); } - RemoveResult removeIfFound(const Bucket &, Timestamp, const DocumentId &, Context&) override { + virtual RemoveResult removeIfFound(const Bucket &, Timestamp, const DocumentId &, Context&) override { last_called = REMOVE_IF_FOUND; return RemoveResult(true); } @@ -77,54 +77,54 @@ struct MockProvider : PersistenceProvider { return RemoveResult(true); } - UpdateResult update(const Bucket &, Timestamp timestamp, const DocumentUpdateSP&, Context&) override { + virtual UpdateResult update(const Bucket &, Timestamp timestamp, const DocumentUpdateSP&, Context&) override { last_called = UPDATE; return UpdateResult(Timestamp(timestamp - 10)); } - Result flush(const Bucket&, Context&) override { + virtual Result flush(const Bucket&, Context&) override { last_called = FLUSH; return Result(); } - GetResult get(const Bucket &, const document::FieldSet&, const DocumentId&, Context&) const override { + virtual GetResult get(const Bucket &, const document::FieldSet&, const DocumentId&, Context&) const override { last_called = GET; return GetResult(Document::UP(new Document), Timestamp(6u)); } - CreateIteratorResult createIterator(const Bucket& bucket, - const document::FieldSet&, - const Selection&, - IncludedVersions, - Context&) override + virtual CreateIteratorResult createIterator(const Bucket& bucket, + const document::FieldSet&, + const Selection&, + IncludedVersions, + Context&) override { last_called = CREATE_ITERATOR; return CreateIteratorResult(IteratorId(bucket.getPartition())); } - IterateResult iterate(IteratorId, uint64_t, Context&) const override { + 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); } - Result destroyIterator(IteratorId, Context&) override { + virtual Result destroyIterator(IteratorId, Context&) override { last_called = DESTROY_ITERATOR; return Result(); } - Result createBucket(const Bucket&, Context&) override { + virtual Result createBucket(const Bucket&, Context&) override { last_called = CREATE_BUCKET; return Result(); } - Result deleteBucket(const Bucket&, Context&) override { + virtual Result deleteBucket(const Bucket&, Context&) override { last_called = DELETE_BUCKET; return Result(); } - BucketIdListResult getModifiedBuckets() const override { + virtual BucketIdListResult getModifiedBuckets() const override { last_called = GET_MODIFIED_BUCKETS; BucketIdListResult::List list; list.push_back(document::BucketId(2)); @@ -132,28 +132,30 @@ struct MockProvider : PersistenceProvider { return BucketIdListResult(list); } - Result split(const Bucket &, const Bucket &, const Bucket &, Context&) override { + virtual Result split(const Bucket &, const Bucket &, const Bucket &, Context&) override + { last_called = SPLIT; return Result(); } - Result join(const Bucket &, const Bucket &, const Bucket &, Context&) override { + virtual Result join(const Bucket &, const Bucket &, const Bucket &, Context&) override + { last_called = JOIN; return Result(); } - Result move(const Bucket &, PartitionId, Context&) override { + virtual Result move(const Bucket &, PartitionId, Context&) override { last_called = MOVE; return Result(); } - Result maintain(const Bucket &, MaintenanceLevel) override { + virtual Result maintain(const Bucket &, MaintenanceLevel) override { last_called = MAINTAIN; return Result(); } - Result removeEntry(const Bucket &, Timestamp, Context&) override { + virtual Result removeEntry(const Bucket &, Timestamp, Context&) override { last_called = REMOVE_ENTRY; return Result(); } @@ -161,3 +163,4 @@ struct MockProvider : PersistenceProvider { } // namespace spi } // namespace storage + diff --git a/persistence/src/tests/proxy/providerproxy_conformancetest.cpp b/persistence/src/tests/proxy/providerproxy_conformancetest.cpp index cadcd3c224a..a33b736a12d 100644 --- a/persistence/src/tests/proxy/providerproxy_conformancetest.cpp +++ b/persistence/src/tests/proxy/providerproxy_conformancetest.cpp @@ -1,5 +1,6 @@ // 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/vespalib/testkit/test_kit.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/persistence/conformancetest/conformancetest.h> @@ -20,7 +21,9 @@ struct DummyFactory : Factory { return PersistenceProvider::UP(new dummy::DummyPersistence(repo, 4)); } - bool supportsActiveState() const override { + virtual bool + 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 415d43e8033..5d7899e7ff9 100644 --- a/persistence/src/tests/proxy/proxy_factory_wrapper.h +++ b/persistence/src/tests/proxy/proxy_factory_wrapper.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/vespalib/util/stringfmt.h> +#include <vespa/vespalib/util/vstringfmt.h> #include <vespa/persistence/conformancetest/conformancetest.h> #include <vespa/persistence/proxy/providerstub.h> #include <vespa/persistence/proxy/providerproxy.h> @@ -33,7 +33,7 @@ struct ProxyFactoryWrapper : ConformanceTest::PersistenceFactory DummyProviderFactory::UP provider; Server::UP server; Wrapper(DummyProviderFactory::UP p, Server::UP s, const Repo &repo) - : Client(vespalib::make_string("tcp/localhost:%u", s->getPort()), repo), + : Client(vespalib::make_vespa_string("tcp/localhost:%u", s->getPort()), repo), provider(std::move(p)), server(std::move(s)) {} @@ -47,7 +47,9 @@ struct ProxyFactoryWrapper : ConformanceTest::PersistenceFactory return Provider::UP(new Wrapper(std::move(provider), std::move(server), *repo)); } - bool supportsActiveState() const override { + virtual bool + supportsActiveState() const override + { return factory->supportsActiveState(); } }; diff --git a/persistence/src/tests/proxy/proxyfactory.h b/persistence/src/tests/proxy/proxyfactory.h index 1d0c7bd2db7..3a18440a6e7 100644 --- a/persistence/src/tests/proxy/proxyfactory.h +++ b/persistence/src/tests/proxy/proxyfactory.h @@ -2,6 +2,7 @@ #pragma once +#include <vespa/vespalib/util/vstringfmt.h> #include <vespa/persistence/conformancetest/conformancetest.h> #include <vespa/persistence/proxy/providerstub.h> #include <vespa/persistence/proxy/providerproxy.h> @@ -29,9 +30,12 @@ struct ProxyFactory : ConformanceTest::PersistenceFactory return Provider::UP(new Client("tcp/localhost:3456", *repo)); } - bool supportsActiveState() const override { + virtual bool + supportsActiveState() const override + { return false; } }; } // namespace spi } // namespace storage + diff --git a/persistence/src/tests/testrunner.cpp b/persistence/src/tests/testrunner.cpp index 5baa0f60b6e..16027870c47 100644 --- a/persistence/src/tests/testrunner.cpp +++ b/persistence/src/tests/testrunner.cpp @@ -1,12 +1,14 @@ // 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 <iostream> +#include <vespa/log/log.h> #include <vespa/vdstestlib/cppunit/cppunittestrunner.h> -#include <vespa/log/log.h> LOG_SETUP("persistencecppunittests"); int -main(int argc, const char *argv[]) +main(int argc, char **argv) { vdstestlib::CppUnitTestRunner testRunner; return testRunner.run(argc, argv); diff --git a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h index a1656ce7ce1..1dee3fb60c3 100644 --- a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h +++ b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h @@ -144,9 +144,14 @@ public: BucketIdListResult getModifiedBuckets() const override; Result setClusterState(const ClusterState& newState) override; - Result setActiveState(const Bucket& bucket, BucketInfo::ActiveState newState) override; + + Result setActiveState(const Bucket& bucket, + BucketInfo::ActiveState newState) override; + BucketInfoResult getBucketInfo(const Bucket&) const override; + Result put(const Bucket&, Timestamp, const DocumentSP&, Context&) override; + GetResult get(const Bucket&, const document::FieldSet& fieldSet, const DocumentId&, @@ -180,6 +185,7 @@ public: Context&) override; Result revert(const Bucket&, Timestamp, Context&); + Result maintain(const Bucket& bucket, MaintenanceLevel level) override; /** @@ -236,3 +242,4 @@ private: } // dummy } // spi } // storage + diff --git a/persistence/src/vespa/persistence/proxy/providerstub.h b/persistence/src/vespa/persistence/proxy/providerstub.h index ce831547ef9..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) {} - void PerformTask() override { + virtual void PerformTask() override { executor.sync(); assert(provider.get() != 0); provider.reset(); |