Move the shared_ptr to further reduce pipeline stalls and big stop signs.

2 files changed, 4 insertions, 3 deletions

diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/putdocumentmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/putdocumentmessage.h
index 9bc1c088dfa..f86e594dfa4 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/putdocumentmessage.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/putdocumentmessage.h
@@ -38,6 +38,7 @@ public:
      * @return The document.
      */
     const DocumentSP & getDocumentSP() const { return _document; }
+    DocumentSP stealDocument() { return std::move(_document); }
     const document::Document & getDocument() const { return *_document; }
 
     /**
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentmessage.h
index 3a320960515..55cb22e05e0 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentmessage.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentmessage.h
@@ -21,8 +21,8 @@ public:
     /**
      * Convenience typedef.
      */
-    typedef std::unique_ptr<UpdateDocumentMessage> UP;
-    typedef std::shared_ptr<UpdateDocumentMessage> SP;
+    using UP = std::unique_ptr<UpdateDocumentMessage>;
+    using SP = std::shared_ptr<UpdateDocumentMessage>;
 
     /**
      * Constructs a new document message for deserialization.
@@ -42,7 +42,7 @@ public:
      *
      * @return The update.
      */
-    const DocumentUpdateSP & getDocumentUpdateSP() const { return _documentUpdate; }
+    DocumentUpdateSP stealDocumentUpdate() const { return std::move(_documentUpdate); }
     const document::DocumentUpdate & getDocumentUpdate() const { return *_documentUpdate; }
     /**
      * Sets the document update to perform.