Use named constants instead of strings sprinkled all over.

13 files changed, 41 insertions, 39 deletions

diff --git a/storage/src/tests/distributor/distributortest.cpp b/storage/src/tests/distributor/distributortest.cpp
index 0da860d0542..dc0a01448af 100644
--- a/storage/src/tests/distributor/distributortest.cpp
+++ b/storage/src/tests/distributor/distributortest.cpp
@@ -8,6 +8,7 @@
 #include <vespa/storageframework/defaultimplementation/thread/threadpoolimpl.h>
 #include <tests/distributor/distributortestutil.h>
 #include <vespa/document/bucket/fixed_bucket_spaces.h>
+#include <vespa/document/fieldset/fieldsets.h>
 #include <vespa/document/test/make_document_bucket.h>
 #include <vespa/document/test/make_bucket_space.h>
 #include <vespa/storage/config/config-stor-distributormanager.h>
@@ -755,7 +756,7 @@ auto make_dummy_get_command_for_bucket_1() {
     return std::make_shared<api::GetCommand>(
             makeDocumentBucket(document::BucketId(0)),
             document::DocumentId("id:foo:testdoctype1:n=1:foo"),
-            "[all]");
+            document::AllFields::NAME);
 }
 
 }
diff --git a/storage/src/tests/distributor/externaloperationhandlertest.cpp b/storage/src/tests/distributor/externaloperationhandlertest.cpp
index 03ba148277e..1f0fba90200 100644
--- a/storage/src/tests/distributor/externaloperationhandlertest.cpp
+++ b/storage/src/tests/distributor/externaloperationhandlertest.cpp
@@ -8,6 +8,7 @@
 #include <vespa/storageapi/message/persistence.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/update/documentupdate.h>
+#include <vespa/document/fieldset/fieldsets.h>
 #include <vespa/document/test/make_document_bucket.h>
 #include <vespa/vespalib/gtest/gtest.h>
 
