diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-04-25 23:44:55 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-04-26 16:08:04 +0200 |
commit | 7ca62862edd0e095b3e6b4a73ffa129fea9fd158 (patch) | |
tree | 84786e757f4a44795e1c910d1ec047d67ea867e3 /persistence | |
parent | 76380b32f48f98711151220227331552693289c1 (diff) |
Optimize includes and add override.
Diffstat (limited to 'persistence')
15 files changed, 52 insertions, 81 deletions
diff --git a/persistence/src/tests/dummyimpl/dummyimpltest.cpp b/persistence/src/tests/dummyimpl/dummyimpltest.cpp index 4b107fde324..9348d90c05a 100644 --- a/persistence/src/tests/dummyimpl/dummyimpltest.cpp +++ b/persistence/src/tests/dummyimpl/dummyimpltest.cpp @@ -1,13 +1,9 @@ // 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 { @@ -20,9 +16,7 @@ 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/external_providerproxy_conformancetest.cpp b/persistence/src/tests/proxy/external_providerproxy_conformancetest.cpp index f24d81532b7..77c2a414955 100644 --- a/persistence/src/tests/proxy/external_providerproxy_conformancetest.cpp +++ b/persistence/src/tests/proxy/external_providerproxy_conformancetest.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 "proxyfactory.h" #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/persistence/conformancetest/conformancetest.h> #include <vespa/persistence/proxy/providerproxy.h> #include <vespa/persistence/proxy/providerstub.h> -#include "proxyfactory.h" using namespace storage::spi; typedef document::DocumentTypeRepo Repo; diff --git a/persistence/src/tests/proxy/mockprovider.h b/persistence/src/tests/proxy/mockprovider.h index b7019239847..a90b4cc27f7 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) {} - virtual Result initialize() override { + Result initialize() override { last_called = INITIALIZE; return Result(); } - virtual PartitionStateListResult getPartitionStates() const override { + PartitionStateListResult getPartitionStates() const override { last_called = GET_PARTITION_STATES; return PartitionStateListResult(PartitionStateList(1u)); } - virtual BucketIdListResult listBuckets(PartitionId id) const override { + 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 &) override { + Result setClusterState(const ClusterState &) override { last_called = SET_CLUSTER_STATE; return Result(); } - virtual Result setActiveState(const Bucket &, BucketInfo::ActiveState) override { + Result setActiveState(const Bucket &, BucketInfo::ActiveState) override { last_called = SET_ACTIVE_STATE; return Result(); } - virtual BucketInfoResult getBucketInfo(const Bucket &bucket) const override { + 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)); } - virtual Result put(const Bucket &, Timestamp, const DocumentSP&, Context&) override { + Result put(const Bucket &, Timestamp, const DocumentSP&, Context&) override { last_called = PUT; return Result(); } - virtual RemoveResult remove(const Bucket &, Timestamp, const DocumentId &, Context&) override { + 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&) override { + 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); } - virtual UpdateResult update(const Bucket &, Timestamp timestamp, const DocumentUpdateSP&, Context&) override { + UpdateResult update(const Bucket &, Timestamp timestamp, const DocumentUpdateSP&, Context&) override { last_called = UPDATE; return UpdateResult(Timestamp(timestamp - 10)); } - virtual Result flush(const Bucket&, Context&) override { + Result flush(const Bucket&, Context&) override { last_called = FLUSH; return Result(); } - virtual GetResult get(const Bucket &, const document::FieldSet&, const DocumentId&, Context&) const override { + GetResult get(const Bucket &, const document::FieldSet&, const DocumentId&, Context&) const override { last_called = GET; return GetResult(Document::UP(new Document), Timestamp(6u)); } - virtual CreateIteratorResult createIterator(const Bucket& bucket, - const document::FieldSet&, - const Selection&, - IncludedVersions, - Context&) override + CreateIteratorResult createIterator(const Bucket& bucket, + const document::FieldSet&, + const Selection&, + IncludedVersions, + Context&) override { last_called = CREATE_ITERATOR; return CreateIteratorResult(IteratorId(bucket.getPartition())); } - virtual IterateResult iterate(IteratorId, uint64_t, Context&) const override { + 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&) override { + Result destroyIterator(IteratorId, Context&) override { last_called = DESTROY_ITERATOR; return Result(); } - virtual Result createBucket(const Bucket&, Context&) override { + Result createBucket(const Bucket&, Context&) override { last_called = CREATE_BUCKET; return Result(); } - virtual Result deleteBucket(const Bucket&, Context&) override { + Result deleteBucket(const Bucket&, Context&) override { last_called = DELETE_BUCKET; return Result(); } - virtual BucketIdListResult getModifiedBuckets() const override { + BucketIdListResult getModifiedBuckets() const override { last_called = GET_MODIFIED_BUCKETS; BucketIdListResult::List list; list.push_back(document::BucketId(2)); @@ -132,30 +132,28 @@ struct MockProvider : PersistenceProvider { return BucketIdListResult(list); } - virtual Result split(const Bucket &, const Bucket &, const Bucket &, Context&) override - { + 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&) override - { + Result join(const Bucket &, const Bucket &, const Bucket &, Context&) override { last_called = JOIN; return Result(); } - virtual Result move(const Bucket &, PartitionId, Context&) override { + Result move(const Bucket &, PartitionId, Context&) override { last_called = MOVE; return Result(); } - virtual Result maintain(const Bucket &, MaintenanceLevel) override { + Result maintain(const Bucket &, MaintenanceLevel) override { last_called = MAINTAIN; return Result(); } - virtual Result removeEntry(const Bucket &, Timestamp, Context&) override { + Result removeEntry(const Bucket &, Timestamp, Context&) override { last_called = REMOVE_ENTRY; return Result(); } @@ -163,4 +161,3 @@ 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 a33b736a12d..cadcd3c224a 100644 --- a/persistence/src/tests/proxy/providerproxy_conformancetest.cpp +++ b/persistence/src/tests/proxy/providerproxy_conformancetest.cpp @@ -1,6 +1,5 @@ // 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> @@ -21,9 +20,7 @@ struct DummyFactory : Factory { return PersistenceProvider::UP(new dummy::DummyPersistence(repo, 4)); } - virtual bool - supportsActiveState() const override - { + 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 5d7899e7ff9..415d43e8033 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/vstringfmt.h> +#include <vespa/vespalib/util/stringfmt.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_vespa_string("tcp/localhost:%u", s->getPort()), repo), + : Client(vespalib::make_string("tcp/localhost:%u", s->getPort()), repo), provider(std::move(p)), server(std::move(s)) {} @@ -47,9 +47,7 @@ struct ProxyFactoryWrapper : ConformanceTest::PersistenceFactory return Provider::UP(new Wrapper(std::move(provider), std::move(server), *repo)); } - virtual bool - supportsActiveState() const override - { + bool supportsActiveState() const override { return factory->supportsActiveState(); } }; diff --git a/persistence/src/tests/proxy/proxyfactory.h b/persistence/src/tests/proxy/proxyfactory.h index 3a18440a6e7..1d0c7bd2db7 100644 --- a/persistence/src/tests/proxy/proxyfactory.h +++ b/persistence/src/tests/proxy/proxyfactory.h @@ -2,7 +2,6 @@ #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> @@ -30,12 +29,9 @@ struct ProxyFactory : ConformanceTest::PersistenceFactory return Provider::UP(new Client("tcp/localhost:3456", *repo)); } - virtual bool - supportsActiveState() const override - { + 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 16027870c47..5baa0f60b6e 100644 --- a/persistence/src/tests/testrunner.cpp +++ b/persistence/src/tests/testrunner.cpp @@ -1,14 +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 <iostream> -#include <vespa/log/log.h> #include <vespa/vdstestlib/cppunit/cppunittestrunner.h> +#include <vespa/log/log.h> LOG_SETUP("persistencecppunittests"); int -main(int argc, char **argv) +main(int argc, const 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 1dee3fb60c3..a1656ce7ce1 100644 --- a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h +++ b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.h @@ -144,14 +144,9 @@ 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&, @@ -185,7 +180,6 @@ public: Context&) override; Result revert(const Bucket&, Timestamp, Context&); - Result maintain(const Bucket& bucket, MaintenanceLevel level) override; /** @@ -242,4 +236,3 @@ private: } // dummy } // spi } // storage - diff --git a/persistence/src/vespa/persistence/proxy/providerstub.h b/persistence/src/vespa/persistence/proxy/providerstub.h index 27e726ca538..ce831547ef9 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() override { + void PerformTask() override { executor.sync(); assert(provider.get() != 0); provider.reset(); diff --git a/persistence/src/vespa/persistence/spi/context.cpp b/persistence/src/vespa/persistence/spi/context.cpp index aba054a9814..a08a30e22e3 100644 --- a/persistence/src/vespa/persistence/spi/context.cpp +++ b/persistence/src/vespa/persistence/spi/context.cpp @@ -1,6 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/persistence/spi/context.h> +#include "context.h" namespace storage { namespace spi { diff --git a/persistence/src/vespa/persistence/spi/documentselection.h b/persistence/src/vespa/persistence/spi/documentselection.h index a3dfb9b4c07..54d62747e9d 100644 --- a/persistence/src/vespa/persistence/spi/documentselection.h +++ b/persistence/src/vespa/persistence/spi/documentselection.h @@ -8,7 +8,7 @@ #pragma once -#include <persistence/spi/types.h> +#include "types.h" namespace storage { namespace spi { @@ -29,4 +29,3 @@ class DocumentSelection } } - diff --git a/persistence/src/vespa/persistence/spi/metricpersistenceprovider.cpp b/persistence/src/vespa/persistence/spi/metricpersistenceprovider.cpp index ae70872b5b0..bd47b1cdffe 100644 --- a/persistence/src/vespa/persistence/spi/metricpersistenceprovider.cpp +++ b/persistence/src/vespa/persistence/spi/metricpersistenceprovider.cpp @@ -1,6 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/persistence/spi/metricpersistenceprovider.h> +#include "metricpersistenceprovider.h" #include <vespa/log/log.h> diff --git a/persistence/src/vespa/persistence/spi/metricpersistenceprovider.h b/persistence/src/vespa/persistence/spi/metricpersistenceprovider.h index 65246140e03..e179b12b3d0 100644 --- a/persistence/src/vespa/persistence/spi/metricpersistenceprovider.h +++ b/persistence/src/vespa/persistence/spi/metricpersistenceprovider.h @@ -5,7 +5,7 @@ #pragma once -#include <vespa/persistence/spi/persistenceprovider.h> +#include "persistenceprovider.h" #include <vespa/metrics/metrics.h> namespace storage { diff --git a/persistence/src/vespa/persistence/spi/persistenceprovider.h b/persistence/src/vespa/persistence/spi/persistenceprovider.h index ae7ec6bb6da..acaac67d2bf 100644 --- a/persistence/src/vespa/persistence/spi/persistenceprovider.h +++ b/persistence/src/vespa/persistence/spi/persistenceprovider.h @@ -1,15 +1,15 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/persistence/spi/bucket.h> -#include <vespa/persistence/spi/bucketinfo.h> -#include <vespa/persistence/spi/context.h> -#include <vespa/persistence/spi/docentry.h> -#include <vespa/persistence/spi/documentselection.h> -#include <vespa/persistence/spi/partitionstate.h> -#include <vespa/persistence/spi/result.h> -#include <vespa/persistence/spi/selection.h> -#include <vespa/persistence/spi/clusterstate.h> +#include "bucket.h" +#include "bucketinfo.h" +#include "context.h" +#include "docentry.h" +#include "documentselection.h" +#include "partitionstate.h" +#include "result.h" +#include "selection.h" +#include "clusterstate.h" namespace document { class FieldSet; diff --git a/persistence/src/vespa/persistence/spi/selection.h b/persistence/src/vespa/persistence/spi/selection.h index 0501475e802..1382430c8a7 100644 --- a/persistence/src/vespa/persistence/spi/selection.h +++ b/persistence/src/vespa/persistence/spi/selection.h @@ -8,7 +8,7 @@ #pragma once -#include <vespa/persistence/spi/documentselection.h> +#include "documentselection.h" namespace storage { namespace spi { |