1 files changed, 18 insertions, 18 deletions

diff --git a/vdslib/src/vespa/vdslib/state/clusterstate.h b/vdslib/src/vespa/vdslib/state/clusterstate.h
index 44af81f52ce..70f4d59977a 100644
--- a/vdslib/src/vespa/vdslib/state/clusterstate.h
+++ b/vdslib/src/vespa/vdslib/state/clusterstate.h
@@ -11,25 +11,19 @@
 #include "node.h"
 #include "nodestate.h"
 #include <map>
+#include <array>
 
 namespace storage::lib {
 
 class Distribution;
 class Group;
 struct NodeData;
+struct SeparatorPrinter;
 
 class ClusterState : public document::Printable {
-    uint32_t _version;
-    const State* _clusterState;
-    std::map<Node, NodeState> _nodeStates;
-    std::vector<uint16_t> _nodeCount;
-    vespalib::string _description;
-    uint16_t _distributionBits;
-
-    void getTextualDifference(std::ostringstream& builder, const NodeType& type,
-                              const ClusterState& other) const;
-
 public:
+    using NodeMap = std::map<Node, NodeState>;
+    using NodeCounts = std::array<uint16_t, 2>;
     using CSP = std::shared_ptr<const ClusterState>;
     using SP = std::shared_ptr<ClusterState>;
     using UP = std::unique_ptr<ClusterState>;
@@ -48,12 +42,12 @@ public:
     bool operator==(const ClusterState& other) const noexcept;
     bool operator!=(const ClusterState& other) const noexcept;
 
-    uint32_t getVersion() const { return _version; }
+    uint32_t getVersion() const noexcept { return _version; }
     /**
      * Returns the smallest number above the highest node index found of the
      * given type that is not down.
      */
-    uint16_t getNodeCount(const NodeType& type) const noexcept;
+    uint16_t getNodeCount(const NodeType& type) const noexcept { return _nodeCount[type]; }
     uint16_t getDistributionBitCount() const noexcept { return _distributionBits; }
     const State& getClusterState() const noexcept { return *_clusterState; }
     const NodeState& getNodeState(const Node& node) const;
@@ -65,9 +59,7 @@ public:
 
     void print(std::ostream& out, bool verbose, const std::string& indent) const override;
 
-    void printStateGroupwise(std::ostream& out,
-                             const Distribution&, bool verbose = false,
-                             const std::string& indent = "") const;
+    void printStateGroupwise(std::ostream& out, const Distribution&, bool verbose, const std::string& indent) const;
 
 private:
     // Preconditions: `key` and `value` MUST point into null-terminated strings.
@@ -75,9 +67,17 @@ private:
     // Preconditions: `key` and `value` MUST point into null-terminated strings.
     bool parseSorD(vespalib::stringref key, vespalib::stringref value, NodeData & nodeData);
     void removeExtraElements();
-    void printStateGroupwise(std::ostream& out, const Group&, bool verbose,
-                             const std::string& indent, bool rootGroup) const;
-
+    void removeExtraElements(const NodeType& type);
+    void printStateGroupwise(std::ostream& out, const Group&, bool verbose, const std::string& indent, bool rootGroup) const;
+    void getTextualDifference(std::ostringstream& builder, const NodeType& type, const ClusterState& other) const;
+    size_t printStateGroupwise(std::ostream& out, const Group&, bool verbose, const std::string& indent, const NodeType& type) const;
+    void serialize_nodes(vespalib::asciistream & out, bool ignoreNewFeatures, SeparatorPrinter & sep, const NodeType & nodeType) const;
+    uint32_t           _version;
+    NodeCounts         _nodeCount;
+    const State*       _clusterState;
+    NodeMap            _nodeStates;
+    vespalib::string   _description;
+    uint16_t           _distributionBits;
 };
 
 }