4 files changed, 57 insertions, 45 deletions

diff --git a/storage/src/vespa/storageapi/message/persistence.cpp b/storage/src/vespa/storageapi/message/persistence.cpp
index 4c24bb74faf..af054855bbe 100644
--- a/storage/src/vespa/storageapi/message/persistence.cpp
+++ b/storage/src/vespa/storageapi/message/persistence.cpp
@@ -105,13 +105,23 @@ UpdateCommand::UpdateCommand(const document::Bucket &bucket, const document::Doc
     : TestAndSetCommand(MessageType::UPDATE, bucket),
       _update(update),
       _timestamp(time),
-      _oldTimestamp(0)
+      _oldTimestamp(0),
+      _create_if_missing()
 {
     if ( ! _update) {
         throw vespalib::IllegalArgumentException("Cannot update a null update", VESPA_STRLOC);
     }
 }
 
+bool
+UpdateCommand::create_if_missing() const
+{
+    if (_create_if_missing.has_value()) {
+        return *_create_if_missing;
+    }
+    return _update->getCreateIfNonExistent();
+}
+
 const document::DocumentType *
 UpdateCommand::getDocumentType() const {
     return &_update->getType();
diff --git a/storage/src/vespa/storageapi/message/persistence.h b/storage/src/vespa/storageapi/message/persistence.h
index f44ab4e8280..0676e1d0f44 100644
--- a/storage/src/vespa/storageapi/message/persistence.h
+++ b/storage/src/vespa/storageapi/message/persistence.h
@@ -1,8 +1,6 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 /**
- * @file persistence.h
- *
- * Persistence related commands, like put, get & remove
+  * Persistence related commands, like put, get & remove
  */
 #pragma once
 
@@ -10,6 +8,7 @@
 #include <vespa/storageapi/defs.h>
 #include <vespa/document/base/documentid.h>
 #include <vespa/documentapi/messagebus/messages/testandsetcondition.h>
+#include <optional>
 
 namespace document {
     class DocumentUpdate;
@@ -117,20 +116,32 @@ class UpdateCommand : public TestAndSetCommand {
     std::shared_ptr<document::DocumentUpdate> _update;
     Timestamp _timestamp;
     Timestamp _oldTimestamp;
+    std::optional<bool> _create_if_missing; // caches the value held (possibly lazily deserialized) in _update
 
 public:
     UpdateCommand(const document::Bucket &bucket,
                   const std::shared_ptr<document::DocumentUpdate>&, Timestamp);
     ~UpdateCommand() override;
 
-    void setTimestamp(Timestamp ts) { _timestamp = ts; }
-    void setOldTimestamp(Timestamp ts) { _oldTimestamp = ts; }
+    void setTimestamp(Timestamp ts) noexcept { _timestamp = ts; }
+    void setOldTimestamp(Timestamp ts) noexcept { _oldTimestamp = ts; }
+
+    [[nodiscard]] bool has_cached_create_if_missing() const noexcept {
+        return _create_if_missing.has_value();
+    }
+    // It is the caller's responsibility to ensure this value matches that of _update->getCreateIfNonExisting()
+    void set_cached_create_if_missing(bool create) noexcept {
+        _create_if_missing = create;
+    }
 
     const std::shared_ptr<document::DocumentUpdate>& getUpdate() const { return _update; }
     const document::DocumentId& getDocumentId() const override;
     Timestamp getTimestamp() const { return _timestamp; }
     Timestamp getOldTimestamp() const { return _oldTimestamp; }
 
+    // May throw iff has_cached_create_if_missing() == false, otherwise noexcept.
+    [[nodiscard]] bool create_if_missing() const;
+
     const document::DocumentType * getDocumentType() const override;
     vespalib::string getSummary() const override;
 
diff --git a/storage/src/vespa/storageapi/message/state.cpp b/storage/src/vespa/storageapi/message/state.cpp
index 5a50167f584..b4e8655d783 100644
--- a/storage/src/vespa/storageapi/message/state.cpp
+++ b/storage/src/vespa/storageapi/message/state.cpp
@@ -5,8 +5,7 @@
 #include <vespa/vdslib/state/clusterstate.h>
 #include <ostream>
 
-namespace storage {
-namespace api {
+namespace storage::api {
 
 IMPLEMENT_COMMAND(GetNodeStateCommand, GetNodeStateReply)
 IMPLEMENT_REPLY(GetNodeStateReply)
@@ -45,7 +44,7 @@ GetNodeStateReply::GetNodeStateReply(const GetNodeStateCommand& cmd)
 GetNodeStateReply::GetNodeStateReply(const GetNodeStateCommand& cmd,
                                      const lib::NodeState& state)
     : StorageReply(cmd),
-      _state(new lib::NodeState(state))
+      _state(std::make_unique<lib::NodeState>(state))
 {
 }
 
@@ -64,23 +63,31 @@ GetNodeStateReply::print(std::ostream& out, bool verbose,
     }
 }
 
+SetSystemStateCommand::SetSystemStateCommand(std::shared_ptr<const lib::ClusterStateBundle> state)
+    : StorageCommand(MessageType::SETSYSTEMSTATE),
+      _state(std::move(state))
+{
+}
+
 SetSystemStateCommand::SetSystemStateCommand(const lib::ClusterStateBundle& state)
     : StorageCommand(MessageType::SETSYSTEMSTATE),
-      _state(state)
+      _state(std::make_shared<const lib::ClusterStateBundle>(state))
 {
 }
 
 SetSystemStateCommand::SetSystemStateCommand(const lib::ClusterState& state)
     : StorageCommand(MessageType::SETSYSTEMSTATE),
-      _state(state)
+      _state(std::make_shared<const lib::ClusterStateBundle>(state))
 {
 }
 
+SetSystemStateCommand::~SetSystemStateCommand() = default;
+
 void
 SetSystemStateCommand::print(std::ostream& out, bool verbose,
                              const std::string& indent) const
 {
-    out << "SetSystemStateCommand(" << *_state.getBaselineClusterState() << ")";
+    out << "SetSystemStateCommand(" << *_state->getBaselineClusterState() << ")";
     if (verbose) {
         out << " : ";
         StorageCommand::print(out, verbose, indent);
@@ -89,7 +96,7 @@ SetSystemStateCommand::print(std::ostream& out, bool verbose,
 
 SetSystemStateReply::SetSystemStateReply(const SetSystemStateCommand& cmd)
     : StorageReply(cmd),
-      _state(cmd.getClusterStateBundle())
+      _state(cmd.cluster_state_bundle_ptr())
 {
 }
 
@@ -138,5 +145,4 @@ void ActivateClusterStateVersionReply::print(std::ostream& out, bool verbose,
     }
 }
 
-} // api
-} // storage
+} // storage::api
diff --git a/storage/src/vespa/storageapi/message/state.h b/storage/src/vespa/storageapi/message/state.h
index 900355b12a2..afeb5ae9c11 100644
--- a/storage/src/vespa/storageapi/message/state.h
+++ b/storage/src/vespa/storageapi/message/state.h
@@ -9,12 +9,6 @@
 
 namespace storage::api {
 
-/**
- * @class GetNodeStateCommand
- * @ingroup message
- *
- * @brief Command for setting node state. No payload
- */
 class GetNodeStateCommand : public StorageCommand {
     lib::NodeState::UP _expectedState;
 
@@ -27,12 +21,6 @@ public:
     DECLARE_STORAGECOMMAND(GetNodeStateCommand, onGetNodeState)
 };
 
-/**
- * @class GetNodeStateReply
- * @ingroup message
- *
- * @brief Reply to GetNodeStateCommand
- */
 class GetNodeStateReply : public StorageReply {
     lib::NodeState::UP _state;
     std::string _nodeInfo;
@@ -53,41 +41,38 @@ public:
 };
 
 /**
- * @class SetSystemStateCommand
- * @ingroup message
- *
- * @brief Command for telling a node about the system state - state of each node
- *  in the system and state of the system (all ok, no merging, block
- *  put/get/remove etx)
+ * Command for telling a node about the cluster state - state of each node
+ * in the cluster and state of the cluster itself (all ok, no merging, block
+ * put/get/remove etx)
  */
 class SetSystemStateCommand : public StorageCommand {
-    lib::ClusterStateBundle _state;
+    std::shared_ptr<const lib::ClusterStateBundle> _state;
 
 public:
+    explicit SetSystemStateCommand(std::shared_ptr<const lib::ClusterStateBundle> state);
     explicit SetSystemStateCommand(const lib::ClusterStateBundle &state);
     explicit SetSystemStateCommand(const lib::ClusterState &state);
-    const lib::ClusterState& getSystemState() const { return *_state.getBaselineClusterState(); }
-    const lib::ClusterStateBundle& getClusterStateBundle() const { return _state; }
+    ~SetSystemStateCommand() override;
+
+    [[nodiscard]] const lib::ClusterState& getSystemState() const { return *_state->getBaselineClusterState(); }
+    [[nodiscard]] const lib::ClusterStateBundle& getClusterStateBundle() const { return *_state; }
+    [[nodiscard]] std::shared_ptr<const lib::ClusterStateBundle> cluster_state_bundle_ptr() const noexcept {
+        return _state;
+    }
     void print(std::ostream& out, bool verbose, const std::string& indent) const override;
 
     DECLARE_STORAGECOMMAND(SetSystemStateCommand, onSetSystemState)
 };
 
-/**
- * @class SetSystemStateReply
- * @ingroup message
- *
- * @brief Reply received after a SetSystemStateCommand.
- */
 class SetSystemStateReply : public StorageReply {
-    lib::ClusterStateBundle _state;
+    std::shared_ptr<const lib::ClusterStateBundle> _state;
 
 public:
     explicit SetSystemStateReply(const SetSystemStateCommand& cmd);
 
     // Not serialized. Available locally
-    const lib::ClusterState& getSystemState() const { return *_state.getBaselineClusterState(); }
-    const lib::ClusterStateBundle& getClusterStateBundle() const { return _state; }
+    const lib::ClusterState& getSystemState() const { return *_state->getBaselineClusterState(); }
+    const lib::ClusterStateBundle& getClusterStateBundle() const { return *_state; }
     void print(std::ostream& out, bool verbose, const std::string& indent) const override;
 
     DECLARE_STORAGEREPLY(SetSystemStateReply, onSetSystemStateReply)