Remove load type from StorageMessage

3 files changed, 4 insertions, 7 deletions

diff --git a/storage/src/vespa/storage/storageserver/documentapiconverter.cpp b/storage/src/vespa/storage/storageserver/documentapiconverter.cpp
index 014a5925b1f..b1c8c1e43a4 100644
--- a/storage/src/vespa/storage/storageserver/documentapiconverter.cpp
+++ b/storage/src/vespa/storage/storageserver/documentapiconverter.cpp
@@ -144,10 +144,9 @@ DocumentApiConverter::toStorageAPI(documentapi::DocumentMessage& fromMsg)
                 : 1ms*INT_MAX;
         toMsg->setTimeout(cappedTimeout);
         toMsg->setPriority(_priConverter->toStoragePriority(fromMsg.getPriority()));
-        toMsg->setLoadType(documentapi::LoadType::DEFAULT);
 
-        LOG(spam, "Converted command %s, loadtype %d, mapped priority %d to %d",
-            toMsg->toString().c_str(), toMsg->getLoadType().getId(),
+        LOG(spam, "Converted command %s, mapped priority %d to %d",
+            toMsg->toString().c_str(),
             fromMsg.getPriority(), toMsg->getPriority());
     }
     return toMsg;
diff --git a/storage/src/vespa/storage/visiting/visitor.cpp b/storage/src/vespa/storage/visiting/visitor.cpp
index 96069acaa88..7cb61e6d0a8 100644
--- a/storage/src/vespa/storage/visiting/visitor.cpp
+++ b/storage/src/vespa/storage/visiting/visitor.cpp
@@ -6,6 +6,7 @@
 #include <vespa/storageapi/message/datagram.h>
 #include <vespa/storage/persistence/messages.h>
 #include <vespa/documentapi/messagebus/messages/visitor.h>
+#include <vespa/documentapi/loadtypes/loadtype.h>
 #include <vespa/document/select/node.h>
 #include <vespa/document/fieldset/fieldsets.h>
 #include <vespa/vespalib/stllike/hash_map.hpp>
@@ -147,7 +148,6 @@ Visitor::BucketIterationState::~BucketIterationState()
     if (_iteratorId != 0) {
         // Making the assumption that this is effectively nothrow.
         auto cmd = std::make_shared<DestroyIteratorCommand>(_iteratorId);
-        cmd->setLoadType(_visitor._initiatingCmd->getLoadType());
         cmd->getTrace().setLevel(_visitor._traceLevel);
         cmd->setPriority(0);
 
@@ -732,7 +732,6 @@ Visitor::onCreateIteratorReply(
     LOG(debug, "Visitor '%s' starting to visit bucket %s.",
         _id.c_str(), bucketId.toString().c_str());
     auto cmd = std::make_shared<GetIterCommand>(bucket, bucketState.getIteratorId(), _docBlockSize);
-    cmd->setLoadType(_initiatingCmd->getLoadType());
     cmd->getTrace().setLevel(_traceLevel);
     cmd->setPriority(_priority);
     ++bucketState._pendingIterators;
@@ -1138,7 +1137,6 @@ Visitor::getIterators()
         }
         auto cmd = std::make_shared<GetIterCommand>(
                 bucketState.getBucket(), bucketState.getIteratorId(), _docBlockSize);
-        cmd->setLoadType(_initiatingCmd->getLoadType());
         cmd->getTrace().setLevel(_traceLevel);
         cmd->setPriority(_priority);
         _messageHandler->send(cmd, *this);
@@ -1184,7 +1182,6 @@ Visitor::getIterators()
                                           spi::NEWEST_DOCUMENT_OR_REMOVE :
                                           spi::NEWEST_DOCUMENT_ONLY));
 
-        cmd->setLoadType(_initiatingCmd->getLoadType());
         cmd->getTrace().setLevel(_traceLevel);
         cmd->setPriority(_initiatingCmd->getPriority());
         cmd->setReadConsistency(getRequiredReadConsistency());
diff --git a/storage/src/vespa/storage/visiting/visitorthread.cpp b/storage/src/vespa/storage/visiting/visitorthread.cpp
index acaa96bc418..50f7e76b149 100644
--- a/storage/src/vespa/storage/visiting/visitorthread.cpp
+++ b/storage/src/vespa/storage/visiting/visitorthread.cpp
@@ -2,6 +2,7 @@
 
 #include "visitorthread.h"
 #include "messages.h"
+#include <vespa/documentapi/loadtypes/loadtype.h>
 #include <vespa/document/select/bodyfielddetector.h>
 #include <vespa/document/select/parser.h>
 #include <vespa/messagebus/rpcmessagebus.h>