Merge pull request #4882 from vespa-engine/toregge/move-fixed-bucketspaces-to-document-module

Move FixedBucketSpaces to document module.

3 files changed, 23 insertions, 23 deletions

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());
 }