Revert "Use existing bucket space instead of placeholder value"

3 files changed, 19 insertions, 25 deletions

diff --git a/storage/src/tests/visiting/commandqueuetest.cpp b/storage/src/tests/visiting/commandqueuetest.cpp
index 7b6d5dcafd6..91f196a9339 100644
--- a/storage/src/tests/visiting/commandqueuetest.cpp
+++ b/storage/src/tests/visiting/commandqueuetest.cpp
@@ -5,11 +5,9 @@
 #include <vespa/storageapi/message/visitor.h>
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/vespalib/stllike/asciistream.h>
-#include <vespa/document/test/make_bucket_space.h>
 
 
 using vespalib::string;
-using document::test::makeBucketSpace;
 
 namespace storage {
 
@@ -41,7 +39,7 @@ namespace {
         ost << name << " t=" << timeout << " p=" << static_cast<unsigned int>(priority);
         // Piggyback name in document selection
         std::shared_ptr<api::CreateVisitorCommand> cmd(
-                new api::CreateVisitorCommand(makeBucketSpace(), "", "", ost.str()));
+                new api::CreateVisitorCommand("", "", ost.str()));
         cmd->setQueueTimeout(timeout);
         cmd->setPriority(priority);
         return cmd;
diff --git a/storage/src/tests/visiting/visitormanagertest.cpp b/storage/src/tests/visiting/visitormanagertest.cpp
index 5da86a134e2..3c5780cf77c 100644
--- a/storage/src/tests/visiting/visitormanagertest.cpp
+++ b/storage/src/tests/visiting/visitormanagertest.cpp
@@ -13,7 +13,6 @@
 #include <tests/common/testhelper.h>
 #include <tests/common/dummystoragelink.h>
 #include <vespa/document/test/make_document_bucket.h>
-#include <vespa/document/test/make_bucket_space.h>
 #include <tests/storageserver/testvisitormessagesession.h>
 #include <vespa/documentapi/messagebus/messages/multioperationmessage.h>
 #include <vespa/documentapi/messagebus/messages/putdocumentmessage.h>
@@ -22,7 +21,6 @@
 #include <vespa/vespalib/util/exceptions.h>
 
 using document::test::makeDocumentBucket;
-using document::test::makeBucketSpace;
 
 namespace storage {
 namespace {
@@ -412,7 +410,7 @@ VisitorManagerTest::testNormalUsage()
     initializeTest();
     api::StorageMessageAddress address("storage", lib::NodeType::STORAGE, 0);
     std::shared_ptr<api::CreateVisitorCommand> cmd(
-            new api::CreateVisitorCommand(makeBucketSpace(), "DumpVisitor", "testvis", ""));
+            new api::CreateVisitorCommand("DumpVisitor", "testvis", ""));
     cmd->addBucketToBeVisited(document::BucketId(16, 3));
     cmd->setAddress(address);
     cmd->setControlDestination("foo/bar");
@@ -438,7 +436,7 @@ VisitorManagerTest::testResending()
     initializeTest();
     api::StorageMessageAddress address("storage", lib::NodeType::STORAGE, 0);
     std::shared_ptr<api::CreateVisitorCommand> cmd(
-            new api::CreateVisitorCommand(makeBucketSpace(), "DumpVisitor", "testvis", ""));
+            new api::CreateVisitorCommand("DumpVisitor", "testvis", ""));
     cmd->addBucketToBeVisited(document::BucketId(16, 3));
     cmd->setAddress(address);
     cmd->setControlDestination("foo/bar");
@@ -488,7 +486,7 @@ VisitorManagerTest::testVisitEmptyBucket()
     addSomeRemoves(true);
     api::StorageMessageAddress address("storage", lib::NodeType::STORAGE, 0);
     std::shared_ptr<api::CreateVisitorCommand> cmd(
-            new api::CreateVisitorCommand(makeBucketSpace(), "DumpVisitor", "testvis", ""));
+            new api::CreateVisitorCommand("DumpVisitor", "testvis", ""));
     cmd->addBucketToBeVisited(document::BucketId(16, 3));
 
     cmd->setAddress(address);
@@ -504,7 +502,7 @@ VisitorManagerTest::testMultiBucketVisit()
     initializeTest();
     api::StorageMessageAddress address("storage", lib::NodeType::STORAGE, 0);
     std::shared_ptr<api::CreateVisitorCommand> cmd(
-            new api::CreateVisitorCommand(makeBucketSpace(), "DumpVisitor", "testvis", ""));
+            new api::CreateVisitorCommand("DumpVisitor", "testvis", ""));
     for (uint32_t i=0; i<10; ++i) {
         cmd->addBucketToBeVisited(document::BucketId(16, i));
     }
