Revert "Revert "Use existing bucket space instead of placeholder value""

3 files changed, 26 insertions, 0 deletions

diff --git a/document/src/vespa/document/test/CMakeLists.txt b/document/src/vespa/document/test/CMakeLists.txt
index f16bfe0144a..1620a8fad39 100644
--- a/document/src/vespa/document/test/CMakeLists.txt
+++ b/document/src/vespa/document/test/CMakeLists.txt
@@ -1,6 +1,7 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(document_test OBJECT
     SOURCES
+    make_bucket_space.cpp
     make_document_bucket.cpp
     DEPENDS
 )
diff --git a/document/src/vespa/document/test/make_bucket_space.cpp b/document/src/vespa/document/test/make_bucket_space.cpp
new file mode 100644
index 00000000000..a213e5e36b7
--- /dev/null
+++ b/document/src/vespa/document/test/make_bucket_space.cpp
@@ -0,0 +1,12 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#include "make_bucket_space.h"
+
+namespace document::test {
+
+BucketSpace makeBucketSpace()
+{
+    return BucketSpace::placeHolder();
+}
+
+}
diff --git a/document/src/vespa/document/test/make_bucket_space.h b/document/src/vespa/document/test/make_bucket_space.h
new file mode 100644
index 00000000000..8289ec2030a
--- /dev/null
+++ b/document/src/vespa/document/test/make_bucket_space.h
@@ -0,0 +1,13 @@
+// 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>
+
+namespace document::test {
+
+// Helper function used by unit tests
+
+BucketSpace makeBucketSpace();
+
+}