Make document::BucketSpace a mandatory argument to

ServiceLayerComponent::getBucketDatabase().

1 files changed, 7 insertions, 2 deletions

diff --git a/storage/src/tests/bucketmover/bucketmovertest.cpp b/storage/src/tests/bucketmover/bucketmovertest.cpp
index f7c69c4cec4..aad66624e89 100644
--- a/storage/src/tests/bucketmover/bucketmovertest.cpp
+++ b/storage/src/tests/bucketmover/bucketmovertest.cpp
@@ -3,6 +3,8 @@
 #include <vespa/storage/bucketdb/storbucketdb.h>
 #include <vespa/storage/common/bucketmessages.h>
 #include <vespa/storage/bucketmover/bucketmover.h>
+#include <vespa/document/test/make_bucket_space.h>
+#include <vespa/document/test/make_document_bucket.h>
 #include <tests/common/dummystoragelink.h>
 #include <tests/common/testhelper.h>
 #include <tests/common/teststorageapp.h>
@@ -10,6 +12,9 @@
 
 bool debug = false;
 
+using document::test::makeBucketSpace;
+using document::test::makeDocumentBucket;
+
 namespace storage {
 namespace bucketmover {
 
@@ -66,14 +71,14 @@ BucketMoverTest::addBucket(const document::BucketId& id,
                            uint16_t idealDiff)
 {
     StorBucketDatabase::WrappedEntry entry(
-            _component->getBucketDatabase().get(
+            _component->getBucketDatabase(makeBucketSpace()).get(
                     id,
                     "",
                     StorBucketDatabase::CREATE_IF_NONEXISTING));
 
     entry->setBucketInfo(api::BucketInfo(1,1,1));
 
-    uint16_t idealDisk = _component->getIdealPartition(id);
+    uint16_t idealDisk = _component->getIdealPartition(makeDocumentBucket(id));
     entry->disk = (idealDisk + idealDiff) % _component->getDiskCount();
     entry.write();
 }