@@ -529,7 +527,7 @@ VisitorManagerTest::testNoBuckets()
     initializeTest();
     api::StorageMessageAddress address("storage", lib::NodeType::STORAGE, 0);
     std::shared_ptr<api::CreateVisitorCommand> cmd(
-            new api::CreateVisitorCommand(makeBucketSpace(), "DumpVisitor", "testvis", ""));
+            new api::CreateVisitorCommand("DumpVisitor", "testvis", ""));
 
     cmd->setAddress(address);
     _top->sendDown(cmd);
@@ -555,7 +553,7 @@ void VisitorManagerTest::testVisitPutsAndRemoves()
     addSomeRemoves();
     api::StorageMessageAddress address("storage", lib::NodeType::STORAGE, 0);
     std::shared_ptr<api::CreateVisitorCommand> cmd(
-            new api::CreateVisitorCommand(makeBucketSpace(), "DumpVisitor", "testvis", ""));
+            new api::CreateVisitorCommand("DumpVisitor", "testvis", ""));
     cmd->setAddress(address);
     cmd->setVisitRemoves();
     for (uint32_t i=0; i<10; ++i) {
@@ -583,7 +581,7 @@ void VisitorManagerTest::testVisitWithTimeframeAndSelection()
     initializeTest();
     api::StorageMessageAddress address("storage", lib::NodeType::STORAGE, 0);
     std::shared_ptr<api::CreateVisitorCommand> cmd(
-            new api::CreateVisitorCommand(makeBucketSpace(), "DumpVisitor", "testvis",
+            new api::CreateVisitorCommand("DumpVisitor", "testvis",
                 "testdoctype1.headerval < 2"));
     cmd->setFromTime(3);
     cmd->setToTime(8);
@@ -615,7 +613,7 @@ void VisitorManagerTest::testVisitWithTimeframeAndBogusSelection()
     initializeTest();
     api::StorageMessageAddress address("storage", lib::NodeType::STORAGE, 0);
     std::shared_ptr<api::CreateVisitorCommand> cmd(
-            new api::CreateVisitorCommand(makeBucketSpace(), "DumpVisitor", "testvis",
+            new api::CreateVisitorCommand("DumpVisitor", "testvis",
                 "DocType(testdoctype1---///---) XXX BAD Field(headerval) < 2"));
     cmd->setFromTime(3);
     cmd->setToTime(8);
@@ -643,7 +641,7 @@ VisitorManagerTest::testVisitorCallbacks()
     std::ostringstream replydata;
     api::StorageMessageAddress address("storage", lib::NodeType::STORAGE, 0);
     std::shared_ptr<api::CreateVisitorCommand> cmd(
-            new api::CreateVisitorCommand(makeBucketSpace(), "TestVisitor", "testvis", ""));
+            new api::CreateVisitorCommand("TestVisitor", "testvis", ""));
     cmd->addBucketToBeVisited(document::BucketId(16, 3));
     cmd->addBucketToBeVisited(document::BucketId(16, 5));
     cmd->setAddress(address);
@@ -692,7 +690,7 @@ VisitorManagerTest::testVisitorCleanup()
         std::ostringstream ost;
         ost << "testvis" << i;
         std::shared_ptr<api::CreateVisitorCommand> cmd(
-                new api::CreateVisitorCommand(makeBucketSpace(), "InvalidVisitor", ost.str(), ""));
+                new api::CreateVisitorCommand("InvalidVisitor", ost.str(), ""));
         cmd->addBucketToBeVisited(document::BucketId(16, 3));
         cmd->setAddress(address);
         cmd->setQueueTimeout(0);
@@ -705,7 +703,7 @@ VisitorManagerTest::testVisitorCleanup()
         std::ostringstream ost;
         ost << "testvis" << (i + 10);
         std::shared_ptr<api::CreateVisitorCommand> cmd(
-                new api::CreateVisitorCommand(makeBucketSpace(), "DumpVisitor", ost.str(), ""));
+                new api::CreateVisitorCommand("DumpVisitor", ost.str(), ""));
         cmd->addBucketToBeVisited(document::BucketId(16, 3));
         cmd->setAddress(address);
         cmd->setQueueTimeout(0);
@@ -769,7 +767,7 @@ VisitorManagerTest::testVisitorCleanup()
         std::ostringstream ost;
         ost << "testvis" << (i + 24);
         std::shared_ptr<api::CreateVisitorCommand> cmd(
-                new api::CreateVisitorCommand(makeBucketSpace(), "DumpVisitor", ost.str(), ""));
+                new api::CreateVisitorCommand("DumpVisitor", ost.str(), ""));
         cmd->addBucketToBeVisited(document::BucketId(16, 3));
         cmd->setAddress(address);
         cmd->setQueueTimeout(0);
