diff options
77 files changed, 150 insertions, 164 deletions
diff --git a/storage/CMakeLists.txt b/storage/CMakeLists.txt index bada6980b89..e0c0ab78824 100644 --- a/storage/CMakeLists.txt +++ b/storage/CMakeLists.txt @@ -63,6 +63,7 @@ vespa_define_module( src/tests/frameworkimpl/memory src/tests/frameworkimpl/status src/tests/persistence + src/tests/persistence/common src/tests/persistence/filestorage src/tests/storageserver src/tests/storageutil diff --git a/storage/src/tests/CMakeLists.txt b/storage/src/tests/CMakeLists.txt index 03fbefed448..fb5bc146983 100644 --- a/storage/src/tests/CMakeLists.txt +++ b/storage/src/tests/CMakeLists.txt @@ -15,8 +15,5 @@ vespa_add_executable(storage_testrunner_app TEST storage_testfilestorage storage_testmemory storage_teststatus - storage - AFTER - storage_storageconfig ) vespa_add_test(NAME storage_testrunner_app COMMAND storage_testrunner_app) diff --git a/storage/src/tests/bucketdb/CMakeLists.txt b/storage/src/tests/bucketdb/CMakeLists.txt index 2ba195e70e0..767c7ccf6fc 100644 --- a/storage/src/tests/bucketdb/CMakeLists.txt +++ b/storage/src/tests/bucketdb/CMakeLists.txt @@ -8,7 +8,7 @@ vespa_add_library(storage_testbucketdb TEST lockablemaptest.cpp bucketinfotest.cpp distribution_hash_normalizer_test.cpp - AFTER - storage_storageconfig - storage_bucketdb + DEPENDS + storage + storage_testcommon ) diff --git a/storage/src/tests/bucketdb/bucketinfotest.cpp b/storage/src/tests/bucketdb/bucketinfotest.cpp index eef4c6d7739..9ee5895a41f 100644 --- a/storage/src/tests/bucketdb/bucketinfotest.cpp +++ b/storage/src/tests/bucketdb/bucketinfotest.cpp @@ -8,7 +8,7 @@ #include <map> #include <vector> #include <vespa/vespalib/text/stringtokenizer.h> -#include <vespa/storage/distributor/bucketdb/bucketinfo.h> +#include <vespa/storage/bucketdb/bucketinfo.h> namespace storage { diff --git a/storage/src/tests/bucketmover/CMakeLists.txt b/storage/src/tests/bucketmover/CMakeLists.txt index 0ac5ec61a71..9181edcc644 100644 --- a/storage/src/tests/bucketmover/CMakeLists.txt +++ b/storage/src/tests/bucketmover/CMakeLists.txt @@ -5,6 +5,5 @@ vespa_add_library(storage_testbucketmover TEST htmltabletest.cpp DEPENDS storage - AFTER - storage_storageconfig + storage_testcommon ) diff --git a/storage/src/tests/common/CMakeLists.txt b/storage/src/tests/common/CMakeLists.txt index 737815d85c2..13ac34c2726 100644 --- a/storage/src/tests/common/CMakeLists.txt +++ b/storage/src/tests/common/CMakeLists.txt @@ -6,7 +6,6 @@ vespa_add_library(storage_testcommon TEST metricstest.cpp storagelinktest.cpp teststorageapp.cpp - AFTER - storage_storageconfig - storage_bucketdb + DEPENDS + storage ) diff --git a/storage/src/tests/common/hostreporter/CMakeLists.txt b/storage/src/tests/common/hostreporter/CMakeLists.txt index 9e3fabdcb29..8a849cf884f 100644 --- a/storage/src/tests/common/hostreporter/CMakeLists.txt +++ b/storage/src/tests/common/hostreporter/CMakeLists.txt @@ -8,6 +8,6 @@ vespa_add_library(storage_testhostreporter TEST diskreportertest.cpp util.cpp hostinfotest.cpp - AFTER - storage_storageconfig + DEPENDS + storage ) diff --git a/storage/src/tests/common/teststorageapp.h b/storage/src/tests/common/teststorageapp.h index e7da9178743..e82b6d9d383 100644 --- a/storage/src/tests/common/teststorageapp.h +++ b/storage/src/tests/common/teststorageapp.h @@ -100,7 +100,7 @@ private: // Storage server interface implementation (until we can remove it) virtual api::Timestamp getUniqueTimestamp() { assert(0); throw; } virtual StorBucketDatabase& getStorageBucketDatabase() { assert(0); throw; } - virtual distributor::BucketDatabase& getBucketDatabase() { assert(0); throw; } + virtual BucketDatabase& getBucketDatabase() { assert(0); throw; } virtual uint16_t getDiskCount() const { assert(0); throw; } }; @@ -151,7 +151,7 @@ public: DistributorComponentRegisterImpl& getComponentRegister() { return _compReg; } - virtual distributor::BucketDatabase& getBucketDatabase() + virtual BucketDatabase& getBucketDatabase() { return _compReg.getBucketDatabase(); } virtual api::Timestamp getUniqueTimestamp(); diff --git a/storage/src/tests/distributor/CMakeLists.txt b/storage/src/tests/distributor/CMakeLists.txt index 29bb8cb67c1..30751a01a30 100644 --- a/storage/src/tests/distributor/CMakeLists.txt +++ b/storage/src/tests/distributor/CMakeLists.txt @@ -38,6 +38,8 @@ vespa_add_library(storage_testdistributor TEST bucketgctimecalculatortest.cpp nodemaintenancestatstrackertest.cpp distributor_host_info_reporter_test.cpp - AFTER - storage_storageconfig + DEPENDS + storage_distributor + storage_testcommon + storage_testhostreporter ) diff --git a/storage/src/tests/distributor/bucketdbmetricupdatertest.cpp b/storage/src/tests/distributor/bucketdbmetricupdatertest.cpp index 6aa9ef3a844..135d5c65110 100644 --- a/storage/src/tests/distributor/bucketdbmetricupdatertest.cpp +++ b/storage/src/tests/distributor/bucketdbmetricupdatertest.cpp @@ -3,8 +3,8 @@ #include <vespa/vdstestlib/cppunit/macros.h> #include <string> #include <sstream> +#include <vespa/storage/bucketdb/bucketdatabase.h> #include <vespa/storage/distributor/bucketdb/bucketdbmetricupdater.h> -#include <vespa/storage/distributor/bucketdb/bucketdatabase.h> #include <vespa/storage/distributor/distributormetricsset.h> #include <vespa/storage/distributor/idealstatemetricsset.h> #include <vespa/storage/config/config-stor-distributormanager.h> diff --git a/storage/src/tests/distributor/maintenanceschedulertest.cpp b/storage/src/tests/distributor/maintenanceschedulertest.cpp index 4316bfd137c..dfc81c1110c 100644 --- a/storage/src/tests/distributor/maintenanceschedulertest.cpp +++ b/storage/src/tests/distributor/maintenanceschedulertest.cpp @@ -6,7 +6,7 @@ #include <memory> #include <vespa/storage/distributor/maintenance/simplebucketprioritydatabase.h> #include <vespa/storage/distributor/maintenance/maintenancescheduler.h> -#include <vespa/storage/distributor/bucketdb/mapbucketdatabase.h> +#include <vespa/storage/bucketdb/mapbucketdatabase.h> #include <tests/distributor/maintenancemocks.h> namespace storage { diff --git a/storage/src/tests/distributor/mapbucketdatabasetest.cpp b/storage/src/tests/distributor/mapbucketdatabasetest.cpp index ab8e5add65f..fbc13d5a8a2 100644 --- a/storage/src/tests/distributor/mapbucketdatabasetest.cpp +++ b/storage/src/tests/distributor/mapbucketdatabasetest.cpp @@ -3,7 +3,7 @@ #include <vespa/vespalib/util/document_runnable.h> #include <vespa/vdstestlib/cppunit/macros.h> #include <cppunit/extensions/HelperMacros.h> -#include <vespa/storage/distributor/bucketdb/mapbucketdatabase.h> +#include <vespa/storage/bucketdb/mapbucketdatabase.h> #include <vespa/storage/storageutil/utils.h> #include <tests/distributor/bucketdatabasetest.h> diff --git a/storage/src/tests/distributor/simplemaintenancescannertest.cpp b/storage/src/tests/distributor/simplemaintenancescannertest.cpp index 512a10bbd9a..3486f41149b 100644 --- a/storage/src/tests/distributor/simplemaintenancescannertest.cpp +++ b/storage/src/tests/distributor/simplemaintenancescannertest.cpp @@ -4,7 +4,7 @@ #include <vespa/vdstestlib/cppunit/macros.h> #include <vespa/storage/distributor/maintenance/simplemaintenancescanner.h> #include <vespa/storage/distributor/maintenance/simplebucketprioritydatabase.h> -#include <vespa/storage/distributor/bucketdb/mapbucketdatabase.h> +#include <vespa/storage/bucketdb/mapbucketdatabase.h> #include <tests/distributor/maintenancemocks.h> #include <string> diff --git a/storage/src/tests/frameworkimpl/memory/CMakeLists.txt b/storage/src/tests/frameworkimpl/memory/CMakeLists.txt index 4d89a4aa548..77e0b9a2a9e 100644 --- a/storage/src/tests/frameworkimpl/memory/CMakeLists.txt +++ b/storage/src/tests/frameworkimpl/memory/CMakeLists.txt @@ -2,6 +2,7 @@ vespa_add_library(storage_testmemory TEST SOURCES memorystatusviewertest.cpp - AFTER - storage_storageconfig + DEPENDS + storage + storage_testcommon ) diff --git a/storage/src/tests/frameworkimpl/status/CMakeLists.txt b/storage/src/tests/frameworkimpl/status/CMakeLists.txt index 95c4d3a532e..2de52df1f7f 100644 --- a/storage/src/tests/frameworkimpl/status/CMakeLists.txt +++ b/storage/src/tests/frameworkimpl/status/CMakeLists.txt @@ -2,6 +2,7 @@ vespa_add_library(storage_teststatus TEST SOURCES statustest.cpp - AFTER - storage_storageconfig + DEPENDS + storage + storage_testcommon ) diff --git a/storage/src/tests/persistence/CMakeLists.txt b/storage/src/tests/persistence/CMakeLists.txt index db0ac64c183..8863b3d0467 100644 --- a/storage/src/tests/persistence/CMakeLists.txt +++ b/storage/src/tests/persistence/CMakeLists.txt @@ -5,7 +5,6 @@ vespa_add_library(storage_testpersistence TEST persistencetestutils.cpp splitbitdetectortest.cpp legacyoperationhandlertest.cpp - persistenceproviderwrapper.cpp diskmoveoperationhandlertest.cpp providershutdownwrappertest.cpp mergehandlertest.cpp @@ -13,6 +12,8 @@ vespa_add_library(storage_testpersistence TEST bucketownershipnotifiertest.cpp persistencequeuetest.cpp testandsettest.cpp - AFTER - storage_storageconfig + DEPENDS + storage + storage_testdistributor + storage_testpersistence_common ) diff --git a/storage/src/tests/persistence/common/CMakeLists.txt b/storage/src/tests/persistence/common/CMakeLists.txt new file mode 100644 index 00000000000..561f516b8d1 --- /dev/null +++ b/storage/src/tests/persistence/common/CMakeLists.txt @@ -0,0 +1,9 @@ +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_library(storage_testpersistence_common TEST + SOURCES + persistenceproviderwrapper.cpp + filestortestfixture.cpp + DEPENDS + persistence + storage_testcommon +) diff --git a/storage/src/tests/persistence/filestorage/filestortestfixture.cpp b/storage/src/tests/persistence/common/filestortestfixture.cpp index 69b109b5cfc..8f7a95f53c8 100644 --- a/storage/src/tests/persistence/filestorage/filestortestfixture.cpp +++ b/storage/src/tests/persistence/common/filestortestfixture.cpp @@ -5,7 +5,7 @@ #include <vespa/storage/persistence/messages.h> #include <vespa/storage/persistence/filestorage/filestormanager.h> #include <vespa/persistence/dummyimpl/dummypersistence.h> -#include <tests/persistence/filestorage/filestortestfixture.h> +#include <tests/persistence/common/filestortestfixture.h> namespace storage { diff --git a/storage/src/tests/persistence/filestorage/filestortestfixture.h b/storage/src/tests/persistence/common/filestortestfixture.h index 4f1de549f47..4f1de549f47 100644 --- a/storage/src/tests/persistence/filestorage/filestortestfixture.h +++ b/storage/src/tests/persistence/common/filestortestfixture.h diff --git a/storage/src/tests/persistence/persistenceproviderwrapper.cpp b/storage/src/tests/persistence/common/persistenceproviderwrapper.cpp index 4a09235ddce..9ec66590b24 100644 --- a/storage/src/tests/persistence/persistenceproviderwrapper.cpp +++ b/storage/src/tests/persistence/common/persistenceproviderwrapper.cpp @@ -2,7 +2,7 @@ #include <vespa/fastos/fastos.h> #include <iostream> #include <sstream> -#include <tests/persistence/persistenceproviderwrapper.h> +#include <tests/persistence/common/persistenceproviderwrapper.h> #define LOG_SPI(ops) \ { \ diff --git a/storage/src/tests/persistence/persistenceproviderwrapper.h b/storage/src/tests/persistence/common/persistenceproviderwrapper.h index b115eb7ef3d..b115eb7ef3d 100644 --- a/storage/src/tests/persistence/persistenceproviderwrapper.h +++ b/storage/src/tests/persistence/common/persistenceproviderwrapper.h diff --git a/storage/src/tests/persistence/filestorage/CMakeLists.txt b/storage/src/tests/persistence/filestorage/CMakeLists.txt index 2ccebdd8a96..f253d42e460 100644 --- a/storage/src/tests/persistence/filestorage/CMakeLists.txt +++ b/storage/src/tests/persistence/filestorage/CMakeLists.txt @@ -3,7 +3,6 @@ vespa_add_library(storage_testfilestorage TEST SOURCES filestormanagertest.cpp operationabortingtest.cpp - filestortestfixture.cpp mergeblockingtest.cpp sanitycheckeddeletetest.cpp deactivatebucketstest.cpp @@ -11,7 +10,8 @@ vespa_add_library(storage_testfilestorage TEST filestormodifiedbucketstest.cpp deletebuckettest.cpp singlebucketjointest.cpp - AFTER - storage_bucketdb - storage_storageconfig + DEPENDS + storage + storageapi + storage_testpersistence_common ) diff --git a/storage/src/tests/persistence/filestorage/deactivatebucketstest.cpp b/storage/src/tests/persistence/filestorage/deactivatebucketstest.cpp index 6de67a3fec0..c4e3ef97eb2 100644 --- a/storage/src/tests/persistence/filestorage/deactivatebucketstest.cpp +++ b/storage/src/tests/persistence/filestorage/deactivatebucketstest.cpp @@ -4,9 +4,9 @@ #include <vespa/vdstestlib/cppunit/macros.h> #include <vespa/storageapi/message/bucket.h> #include <vespa/storageapi/message/state.h> -#include <tests/persistence/persistenceproviderwrapper.h> +#include <tests/persistence/common/persistenceproviderwrapper.h> #include <vespa/persistence/dummyimpl/dummypersistence.h> -#include <tests/persistence/filestorage/filestortestfixture.h> +#include <tests/persistence/common/filestortestfixture.h> namespace storage { diff --git a/storage/src/tests/persistence/filestorage/deletebuckettest.cpp b/storage/src/tests/persistence/filestorage/deletebuckettest.cpp index 08ca9bc68fa..d415db1b45e 100644 --- a/storage/src/tests/persistence/filestorage/deletebuckettest.cpp +++ b/storage/src/tests/persistence/filestorage/deletebuckettest.cpp @@ -4,9 +4,9 @@ #include <vespa/log/log.h> #include <vespa/vdstestlib/cppunit/macros.h> #include <vespa/storageapi/message/bucket.h> -#include <tests/persistence/persistenceproviderwrapper.h> +#include <tests/persistence/common/persistenceproviderwrapper.h> #include <vespa/persistence/dummyimpl/dummypersistence.h> -#include <tests/persistence/filestorage/filestortestfixture.h> +#include <tests/persistence/common/filestortestfixture.h> LOG_SETUP(".deletebuckettest"); diff --git a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp index 0ffbe9fa440..251b2474154 100644 --- a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp +++ b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp @@ -2264,7 +2264,7 @@ FileStorManagerTest::testDeleteBucketRejectOutdatedBucketInfo() { std::shared_ptr<api::DeleteBucketCommand> cmd( new api::DeleteBucketCommand(bid)); - cmd->setBucketInfo(BucketInfo(0xf000baaa, 1, 123, 1, 456)); + cmd->setBucketInfo(api::BucketInfo(0xf000baaa, 1, 123, 1, 456)); cmd->setAddress(address); top.sendDown(cmd); top.waitForMessages(1, _waitTime); @@ -2777,7 +2777,7 @@ FileStorManagerTest::testGetIter() _node->getTestDocMan().createRandomDocumentAtLocation( 4000, i, 400, 400))); } - BucketInfo bucketInfo; + api::BucketInfo bucketInfo; // Putting all docs to have something to visit for (uint32_t i=0; i<docs.size(); ++i) { std::shared_ptr<api::PutCommand> cmd( diff --git a/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp b/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp index 19b84ef475b..8d6a8fb8e03 100644 --- a/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp +++ b/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp @@ -4,9 +4,9 @@ #include <vespa/vdstestlib/cppunit/macros.h> #include <vespa/storageapi/message/bucket.h> #include <vespa/storage/persistence/filestorage/modifiedbucketchecker.h> -#include <tests/persistence/persistenceproviderwrapper.h> +#include <tests/persistence/common/persistenceproviderwrapper.h> #include <vespa/persistence/dummyimpl/dummypersistence.h> -#include <tests/persistence/filestorage/filestortestfixture.h> +#include <tests/persistence/common/filestortestfixture.h> namespace storage { diff --git a/storage/src/tests/persistence/filestorage/mergeblockingtest.cpp b/storage/src/tests/persistence/filestorage/mergeblockingtest.cpp index ff9ec063555..fd106fb3117 100644 --- a/storage/src/tests/persistence/filestorage/mergeblockingtest.cpp +++ b/storage/src/tests/persistence/filestorage/mergeblockingtest.cpp @@ -4,9 +4,9 @@ #include <vector> #include <vespa/vdstestlib/cppunit/macros.h> #include <vespa/storage/persistence/messages.h> -#include <tests/persistence/persistenceproviderwrapper.h> +#include <tests/persistence/common/persistenceproviderwrapper.h> #include <vespa/persistence/dummyimpl/dummypersistence.h> -#include <tests/persistence/filestorage/filestortestfixture.h> +#include <tests/persistence/common/filestortestfixture.h> namespace storage { diff --git a/storage/src/tests/persistence/filestorage/operationabortingtest.cpp b/storage/src/tests/persistence/filestorage/operationabortingtest.cpp index 0d6583cacdb..e0d2bae9a44 100644 --- a/storage/src/tests/persistence/filestorage/operationabortingtest.cpp +++ b/storage/src/tests/persistence/filestorage/operationabortingtest.cpp @@ -4,9 +4,9 @@ #include <vector> #include <vespa/vdstestlib/cppunit/macros.h> #include <vespa/storage/persistence/messages.h> -#include <tests/persistence/persistenceproviderwrapper.h> +#include <tests/persistence/common/persistenceproviderwrapper.h> #include <vespa/persistence/dummyimpl/dummypersistence.h> -#include <tests/persistence/filestorage/filestortestfixture.h> +#include <tests/persistence/common/filestortestfixture.h> #include <vespa/vespalib/util/barrier.h> #include <vespa/vespalib/util/thread.h> diff --git a/storage/src/tests/persistence/filestorage/sanitycheckeddeletetest.cpp b/storage/src/tests/persistence/filestorage/sanitycheckeddeletetest.cpp index 9b492a3aaa6..19841e98e85 100644 --- a/storage/src/tests/persistence/filestorage/sanitycheckeddeletetest.cpp +++ b/storage/src/tests/persistence/filestorage/sanitycheckeddeletetest.cpp @@ -3,9 +3,9 @@ #include <vespa/fastos/fastos.h> #include <vespa/vdstestlib/cppunit/macros.h> #include <vespa/storageapi/message/bucket.h> -#include <tests/persistence/persistenceproviderwrapper.h> +#include <tests/persistence/common/persistenceproviderwrapper.h> #include <vespa/persistence/dummyimpl/dummypersistence.h> -#include <tests/persistence/filestorage/filestortestfixture.h> +#include <tests/persistence/common/filestortestfixture.h> namespace storage { diff --git a/storage/src/tests/persistence/filestorage/singlebucketjointest.cpp b/storage/src/tests/persistence/filestorage/singlebucketjointest.cpp index 480652207d3..c754ca353af 100644 --- a/storage/src/tests/persistence/filestorage/singlebucketjointest.cpp +++ b/storage/src/tests/persistence/filestorage/singlebucketjointest.cpp @@ -5,9 +5,9 @@ #include <vespa/vdstestlib/cppunit/macros.h> #include <vespa/storageapi/message/bucket.h> #include <vespa/storageapi/message/bucketsplitting.h> -#include <tests/persistence/persistenceproviderwrapper.h> +#include <tests/persistence/common/persistenceproviderwrapper.h> #include <vespa/persistence/dummyimpl/dummypersistence.h> -#include <tests/persistence/filestorage/filestortestfixture.h> +#include <tests/persistence/common/filestortestfixture.h> LOG_SETUP(".singlebucketjointest"); diff --git a/storage/src/tests/persistence/mergehandlertest.cpp b/storage/src/tests/persistence/mergehandlertest.cpp index b0ec11a3e46..48d2ef2dc61 100644 --- a/storage/src/tests/persistence/mergehandlertest.cpp +++ b/storage/src/tests/persistence/mergehandlertest.cpp @@ -7,7 +7,7 @@ #include <vespa/storageapi/message/bucket.h> #include <vespa/log/log.h> #include <tests/persistence/persistencetestutils.h> -#include <tests/persistence/persistenceproviderwrapper.h> +#include <tests/persistence/common/persistenceproviderwrapper.h> #include <tests/distributor/messagesenderstub.h> #include <vespa/storageframework/defaultimplementation/clock/fakeclock.h> #include <cmath> diff --git a/storage/src/tests/persistence/persistencequeuetest.cpp b/storage/src/tests/persistence/persistencequeuetest.cpp index 06daf2a975c..3a262c01d54 100644 --- a/storage/src/tests/persistence/persistencequeuetest.cpp +++ b/storage/src/tests/persistence/persistencequeuetest.cpp @@ -4,9 +4,9 @@ #include <vespa/log/log.h> #include <vespa/vdstestlib/cppunit/macros.h> #include <vespa/storageapi/message/bucket.h> -#include <tests/persistence/persistenceproviderwrapper.h> +#include <tests/persistence/common/persistenceproviderwrapper.h> #include <vespa/persistence/dummyimpl/dummypersistence.h> -#include <tests/persistence/filestorage/filestortestfixture.h> +#include <tests/persistence/common/filestortestfixture.h> #include <tests/persistence/filestorage/forwardingmessagesender.h> LOG_SETUP(".persistencequeuetest"); diff --git a/storage/src/tests/persistence/providershutdownwrappertest.cpp b/storage/src/tests/persistence/providershutdownwrappertest.cpp index 0731dcb155a..1d2bf08e0c4 100644 --- a/storage/src/tests/persistence/providershutdownwrappertest.cpp +++ b/storage/src/tests/persistence/providershutdownwrappertest.cpp @@ -3,7 +3,7 @@ #include <vespa/fastos/fastos.h> #include <vespa/vdstestlib/cppunit/macros.h> #include <tests/persistence/persistencetestutils.h> -#include <tests/persistence/persistenceproviderwrapper.h> +#include <tests/persistence/common/persistenceproviderwrapper.h> #include <vespa/storage/persistence/providershutdownwrapper.h> namespace storage { diff --git a/storage/src/tests/storageserver/CMakeLists.txt b/storage/src/tests/storageserver/CMakeLists.txt index dacd37d8ea7..e415c76ae83 100644 --- a/storage/src/tests/storageserver/CMakeLists.txt +++ b/storage/src/tests/storageserver/CMakeLists.txt @@ -11,7 +11,7 @@ vespa_add_library(storage_teststorageserver TEST priorityconvertertest.cpp statereportertest.cpp changedbucketownershiphandlertest.cpp - AFTER - storage_bucketdb - storage_storageconfig + DEPENDS + storage_storageserver + storage_testcommon ) diff --git a/storage/src/tests/storageutil/CMakeLists.txt b/storage/src/tests/storageutil/CMakeLists.txt index e49361285d8..5fc955a0b1e 100644 --- a/storage/src/tests/storageutil/CMakeLists.txt +++ b/storage/src/tests/storageutil/CMakeLists.txt @@ -4,6 +4,6 @@ vespa_add_library(storage_teststorageutil TEST functortest.cpp charttest.cpp palettetest.cpp - AFTER - storage_storageconfig + DEPENDS + storage ) diff --git a/storage/src/tests/visiting/CMakeLists.txt b/storage/src/tests/visiting/CMakeLists.txt index f1c10bde4f0..de73896a203 100644 --- a/storage/src/tests/visiting/CMakeLists.txt +++ b/storage/src/tests/visiting/CMakeLists.txt @@ -5,7 +5,7 @@ vespa_add_library(storage_testvisiting TEST visitormanagertest.cpp visitortest.cpp memory_bounded_trace_test.cpp - AFTER - storage_storageconfig - storage_visitor + DEPENDS + storage + storage_teststorageserver ) diff --git a/storage/src/vespa/storage/CMakeLists.txt b/storage/src/vespa/storage/CMakeLists.txt index 2adfe73db38..a04ab6e92d6 100644 --- a/storage/src/vespa/storage/CMakeLists.txt +++ b/storage/src/vespa/storage/CMakeLists.txt @@ -5,13 +5,8 @@ vespa_add_library(storage $<TARGET_OBJECTS:storage_common> $<TARGET_OBJECTS:storage_storageconfig> $<TARGET_OBJECTS:storage_hostreporter> - $<TARGET_OBJECTS:storage_distributoroperation> - $<TARGET_OBJECTS:storage_distributoroperationexternal> - $<TARGET_OBJECTS:storage_distributoroperationidealstate> - $<TARGET_OBJECTS:storage_distributormaintenance> $<TARGET_OBJECTS:storage_filestorpersistence> $<TARGET_OBJECTS:storage_spersistence> - $<TARGET_OBJECTS:storage_storageserver> $<TARGET_OBJECTS:storage_storageutil> $<TARGET_OBJECTS:storage_visitor> $<TARGET_OBJECTS:storage_bucketmover> @@ -21,5 +16,4 @@ vespa_add_library(storage $<TARGET_OBJECTS:storage_component> INSTALL lib64 DEPENDS - storage_distributor ) diff --git a/storage/src/vespa/storage/bucketdb/CMakeLists.txt b/storage/src/vespa/storage/bucketdb/CMakeLists.txt index 189f773dcbe..4f1f8218da1 100644 --- a/storage/src/vespa/storage/bucketdb/CMakeLists.txt +++ b/storage/src/vespa/storage/bucketdb/CMakeLists.txt @@ -1,6 +1,10 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_library(storage_bucketdb OBJECT SOURCES + bucketinfo.cpp + bucketcopy.cpp + bucketdatabase.cpp + mapbucketdatabase.cpp storagebucketdbinitializer.cpp distrbucketdb.cpp storbucketdb.cpp diff --git a/storage/src/vespa/storage/distributor/bucketdb/bucketcopy.cpp b/storage/src/vespa/storage/bucketdb/bucketcopy.cpp index 762fa290109..8bd2a4ff08f 100644 --- a/storage/src/vespa/storage/distributor/bucketdb/bucketcopy.cpp +++ b/storage/src/vespa/storage/bucketdb/bucketcopy.cpp @@ -1,11 +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/storage/distributor/bucketdb/bucketcopy.h> +#include <vespa/storage/bucketdb/bucketcopy.h> namespace storage { -namespace distributor { - void BucketCopy::print(std::ostream& out, bool /*verbose*/, const std::string&) const { @@ -20,5 +18,3 @@ BucketCopy::print(std::ostream& out, bool /*verbose*/, const std::string&) const } } - -} diff --git a/storage/src/vespa/storage/distributor/bucketdb/bucketcopy.h b/storage/src/vespa/storage/bucketdb/bucketcopy.h index 5d7c2067fe1..7230c28eb74 100644 --- a/storage/src/vespa/storage/distributor/bucketdb/bucketcopy.h +++ b/storage/src/vespa/storage/bucketdb/bucketcopy.h @@ -5,8 +5,6 @@ namespace storage { -namespace distributor { - class BucketCopy { private: uint64_t _timestamp; @@ -109,5 +107,3 @@ public: } -} - diff --git a/storage/src/vespa/storage/distributor/bucketdb/bucketdatabase.cpp b/storage/src/vespa/storage/bucketdb/bucketdatabase.cpp index 902b6d88ab0..4a17c2aab59 100644 --- a/storage/src/vespa/storage/distributor/bucketdb/bucketdatabase.cpp +++ b/storage/src/vespa/storage/bucketdb/bucketdatabase.cpp @@ -1,9 +1,8 @@ // 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/storage/distributor/bucketdb/bucketdatabase.h> +#include <vespa/storage/bucketdb/bucketdatabase.h> namespace storage { -namespace distributor { namespace { struct GetNextEntryProcessor : public BucketDatabase::EntryProcessor { @@ -52,5 +51,3 @@ BucketDatabase::Entry::toString() const } } - -} diff --git a/storage/src/vespa/storage/distributor/bucketdb/bucketdatabase.h b/storage/src/vespa/storage/bucketdb/bucketdatabase.h index a85b5aa5edf..d17f4a20176 100644 --- a/storage/src/vespa/storage/distributor/bucketdb/bucketdatabase.h +++ b/storage/src/vespa/storage/bucketdb/bucketdatabase.h @@ -5,11 +5,10 @@ #pragma once #include <vespa/vespalib/util/printable.h> -#include <vespa/storage/distributor/bucketdb/bucketinfo.h> +#include <vespa/storage/bucketdb/bucketinfo.h> #include <vespa/document/bucket/bucketid.h> namespace storage { -namespace distributor { class BucketDatabase : public vespalib::Printable { @@ -117,5 +116,4 @@ public: std::ostream& operator<<(std::ostream& o, const BucketDatabase::Entry& e); -} // distributor } // storage diff --git a/storage/src/vespa/storage/distributor/bucketdb/bucketinfo.cpp b/storage/src/vespa/storage/bucketdb/bucketinfo.cpp index ccb3702bbbd..a9f6a85892b 100644 --- a/storage/src/vespa/storage/distributor/bucketdb/bucketinfo.cpp +++ b/storage/src/vespa/storage/bucketdb/bucketinfo.cpp @@ -1,12 +1,10 @@ // 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/storage/distributor/bucketdb/bucketinfo.h> +#include <vespa/storage/bucketdb/bucketinfo.h> #include <vespa/storage/storageutil/utils.h> namespace storage { -namespace distributor { - BucketInfo::BucketInfo() : _lastGarbageCollection(0) { @@ -312,5 +310,3 @@ BucketInfo::operator==(const BucketInfo& other) const }; } - -} diff --git a/storage/src/vespa/storage/distributor/bucketdb/bucketinfo.h b/storage/src/vespa/storage/bucketdb/bucketinfo.h index 4e450994f8a..1b220282cf0 100644 --- a/storage/src/vespa/storage/distributor/bucketdb/bucketinfo.h +++ b/storage/src/vespa/storage/bucketdb/bucketinfo.h @@ -1,11 +1,13 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/storage/distributor/bucketdb/bucketcopy.h> +#include <vespa/storage/bucketdb/bucketcopy.h> namespace storage { namespace distributor { + class DistributorTestUtil; +} class BucketInfo { @@ -153,8 +155,7 @@ public: bool operator==(const BucketInfo& other) const; private: - friend class DistrBucketDBTest; - friend class DistributorTestUtil; + friend class distributor::DistributorTestUtil; /** * Returns the bucket copy struct for the given node, null if nonexisting @@ -173,5 +174,3 @@ inline std::ostream& operator<<(std::ostream& out, const BucketInfo& info) } -} - diff --git a/storage/src/vespa/storage/bucketdb/distrbucketdb.cpp b/storage/src/vespa/storage/bucketdb/distrbucketdb.cpp index 6bca384a076..d3d45360149 100644 --- a/storage/src/vespa/storage/bucketdb/distrbucketdb.cpp +++ b/storage/src/vespa/storage/bucketdb/distrbucketdb.cpp @@ -11,16 +11,16 @@ namespace bucketdb { void DistrBucketDatabase::insert(const document::BucketId& bucket, - const distributor::BucketInfo& entry, + const BucketInfo& entry, const char* clientId) { bool preExisted; #ifdef USE_JUDY - return LockableMap<JudyMultiMap<distributor::BucketInfo> >::insert( + return LockableMap<JudyMultiMap<BucketInfo> >::insert( bucket.toKey(), entry, clientId, preExisted); #else return LockableMap<StdMapWrapper<document::BucketId::Type, - distributor::BucketInfo> >::insert( + BucketInfo> >::insert( bucket.toKey(), entry, clientId, preExisted); #endif } @@ -30,11 +30,11 @@ DistrBucketDatabase::get(const document::BucketId& bucket, const char* clientId, bool createIfNonExisting) { #ifdef USE_JUDY - return LockableMap<JudyMultiMap<distributor::BucketInfo> >::get( + return LockableMap<JudyMultiMap<BucketInfo> >::get( bucket.stripUnused().toKey(), clientId, createIfNonExisting); #else return LockableMap<StdMapWrapper<document::BucketId::Type, - distributor::BucketInfo> >::get( + BucketInfo> >::get( bucket.stripUnused().toKey(), clientId, createIfNonExisting); #endif } diff --git a/storage/src/vespa/storage/bucketdb/distrbucketdb.h b/storage/src/vespa/storage/bucketdb/distrbucketdb.h index 57bdfede403..0df0157501c 100644 --- a/storage/src/vespa/storage/bucketdb/distrbucketdb.h +++ b/storage/src/vespa/storage/bucketdb/distrbucketdb.h @@ -12,7 +12,7 @@ #include <vector> #include <vespa/vespalib/util/sync.h> #include <vespa/metrics/valuemetric.h> -#include <vespa/storage/distributor/bucketdb/bucketinfo.h> +#include <vespa/storage/bucketdb/bucketinfo.h> #if __WORDSIZE == 64 #define USE_JUDY @@ -26,19 +26,19 @@ namespace bucketdb { class DistrBucketDatabase #ifdef USE_JUDY - : public LockableMap<JudyMultiMap<distributor::BucketInfo> > + : public LockableMap<JudyMultiMap<BucketInfo> > #else : public LockableMap<StdMapWrapper<document::BucketId::Type, - distributor::BucketInfo> > + BucketInfo> > #endif { public: DistrBucketDatabase() {}; - typedef distributor::BucketInfo Entry; + typedef BucketInfo Entry; void insert(const document::BucketId&, - const distributor::BucketInfo&, + const BucketInfo&, const char* clientId); WrappedEntry get(const document::BucketId& bucket, diff --git a/storage/src/vespa/storage/distributor/bucketdb/mapbucketdatabase.cpp b/storage/src/vespa/storage/bucketdb/mapbucketdatabase.cpp index 0abf24e5821..243deac5034 100644 --- a/storage/src/vespa/storage/distributor/bucketdb/mapbucketdatabase.cpp +++ b/storage/src/vespa/storage/bucketdb/mapbucketdatabase.cpp @@ -1,12 +1,10 @@ // 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/storage/distributor/bucketdb/mapbucketdatabase.h> +#include <vespa/storage/bucketdb/mapbucketdatabase.h> #include <vespa/storage/common/bucketoperationlogger.h> namespace storage { -namespace distributor { - MapBucketDatabase::MapBucketDatabase() { // Allocate the root element. @@ -511,5 +509,4 @@ MapBucketDatabase::print(std::ostream& out, bool verbose, } } -} // distributor } // storage diff --git a/storage/src/vespa/storage/distributor/bucketdb/mapbucketdatabase.h b/storage/src/vespa/storage/bucketdb/mapbucketdatabase.h index 9574d4fe114..b1d571824c2 100644 --- a/storage/src/vespa/storage/distributor/bucketdb/mapbucketdatabase.h +++ b/storage/src/vespa/storage/bucketdb/mapbucketdatabase.h @@ -1,13 +1,11 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/storage/distributor/bucketdb/bucketdatabase.h> +#include <vespa/storage/bucketdb/bucketdatabase.h> #include <map> namespace storage { -namespace distributor { - class MapBucketDatabase : public BucketDatabase { public: @@ -107,5 +105,3 @@ private: } -} - diff --git a/storage/src/vespa/storage/common/distributorcomponent.h b/storage/src/vespa/storage/common/distributorcomponent.h index 586bbf61890..a1e28c410d7 100644 --- a/storage/src/vespa/storage/common/distributorcomponent.h +++ b/storage/src/vespa/storage/common/distributorcomponent.h @@ -27,8 +27,8 @@ #include <vespa/storageapi/defs.h> #include <vespa/storage/common/storagecomponent.h> -#include <vespa/storage/distributor/bucketdb/bucketdatabase.h> -#include <vespa/storage/distributor/distributorconfiguration.h> +#include <vespa/storage/bucketdb/bucketdatabase.h> +#include <vespa/storage/config/distributorconfiguration.h> #include <vespa/storage/config/config-stor-distributormanager.h> #include <vespa/storage/config/config-stor-visitordispatcher.h> @@ -55,7 +55,7 @@ struct DistributorManagedComponent virtual void setIdealNodeCalculator(lib::IdealNodeCalculator&) = 0; virtual void setTimeCalculator(UniqueTimeCalculator&) = 0; - virtual void setBucketDatabase(distributor::BucketDatabase&) = 0; + virtual void setBucketDatabase(BucketDatabase&) = 0; virtual void setDistributorConfig(const DistributorConfig&)= 0; virtual void setVisitorConfig(const VisitorConfig&) = 0; }; @@ -70,14 +70,14 @@ class DistributorComponent : public StorageComponent, private DistributorManagedComponent { lib::IdealNodeCalculator* _idealNodeCalculator; - distributor::BucketDatabase* _bucketDatabase; + BucketDatabase* _bucketDatabase; mutable UniqueTimeCalculator* _timeCalculator; DistributorConfig _distributorConfig; VisitorConfig _visitorConfig; - distributor::DistributorConfiguration _totalConfig; + DistributorConfiguration _totalConfig; // DistributorManagedComponent implementation - virtual void setBucketDatabase(distributor::BucketDatabase& db) + virtual void setBucketDatabase(BucketDatabase& db) { _bucketDatabase = &db; } virtual void setIdealNodeCalculator(lib::IdealNodeCalculator& c) { _idealNodeCalculator = &c; } @@ -109,11 +109,11 @@ public: const VisitorConfig& getVisitorConfig() const { return _visitorConfig; } - const distributor::DistributorConfiguration& + const DistributorConfiguration& getTotalDistributorConfig() const { return _totalConfig; } - distributor::BucketDatabase& getBucketDatabase() { + BucketDatabase& getBucketDatabase() { assert(_bucketDatabase); return *_bucketDatabase; } lib::IdealNodeCalculator& getIdealNodeCalculator() const { diff --git a/storage/src/vespa/storage/config/CMakeLists.txt b/storage/src/vespa/storage/config/CMakeLists.txt index 863b29e6fd6..8a62f68b27c 100644 --- a/storage/src/vespa/storage/config/CMakeLists.txt +++ b/storage/src/vespa/storage/config/CMakeLists.txt @@ -1,6 +1,7 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_library(storage_storageconfig OBJECT SOURCES + distributorconfiguration.cpp DEPENDS ) vespa_generate_config(storage_storageconfig stor-communicationmanager.def) diff --git a/storage/src/vespa/storage/distributor/distributorconfiguration.cpp b/storage/src/vespa/storage/config/distributorconfiguration.cpp index 0ac1851fdc4..51909ab335a 100644 --- a/storage/src/vespa/storage/distributor/distributorconfiguration.cpp +++ b/storage/src/vespa/storage/config/distributorconfiguration.cpp @@ -1,5 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/storage/distributor/distributorconfiguration.h> +#include <vespa/storage/config/distributorconfiguration.h> #include <vespa/log/log.h> #include <vespa/document/select/parser.h> #include <vespa/document/select/node.h> @@ -10,8 +10,6 @@ LOG_SETUP(".distributorconfiguration"); namespace storage { -namespace distributor { - DistributorConfiguration::DistributorConfiguration(StorageComponent& component) : _component(component), _byteCountSplitLimit(0xffffffff), @@ -171,6 +169,5 @@ DistributorConfiguration::configure(const vespa::config::content::core::StorVisi _maxVisitorsPerNodePerClientVisitor = config.maxvisitorspernodeperclientvisitor; } -} // distributor } // storage diff --git a/storage/src/vespa/storage/distributor/distributorconfiguration.h b/storage/src/vespa/storage/config/distributorconfiguration.h index efc57fe534b..0ca2eb49c8a 100644 --- a/storage/src/vespa/storage/distributor/distributorconfiguration.h +++ b/storage/src/vespa/storage/config/distributorconfiguration.h @@ -7,8 +7,10 @@ #include <vespa/storage/common/storagecomponent.h> namespace storage { -namespace distributor { +namespace distributor { + class Distributor_Test; +} class DistributorConfiguration { public: @@ -263,7 +265,7 @@ private: DistrConfig::MinimumReplicaCountingMode _minimumReplicaCountingMode; - friend class Distributor_Test; + friend class distributor::Distributor_Test; bool containsTimeStatement(const std::string& documentSelection) const; void configureMaintenancePriorities( @@ -271,6 +273,5 @@ private: }; } -} diff --git a/storage/src/vespa/storage/distributor/CMakeLists.txt b/storage/src/vespa/storage/distributor/CMakeLists.txt index eb7850c3439..5333c2281f8 100644 --- a/storage/src/vespa/storage/distributor/CMakeLists.txt +++ b/storage/src/vespa/storage/distributor/CMakeLists.txt @@ -17,7 +17,6 @@ vespa_add_library(storage_distributor nodeinfo.cpp sentmessagemap.cpp operationtargetresolverimpl.cpp - distributorconfiguration.cpp throttlingoperationstarter.cpp blockingoperationstarter.cpp distributormessagesender.cpp @@ -27,9 +26,14 @@ vespa_add_library(storage_distributor bucketgctimecalculator.cpp distributor_host_info_reporter.cpp latency_statistics_provider.cpp - $<TARGET_OBJECTS:storage_bucketdatabase> + $<TARGET_OBJECTS:storage_distributoroperation> + $<TARGET_OBJECTS:storage_distributoroperationexternal> + $<TARGET_OBJECTS:storage_distributoroperationidealstate> + $<TARGET_OBJECTS:storage_distributormaintenance> + $<TARGET_OBJECTS:storage_distributor_bucketdb> INSTALL lib64 DEPENDS + storage AFTER storage_storageconfig ) diff --git a/storage/src/vespa/storage/distributor/activecopy.h b/storage/src/vespa/storage/distributor/activecopy.h index 73e135af352..00a7bf3d4f6 100644 --- a/storage/src/vespa/storage/distributor/activecopy.h +++ b/storage/src/vespa/storage/distributor/activecopy.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/storage/distributor/bucketdb/bucketdatabase.h> +#include <vespa/storage/bucketdb/bucketdatabase.h> namespace storage { namespace lib { diff --git a/storage/src/vespa/storage/distributor/bucketdb/CMakeLists.txt b/storage/src/vespa/storage/distributor/bucketdb/CMakeLists.txt index b9f5f926a65..f969dfd8c3f 100644 --- a/storage/src/vespa/storage/distributor/bucketdb/CMakeLists.txt +++ b/storage/src/vespa/storage/distributor/bucketdb/CMakeLists.txt @@ -1,11 +1,7 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(storage_bucketdatabase OBJECT +vespa_add_library(storage_distributor_bucketdb OBJECT SOURCES - bucketinfo.cpp - bucketcopy.cpp - bucketdatabase.cpp judybucketdatabase.cpp - mapbucketdatabase.cpp bucketdbmetricupdater.cpp DEPENDS AFTER diff --git a/storage/src/vespa/storage/distributor/bucketdb/bucketdbmetricupdater.h b/storage/src/vespa/storage/distributor/bucketdb/bucketdbmetricupdater.h index 1fb7b5672f5..9f59426f983 100644 --- a/storage/src/vespa/storage/distributor/bucketdb/bucketdbmetricupdater.h +++ b/storage/src/vespa/storage/distributor/bucketdb/bucketdbmetricupdater.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/storage/distributor/bucketdb/bucketdatabase.h> +#include <vespa/storage/bucketdb/bucketdatabase.h> #include <vespa/storage/config/config-stor-distributormanager.h> #include <unordered_map> diff --git a/storage/src/vespa/storage/distributor/bucketdb/judybucketdatabase.h b/storage/src/vespa/storage/distributor/bucketdb/judybucketdatabase.h index 13cddd72cdf..a50a32d5937 100644 --- a/storage/src/vespa/storage/distributor/bucketdb/judybucketdatabase.h +++ b/storage/src/vespa/storage/distributor/bucketdb/judybucketdatabase.h @@ -1,7 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/storage/distributor/bucketdb/bucketdatabase.h> +#include <vespa/storage/bucketdb/bucketdatabase.h> #include <vespa/storage/bucketdb/distrbucketdb.h> namespace storage { diff --git a/storage/src/vespa/storage/distributor/distributor.cpp b/storage/src/vespa/storage/distributor/distributor.cpp index 2c806901de5..3cdf5926c22 100644 --- a/storage/src/vespa/storage/distributor/distributor.cpp +++ b/storage/src/vespa/storage/distributor/distributor.cpp @@ -2,7 +2,7 @@ #include <vespa/fastos/fastos.h> #include <vespa/log/log.h> #include <vespa/storage/distributor/distributor.h> -#include <vespa/storage/distributor/bucketdb/mapbucketdatabase.h> +#include <vespa/storage/bucketdb/mapbucketdatabase.h> #include <vespa/storage/distributor/maintenance/simplemaintenancescanner.h> #include <vespa/storage/distributor/maintenance/simplebucketprioritydatabase.h> #include <vespa/storage/distributor/blockingoperationstarter.h> diff --git a/storage/src/vespa/storage/distributor/distributorinterface.h b/storage/src/vespa/storage/distributor/distributorinterface.h index 5562670c35e..ecbc0163b01 100644 --- a/storage/src/vespa/storage/distributor/distributorinterface.h +++ b/storage/src/vespa/storage/distributor/distributorinterface.h @@ -6,10 +6,10 @@ #include <vespa/storage/distributor/pendingmessagetracker.h> #include <vespa/storageapi/message/state.h> #include <vespa/storage/distributor/maintenancebucket.h> -#include <vespa/storage/distributor/bucketdb/bucketdatabase.h> +#include <vespa/storage/bucketdb/bucketdatabase.h> #include <vespa/storage/distributor/bucketgctimecalculator.h> #include <vespa/storage/distributor/distributormetricsset.h> -#include <vespa/storage/distributor/distributorconfiguration.h> +#include <vespa/storage/config/distributorconfiguration.h> #include <vespa/storage/distributor/distributormessagesender.h> #include <vespa/storage/distributor/bucketownership.h> diff --git a/storage/src/vespa/storage/distributor/maintenance/bucketprioritydatabase.h b/storage/src/vespa/storage/distributor/maintenance/bucketprioritydatabase.h index 3a4a278543f..30ccf0040ba 100644 --- a/storage/src/vespa/storage/distributor/maintenance/bucketprioritydatabase.h +++ b/storage/src/vespa/storage/distributor/maintenance/bucketprioritydatabase.h @@ -1,7 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/storage/distributor/bucketdb/bucketdatabase.h> +#include <vespa/storage/bucketdb/bucketdatabase.h> #include <vespa/storage/distributor/maintenance/prioritizedbucket.h> #include <boost/iterator/iterator_facade.hpp> #include <vespa/vespalib/util/linkedptr.h> diff --git a/storage/src/vespa/storage/distributor/maintenance/maintenancescanner.h b/storage/src/vespa/storage/distributor/maintenance/maintenancescanner.h index 9dce66c1f32..50d947008de 100644 --- a/storage/src/vespa/storage/distributor/maintenance/maintenancescanner.h +++ b/storage/src/vespa/storage/distributor/maintenance/maintenancescanner.h @@ -1,7 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/storage/distributor/bucketdb/bucketdatabase.h> +#include <vespa/storage/bucketdb/bucketdatabase.h> namespace storage { namespace distributor { diff --git a/storage/src/vespa/storage/distributor/maintenance/simplemaintenancescanner.h b/storage/src/vespa/storage/distributor/maintenance/simplemaintenancescanner.h index eaec4d5186b..b62ecffa0fd 100644 --- a/storage/src/vespa/storage/distributor/maintenance/simplemaintenancescanner.h +++ b/storage/src/vespa/storage/distributor/maintenance/simplemaintenancescanner.h @@ -7,7 +7,7 @@ #include <vespa/storage/distributor/maintenance/bucketprioritydatabase.h> #include <vespa/storage/distributor/maintenance/maintenanceprioritygenerator.h> #include <vespa/storage/distributor/maintenance/node_maintenance_stats_tracker.h> -#include <vespa/storage/distributor/bucketdb/bucketdatabase.h> +#include <vespa/storage/bucketdb/bucketdatabase.h> namespace storage { namespace distributor { diff --git a/storage/src/vespa/storage/distributor/operations/external/multioperationoperation.h b/storage/src/vespa/storage/distributor/operations/external/multioperationoperation.h index 95f31537dfb..20d64e95fae 100644 --- a/storage/src/vespa/storage/distributor/operations/external/multioperationoperation.h +++ b/storage/src/vespa/storage/distributor/operations/external/multioperationoperation.h @@ -4,7 +4,7 @@ #include <vespa/storage/distributor/persistencemessagetracker.h> #include <vespa/storageapi/messageapi/returncode.h> #include <vespa/vdslib/container/writabledocumentlist.h> -#include <vespa/storage/distributor/bucketdb/bucketdatabase.h> +#include <vespa/storage/bucketdb/bucketdatabase.h> namespace document { class Document; diff --git a/storage/src/vespa/storage/distributor/operations/external/statbucketlistoperation.h b/storage/src/vespa/storage/distributor/operations/external/statbucketlistoperation.h index a1b4eb110b7..8e092a96f88 100644 --- a/storage/src/vespa/storage/distributor/operations/external/statbucketlistoperation.h +++ b/storage/src/vespa/storage/distributor/operations/external/statbucketlistoperation.h @@ -2,7 +2,7 @@ #pragma once #include <vespa/storage/distributor/operations/operation.h> -#include <vespa/storage/distributor/bucketdb/bucketdatabase.h> +#include <vespa/storage/bucketdb/bucketdatabase.h> #include <vespa/vespalib/util/sync.h> namespace storage { diff --git a/storage/src/vespa/storage/distributor/operations/external/visitoroperation.h b/storage/src/vespa/storage/distributor/operations/external/visitoroperation.h index 6de20b81f25..8329d68a80c 100644 --- a/storage/src/vespa/storage/distributor/operations/external/visitoroperation.h +++ b/storage/src/vespa/storage/distributor/operations/external/visitoroperation.h @@ -7,7 +7,7 @@ #include <vespa/storageapi/messageapi/storagemessage.h> #include <vespa/storageapi/message/visitor.h> #include <vespa/storage/distributor/visitormetricsset.h> -#include <vespa/storage/distributor/bucketdb/bucketdatabase.h> +#include <vespa/storage/bucketdb/bucketdatabase.h> #include <vespa/storage/visiting/memory_bounded_trace.h> namespace document { diff --git a/storage/src/vespa/storage/distributor/operations/idealstate/mergemetadata.h b/storage/src/vespa/storage/distributor/operations/idealstate/mergemetadata.h index 3edc9a3f268..77f3ff6b678 100644 --- a/storage/src/vespa/storage/distributor/operations/idealstate/mergemetadata.h +++ b/storage/src/vespa/storage/distributor/operations/idealstate/mergemetadata.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/storage/distributor/bucketdb/bucketcopy.h> +#include <vespa/storage/bucketdb/bucketcopy.h> #include <vespa/vespalib/stllike/asciistream.h> namespace storage { diff --git a/storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.h b/storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.h index 0dfe7756b79..b99a302a9d3 100644 --- a/storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.h +++ b/storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/storage/distributor/bucketdb/bucketdatabase.h> +#include <vespa/storage/bucketdb/bucketdatabase.h> #include <vespa/storage/distributor/operations/idealstate/idealstateoperation.h> #include <vespa/storage/distributor/operations/idealstate/mergelimiter.h> #include <vespa/storage/distributor/operations/idealstate/mergemetadata.h> diff --git a/storage/src/vespa/storage/distributor/operationtargetresolverimpl.h b/storage/src/vespa/storage/distributor/operationtargetresolverimpl.h index 36cb02dc213..25ce4be09dc 100644 --- a/storage/src/vespa/storage/distributor/operationtargetresolverimpl.h +++ b/storage/src/vespa/storage/distributor/operationtargetresolverimpl.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/storage/distributor/bucketdb/bucketdatabase.h> +#include <vespa/storage/bucketdb/bucketdatabase.h> #include <vespa/storage/distributor/operationtargetresolver.h> #include <vespa/vdslib/distribution/idealnodecalculator.h> diff --git a/storage/src/vespa/storage/distributor/pendingclusterstate.h b/storage/src/vespa/storage/distributor/pendingclusterstate.h index c31747cf600..e5542b7aaa5 100644 --- a/storage/src/vespa/storage/distributor/pendingclusterstate.h +++ b/storage/src/vespa/storage/distributor/pendingclusterstate.h @@ -7,7 +7,7 @@ #include <vespa/storage/bucketdb/distrbucketdb.h> #include <vespa/vdslib/distribution/distribution.h> #include <vespa/vespalib/util/xmlserializable.h> -#include <vespa/storage/distributor/bucketdb/bucketdatabase.h> +#include <vespa/storage/bucketdb/bucketdatabase.h> #include <vespa/storage/distributor/clusterinformation.h> #include <unordered_set> diff --git a/storage/src/vespa/storage/distributor/statechecker.h b/storage/src/vespa/storage/distributor/statechecker.h index 3b0d16644df..6dd7f36e2a6 100644 --- a/storage/src/vespa/storage/distributor/statechecker.h +++ b/storage/src/vespa/storage/distributor/statechecker.h @@ -8,7 +8,7 @@ #include <vespa/vdslib/state/clusterstate.h> #include <vespa/storage/distributor/bucketgctimecalculator.h> #include <vespa/storage/distributor/maintenancebucket.h> -#include <vespa/storage/distributor/bucketdb/bucketdatabase.h> +#include <vespa/storage/bucketdb/bucketdatabase.h> #include <vespa/vespalib/util/linkedptr.h> #include <unordered_set> @@ -17,10 +17,11 @@ namespace storage { +class DistributorConfiguration; + namespace distributor { class DistributorComponent; -class DistributorConfiguration; class NodeMaintenanceStatsTracker; /** diff --git a/storage/src/vespa/storage/distributor/statecheckers.cpp b/storage/src/vespa/storage/distributor/statecheckers.cpp index e93806e2181..dd247eb497e 100644 --- a/storage/src/vespa/storage/distributor/statecheckers.cpp +++ b/storage/src/vespa/storage/distributor/statecheckers.cpp @@ -4,13 +4,13 @@ #include <vespa/log/log.h> #include <vespa/storage/distributor/activecopy.h> -#include <vespa/storage/distributor/bucketdb/bucketdatabase.h> #include <vespa/storage/distributor/operations/idealstate/splitoperation.h> #include <vespa/storage/distributor/operations/idealstate/joinoperation.h> #include <vespa/storage/distributor/operations/idealstate/removebucketoperation.h> #include <vespa/storage/distributor/operations/idealstate/setbucketstateoperation.h> #include <vespa/storage/distributor/operations/idealstate/mergeoperation.h> #include <vespa/storage/distributor/operations/idealstate/garbagecollectionoperation.h> +#include <vespa/storage/bucketdb/bucketdatabase.h> #include <vespa/storage/common/bucketoperationlogger.h> #include <vespa/vespalib/stllike/asciistream.h> diff --git a/storage/src/vespa/storage/frameworkimpl/component/distributorcomponentregisterimpl.h b/storage/src/vespa/storage/frameworkimpl/component/distributorcomponentregisterimpl.h index d1a37c5ba5e..d70d69f6022 100644 --- a/storage/src/vespa/storage/frameworkimpl/component/distributorcomponentregisterimpl.h +++ b/storage/src/vespa/storage/frameworkimpl/component/distributorcomponentregisterimpl.h @@ -7,7 +7,7 @@ */ #pragma once -#include <vespa/storage/distributor/bucketdb/mapbucketdatabase.h> +#include <vespa/storage/bucketdb/mapbucketdatabase.h> #include <vespa/storage/common/distributorcomponent.h> #include <vespa/storage/common/nodestateupdater.h> #include <vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.h> @@ -26,7 +26,7 @@ class DistributorComponentRegisterImpl std::vector<DistributorManagedComponent*> _components; UniqueTimeCalculator* _timeCalculator; - distributor::MapBucketDatabase _bucketDatabase; + MapBucketDatabase _bucketDatabase; DistributorConfig _distributorConfig; VisitorConfig _visitorConfig; lib::ClusterState _clusterState; @@ -37,7 +37,7 @@ public: DistributorComponentRegisterImpl(); - distributor::BucketDatabase& getBucketDatabase() { return _bucketDatabase; } + BucketDatabase& getBucketDatabase() { return _bucketDatabase; } virtual void registerDistributorComponent(DistributorManagedComponent&); diff --git a/storage/src/vespa/storage/storageserver/CMakeLists.txt b/storage/src/vespa/storage/storageserver/CMakeLists.txt index 2253fb1dcee..17638f55b3a 100644 --- a/storage/src/vespa/storage/storageserver/CMakeLists.txt +++ b/storage/src/vespa/storage/storageserver/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(storage_storageserver OBJECT +vespa_add_library(storage_storageserver SOURCES priorityconverter.cpp bucketintegritychecker.cpp @@ -21,8 +21,8 @@ vespa_add_library(storage_storageserver OBJECT servicelayernode.cpp statereporter.cpp changedbucketownershiphandler.cpp + INSTALL lib64 DEPENDS - AFTER - storage_storageconfig - storage_visitor + storage + storage_distributor ) diff --git a/storageapi/src/tests/buckets/CMakeLists.txt b/storageapi/src/tests/buckets/CMakeLists.txt index aa25f630f53..5e50945bb19 100644 --- a/storageapi/src/tests/buckets/CMakeLists.txt +++ b/storageapi/src/tests/buckets/CMakeLists.txt @@ -3,5 +3,6 @@ vespa_add_library(storageapi_testbuckets SOURCES bucketinfotest.cpp DEPENDS + storageapi cppunit ) diff --git a/storageapi/src/tests/mbusprot/CMakeLists.txt b/storageapi/src/tests/mbusprot/CMakeLists.txt index d7d376ae105..75a0bddc0bd 100644 --- a/storageapi/src/tests/mbusprot/CMakeLists.txt +++ b/storageapi/src/tests/mbusprot/CMakeLists.txt @@ -3,5 +3,6 @@ vespa_add_library(storageapi_testmbusprot SOURCES storageprotocoltest.cpp DEPENDS + storageapi vdstestlib ) diff --git a/storageserver/src/tests/storageservertest.cpp b/storageserver/src/tests/storageservertest.cpp index 69c55248eb7..379a8c64d78 100644 --- a/storageserver/src/tests/storageservertest.cpp +++ b/storageserver/src/tests/storageservertest.cpp @@ -173,7 +173,7 @@ namespace { virtual StorageNode& getNode() { return _process.getNode(); } virtual StorageNodeContext& getContext() { return _process.getContext(); } - distributor::BucketDatabase& getBucketDatabase() + BucketDatabase& getBucketDatabase() { return _process.getDistributorContext().getComponentRegister().getBucketDatabase(); } }; @@ -673,7 +673,7 @@ StorageServerTest::testSplitJoinSplitThroughDistributor_Stress() } dummyLink.reset(); // Wait until system has split to 7 buckets - distributor::BucketDatabase& db(distServer.getBucketDatabase()); + BucketDatabase& db(distServer.getBucketDatabase()); for (size_t i(0); (i < 6000) && (7ul != db.size()); i++) { FastOS_Thread::Sleep(10); } diff --git a/storageserver/src/vespa/storageserver/app/CMakeLists.txt b/storageserver/src/vespa/storageserver/app/CMakeLists.txt index e2918ae49d6..6c038d65bb2 100644 --- a/storageserver/src/vespa/storageserver/app/CMakeLists.txt +++ b/storageserver/src/vespa/storageserver/app/CMakeLists.txt @@ -8,4 +8,5 @@ vespa_add_library(storageserver_storageapp STATIC rpcservicelayerprocess.cpp memfileservicelayerprocess.cpp DEPENDS + storage_storageserver ) |