Add bucket space concept to DocumentDB and wire it into setup of PersistenceEngine.

4 files changed, 8 insertions, 3 deletions

diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp
index da85bb3e8c0..8787882b5ae 100644
--- a/searchcore/src/tests/proton/docsummary/docsummary.cpp
+++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp
@@ -209,7 +209,8 @@ public:
         _configMgr.nextGeneration(0);
         if (! FastOS_File::MakeDirectory((std::string("tmpdb/") + docTypeName).c_str())) { abort(); }
         _ddb.reset(new DocumentDB("tmpdb", _configMgr.getConfig(), "tcp/localhost:9013", _queryLimiter, _clock,
-                                  DocTypeName(docTypeName), *b->getProtonConfigSP(), *this, _summaryExecutor, _summaryExecutor,
+                                  DocTypeName(docTypeName), document::BucketSpace::placeHolder(),
+				  *b->getProtonConfigSP(), *this, _summaryExecutor, _summaryExecutor,
                                   _tls, _dummy, _fileHeaderContext, ConfigStore::UP(new MemoryConfigStore),
                                   std::make_shared<vespalib::ThreadStackExecutor>(16, 128 * 1024), _hwInfo)),
         _ddb->start();
diff --git a/searchcore/src/tests/proton/documentdb/documentdb_test.cpp b/searchcore/src/tests/proton/documentdb/documentdb_test.cpp
index 96b98dd4274..f737b2ed92c 100644
--- a/searchcore/src/tests/proton/documentdb/documentdb_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/documentdb_test.cpp
@@ -114,6 +114,7 @@ Fixture::Fixture()
     mgr.forwardConfig(b);
     mgr.nextGeneration(0);
     _db.reset(new DocumentDB(".", mgr.getConfig(), "tcp/localhost:9014", _queryLimiter, _clock, DocTypeName("typea"),
+                             document::BucketSpace::placeHolder(),
                              *b->getProtonConfigSP(), _myDBOwner, _summaryExecutor, _summaryExecutor, _tls, _dummy,
                              _fileHeaderContext, ConfigStore::UP(new MemoryConfigStore),
                              std::make_shared<vespalib::ThreadStackExecutor>(16, 128 * 1024), _hwInfo));
diff --git a/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp b/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp
index 97ff517821c..4422c67c5bd 100644
--- a/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp
+++ b/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp
@@ -14,6 +14,7 @@
 #include <set>
 
 using document::BucketId;
+using document::BucketSpace;
 using document::Document;
 using document::DocumentId;
 using document::DocumentType;
@@ -432,8 +433,8 @@ struct SimpleFixture {
           engine(_owner, _writeFilter, -1, false),
           hset()
     {
-        engine.putHandler(DocTypeName(doc1->getType()), hset.phandler1);
-        engine.putHandler(DocTypeName(doc2->getType()), hset.phandler2);
+        engine.putHandler(BucketSpace::placeHolder(), DocTypeName(doc1->getType()), hset.phandler1);
+        engine.putHandler(BucketSpace::placeHolder(), DocTypeName(doc2->getType()), hset.phandler2);
     }
 };
 
diff --git a/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp b/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp
index 08aa4430fde..a99eaa0daf6 100644
--- a/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp
+++ b/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp
@@ -230,11 +230,13 @@ struct MyProtonConfigurerOwner : public IProtonConfigurerOwner
     virtual ~MyProtonConfigurerOwner() { }
 
     virtual IDocumentDBConfigOwner *addDocumentDB(const DocTypeName &docTypeName,
+                                                  document::BucketSpace bucketSpace,
                                                   const vespalib::string &configId,
                                                   const std::shared_ptr<BootstrapConfig> &bootstrapConfig,
                                                   const std::shared_ptr<DocumentDBConfig> &documentDBConfig,
                                                   InitializeThreads initializeThreads) override
     {
+        (void) bucketSpace;
         (void) configId;
         (void) bootstrapConfig;
         (void) initializeThreads;