@@ -800,7 +798,7 @@ VisitorManagerTest::testAbortOnFailedVisitorInfo()
 
     {
         std::shared_ptr<api::CreateVisitorCommand> cmd(
-                new api::CreateVisitorCommand(makeBucketSpace(), "DumpVisitor", "testvis", ""));
+                new api::CreateVisitorCommand("DumpVisitor", "testvis", ""));
         cmd->addBucketToBeVisited(document::BucketId(16, 3));
         cmd->setAddress(address);
         cmd->setQueueTimeout(0);
@@ -865,7 +863,7 @@ VisitorManagerTest::testAbortOnFieldPathError()
 
     // Use bogus field path to force error to happen
     std::shared_ptr<api::CreateVisitorCommand> cmd(
-            new api::CreateVisitorCommand(makeBucketSpace(), "DumpVisitor",
+            new api::CreateVisitorCommand("DumpVisitor",
                                           "testvis",
                                           "testdoctype1.headerval{bogus} == 1234"));
     cmd->addBucketToBeVisited(document::BucketId(16, 3));
@@ -887,7 +885,7 @@ VisitorManagerTest::testVisitorQueueTimeout()
         vespalib::MonitorGuard guard(_manager->getThread(0).getQueueMonitor());
 
         std::shared_ptr<api::CreateVisitorCommand> cmd(
-                new api::CreateVisitorCommand(makeBucketSpace(), "DumpVisitor", "testvis", ""));
+                new api::CreateVisitorCommand("DumpVisitor", "testvis", ""));
         cmd->addBucketToBeVisited(document::BucketId(16, 3));
         cmd->setAddress(address);
         cmd->setQueueTimeout(1);
@@ -920,7 +918,7 @@ VisitorManagerTest::testVisitorProcessingTimeout()
     api::StorageMessageAddress address("storage", lib::NodeType::STORAGE, 0);
 
     std::shared_ptr<api::CreateVisitorCommand> cmd(
-            new api::CreateVisitorCommand(makeBucketSpace(), "DumpVisitor", "testvis", ""));
+            new api::CreateVisitorCommand("DumpVisitor", "testvis", ""));
     cmd->addBucketToBeVisited(document::BucketId(16, 3));
     cmd->setAddress(address);
     cmd->setQueueTimeout(0);
@@ -957,7 +955,7 @@ namespace {
         ost << "testvis" << ++nextVisitor;
         api::StorageMessageAddress address("storage", lib::NodeType::STORAGE, 0);
         std::shared_ptr<api::CreateVisitorCommand> cmd(
-                new api::CreateVisitorCommand(makeBucketSpace(), "DumpVisitor", ost.str(), ""));
+                new api::CreateVisitorCommand("DumpVisitor", ost.str(), ""));
         cmd->addBucketToBeVisited(document::BucketId(16, 3));
         cmd->setAddress(address);
         cmd->setQueueTimeout(timeout);
diff --git a/storage/src/tests/visiting/visitortest.cpp b/storage/src/tests/visiting/visitortest.cpp
index 00051d64b90..8abe7a3857d 100644
--- a/storage/src/tests/visiting/visitortest.cpp
+++ b/storage/src/tests/visiting/visitortest.cpp
@@ -4,7 +4,6 @@
 #include <vespa/document/fieldvalue/intfieldvalue.h>
 #include <vespa/document/fieldvalue/stringfieldvalue.h>
 #include <vespa/document/fieldvalue/rawfieldvalue.h>
-#include <vespa/document/test/make_bucket_space.h>
 #include <vespa/storageapi/message/datagram.h>
 #include <vespa/storageapi/message/persistence.h>
 #include <vespa/storage/persistence/filestorage/filestormanager.h>
@@ -21,7 +20,6 @@
 #include <thread>
 
 using namespace std::chrono_literals;
-using document::test::makeBucketSpace;
 
 namespace storage {
 
@@ -492,7 +490,7 @@ VisitorTest::makeCreateVisitor(const VisitorOptions& options)
 {
     api::StorageMessageAddress address("storage", lib::NodeType::STORAGE, 0);
     std::shared_ptr<api::CreateVisitorCommand> cmd(
-            new api::CreateVisitorCommand(makeBucketSpace(), options.visitorType, "testvis", ""));
+            new api::CreateVisitorCommand(options.visitorType, "testvis", ""));
     cmd->addBucketToBeVisited(document::BucketId(16, 3));
     cmd->setAddress(address);
     cmd->setMaximumPendingReplyCount(UINT32_MAX);