GC LoadType and PriorityMapper.

5 files changed, 3 insertions, 15 deletions

diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.cpp b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.cpp
index 1bb83b2a547..45d9d2bd711 100644
--- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.cpp
+++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.cpp
@@ -7,7 +7,6 @@
 #include <vespa/storageapi/message/bucketsplitting.h>
 #include <vespa/storageapi/message/visitor.h>
 #include <vespa/document/update/documentupdate.h>
-#include <vespa/documentapi/loadtypes/loadtype.h>
 #include <vespa/document/bucket/fixed_bucket_spaces.h>
 #include <sstream>
 
@@ -93,7 +92,7 @@ ProtocolSerialization5_0::onEncodeCommand(GBBuf& buf, const api::StorageCommand&
     buf.putLong(msg.getMsgId());
     buf.putByte(msg.getPriority());
     buf.putShort(msg.getSourceIndex());
-    buf.putInt(documentapi::LoadType::DEFAULT.getId());
+    buf.putInt(0); // LoadType 'default'
 }
 
 void
@@ -103,7 +102,7 @@ ProtocolSerialization5_0::onDecodeCommand(BBuf& buf, api::StorageCommand& msg) c
     uint8_t priority = SH::getByte(buf);
     msg.setPriority(priority);
     msg.setSourceIndex(SH::getShort(buf));
-    (void)SH::getInt(buf);
+    (void)SH::getInt(buf); // LoadType
 }
 
 
diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization7.cpp b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization7.cpp
index 00572ff0eba..98f76b4afb7 100644
--- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization7.cpp
+++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization7.cpp
@@ -11,7 +11,6 @@
 #include <vespa/storageapi/message/removelocation.h>
 #include <vespa/storageapi/message/visitor.h>
 #include <vespa/storageapi/message/stat.h>
-#include <vespa/documentapi/loadtypes/loadtype.h>
 
 namespace storage::mbusprot {
 
@@ -112,7 +111,6 @@ void write_request_header(vespalib::GrowableByteBuffer& buf, const api::StorageC
     hdr.set_message_id(cmd.getMsgId());
     hdr.set_priority(cmd.getPriority());
     hdr.set_source_index(cmd.getSourceIndex());
-    hdr.set_loadtype_id(documentapi::LoadType::DEFAULT.getId());
 
     uint8_t dest[128]; // Only primitive fields, should be plenty large enough.
     auto encoded_size = static_cast<uint32_t>(hdr.ByteSizeLong());
diff --git a/storageapi/src/vespa/storageapi/mbusprot/storagemessage.h b/storageapi/src/vespa/storageapi/mbusprot/storagemessage.h
index c63271a8956..edeab31ec8a 100644
--- a/storageapi/src/vespa/storageapi/mbusprot/storagemessage.h
+++ b/storageapi/src/vespa/storageapi/mbusprot/storagemessage.h
@@ -12,7 +12,7 @@ public:
     virtual ~StorageMessage() {}
 
     virtual api::StorageMessage::SP getInternalMessage() = 0;
-    virtual storage::api::StorageMessage::CSP getInternalMessage() const = 0;
+    virtual api::StorageMessage::CSP getInternalMessage() const = 0;
 
 };
 
diff --git a/storageapi/src/vespa/storageapi/messageapi/storagemessage.cpp b/storageapi/src/vespa/storageapi/messageapi/storagemessage.cpp
index 1c2eccb0743..892e7199cf3 100644
--- a/storageapi/src/vespa/storageapi/messageapi/storagemessage.cpp
+++ b/storageapi/src/vespa/storageapi/messageapi/storagemessage.cpp
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "storagemessage.h"
-#include <vespa/documentapi/loadtypes/loadtype.h>
 #include <vespa/messagebus/routing/verbatimdirective.h>
 #include <vespa/vespalib/util/exceptions.h>
 #include <vespa/vespalib/stllike/asciistream.h>
@@ -263,11 +262,6 @@ StorageMessage::StorageMessage(const StorageMessage& other, Id id) noexcept
 
 StorageMessage::~StorageMessage() = default;
 
-const documentapi::LoadType&
-StorageMessage::getLoadType() const noexcept {
-    return documentapi::LoadType::DEFAULT;
-}
-
 void
 StorageMessage::setNewMsgId() noexcept
 {
diff --git a/storageapi/src/vespa/storageapi/messageapi/storagemessage.h b/storageapi/src/vespa/storageapi/messageapi/storagemessage.h
index b49612d8728..acf651d8816 100644
--- a/storageapi/src/vespa/storageapi/messageapi/storagemessage.h
+++ b/storageapi/src/vespa/storageapi/messageapi/storagemessage.h
@@ -21,7 +21,6 @@
 #include <iosfwd>
 
 namespace vespalib { class asciistream; }
-namespace documentapi { class LoadType; }
 // The following macros are provided as a way to write storage messages simply.
 // They implement the parts of the code that can easily be automaticly
 // generated.
@@ -431,8 +430,6 @@ public:
      */
     virtual bool callHandler(MessageHandler&, const StorageMessage::SP&) const = 0;
 
-    const documentapi::LoadType& getLoadType() const noexcept;
-
     mbus::Trace && steal_trace() noexcept { return std::move(_trace); }
     mbus::Trace& getTrace() noexcept { return _trace; }
     const mbus::Trace& getTrace() const noexcept { return _trace; }