diff options
25 files changed, 101 insertions, 103 deletions
diff --git a/document/src/tests/CMakeLists.txt b/document/src/tests/CMakeLists.txt index 197f7cc508a..6edd113f17b 100644 --- a/document/src/tests/CMakeLists.txt +++ b/document/src/tests/CMakeLists.txt @@ -28,6 +28,7 @@ vespa_add_executable(document_testrunner_app TEST urltypetest.cpp fieldsettest.cpp gid_filter_test.cpp + fixed_bucket_spaces_test.cpp DEPENDS document AFTER diff --git a/persistence/src/tests/spi/fixed_bucket_spaces_test.cpp b/document/src/tests/fixed_bucket_spaces_test.cpp index 7e36d80248a..fab38c638a7 100644 --- a/persistence/src/tests/spi/fixed_bucket_spaces_test.cpp +++ b/document/src/tests/fixed_bucket_spaces_test.cpp @@ -1,9 +1,9 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/persistence/spi/fixed_bucket_spaces.h> +#include <vespa/document/bucket/fixed_bucket_spaces.h> #include <cppunit/extensions/HelperMacros.h> -namespace storage::spi { +namespace document { struct FixedBucketSpacesTest : CppUnit::TestFixture { CPPUNIT_TEST_SUITE(FixedBucketSpacesTest); @@ -25,8 +25,6 @@ struct FixedBucketSpacesTest : CppUnit::TestFixture { CPPUNIT_TEST_SUITE_REGISTRATION(FixedBucketSpacesTest); -using document::BucketSpace; - void FixedBucketSpacesTest::bucket_space_from_name_is_defined_for_default_space() { CPPUNIT_ASSERT_EQUAL(FixedBucketSpaces::default_space(), FixedBucketSpaces::from_string("default")); } @@ -39,7 +37,7 @@ void FixedBucketSpacesTest::bucket_space_from_name_throws_exception_for_unknown_ try { FixedBucketSpaces::from_string("banana"); CPPUNIT_FAIL("Expected exception on unknown bucket space name"); - } catch (spi::UnknownBucketSpaceException& e) { + } catch (document::UnknownBucketSpaceException& e) { } } @@ -57,8 +55,8 @@ void FixedBucketSpacesTest::name_from_bucket_space_throws_exception_for_unknown_ try { FixedBucketSpaces::to_string(BucketSpace(4567)); CPPUNIT_FAIL("Expected exception on unknown bucket space value"); - } catch (spi::UnknownBucketSpaceException& e) { + } catch (document::UnknownBucketSpaceException& e) { } } -}
\ No newline at end of file +} diff --git a/document/src/vespa/document/bucket/CMakeLists.txt b/document/src/vespa/document/bucket/CMakeLists.txt index 3e779211762..5e3bc02595a 100644 --- a/document/src/vespa/document/bucket/CMakeLists.txt +++ b/document/src/vespa/document/bucket/CMakeLists.txt @@ -8,6 +8,7 @@ vespa_add_library(document_bucket OBJECT bucketidlist.cpp bucketselector.cpp bucketspace.cpp + fixed_bucket_spaces.cpp DEPENDS AFTER document_documentconfig diff --git a/persistence/src/vespa/persistence/spi/fixed_bucket_spaces.cpp b/document/src/vespa/document/bucket/fixed_bucket_spaces.cpp index 6a8ec0f18f7..4737c459bad 100644 --- a/persistence/src/vespa/persistence/spi/fixed_bucket_spaces.cpp +++ b/document/src/vespa/document/bucket/fixed_bucket_spaces.cpp @@ -1,16 +1,16 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "fixed_bucket_spaces.h" -namespace storage::spi { +namespace document { VESPA_IMPLEMENT_EXCEPTION(UnknownBucketSpaceException, vespalib::IllegalArgumentException) // Some sanity checks to ensure we don't mess up any legacy mappings. -static_assert(document::BucketSpace::placeHolder() != document::BucketSpace::invalid()); -static_assert(FixedBucketSpaces::default_space() == document::BucketSpace::placeHolder()); +static_assert(BucketSpace::placeHolder() != BucketSpace::invalid()); +static_assert(FixedBucketSpaces::default_space() == BucketSpace::placeHolder()); static_assert(FixedBucketSpaces::global_space() != FixedBucketSpaces::default_space()); -document::BucketSpace FixedBucketSpaces::from_string(vespalib::stringref name) { +BucketSpace FixedBucketSpaces::from_string(vespalib::stringref name) { if (name == "default") { return default_space(); } else if (name == "global") { @@ -20,7 +20,7 @@ document::BucketSpace FixedBucketSpaces::from_string(vespalib::stringref name) { } } -vespalib::stringref FixedBucketSpaces::to_string(document::BucketSpace space) { +vespalib::stringref FixedBucketSpaces::to_string(BucketSpace space) { if (space == default_space()) { return "default"; } else if (space == global_space()) { diff --git a/persistence/src/vespa/persistence/spi/fixed_bucket_spaces.h b/document/src/vespa/document/bucket/fixed_bucket_spaces.h index c2e97407797..87722c7a21c 100644 --- a/persistence/src/vespa/persistence/spi/fixed_bucket_spaces.h +++ b/document/src/vespa/document/bucket/fixed_bucket_spaces.h @@ -1,11 +1,11 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/document/bucket/bucketspace.h> +#include "bucketspace.h" #include <vespa/vespalib/util/exceptions.h> #include <vespa/vespalib/stllike/string.h> -namespace storage::spi { +namespace document { VESPA_DEFINE_EXCEPTION(UnknownBucketSpaceException, vespalib::IllegalArgumentException); @@ -14,17 +14,17 @@ VESPA_DEFINE_EXCEPTION(UnknownBucketSpaceException, vespalib::IllegalArgumentExc * distributions. */ struct FixedBucketSpaces { - static constexpr document::BucketSpace default_space() { return document::BucketSpace(1); }; - static constexpr document::BucketSpace global_space() { return document::BucketSpace(2); } + static constexpr BucketSpace default_space() { return BucketSpace(1); }; + static constexpr BucketSpace global_space() { return BucketSpace(2); } // Post-condition: returned space has valid() == true iff name // is either "default" or "global". // Throws UnknownBucketSpaceException if name does not map to a known bucket space. - static document::BucketSpace from_string(vespalib::stringref name); + static BucketSpace from_string(vespalib::stringref name); // Post-condition: returned string can be losslessly passed to from_string() // iff space is equal to default_space() or global_space(). // Throws UnknownBucketSpaceException if space does not map to a known name. - static vespalib::stringref to_string(document::BucketSpace space); + static vespalib::stringref to_string(BucketSpace space); }; } diff --git a/memfilepersistence/src/tests/spi/basicoperationhandlertest.cpp b/memfilepersistence/src/tests/spi/basicoperationhandlertest.cpp index 8053ed045f5..28cc56aa44e 100644 --- a/memfilepersistence/src/tests/spi/basicoperationhandlertest.cpp +++ b/memfilepersistence/src/tests/spi/basicoperationhandlertest.cpp @@ -6,7 +6,7 @@ #include <vespa/document/fieldset/fieldsetrepo.h> #include <vespa/document/fieldset/fieldsets.h> #include <vespa/persistence/spi/test.h> -#include <vespa/persistence/spi/fixed_bucket_spaces.h> +#include <vespa/document/bucket/fixed_bucket_spaces.h> #include <vespa/vdstestlib/cppunit/macros.h> using storage::spi::test::makeSpiBucket; @@ -728,13 +728,13 @@ void BasicOperationHandlerTest::list_buckets_returns_empty_set_for_non_default_b doPut(createRandomDocumentAtLocation(4), bucket, Timestamp(4567), 0); flush(bucket); - auto buckets = getPersistenceProvider().listBuckets(spi::FixedBucketSpaces::global_space(), spi::PartitionId(0)); + auto buckets = getPersistenceProvider().listBuckets(document::FixedBucketSpaces::global_space(), spi::PartitionId(0)); CPPUNIT_ASSERT_EQUAL(size_t(0), buckets.getList().size()); } void BasicOperationHandlerTest::get_modified_buckets_returns_empty_set_for_non_default_bucketspace() { env().addModifiedBucket(document::BucketId(16, 1234)); - auto buckets = getPersistenceProvider().getModifiedBuckets(spi::FixedBucketSpaces::global_space()); + auto buckets = getPersistenceProvider().getModifiedBuckets(document::FixedBucketSpaces::global_space()); CPPUNIT_ASSERT_EQUAL(size_t(0), buckets.getList().size()); } diff --git a/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp b/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp index 658e0d21765..87eea4e2c9f 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp @@ -6,7 +6,7 @@ #include <vespa/document/update/documentupdate.h> #include <vespa/config/helper/configgetter.hpp> #include <vespa/storageframework/generic/status/htmlstatusreporter.h> -#include <vespa/persistence/spi/fixed_bucket_spaces.h> +#include <vespa/document/bucket/fixed_bucket_spaces.h> #include <sstream> #include <vespa/log/log.h> @@ -80,7 +80,7 @@ MemFilePtr MemFilePersistenceProvider::getMemFile(const spi::Bucket& b, bool keepInCache) const { - assert(b.getBucketSpace() == spi::FixedBucketSpaces::default_space()); + assert(b.getBucketSpace() == document::FixedBucketSpaces::default_space()); MemFilePtr& ptr = getThreadLocalMemFile(); if (ptr.get()) { @@ -212,7 +212,7 @@ private: void MemFilePersistenceProvider::handleBucketCorruption(const FileSpecification& file) const { - spi::Bucket fixBucket(document::Bucket(spi::FixedBucketSpaces::default_space(), + spi::Bucket fixBucket(document::Bucket(document::FixedBucketSpaces::default_space(), file.getBucketId()), spi::PartitionId(file.getDirectory().getIndex())); @@ -416,7 +416,7 @@ spi::BucketIdListResult MemFilePersistenceProvider::listBuckets(BucketSpace space, spi::PartitionId partition) const { spi::BucketIdListResult::List buckets; - if (space == spi::FixedBucketSpaces::default_space()) { + if (space == document::FixedBucketSpaces::default_space()) { _fileScanner->buildBucketList(buckets, partition, 0, 1); } return spi::BucketIdListResult(buckets); @@ -426,7 +426,7 @@ spi::BucketIdListResult MemFilePersistenceProvider::getModifiedBuckets(BucketSpace space) const { document::BucketId::List modified; - if (space == spi::FixedBucketSpaces::default_space()) { + if (space == document::FixedBucketSpaces::default_space()) { _env->swapModifiedBuckets(modified); // Atomic op } return spi::BucketIdListResult(modified); @@ -435,7 +435,7 @@ MemFilePersistenceProvider::getModifiedBuckets(BucketSpace space) const spi::BucketInfoResult MemFilePersistenceProvider::getBucketInfo(const spi::Bucket& bucket) const { - assert(bucket.getBucketSpace() == spi::FixedBucketSpaces::default_space()); + assert(bucket.getBucketSpace() == document::FixedBucketSpaces::default_space()); LOG(spam, "getBucketInfo(%s)", bucket.toString().c_str()); try { bool retainMemFile = hasCachedMemFile(); @@ -458,7 +458,7 @@ MemFilePersistenceProvider::put(const spi::Bucket& bucket, spi::Timestamp ts, const document::Document::SP& doc, spi::Context& context) { - assert(bucket.getBucketSpace() == spi::FixedBucketSpaces::default_space()); + assert(bucket.getBucketSpace() == document::FixedBucketSpaces::default_space()); TRACEGENERIC(context, "put"); LOG(spam, "put(%s, %zu, %s)", bucket.toString().c_str(), uint64_t(ts), doc->getId().toString().c_str()); @@ -481,7 +481,7 @@ spi::RemoveResult MemFilePersistenceProvider::remove(const spi::Bucket& bucket, spi::Timestamp ts, const DocumentId& id, spi::Context& context) { - assert(bucket.getBucketSpace() == spi::FixedBucketSpaces::default_space()); + assert(bucket.getBucketSpace() == document::FixedBucketSpaces::default_space()); TRACEGENERIC(context, "remove"); LOG(spam, "remove(%s, %zu, %s)", bucket.toString().c_str(), uint64_t(ts), id.toString().c_str()); @@ -507,7 +507,7 @@ MemFilePersistenceProvider::removeIfFound(const spi::Bucket& bucket, const DocumentId& id, spi::Context& context) { - assert(bucket.getBucketSpace() == spi::FixedBucketSpaces::default_space()); + assert(bucket.getBucketSpace() == document::FixedBucketSpaces::default_space()); TRACEGENERIC(context, "removeIfFound"); LOG(spam, "removeIfFound(%s, %zu, %s)", bucket.toString().c_str(), uint64_t(ts), id.toString().c_str()); @@ -532,7 +532,7 @@ MemFilePersistenceProvider::MemFilePersistenceProvider::update( const spi::Bucket& bucket, spi::Timestamp ts, const document::DocumentUpdate::SP& upd, spi::Context& context) { - assert(bucket.getBucketSpace() == spi::FixedBucketSpaces::default_space()); + assert(bucket.getBucketSpace() == document::FixedBucketSpaces::default_space()); TRACEGENERIC(context, "update"); LOG(spam, "update(%s, %zu, %s)", bucket.toString().c_str(), uint64_t(ts), upd->getId().toString().c_str()); @@ -609,7 +609,7 @@ MemFilePersistenceProvider::get(const spi::Bucket& bucket, const DocumentId& id, spi::Context& context) const { - assert(bucket.getBucketSpace() == spi::FixedBucketSpaces::default_space()); + assert(bucket.getBucketSpace() == document::FixedBucketSpaces::default_space()); TRACEGENERIC(context, "get"); LOG(spam, "get(%s, %s)", bucket.toString().c_str(), id.toString().c_str()); try { @@ -652,7 +652,7 @@ spi::Result MemFilePersistenceProvider::flush(const spi::Bucket& bucket, spi::Context& context) { - assert(bucket.getBucketSpace() == spi::FixedBucketSpaces::default_space()); + assert(bucket.getBucketSpace() == document::FixedBucketSpaces::default_space()); TRACEGENERIC(context, "flush"); LOG(spam, "flush(%s)", bucket.toString().c_str()); try { @@ -679,7 +679,7 @@ MemFilePersistenceProvider::createIterator(const spi::Bucket& b, spi::IncludedVersions versions, spi::Context& context) { - assert(b.getBucketSpace() == spi::FixedBucketSpaces::default_space()); + assert(b.getBucketSpace() == document::FixedBucketSpaces::default_space()); TRACEGENERIC(context, "createIterator"); LOG(spam, "createIterator(%s)", b.toString().c_str()); try { @@ -723,7 +723,7 @@ spi::Result MemFilePersistenceProvider::deleteBucket(const spi::Bucket& bucket, spi::Context& context) { - assert(bucket.getBucketSpace() == spi::FixedBucketSpaces::default_space()); + assert(bucket.getBucketSpace() == document::FixedBucketSpaces::default_space()); TRACEGENERIC(context, "deleteBucket"); LOG(spam, "deleteBucket(%s)", bucket.toString().c_str()); try { @@ -749,9 +749,9 @@ MemFilePersistenceProvider::split(const spi::Bucket& source, const spi::Bucket& target2, spi::Context& context) { - assert(source.getBucketSpace() == spi::FixedBucketSpaces::default_space()); - assert(target1.getBucketSpace() == spi::FixedBucketSpaces::default_space()); - assert(target2.getBucketSpace() == spi::FixedBucketSpaces::default_space()); + assert(source.getBucketSpace() == document::FixedBucketSpaces::default_space()); + assert(target1.getBucketSpace() == document::FixedBucketSpaces::default_space()); + assert(target2.getBucketSpace() == document::FixedBucketSpaces::default_space()); TRACEGENERIC(context, "split"); LOG(spam, "split(%s -> %s, %s)", source.toString().c_str(), target1.toString().c_str(), target2.toString().c_str()); @@ -769,9 +769,9 @@ MemFilePersistenceProvider::join(const spi::Bucket& source1, const spi::Bucket& target, spi::Context& context) { - assert(source1.getBucketSpace() == spi::FixedBucketSpaces::default_space()); - assert(source2.getBucketSpace() == spi::FixedBucketSpaces::default_space()); - assert(target.getBucketSpace() == spi::FixedBucketSpaces::default_space()); + assert(source1.getBucketSpace() == document::FixedBucketSpaces::default_space()); + assert(source2.getBucketSpace() == document::FixedBucketSpaces::default_space()); + assert(target.getBucketSpace() == document::FixedBucketSpaces::default_space()); TRACEGENERIC(context, "join"); LOG(spam, "join(%s, %s -> %s)", source1.toString().c_str(), source2.toString().c_str(), target.toString().c_str()); @@ -788,7 +788,7 @@ MemFilePersistenceProvider::removeEntry(const spi::Bucket& bucket, spi::Timestamp ts, spi::Context& context) { - assert(bucket.getBucketSpace() == spi::FixedBucketSpaces::default_space()); + assert(bucket.getBucketSpace() == document::FixedBucketSpaces::default_space()); TRACEGENERIC(context, "removeEntry"); LOG(spam, "removeEntry(%s, %zu)", bucket.toString().c_str(), uint64_t(ts)); try { @@ -813,7 +813,7 @@ spi::Result MemFilePersistenceProvider::maintain(const spi::Bucket& bucket, spi::MaintenanceLevel level) { - assert(bucket.getBucketSpace() == spi::FixedBucketSpaces::default_space()); + assert(bucket.getBucketSpace() == document::FixedBucketSpaces::default_space()); LOG(spam, "maintain(%s)", bucket.toString().c_str()); try { MemFileAccessGuard file(*this, getMemFile(bucket, false), "maintain"); diff --git a/persistence/src/tests/spi/CMakeLists.txt b/persistence/src/tests/spi/CMakeLists.txt index c51270a420c..a130573e028 100644 --- a/persistence/src/tests/spi/CMakeLists.txt +++ b/persistence/src/tests/spi/CMakeLists.txt @@ -2,7 +2,6 @@ vespa_add_library(persistence_testspi SOURCES clusterstatetest.cpp - fixed_bucket_spaces_test.cpp DEPENDS persistence_persistence_conformancetest persistence diff --git a/persistence/src/vespa/persistence/spi/CMakeLists.txt b/persistence/src/vespa/persistence/spi/CMakeLists.txt index a2b8fa7a79c..f9146c5a833 100644 --- a/persistence/src/vespa/persistence/spi/CMakeLists.txt +++ b/persistence/src/vespa/persistence/spi/CMakeLists.txt @@ -8,7 +8,6 @@ vespa_add_library(persistence_spi OBJECT context.cpp docentry.cpp exceptions.cpp - fixed_bucket_spaces.cpp metricpersistenceprovider.cpp partitionstate.cpp persistenceprovider.cpp diff --git a/searchcore/src/vespa/searchcore/proton/server/proton_configurer.cpp b/searchcore/src/vespa/searchcore/proton/server/proton_configurer.cpp index 828cc909ac6..9f2d0ff8593 100644 --- a/searchcore/src/vespa/searchcore/proton/server/proton_configurer.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/proton_configurer.cpp @@ -7,7 +7,7 @@ #include "i_document_db_config_owner.h" #include <vespa/vespalib/util/lambdatask.h> #include <vespa/vespalib/util/threadstackexecutorbase.h> -#include <vespa/persistence/spi/fixed_bucket_spaces.h> +#include <vespa/document/bucket/fixed_bucket_spaces.h> #include <vespa/config-bucketspaces.h> #include <vespa/vespalib/util/exceptions.h> #include <vespa/vespalib/stllike/asciistream.h> @@ -27,14 +27,14 @@ getBucketSpace(const BootstrapConfig &bootstrapConfig, const DocTypeName &name) if (bucketspaces.enableMultipleBucketSpaces) { for (const auto &entry : bucketspaces.documenttype) { if (entry.name == name.getName()) { - return storage::spi::FixedBucketSpaces::from_string(entry.bucketspace); + return document::FixedBucketSpaces::from_string(entry.bucketspace); } } vespalib::asciistream ost; ost << "Could not map from document type name '" << name.getName() << "' to bucket space name"; throw vespalib::IllegalStateException(ost.str(), VESPA_STRLOC); } - return storage::spi::FixedBucketSpaces::default_space(); + return document::FixedBucketSpaces::default_space(); } } diff --git a/storage/src/tests/common/teststorageapp.h b/storage/src/tests/common/teststorageapp.h index 64572b8ef8d..369cdedc583 100644 --- a/storage/src/tests/common/teststorageapp.h +++ b/storage/src/tests/common/teststorageapp.h @@ -27,7 +27,7 @@ #include <vespa/storageframework/defaultimplementation/clock/realclock.h> #include <vespa/storageframework/defaultimplementation/component/testcomponentregister.h> #include <vespa/persistence/spi/persistenceprovider.h> -#include <vespa/persistence/spi/fixed_bucket_spaces.h> +#include <vespa/document/bucket/fixed_bucket_spaces.h> #include <vespa/document/base/testdocman.h> namespace storage { @@ -126,7 +126,7 @@ public: uint16_t getPartition(const document::BucketId&); StorBucketDatabase& getStorageBucketDatabase() override { - return _compReg.getBucketSpaceRepo().get(spi::FixedBucketSpaces::default_space()).bucketDatabase(); + return _compReg.getBucketSpaceRepo().get(document::FixedBucketSpaces::default_space()).bucketDatabase(); } private: diff --git a/storage/src/tests/storageserver/communicationmanagertest.cpp b/storage/src/tests/storageserver/communicationmanagertest.cpp index aa20f32450d..a271fbccf50 100644 --- a/storage/src/tests/storageserver/communicationmanagertest.cpp +++ b/storage/src/tests/storageserver/communicationmanagertest.cpp @@ -6,7 +6,7 @@ #include <vespa/messagebus/rpcmessagebus.h> #include <vespa/storageapi/message/persistence.h> #include <vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.h> -#include <vespa/persistence/spi/fixed_bucket_spaces.h> +#include <vespa/document/bucket/fixed_bucket_spaces.h> #include <tests/common/teststorageapp.h> #include <tests/common/dummystoragelink.h> #include <tests/common/testhelper.h> @@ -303,10 +303,10 @@ void CommunicationManagerTest::bucket_space_config_can_be_updated_live() { f.bottom_link->waitForMessages(2, MESSAGE_WAIT_TIME_SEC); auto cmd1 = f.bottom_link->getCommand(0); - CPPUNIT_ASSERT_EQUAL(spi::FixedBucketSpaces::global_space(), cmd1->getBucket().getBucketSpace()); + CPPUNIT_ASSERT_EQUAL(document::FixedBucketSpaces::global_space(), cmd1->getBucket().getBucketSpace()); auto cmd2 = f.bottom_link->getCommand(1); - CPPUNIT_ASSERT_EQUAL(spi::FixedBucketSpaces::default_space(), cmd2->getBucket().getBucketSpace()); + CPPUNIT_ASSERT_EQUAL(document::FixedBucketSpaces::default_space(), cmd2->getBucket().getBucketSpace()); config.documenttype[1] = doc_type("bar", "default"); f.comm_mgr->updateBucketSpacesConfig(config); @@ -314,7 +314,7 @@ void CommunicationManagerTest::bucket_space_config_can_be_updated_live() { f.bottom_link->waitForMessages(3, MESSAGE_WAIT_TIME_SEC); auto cmd3 = f.bottom_link->getCommand(2); - CPPUNIT_ASSERT_EQUAL(spi::FixedBucketSpaces::default_space(), cmd3->getBucket().getBucketSpace()); + CPPUNIT_ASSERT_EQUAL(document::FixedBucketSpaces::default_space(), cmd3->getBucket().getBucketSpace()); CPPUNIT_ASSERT_EQUAL(uint64_t(0), f.comm_mgr->metrics().bucketSpaceMappingFailures.getValue()); } diff --git a/storage/src/tests/storageserver/configurable_bucket_resolver_test.cpp b/storage/src/tests/storageserver/configurable_bucket_resolver_test.cpp index 3f121240065..4d80192d9e9 100644 --- a/storage/src/tests/storageserver/configurable_bucket_resolver_test.cpp +++ b/storage/src/tests/storageserver/configurable_bucket_resolver_test.cpp @@ -2,7 +2,7 @@ #include <vespa/storage/storageserver/configurable_bucket_resolver.h> #include <vespa/document/base/documentid.h> -#include <vespa/persistence/spi/fixed_bucket_spaces.h> +#include <vespa/document/bucket/fixed_bucket_spaces.h> #include <cppunit/extensions/HelperMacros.h> namespace storage { @@ -25,9 +25,9 @@ struct ConfigurableBucketResolverTest : CppUnit::TestFixture { using BucketSpaceMapping = ConfigurableBucketResolver::BucketSpaceMapping; BucketSpaceMapping create_simple_mapping() { - return {{"foo", spi::FixedBucketSpaces::default_space()}, - {"bar", spi::FixedBucketSpaces::default_space()}, - {"baz", spi::FixedBucketSpaces::global_space()}}; + return {{"foo", document::FixedBucketSpaces::default_space()}, + {"bar", document::FixedBucketSpaces::default_space()}, + {"baz", document::FixedBucketSpaces::global_space()}}; } ConfigurableBucketResolver create_empty_resolver() { @@ -54,47 +54,47 @@ CPPUNIT_TEST_SUITE_REGISTRATION(ConfigurableBucketResolverTest); // TODO reduce overlap with FixedBucketSpacesTest void ConfigurableBucketResolverTest::bucket_space_from_name_is_defined_for_default_space() { auto space = create_empty_resolver().bucketSpaceFromName("default"); - CPPUNIT_ASSERT_EQUAL(spi::FixedBucketSpaces::default_space(), space); + CPPUNIT_ASSERT_EQUAL(document::FixedBucketSpaces::default_space(), space); } void ConfigurableBucketResolverTest::bucket_space_from_name_is_defined_for_global_space() { auto space = create_empty_resolver().bucketSpaceFromName("global"); - CPPUNIT_ASSERT_EQUAL(spi::FixedBucketSpaces::global_space(), space); + CPPUNIT_ASSERT_EQUAL(document::FixedBucketSpaces::global_space(), space); } void ConfigurableBucketResolverTest::bucket_space_from_name_throws_exception_for_unknown_space() { try { create_empty_resolver().bucketSpaceFromName("bjarne"); CPPUNIT_FAIL("Expected exception on unknown bucket space name"); - } catch (spi::UnknownBucketSpaceException& e) { + } catch (document::UnknownBucketSpaceException& e) { } } void ConfigurableBucketResolverTest::name_from_bucket_space_is_defined_for_default_space() { CPPUNIT_ASSERT_EQUAL(vespalib::string("default"), - create_empty_resolver().nameFromBucketSpace(spi::FixedBucketSpaces::default_space())); + create_empty_resolver().nameFromBucketSpace(document::FixedBucketSpaces::default_space())); } void ConfigurableBucketResolverTest::name_from_bucket_space_is_defined_for_global_space() { CPPUNIT_ASSERT_EQUAL(vespalib::string("global"), - create_empty_resolver().nameFromBucketSpace(spi::FixedBucketSpaces::global_space())); + create_empty_resolver().nameFromBucketSpace(document::FixedBucketSpaces::global_space())); } void ConfigurableBucketResolverTest::name_from_bucket_space_throws_exception_for_unknown_space() { try { create_empty_resolver().nameFromBucketSpace(document::BucketSpace(1234)); CPPUNIT_FAIL("Expected exception on unknown bucket space value"); - } catch (spi::UnknownBucketSpaceException& e) { + } catch (document::UnknownBucketSpaceException& e) { } } void ConfigurableBucketResolverTest::known_bucket_space_is_resolved_from_document_id() { auto resolver = create_simple_resolver(); - CPPUNIT_ASSERT_EQUAL(spi::FixedBucketSpaces::default_space(), + CPPUNIT_ASSERT_EQUAL(document::FixedBucketSpaces::default_space(), resolver.bucketFromId(DocumentId("id::foo::xyz")).getBucketSpace()); - CPPUNIT_ASSERT_EQUAL(spi::FixedBucketSpaces::default_space(), + CPPUNIT_ASSERT_EQUAL(document::FixedBucketSpaces::default_space(), resolver.bucketFromId(DocumentId("id::bar::xyz")).getBucketSpace()); - CPPUNIT_ASSERT_EQUAL(spi::FixedBucketSpaces::global_space(), + CPPUNIT_ASSERT_EQUAL(document::FixedBucketSpaces::global_space(), resolver.bucketFromId(DocumentId("id::baz::xyz")).getBucketSpace()); } @@ -102,7 +102,7 @@ void ConfigurableBucketResolverTest::unknown_bucket_space_in_id_throws_exception try { create_simple_resolver().bucketFromId(DocumentId("id::bjarne::xyz")); CPPUNIT_FAIL("Expected exception on unknown document type -> bucket space mapping"); - } catch (spi::UnknownBucketSpaceException& e) { + } catch (document::UnknownBucketSpaceException& e) { } } @@ -125,11 +125,11 @@ void ConfigurableBucketResolverTest::can_create_resolver_from_bucket_space_confi builder.documenttype.emplace_back(make_doc_type("bar", "global")); builder.documenttype.emplace_back(make_doc_type("baz", "global")); auto resolver = ConfigurableBucketResolver::from_config(builder); - CPPUNIT_ASSERT_EQUAL(spi::FixedBucketSpaces::default_space(), + CPPUNIT_ASSERT_EQUAL(document::FixedBucketSpaces::default_space(), resolver->bucketFromId(DocumentId("id::foo::xyz")).getBucketSpace()); - CPPUNIT_ASSERT_EQUAL(spi::FixedBucketSpaces::global_space(), + CPPUNIT_ASSERT_EQUAL(document::FixedBucketSpaces::global_space(), resolver->bucketFromId(DocumentId("id::bar::xyz")).getBucketSpace()); - CPPUNIT_ASSERT_EQUAL(spi::FixedBucketSpaces::global_space(), + CPPUNIT_ASSERT_EQUAL(document::FixedBucketSpaces::global_space(), resolver->bucketFromId(DocumentId("id::baz::xyz")).getBucketSpace()); } diff --git a/storage/src/vespa/storage/bucketdb/bucketmanager.cpp b/storage/src/vespa/storage/bucketdb/bucketmanager.cpp index 1b118e72ded..62094bce395 100644 --- a/storage/src/vespa/storage/bucketdb/bucketmanager.cpp +++ b/storage/src/vespa/storage/bucketdb/bucketmanager.cpp @@ -16,7 +16,7 @@ #include <vespa/storageapi/message/state.h> #include <vespa/storageapi/message/bucketsplitting.h> #include <vespa/storageapi/message/stat.h> -#include <vespa/persistence/spi/fixed_bucket_spaces.h> +#include <vespa/document/bucket/fixed_bucket_spaces.h> #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/stllike/hash_map.hpp> #include <vespa/config/config.h> @@ -342,7 +342,7 @@ BucketManager::reportStatus(std::ostream& out, xmlReporter << vespalib::xml::XmlTag("buckets"); for (auto& space : _component.getBucketSpaceRepo()) { xmlReporter << XmlTag("bucket-space") - << XmlAttribute("name", spi::FixedBucketSpaces::to_string(space.first)); + << XmlAttribute("name", document::FixedBucketSpaces::to_string(space.first)); BucketDBDumper dumper(xmlReporter.getStream()); _component.getBucketSpaceRepo().get(space.first).bucketDatabase().chunkedAll( dumper, "BucketManager::reportStatus"); diff --git a/storage/src/vespa/storage/bucketmover/bucketmover.cpp b/storage/src/vespa/storage/bucketmover/bucketmover.cpp index 94db4ee9f32..b47b3b59b4f 100644 --- a/storage/src/vespa/storage/bucketmover/bucketmover.cpp +++ b/storage/src/vespa/storage/bucketmover/bucketmover.cpp @@ -9,7 +9,7 @@ #include <vespa/storage/storageutil/log.h> #include <vespa/config/common/exceptions.h> #include <vespa/vespalib/util/stringfmt.h> -#include <vespa/persistence/spi/fixed_bucket_spaces.h> +#include <vespa/document/bucket/fixed_bucket_spaces.h> #include <thread> #include <vespa/log/bufferedlogger.h> @@ -115,7 +115,7 @@ BucketMover::startNewRun() // If so, we have to spawn off an individual Run per space, as it encompasses // both a (disk) distribution and a bucket database. _currentRun = std::make_unique<bucketmover::Run>( - _component.getBucketSpaceRepo().get(spi::FixedBucketSpaces::default_space()), + _component.getBucketSpaceRepo().get(document::FixedBucketSpaces::default_space()), *_component.getStateUpdater().getReportedNodeState(), _component.getIndex(), _component.getClock()); @@ -363,7 +363,7 @@ BucketMover::storageDistributionChanged() } lib::Distribution::DiskDistribution BucketMover::currentDiskDistribution() const { - auto distribution = _component.getBucketSpaceRepo().get(spi::FixedBucketSpaces::default_space()).getDistribution(); + auto distribution = _component.getBucketSpaceRepo().get(document::FixedBucketSpaces::default_space()).getDistribution(); return distribution->getDiskDistribution(); } diff --git a/storage/src/vespa/storage/bucketmover/move.cpp b/storage/src/vespa/storage/bucketmover/move.cpp index 28ab48223e8..12b38980818 100644 --- a/storage/src/vespa/storage/bucketmover/move.cpp +++ b/storage/src/vespa/storage/bucketmover/move.cpp @@ -1,7 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "move.h" -#include <vespa/persistence/spi/fixed_bucket_spaces.h> +#include <vespa/document/bucket/fixed_bucket_spaces.h> #include <ostream> namespace storage { diff --git a/storage/src/vespa/storage/common/content_bucket_space_repo.cpp b/storage/src/vespa/storage/common/content_bucket_space_repo.cpp index d75e0b4cbb3..304c6eddddc 100644 --- a/storage/src/vespa/storage/common/content_bucket_space_repo.cpp +++ b/storage/src/vespa/storage/common/content_bucket_space_repo.cpp @@ -1,7 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "content_bucket_space_repo.h" -#include <vespa/persistence/spi/fixed_bucket_spaces.h> +#include <vespa/document/bucket/fixed_bucket_spaces.h> using document::BucketSpace; @@ -10,7 +10,7 @@ namespace storage { ContentBucketSpaceRepo::ContentBucketSpaceRepo() : _map() { - _map.emplace(spi::FixedBucketSpaces::default_space(), std::make_unique<ContentBucketSpace>(spi::FixedBucketSpaces::default_space())); + _map.emplace(document::FixedBucketSpaces::default_space(), std::make_unique<ContentBucketSpace>(document::FixedBucketSpaces::default_space())); } ContentBucketSpace & @@ -22,7 +22,7 @@ ContentBucketSpaceRepo::get(BucketSpace bucketSpace) const } void ContentBucketSpaceRepo::enableGlobalBucketSpace() { - _map.emplace(spi::FixedBucketSpaces::global_space(), std::make_unique<ContentBucketSpace>(spi::FixedBucketSpaces::global_space())); + _map.emplace(document::FixedBucketSpaces::global_space(), std::make_unique<ContentBucketSpace>(document::FixedBucketSpaces::global_space())); } ContentBucketSpaceRepo::BucketSpaces diff --git a/storage/src/vespa/storage/distributor/distributor.cpp b/storage/src/vespa/storage/distributor/distributor.cpp index 82d0c873cb6..f79d1b04c7d 100644 --- a/storage/src/vespa/storage/distributor/distributor.cpp +++ b/storage/src/vespa/storage/distributor/distributor.cpp @@ -12,7 +12,7 @@ #include <vespa/storage/common/hostreporter/hostinfo.h> #include <vespa/storage/common/global_bucket_space_distribution_converter.h> #include <vespa/storageframework/generic/status/xmlstatusreporter.h> -#include <vespa/persistence/spi/fixed_bucket_spaces.h> +#include <vespa/document/bucket/fixed_bucket_spaces.h> #include <vespa/log/log.h> LOG_SETUP(".distributor-main"); @@ -534,10 +534,10 @@ void Distributor::propagateDefaultDistribution( std::shared_ptr<const lib::Distribution> distribution) { - _bucketSpaceRepo->get(spi::FixedBucketSpaces::default_space()).setDistribution(distribution); + _bucketSpaceRepo->get(document::FixedBucketSpaces::default_space()).setDistribution(distribution); if (_component.enableMultipleBucketSpaces()) { auto global_distr = GlobalBucketSpaceDistributionConverter::convert_to_global(*distribution); - _bucketSpaceRepo->get(spi::FixedBucketSpaces::global_space()).setDistribution(std::move(global_distr)); + _bucketSpaceRepo->get(document::FixedBucketSpaces::global_space()).setDistribution(std::move(global_distr)); } } diff --git a/storage/src/vespa/storage/distributor/distributor_bucket_space_repo.cpp b/storage/src/vespa/storage/distributor/distributor_bucket_space_repo.cpp index aad3bee8b32..d963492ffb4 100644 --- a/storage/src/vespa/storage/distributor/distributor_bucket_space_repo.cpp +++ b/storage/src/vespa/storage/distributor/distributor_bucket_space_repo.cpp @@ -3,7 +3,7 @@ #include "distributor_bucket_space_repo.h" #include "distributor_bucket_space.h" #include <vespa/vdslib/distribution/distribution.h> -#include <vespa/persistence/spi/fixed_bucket_spaces.h> +#include <vespa/document/bucket/fixed_bucket_spaces.h> #include <cassert> #include <vespa/log/log.h> @@ -17,9 +17,9 @@ namespace distributor { DistributorBucketSpaceRepo::DistributorBucketSpaceRepo(bool enableGlobalBucketSpace) : _map() { - add(spi::FixedBucketSpaces::default_space(), std::make_unique<DistributorBucketSpace>()); + add(document::FixedBucketSpaces::default_space(), std::make_unique<DistributorBucketSpace>()); if (enableGlobalBucketSpace) { - add(spi::FixedBucketSpaces::global_space(), std::make_unique<DistributorBucketSpace>()); + add(document::FixedBucketSpaces::global_space(), std::make_unique<DistributorBucketSpace>()); } } diff --git a/storage/src/vespa/storage/distributor/idealstatemanager.cpp b/storage/src/vespa/storage/distributor/idealstatemanager.cpp index d132d0e018c..4018bb88583 100644 --- a/storage/src/vespa/storage/distributor/idealstatemanager.cpp +++ b/storage/src/vespa/storage/distributor/idealstatemanager.cpp @@ -9,7 +9,7 @@ #include <vespa/storageapi/message/persistence.h> #include <vespa/storageapi/message/multioperation.h> #include <vespa/storage/common/bucketmessages.h> -#include <vespa/persistence/spi/fixed_bucket_spaces.h> +#include <vespa/document/bucket/fixed_bucket_spaces.h> #include <vespa/vespalib/stllike/hash_map.hpp> #include "distributor_bucket_space_repo.h" #include "distributor_bucket_space.h" @@ -269,7 +269,7 @@ IdealStateManager::getBucketStatus( } void IdealStateManager::dump_bucket_space_db_status(document::BucketSpace bucket_space, std::ostream& out) const { - out << "<h2>" << spi::FixedBucketSpaces::to_string(bucket_space) << " - " << bucket_space << "</h2>\n"; + out << "<h2>" << document::FixedBucketSpaces::to_string(bucket_space) << " - " << bucket_space << "</h2>\n"; StatusBucketVisitor proc(*this, bucket_space, out); auto &distributorBucketSpace(_bucketSpaceRepo.get(bucket_space)); diff --git a/storage/src/vespa/storage/distributor/pendingclusterstate.cpp b/storage/src/vespa/storage/distributor/pendingclusterstate.cpp index 19257192022..51ef710d316 100644 --- a/storage/src/vespa/storage/distributor/pendingclusterstate.cpp +++ b/storage/src/vespa/storage/distributor/pendingclusterstate.cpp @@ -7,7 +7,7 @@ #include "distributor_bucket_space.h" #include <vespa/storageframework/defaultimplementation/clock/realclock.h> #include <vespa/storage/common/bucketoperationlogger.h> -#include <vespa/persistence/spi/fixed_bucket_spaces.h> +#include <vespa/document/bucket/fixed_bucket_spaces.h> #include <vespa/vespalib/util/xmlstream.hpp> #include <climits> @@ -93,7 +93,7 @@ PendingClusterState::initializeBucketSpaceTransitions(bool distributionChanged, void PendingClusterState::logConstructionInformation() const { - const auto &distributorBucketSpace(_bucketSpaceRepo.get(spi::FixedBucketSpaces::default_space())); + const auto &distributorBucketSpace(_bucketSpaceRepo.get(document::FixedBucketSpaces::default_space())); const auto &distribution(distributorBucketSpace.getDistribution()); LOG(debug, "New PendingClusterState constructed with previous cluster " diff --git a/storage/src/vespa/storage/frameworkimpl/component/servicelayercomponentregisterimpl.cpp b/storage/src/vespa/storage/frameworkimpl/component/servicelayercomponentregisterimpl.cpp index 7a882c9539f..29c69b59760 100644 --- a/storage/src/vespa/storage/frameworkimpl/component/servicelayercomponentregisterimpl.cpp +++ b/storage/src/vespa/storage/frameworkimpl/component/servicelayercomponentregisterimpl.cpp @@ -2,7 +2,7 @@ #include "servicelayercomponentregisterimpl.h" #include <vespa/vespalib/util/exceptions.h> -#include <vespa/persistence/spi/fixed_bucket_spaces.h> +#include <vespa/document/bucket/fixed_bucket_spaces.h> #include <vespa/storage/common/global_bucket_space_distribution_converter.h> namespace storage { @@ -41,10 +41,10 @@ ServiceLayerComponentRegisterImpl::setDiskCount(uint16_t count) void ServiceLayerComponentRegisterImpl::setDistribution(lib::Distribution::SP distribution) { - _bucketSpaceRepo.get(spi::FixedBucketSpaces::default_space()).setDistribution(distribution); + _bucketSpaceRepo.get(document::FixedBucketSpaces::default_space()).setDistribution(distribution); if (enableMultipleBucketSpaces()) { auto global_distr = GlobalBucketSpaceDistributionConverter::convert_to_global(*distribution); - _bucketSpaceRepo.get(spi::FixedBucketSpaces::global_space()).setDistribution(global_distr); + _bucketSpaceRepo.get(document::FixedBucketSpaces::global_space()).setDistribution(global_distr); } StorageComponentRegisterImpl::setDistribution(distribution); } diff --git a/storage/src/vespa/storage/storageserver/communicationmanager.cpp b/storage/src/vespa/storage/storageserver/communicationmanager.cpp index eecf2b0be69..e64f28ca6e9 100644 --- a/storage/src/vespa/storage/storageserver/communicationmanager.cpp +++ b/storage/src/vespa/storage/storageserver/communicationmanager.cpp @@ -18,7 +18,7 @@ #include <vespa/vespalib/util/stringfmt.h> #include <vespa/log/bufferedlogger.h> -#include <vespa/persistence/spi/fixed_bucket_spaces.h> +#include <vespa/document/bucket/fixed_bucket_spaces.h> LOG_SETUP(".communication.manager"); @@ -123,7 +123,7 @@ CommunicationManager::handleMessage(std::unique_ptr<mbus::Message> msg) std::unique_ptr<api::StorageCommand> cmd; try { cmd = _docApiConverter.toStorageAPI(static_cast<documentapi::DocumentMessage&>(*docMsgPtr), _component.getTypeRepo()); - } catch (spi::UnknownBucketSpaceException& e) { + } catch (document::UnknownBucketSpaceException& e) { fail_with_unresolvable_bucket_space(std::move(docMsgPtr), e.getMessage()); return; } @@ -274,8 +274,8 @@ struct PlaceHolderBucketResolver : public BucketResolver { return document::BucketSpace::placeHolder(); } virtual vespalib::string nameFromBucketSpace(const document::BucketSpace &bucketSpace) const override { - assert(bucketSpace == spi::FixedBucketSpaces::default_space()); - return spi::FixedBucketSpaces::to_string(bucketSpace); + assert(bucketSpace == document::FixedBucketSpaces::default_space()); + return document::FixedBucketSpaces::to_string(bucketSpace); } }; diff --git a/storage/src/vespa/storage/storageserver/configurable_bucket_resolver.cpp b/storage/src/vespa/storage/storageserver/configurable_bucket_resolver.cpp index 9d1ea2d00b5..bd4a60f851a 100644 --- a/storage/src/vespa/storage/storageserver/configurable_bucket_resolver.cpp +++ b/storage/src/vespa/storage/storageserver/configurable_bucket_resolver.cpp @@ -1,7 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/document/base/documentid.h> -#include <vespa/persistence/spi/fixed_bucket_spaces.h> +#include <vespa/document/bucket/fixed_bucket_spaces.h> #include <vespa/vespalib/util/exceptions.h> #include "configurable_bucket_resolver.h" @@ -12,23 +12,23 @@ document::Bucket ConfigurableBucketResolver::bucketFromId(const document::Docume if (iter != _type_to_space.end()) { return document::Bucket(iter->second, document::BucketId(0)); } - throw spi::UnknownBucketSpaceException("Unknown bucket space mapping for document type '" + throw document::UnknownBucketSpaceException("Unknown bucket space mapping for document type '" + id.getDocType() + "' in id: '" + id.toString() + "'", VESPA_STRLOC); } document::BucketSpace ConfigurableBucketResolver::bucketSpaceFromName(const vespalib::string& name) const { - return spi::FixedBucketSpaces::from_string(name); + return document::FixedBucketSpaces::from_string(name); } vespalib::string ConfigurableBucketResolver::nameFromBucketSpace(const document::BucketSpace& space) const { - return spi::FixedBucketSpaces::to_string(space); + return document::FixedBucketSpaces::to_string(space); } std::shared_ptr<ConfigurableBucketResolver> ConfigurableBucketResolver::from_config( const vespa::config::content::core::BucketspacesConfig& config) { ConfigurableBucketResolver::BucketSpaceMapping type_to_space; for (auto& mapping : config.documenttype) { - type_to_space.emplace(mapping.name, spi::FixedBucketSpaces::from_string(mapping.bucketspace)); + type_to_space.emplace(mapping.name, document::FixedBucketSpaces::from_string(mapping.bucketspace)); } return std::make_shared<ConfigurableBucketResolver>(std::move(type_to_space)); } diff --git a/storage/src/vespa/storage/storageserver/configurable_bucket_resolver.h b/storage/src/vespa/storage/storageserver/configurable_bucket_resolver.h index ab296c86c4c..0800cc9612e 100644 --- a/storage/src/vespa/storage/storageserver/configurable_bucket_resolver.h +++ b/storage/src/vespa/storage/storageserver/configurable_bucket_resolver.h @@ -14,7 +14,7 @@ namespace storage { * mapping from document type to bucket space. * * If an unknown document type or bucket space is given as an argument, - * an spi::UnknownBucketSpaceException is thrown. + * a document::UnknownBucketSpaceException is thrown. */ class ConfigurableBucketResolver : public BucketResolver { public: |