@@ -157,13 +158,13 @@ ExternalOperationHandlerTest::findOwned1stNotOwned2ndInStates(
 
 std::shared_ptr<api::GetCommand>
 ExternalOperationHandlerTest::makeGetCommand(const vespalib::string& id) const {
-    return std::make_shared<api::GetCommand>(makeDocumentBucket(document::BucketId(0)), DocumentId(id), "[all]");
+    return std::make_shared<api::GetCommand>(makeDocumentBucket(document::BucketId(0)), DocumentId(id), document::AllFields::NAME);
 }
 
 std::shared_ptr<api::GetCommand>
 ExternalOperationHandlerTest::makeGetCommandForUser(uint64_t id) const {
     DocumentId docId(vespalib::make_string("id:foo:test:n=%" PRIu64 ":bar", id));
-    return std::make_shared<api::GetCommand>(makeDocumentBucket(document::BucketId(0)), docId, "[all]");
+    return std::make_shared<api::GetCommand>(makeDocumentBucket(document::BucketId(0)), docId, document::AllFields::NAME);
 }
 
 std::shared_ptr<api::UpdateCommand> ExternalOperationHandlerTest::makeUpdateCommand(
diff --git a/storage/src/tests/distributor/getoperationtest.cpp b/storage/src/tests/distributor/getoperationtest.cpp
index d4d14314790..09e4f41d275 100644
--- a/storage/src/tests/distributor/getoperationtest.cpp
+++ b/storage/src/tests/distributor/getoperationtest.cpp
@@ -3,6 +3,7 @@
 #include <vespa/config/helper/configgetter.h>
 #include <vespa/document/config/config-documenttypes.h>
 #include <vespa/document/repo/documenttyperepo.h>
+#include <vespa/document/fieldset/fieldsets.h>
 #include <vespa/storage/bucketdb/bucketdatabase.h>
 #include <vespa/storage/distributor/distributor_bucket_space.h>
 #include <vespa/storage/distributor/externaloperationhandler.h>
@@ -53,7 +54,7 @@ struct GetOperationTest : Test, DistributorTestUtil {
     }
 
     void sendGet(api::InternalReadConsistency consistency = api::InternalReadConsistency::Strong) {
-        auto msg = std::make_shared<api::GetCommand>(makeDocumentBucket(BucketId(0)), docId, "[all]");
+        auto msg = std::make_shared<api::GetCommand>(makeDocumentBucket(BucketId(0)), docId, document::AllFields::NAME);
         op = std::make_unique<GetOperation>(
                 getExternalOperationHandler(), getDistributorBucketSpace(),
                 getDistributorBucketSpace().getBucketDatabase().acquire_read_guard(),
diff --git a/storage/src/tests/distributor/twophaseupdateoperationtest.cpp b/storage/src/tests/distributor/twophaseupdateoperationtest.cpp
index e42e7684f81..635e5b9883b 100644
--- a/storage/src/tests/distributor/twophaseupdateoperationtest.cpp
+++ b/storage/src/tests/distributor/twophaseupdateoperationtest.cpp
@@ -1,18 +1,16 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/config/helper/configgetter.h>
-#include <vespa/document/config/config-documenttypes.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/base/testdocrepo.h>
 #include <vespa/document/update/arithmeticvalueupdate.h>
-#include <iomanip>
-#include <tests/common/dummystoragelink.h>
 #include <vespa/storage/distributor/externaloperationhandler.h>
 #include <vespa/storageapi/message/persistence.h>
 #include <vespa/storage/distributor/operations/external/twophaseupdateoperation.h>
 #include <tests/distributor/distributortestutil.h>
 #include <vespa/document/test/make_document_bucket.h>
 #include <vespa/storage/distributor/distributor.h>
+#include <vespa/document/fieldset/fieldsets.h>
 #include <vespa/vespalib/gtest/gtest.h>
 #include <gmock/gmock.h>
 
@@ -1100,13 +1098,13 @@ TEST_F(ThreePhaseUpdateTest, metadata_only_gets_are_sent_if_3phase_update_enable
     ASSERT_EQ("Get => 0,Get => 1", _sender.getCommands(true));
     {
         auto& get_cmd = dynamic_cast<const api::GetCommand&>(*_sender.command(0));
-        EXPECT_EQ("[none]", get_cmd.getFieldSet());
+        EXPECT_EQ(document::NoFields::NAME, get_cmd.getFieldSet());
         EXPECT_EQ(get_cmd.internal_read_consistency(), api::InternalReadConsistency::Weak);
         checkMessageSettingsPropagatedTo(_sender.command(0));
     }
     {
         auto& get_cmd = dynamic_cast<const api::GetCommand&>(*_sender.command(1));
-        EXPECT_EQ("[none]", get_cmd.getFieldSet());
+        EXPECT_EQ(document::NoFields::NAME, get_cmd.getFieldSet());
         EXPECT_EQ(get_cmd.internal_read_consistency(), api::InternalReadConsistency::Weak);
         checkMessageSettingsPropagatedTo(_sender.command(1));
     }
@@ -1125,7 +1123,7 @@ TEST_F(ThreePhaseUpdateTest, full_document_get_sent_to_replica_with_highest_time
     ASSERT_EQ("Get => 1", _sender.getCommands(true, false, 2));
     {
         auto& get_cmd = dynamic_cast<const api::GetCommand&>(*_sender.command(2));
-        EXPECT_EQ("[all]", get_cmd.getFieldSet());
+        EXPECT_EQ(document::AllFields::NAME, get_cmd.getFieldSet());
         EXPECT_EQ(get_cmd.internal_read_consistency(), api::InternalReadConsistency::Strong);
     }
 }
diff --git a/storage/src/tests/distributor/visitoroperationtest.cpp b/storage/src/tests/distributor/visitoroperationtest.cpp
index 5d7871376cb..8a9d8063525 100644
--- a/storage/src/tests/distributor/visitoroperationtest.cpp
+++ b/storage/src/tests/distributor/visitoroperationtest.cpp
@@ -9,11 +9,9 @@
 #include <vespa/storage/distributor/distributormetricsset.h>
 #include <tests/distributor/distributortestutil.h>
 #include <vespa/storage/distributor/distributor.h>
-#include <tests/common/dummystoragelink.h>
+#include <vespa/document/fieldset/fieldsets.h>
 #include <vespa/document/test/make_bucket_space.h>
 #include <vespa/vespalib/gtest/gtest.h>
-#include <gmock/gmock.h>
-#include <ostream>
 
 using namespace document;
 using namespace storage::api;
@@ -57,7 +55,7 @@ struct VisitorOperationTest : Test, DistributorTestUtil {
                 makeBucketSpace(), libraryName, instanceId, docSelection);
         cmd->setControlDestination("controldestination");
         cmd->setDataDestination("datadestination");
-        cmd->setFieldSet("[header]");
+        cmd->setFieldSet(document::AllFields::NAME);
         if (visitRemoves) {
             cmd->setVisitRemoves();
         }
@@ -176,7 +174,7 @@ VisitorOperationTest::doStandardVisitTest(const std::string& clusterState)
     msg->setToTime(0);
     msg->addBucketToBeVisited(id);
     msg->addBucketToBeVisited(nullId);
-    msg->setFieldSet("[header]");
+    msg->setFieldSet(document::AllFields::NAME);
     msg->setVisitRemoves();
     msg->setTimeout(1234ms);
     msg->getTrace().setLevel(7);
@@ -201,7 +199,7 @@ VisitorOperationTest::doStandardVisitTest(const std::string& clusterState)
     EXPECT_EQ(1, cvc->getBuckets().size());
     EXPECT_EQ(api::Timestamp(10), cvc->getFromTime());
     EXPECT_GT(cvc->getToTime(), 0);
-    EXPECT_EQ("[header]", cvc->getFieldSet());
+    EXPECT_EQ(document::AllFields::NAME, cvc->getFieldSet());
     EXPECT_TRUE(cvc->visitRemoves());
     EXPECT_EQ(1234ms, cvc->getTimeout());
     EXPECT_EQ(7, cvc->getTrace().getLevel());
diff --git a/storage/src/tests/persistence/common/filestortestfixture.cpp b/storage/src/tests/persistence/common/filestortestfixture.cpp
index 63b7885fc53..352f1326463 100644
--- a/storage/src/tests/persistence/common/filestortestfixture.cpp
+++ b/storage/src/tests/persistence/common/filestortestfixture.cpp
@@ -5,6 +5,7 @@
 #include <vespa/persistence/dummyimpl/dummypersistence.h>
 #include <tests/persistence/common/filestortestfixture.h>
 #include <vespa/document/repo/documenttyperepo.h>
+#include <vespa/document/fieldset/fieldsets.h>
 #include <vespa/document/test/make_document_bucket.h>
 #include <vespa/persistence/spi/test.h>
 #include <sstream>
@@ -96,8 +97,7 @@ FileStorTestFixture::TestFileStorComponents::sendDummyGet(
 {
     std::ostringstream id;
     id << "id:foo:testdoctype1:n=" << bid.getId() << ":0";
-    std::shared_ptr<api::GetCommand> cmd(
-            new api::GetCommand(makeDocumentBucket(bid), document::DocumentId(id.str()), "[all]"));
+    auto cmd = std::make_shared<api::GetCommand>(makeDocumentBucket(bid), document::DocumentId(id.str()), document::AllFields::NAME);
     cmd->setAddress(makeSelfAddress());
     cmd->setPriority(255);
     top.sendDown(cmd);
diff --git a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
index 3407b77d698..b7f2cb81956 100644
--- a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
+++ b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
@@ -6,6 +6,7 @@
 #include <tests/persistence/filestorage/forwardingmessagesender.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/test/make_document_bucket.h>
+#include <vespa/document/fieldset/fieldsets.h>
 #include <vespa/storage/storageserver/statemanager.h>
 #include <vespa/storage/bucketdb/bucketmanager.h>
 #include <vespa/storage/persistence/persistencethread.h>
@@ -20,7 +21,6 @@
 #include <vespa/persistence/spi/test.h>
 #include <vespa/config/common/exceptions.h>
 #include <vespa/fastos/file.h>
-#include <vespa/vespalib/util/time.h>
 #include <vespa/vespalib/gtest/gtest.h>
 #include <atomic>
 #include <thread>
@@ -281,7 +281,7 @@ TEST_F(FileStorManagerTest, header_only_put) {
     }
     // Getting it
     {
-        auto cmd = std::make_shared<api::GetCommand>(makeDocumentBucket(bid), doc->getId(), "[all]");
+        auto cmd = std::make_shared<api::GetCommand>(makeDocumentBucket(bid), doc->getId(), document::AllFields::NAME);
         cmd->setAddress(address);
         top.sendDown(cmd);
         top.waitForMessages(1, _waitTime);
@@ -870,7 +870,7 @@ TEST_F(FileStorManagerTest, split1) {
             document::BucketId bucket(
                         17, i % 3 == 0 ? 0x10001 : 0x0100001);
             auto cmd = std::make_shared<api::GetCommand>(
-                    makeDocumentBucket(bucket), documents[i]->getId(), "[all]");
+                    makeDocumentBucket(bucket), documents[i]->getId(), document::AllFields::NAME);
             api::StorageMessageAddress address("storage", lib::NodeType::STORAGE, 3);
             cmd->setAddress(address);
             filestorHandler.schedule(cmd, 0);
@@ -906,7 +906,7 @@ TEST_F(FileStorManagerTest, split1) {
                                     documents[i]->getId()).getRawId());
             }
             auto cmd = std::make_shared<api::GetCommand>(
-                    makeDocumentBucket(bucket), documents[i]->getId(), "[all]");
+                    makeDocumentBucket(bucket), documents[i]->getId(), document::AllFields::NAME);
             api::StorageMessageAddress address("storage", lib::NodeType::STORAGE, 3);
             cmd->setAddress(address);
             filestorHandler.schedule(cmd, 0);
@@ -993,7 +993,7 @@ TEST_F(FileStorManagerTest, split_single_group) {
         for (uint32_t i=0; i<documents.size(); ++i) {
             document::BucketId bucket(17, state ? 0x10001 : 0x00001);
             auto cmd = std::make_shared<api::GetCommand>
-                    (makeDocumentBucket(bucket), documents[i]->getId(), "[all]");
+                    (makeDocumentBucket(bucket), documents[i]->getId(), document::AllFields::NAME);
             api::StorageMessageAddress address("storage", lib::NodeType::STORAGE, 3);
             cmd->setAddress(address);
             filestorHandler.schedule(cmd, 0);
@@ -1221,7 +1221,7 @@ TEST_F(FileStorManagerTest, join) {
         for (uint32_t i=0; i<documents.size(); ++i) {
             document::BucketId bucket(16, 1);
             auto cmd = std::make_shared<api::GetCommand>(
-                    makeDocumentBucket(bucket), documents[i]->getId(), "[all]");
+                    makeDocumentBucket(bucket), documents[i]->getId(), document::AllFields::NAME);
             api::StorageMessageAddress address("storage", lib::NodeType::STORAGE, 3);
             cmd->setAddress(address);
             filestorHandler.schedule(cmd, 0);
@@ -1255,7 +1255,7 @@ createIterator(DummyStorageLink& link,
     selection.setToTimestamp(spi::Timestamp(toTime.getTime()));
     auto createIterCmd = std::make_shared<CreateIteratorCommand>(
             makeDocumentBucket(bucket), selection,
-            "[all]",
+            document::AllFields::NAME,
             spi::NEWEST_DOCUMENT_ONLY);
     link.sendDown(createIterCmd);
     link.waitForMessages(1, FileStorManagerTest::LONG_WAITTIME);
@@ -2044,7 +2044,7 @@ TEST_F(FileStorManagerTest, get_command_size_is_added_to_metric) {
     document::BucketId bucket(16, 4000);
     createBucket(bucket, 0);
     auto cmd = std::make_shared<api::GetCommand>(
-            makeDocumentBucket(bucket), document::DocumentId("id:foo:testdoctype1::bar"), "[all]");
+            makeDocumentBucket(bucket), document::DocumentId("id:foo:testdoctype1::bar"), document::AllFields::NAME);
 
     assert_request_size_set(c, std::move(cmd), thread_metrics_of(*c.manager)->get[defaultLoadType]);
 }
diff --git a/storage/src/tests/persistence/persistencequeuetest.cpp b/storage/src/tests/persistence/persistencequeuetest.cpp
index 3754a82e7ae..289d5462203 100644
--- a/storage/src/tests/persistence/persistencequeuetest.cpp
+++ b/storage/src/tests/persistence/persistencequeuetest.cpp
@@ -1,12 +1,11 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/log/log.h>
-#include <vespa/storageapi/message/bucket.h>
-#include <tests/persistence/common/persistenceproviderwrapper.h>
 #include <vespa/persistence/dummyimpl/dummypersistence.h>
 #include <tests/persistence/common/filestortestfixture.h>
 #include <tests/persistence/filestorage/forwardingmessagesender.h>
 #include <vespa/document/test/make_document_bucket.h>
+#include <vespa/document/fieldset/fieldsets.h>
+#include <vespa/log/log.h>
 
 LOG_SETUP(".persistencequeuetest");
 
@@ -80,7 +79,7 @@ std::shared_ptr<api::StorageMessage> PersistenceQueueTest::createPut(uint64_t bu
 std::shared_ptr<api::StorageMessage> PersistenceQueueTest::createGet(uint64_t bucket) const {
     auto cmd = std::make_shared<api::GetCommand>(
             makeDocumentBucket(document::BucketId(16, bucket)),
-            document::DocumentId(vespalib::make_string("id:foo:testdoctype1:n=%" PRIu64 ":0", bucket)), "[all]");
+            document::DocumentId(vespalib::make_string("id:foo:testdoctype1:n=%" PRIu64 ":0", bucket)), document::AllFields::NAME);
     cmd->setAddress(makeSelfAddress());
     return cmd;
 }
diff --git a/storage/src/tests/persistence/testandsettest.cpp b/storage/src/tests/persistence/testandsettest.cpp
index 578a90081c7..18d78e1e8cf 100644
--- a/storage/src/tests/persistence/testandsettest.cpp
+++ b/storage/src/tests/persistence/testandsettest.cpp
@@ -7,6 +7,7 @@
 #include <vespa/document/fieldvalue/fieldvalues.h>
 #include <vespa/document/update/documentupdate.h>
 #include <vespa/document/update/assignvalueupdate.h>
+#include <vespa/document/fieldset/fieldsets.h>
 #include <vespa/persistence/spi/test.h>
 #include <functional>
 
@@ -252,7 +253,7 @@ TestAndSetTest::createTestDocument()
 
 document::Document::SP TestAndSetTest::retrieveTestDocument()
 {
-    auto get = std::make_shared<api::GetCommand>(BUCKET, testDocId, "[all]");
+    auto get = std::make_shared<api::GetCommand>(BUCKET, testDocId, document::AllFields::NAME);
     auto tracker = thread->handleGet(*get, createTracker(get, BUCKET));
     assert(tracker->getResult() == api::ReturnCode::Result::OK);
 
diff --git a/storage/src/tests/storageserver/bouncertest.cpp b/storage/src/tests/storageserver/bouncertest.cpp
index 29a56b234d0..46dad62de48 100644
--- a/storage/src/tests/storageserver/bouncertest.cpp
+++ b/storage/src/tests/storageserver/bouncertest.cpp
@@ -10,6 +10,7 @@
 #include <tests/common/dummystoragelink.h>
 #include <vespa/document/bucket/fixed_bucket_spaces.h>
 #include <vespa/document/test/make_document_bucket.h>
+#include <vespa/document/fieldset/fieldsets.h>
 #include <vespa/storageapi/message/persistence.h>
 #include <vespa/config/common/exceptions.h>
 #include <vespa/vespalib/gtest/gtest.h>
@@ -122,7 +123,7 @@ std::shared_ptr<api::StorageCommand> create_dummy_get_message() {
     return std::make_shared<api::GetCommand>(
             document::Bucket(document::FixedBucketSpaces::default_space(), document::BucketId(0)),
             document::DocumentId("id:ns:foo::bar"),
-            "[all]");
+            document::AllFields::NAME);
 }
 
 TEST_F(BouncerTest, future_timestamp) {
diff --git a/storage/src/tests/storageserver/communicationmanagertest.cpp b/storage/src/tests/storageserver/communicationmanagertest.cpp
index 8444319b395..0f95f7e7ece 100644
--- a/storage/src/tests/storageserver/communicationmanagertest.cpp
+++ b/storage/src/tests/storageserver/communicationmanagertest.cpp
@@ -11,11 +11,11 @@
 #include <tests/common/dummystoragelink.h>
 #include <tests/common/testhelper.h>
 #include <vespa/document/test/make_document_bucket.h>
+#include <vespa/document/fieldset/fieldsets.h>
 #include <vespa/documentapi/messagebus/messages/getdocumentmessage.h>
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/documentapi/messagebus/messages/removedocumentmessage.h>
 #include <vespa/documentapi/messagebus/messages/getdocumentreply.h>
-#include <vespa/vespalib/util/time.h>
 #include <thread>
 #include <vespa/vespalib/gtest/gtest.h>
 
@@ -35,7 +35,7 @@ struct CommunicationManagerTest : Test {
     {
         auto cmd = std::make_shared<api::GetCommand>(makeDocumentBucket(document::BucketId(0)),
                                                      document::DocumentId("id:ns:mytype::mydoc"),
-                                                     "[all]");
+                                                     document::AllFields::NAME);
         cmd->setAddress(api::StorageMessageAddress("storage", lib::NodeType::STORAGE, 1));
         cmd->setPriority(priority);
         return cmd;
@@ -71,7 +71,7 @@ TEST_F(CommunicationManagerTest, simple) {
 
     // Send a message through from distributor to storage
     auto cmd = std::make_shared<api::GetCommand>(
-            makeDocumentBucket(document::BucketId(0)), document::DocumentId("id:ns:mytype::mydoc"), "[all]");
+            makeDocumentBucket(document::BucketId(0)), document::DocumentId("id:ns:mytype::mydoc"), document::AllFields::NAME);
     cmd->setAddress(api::StorageMessageAddress("storage", lib::NodeType::STORAGE, 1));
     distributorLink->sendUp(cmd);
     storageLink->waitForMessages(1, MESSAGE_WAIT_TIME_SEC);
diff --git a/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.cpp b/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.cpp
index 73788d0affe..53940426a63 100644
--- a/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.cpp
@@ -9,6 +9,7 @@
 #include <vespa/document/datatype/documenttype.h>
 #include <vespa/document/fieldvalue/document.h>
 #include <vespa/document/select/parser.h>
+#include <vespa/document/fieldset//fieldsets.h>
 #include <vespa/vespalib/stllike/hash_map.hpp>
 
 #include <vespa/log/log.h>
@@ -205,7 +206,7 @@ TwoPhaseUpdateOperation::startSafePathUpdate(DistributorMessageSender& sender)
 std::shared_ptr<GetOperation>
 TwoPhaseUpdateOperation::create_initial_safe_path_get_operation() {
     document::Bucket bucket(_updateCmd->getBucket().getBucketSpace(), document::BucketId(0));
-    const char* field_set = _use_initial_cheap_metadata_fetch_phase ? "[none]" : "[all]";
+    const char* field_set = _use_initial_cheap_metadata_fetch_phase ? document::NoFields::NAME : document::AllFields::NAME;
     auto get = std::make_shared<api::GetCommand>(bucket, _updateCmd->getDocumentId(), field_set);
     copyMessageSettings(*_updateCmd, *get);
     // Metadata-only Gets just look at the data in the meta-store, not any fields.
@@ -345,7 +346,7 @@ TwoPhaseUpdateOperation::handleFastPathReceive(DistributorMessageSender& sender,
                 _updateReply = intermediate._reply;
                 _fast_path_repair_source_node = bestNode.second;
                 document::Bucket bucket(_updateCmd->getBucket().getBucketSpace(), bestNode.first);
-                auto cmd = std::make_shared<api::GetCommand>(bucket, _updateCmd->getDocumentId(), "[all]");
+                auto cmd = std::make_shared<api::GetCommand>(bucket, _updateCmd->getDocumentId(), document::AllFields::NAME);
                 copyMessageSettings(*_updateCmd, *cmd);
 
                 sender.sendToNode(lib::NodeType::STORAGE, _fast_path_repair_source_node, cmd);
@@ -471,7 +472,7 @@ void TwoPhaseUpdateOperation::handle_safe_path_received_metadata_get(
     LOG(debug, "Update(%s): sending single payload Get to %s on node %u (had timestamp %" PRIu64 ")",
         update_doc_id().c_str(), bucket.toString().c_str(),
         newest_replica->node, newest_replica->timestamp);
-    auto cmd = std::make_shared<api::GetCommand>(bucket, _updateCmd->getDocumentId(), "[all]");
+    auto cmd = std::make_shared<api::GetCommand>(bucket, _updateCmd->getDocumentId(), document::AllFields::NAME);
     copyMessageSettings(*_updateCmd, *cmd);
     sender.sendToNode(lib::NodeType::STORAGE, newest_replica->node, cmd);
 
diff --git a/storage/src/vespa/storage/visiting/visitor.cpp b/storage/src/vespa/storage/visiting/visitor.cpp
index c9cda047784..dcd8cc4ba39 100644
--- a/storage/src/vespa/storage/visiting/visitor.cpp
+++ b/storage/src/vespa/storage/visiting/visitor.cpp
@@ -7,6 +7,7 @@
 #include <vespa/storage/persistence/messages.h>
 #include <vespa/documentapi/messagebus/messages/visitor.h>
 #include <vespa/document/select/node.h>
+#include <vespa/document/fieldset/fieldsets.h>
 #include <vespa/vespalib/stllike/hash_map.hpp>
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <vespa/vespalib/util/stringfmt.h>
@@ -165,7 +166,7 @@ Visitor::VisitorOptions::VisitorOptions()
       _maxParallel(1),
       _maxParallelOneBucket(2),
       _maxPending(1),
-      _fieldSet("[all]"),
+      _fieldSet(document::AllFields::NAME),
       _visitRemoves(false)
 {
 }