Add bucket space to create visitor command.

5 files changed, 12 insertions, 5 deletions

diff --git a/storageapi/src/tests/mbusprot/storageprotocoltest.cpp b/storageapi/src/tests/mbusprot/storageprotocoltest.cpp
index 0c8b5d326fe..cb0cf756586 100644
--- a/storageapi/src/tests/mbusprot/storageprotocoltest.cpp
+++ b/storageapi/src/tests/mbusprot/storageprotocoltest.cpp
@@ -660,7 +660,7 @@ StorageProtocolTest::testCreateVisitor51()
     buckets.push_back(document::BucketId(16, 2));
 
     CreateVisitorCommand::SP cmd(
-            new CreateVisitorCommand("library", "id", "doc selection"));
+            new CreateVisitorCommand(makeBucketSpace(), "library", "id", "doc selection"));
     cmd->setControlDestination("controldest");
     cmd->setDataDestination("datadest");
     cmd->setVisitorCmdId(1);
diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization4_2.cpp b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization4_2.cpp
index d207b307593..e4993a1ee7b 100644
--- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization4_2.cpp
+++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization4_2.cpp
@@ -562,11 +562,12 @@ ProtocolSerialization4_2::onEncode(
 api::StorageCommand::UP
 ProtocolSerialization4_2::onDecodeCreateVisitorCommand(BBuf& buf) const
 {
+    BucketSpace bucketSpace(BucketSpace::placeHolder());
     vespalib::stringref libraryName = SH::getString(buf);
     vespalib::stringref instanceId = SH::getString(buf);
     vespalib::stringref selection = SH::getString(buf);
     api::CreateVisitorCommand::UP msg(
-            new api::CreateVisitorCommand(libraryName, instanceId, selection));
+            new api::CreateVisitorCommand(bucketSpace, libraryName, instanceId, selection));
     msg->setVisitorCmdId(SH::getInt(buf));
     msg->setControlDestination(SH::getString(buf));
     msg->setDataDestination(SH::getString(buf));
diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_1.cpp b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_1.cpp
index 4f84eff0ab8..dc97742b733 100644
--- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_1.cpp
+++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_1.cpp
@@ -161,11 +161,12 @@ ProtocolSerialization5_1::onEncode(
 api::StorageCommand::UP
 ProtocolSerialization5_1::onDecodeCreateVisitorCommand(BBuf& buf) const
 {
+    BucketSpace bucketSpace(BucketSpace::placeHolder());
     vespalib::stringref libraryName = SH::getString(buf);
     vespalib::stringref instanceId = SH::getString(buf);
     vespalib::stringref selection = SH::getString(buf);
     api::CreateVisitorCommand::UP msg(
-            new api::CreateVisitorCommand(libraryName, instanceId, selection));
+            new api::CreateVisitorCommand(bucketSpace, libraryName, instanceId, selection));
     msg->setVisitorCmdId(SH::getInt(buf));
     msg->setControlDestination(SH::getString(buf));
     msg->setDataDestination(SH::getString(buf));
diff --git a/storageapi/src/vespa/storageapi/message/visitor.cpp b/storageapi/src/vespa/storageapi/message/visitor.cpp
index 8c10eb501b2..7b5a614bd3e 100644
--- a/storageapi/src/vespa/storageapi/message/visitor.cpp
+++ b/storageapi/src/vespa/storageapi/message/visitor.cpp
@@ -13,10 +13,12 @@ IMPLEMENT_REPLY(DestroyVisitorReply)
 IMPLEMENT_COMMAND(VisitorInfoCommand, VisitorInfoReply)
 IMPLEMENT_REPLY(VisitorInfoReply)
 
-CreateVisitorCommand::CreateVisitorCommand(const vespalib::stringref & libraryName,
+CreateVisitorCommand::CreateVisitorCommand(document::BucketSpace bucketSpace,
+                                           const vespalib::stringref & libraryName,
                                            const vespalib::stringref & instanceId,
                                            const vespalib::stringref & docSelection)
     : StorageCommand(MessageType::VISITOR_CREATE),
+      _bucketSpace(bucketSpace),
       _libName(libraryName),
       _params(),
       _controlDestination(),
@@ -41,6 +43,7 @@ CreateVisitorCommand::CreateVisitorCommand(const vespalib::stringref & libraryNa
 
 CreateVisitorCommand::CreateVisitorCommand(const CreateVisitorCommand& o)
     : StorageCommand(o),
+      _bucketSpace(o._bucketSpace),
       _libName(o._libName),
       _params(o._params),
       _controlDestination(o._controlDestination),
diff --git a/storageapi/src/vespa/storageapi/message/visitor.h b/storageapi/src/vespa/storageapi/message/visitor.h
index 3d659831351..b9094a293dd 100644
--- a/storageapi/src/vespa/storageapi/message/visitor.h
+++ b/storageapi/src/vespa/storageapi/message/visitor.h
@@ -26,6 +26,7 @@ namespace api {
  */
 class CreateVisitorCommand : public StorageCommand {
 private:
+    document::BucketSpace _bucketSpace;
     vespalib::string _libName; // Name of visitor library to use, ie. DumpVisitor.so
     vdslib::Parameters _params;
 
@@ -53,7 +54,8 @@ private:
     uint32_t _maxBucketsPerVisitor;
 
 public:
-    CreateVisitorCommand(const vespalib::stringref & libraryName,
+    CreateVisitorCommand(document::BucketSpace bucketSpace,
+                         const vespalib::stringref & libraryName,
                          const vespalib::stringref & instanceId,
                          const vespalib::stringref & docSelection);