Modernize code and prepare for changing map implementation.

3 files changed, 132 insertions, 151 deletions

diff --git a/vdslib/src/vespa/vdslib/state/clusterstate.cpp b/vdslib/src/vespa/vdslib/state/clusterstate.cpp
index 6a319af68ef..61a41086ef3 100644
--- a/vdslib/src/vespa/vdslib/state/clusterstate.cpp
+++ b/vdslib/src/vespa/vdslib/state/clusterstate.cpp
@@ -8,6 +8,7 @@
 #include <vespa/vespalib/util/exceptions.h>
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <sstream>
+#include <cassert>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".vdslib.state.cluster");
@@ -24,9 +25,9 @@ namespace storage::lib {
 ClusterState::ClusterState()
     : Printable(),
       _version(0),
+      _nodeCount(),
       _clusterState(&State::DOWN),
       _nodeStates(),
-      _nodeCount(2),
       _description(),
       _distributionBits(16)
 { }
@@ -41,14 +42,10 @@ struct NodeData {
 
     NodeData() : empty(true), node(NodeType::STORAGE, 0), ost() {}
 
-    void addTo(std::map<Node, NodeState>& nodeStates,
-               std::vector<uint16_t>& nodeCount)
-    {
+    void addTo(ClusterState::NodeMap & nodeStates, ClusterState::NodeCounts & nodeCount) {
         if (!empty) {
             NodeState state(ost.str(), &node.getType());
-            if (state != NodeState(node.getType(), State::UP)
-                || state.getDescription().size() > 0)
-            {
+            if ((state != NodeState(node.getType(), State::UP)) || (state.getDescription().size() > 0)) {
                 nodeStates.insert(std::make_pair(node, state));
             }
             if (nodeCount[node.getType()] <= node.getIndex()) {
@@ -63,9 +60,9 @@ struct NodeData {
 ClusterState::ClusterState(const vespalib::string& serialized)
     : Printable(),
       _version(0),
+      _nodeCount(),
       _clusterState(&State::UP),
       _nodeStates(),
-      _nodeCount(2),
       _description(),
       _distributionBits(16)
 {
@@ -74,13 +71,13 @@ ClusterState::ClusterState(const vespalib::string& serialized)
     NodeData nodeData;
     vespalib::string lastAbsolutePath;
 
-    for (vespalib::StringTokenizer::Iterator it = st.begin(); it != st.end(); ++it) {
-        vespalib::string::size_type index = it->find(':');
+    for (const auto & token : st) {
+        vespalib::string::size_type index = token.find(':');
         if (index == vespalib::string::npos) {
-            throw IllegalArgumentException("Token " + *it + " does not contain ':': " + serialized, VESPA_STRLOC);
+            throw IllegalArgumentException("Token " + token + " does not contain ':': " + serialized, VESPA_STRLOC);
         }
-        vespalib::string key = it->substr(0, index);
-        vespalib::stringref value = it->substr(index + 1);
+        vespalib::string key = token.substr(0, index);
+        vespalib::stringref value = token.substr(index + 1);
         if (key.size() > 0 && key[0] == '.') {
             if (lastAbsolutePath == "") {
                 throw IllegalArgumentException("The first path in system state string needs to be absolute", VESPA_STRLOC);
@@ -111,7 +108,9 @@ ClusterState::parse(vespalib::stringref key, vespalib::stringref value, NodeData
         break;
     case 'b':
         if (key == "bits") {
-            _distributionBits = atoi(value.data());
+            uint32_t numBits = atoi(value.data());
+            assert(numBits <= 64);
+            _distributionBits = numBits;
             return true;
         }
         break;
@@ -138,7 +137,7 @@ ClusterState::parse(vespalib::stringref key, vespalib::stringref value, NodeData
 
 bool
 ClusterState::parseSorD(vespalib::stringref key, vespalib::stringref value, NodeData & nodeData) {
-    const NodeType* nodeType(0);
+    const NodeType* nodeType = nullptr;
     vespalib::string::size_type dot = key.find('.');
     vespalib::stringref type(dot == vespalib::string::npos
                              ? key : key.substr(0, dot));
@@ -147,10 +146,9 @@ ClusterState::parseSorD(vespalib::stringref key, vespalib::stringref value, Node
     } else if (type == "distributor") {
         nodeType = &NodeType::DISTRIBUTOR;
     }
-    if (nodeType == 0) return false;
+    if (nodeType == nullptr) return false;
     if (dot == vespalib::string::npos) { // Entry that set node counts
-        uint16_t nodeCount = 0;
-        nodeCount = atoi(value.data());
+        uint16_t nodeCount = atoi(value.data());
 
         if (nodeCount > _nodeCount[*nodeType] ) {
             _nodeCount[*nodeType] = nodeCount;
@@ -158,12 +156,9 @@ ClusterState::parseSorD(vespalib::stringref key, vespalib::stringref value, Node
         return true;
     }
     vespalib::string::size_type dot2 = key.find('.', dot + 1);
-    Node node;
-    if (dot2 == vespalib::string::npos) {
-        node = Node(*nodeType, atoi(key.substr(dot + 1).data()));
-    } else {
-        node = Node(*nodeType, atoi(key.substr(dot + 1, dot2 - dot - 1).data()));
-    }
+    Node node(*nodeType, (dot2 == vespalib::string::npos)
+                         ? atoi(key.substr(dot + 1).data())
+                         : atoi(key.substr(dot + 1, dot2 - dot - 1).data()));
 
     if (node.getIndex() >= _nodeCount[*nodeType]) {
         vespalib::asciistream ost;
@@ -184,17 +179,19 @@ ClusterState::parseSorD(vespalib::stringref key, vespalib::stringref value, Node
 }
 
 namespace {
-    struct SeparatorPrinter {
-        bool first;
-        SeparatorPrinter() : first(true) {}
-        const char * toString() {
-            if (first) {
-                first = false;
-                return "";
-            }
-            return " ";
+
+struct SeparatorPrinter {
+    bool first;
+    SeparatorPrinter() : first(true) {}
+    const char * toString() {
+        if (first) {
+            first = false;
+            return "";
         }
-    };
+        return " ";
+    }
+};
+
 }
 
 void
@@ -214,15 +211,12 @@ ClusterState::serialize(vespalib::asciistream & out, bool ignoreNewFeatures) con
     uint16_t distCount = getNodeCount(NodeType::DISTRIBUTOR);
     if (ignoreNewFeatures || distCount > 0) {
         out << sep.toString() << "distributor:" << distCount;
-        for (std::map<Node, NodeState>::const_iterator it =
-                 _nodeStates.begin();
-             it != _nodeStates.end(); ++it)
-        {
-            if (it->first.getType() != NodeType::DISTRIBUTOR) continue;
+        for (const auto & entry : _nodeStates) {
+            if (entry.first.getType() != NodeType::DISTRIBUTOR) continue;
             vespalib::asciistream prefix;
-            prefix << "." << it->first.getIndex() << ".";
+            prefix << "." << entry.first.getIndex() << ".";
             vespalib::asciistream ost;
-            it->second.serialize(ost, prefix.str(), false);
+            entry.second.serialize(ost, prefix.str(), false);
             vespalib::stringref content = ost.str();
             if (content.size() > 0) {
                 out << " " << content;
@@ -232,15 +226,12 @@ ClusterState::serialize(vespalib::asciistream & out, bool ignoreNewFeatures) con
     uint16_t storCount = getNodeCount(NodeType::STORAGE);
     if (ignoreNewFeatures || storCount > 0) {
         out << sep.toString() << "storage:" << storCount;
-        for (std::map<Node, NodeState>::const_iterator it =
-                 _nodeStates.begin();
-             it != _nodeStates.end(); ++it)
-        {
-            if (it->first.getType() != NodeType::STORAGE) continue;
+        for (const auto & entry : _nodeStates) {
+            if (entry.first.getType() != NodeType::STORAGE) continue;
             vespalib::asciistream prefix;
-            prefix << "." << it->first.getIndex() << ".";
+            prefix << "." << entry.first.getIndex() << ".";
             vespalib::asciistream ost;
-            it->second.serialize(ost, prefix.str(), false);
+            entry.second.serialize(ost, prefix.str(), false);
             vespalib::stringref content = ost.str();
             if ( !content.empty()) {
                 out << " " << content;
@@ -265,12 +256,6 @@ ClusterState::operator!=(const ClusterState& other) const noexcept
     return !(*this == other);
 }
 
-uint16_t
-ClusterState::getNodeCount(const NodeType& type) const noexcept
-{
-    return _nodeCount[type];
-}
-
 namespace {
     [[noreturn]] void throwUnknownType(const Node & node) __attribute__((noinline));
     void throwUnknownType(const Node & node) {
@@ -282,7 +267,7 @@ const NodeState&
 ClusterState::getNodeState(const Node& node) const
 {
     // If it actually has an entry in map, return that
-    auto it = _nodeStates.find(node);
+    const auto it = _nodeStates.find(node);
     if (it != _nodeStates.end()) return it->second;
 
     // If beyond node count, the node is down.
@@ -307,9 +292,7 @@ void
 ClusterState::setClusterState(const State& state)
 {
     if (!state.validClusterState()) {
-        throw vespalib::IllegalStateException(
-            state.toString(true) + " is not a legal cluster state",
-            VESPA_STRLOC);
+        throw vespalib::IllegalStateException(state.toString(true) + " is not a legal cluster state", VESPA_STRLOC);
     }
     _clusterState = &state;
 }
@@ -319,17 +302,12 @@ ClusterState::setNodeState(const Node& node, const NodeState& state)
 {
     state.verifySupportForNodeType(node.getType());
     if (node.getIndex() >= _nodeCount[node.getType()]) {
-        for (uint32_t i = _nodeCount[node.getType()]; i < node.getIndex(); ++i)
-        {
-            _nodeStates.insert(std::make_pair(
-                        Node(node.getType(), i),
-                        NodeState(node.getType(), State::DOWN)));
+        for (uint32_t i = _nodeCount[node.getType()]; i < node.getIndex(); ++i) {
+            _nodeStates.insert(std::make_pair(Node(node.getType(), i), NodeState(node.getType(), State::DOWN)));
         }
         _nodeCount[node.getType()] = node.getIndex() + 1;
     }
-    if (state == NodeState(node.getType(), State::UP)
-        && state.getDescription().size() == 0)
-    {
+    if ((state == NodeState(node.getType(), State::UP)) && state.getDescription().empty()) {
         _nodeStates.erase(node);
     } else {
         _nodeStates.insert(std::make_pair(node, state));
@@ -339,8 +317,7 @@ ClusterState::setNodeState(const Node& node, const NodeState& state)
 }
 
 void
-ClusterState::print(std::ostream& out, bool verbose,
-                   const std::string&) const
+ClusterState::print(std::ostream& out, bool verbose, const std::string&) const
 {
     (void) verbose;
     vespalib::asciistream tmp;
@@ -351,20 +328,23 @@ ClusterState::print(std::ostream& out, bool verbose,
 void
 ClusterState::removeExtraElements()
 {
+    removeExtraElements(NodeType::STORAGE);
+    removeExtraElements(NodeType::DISTRIBUTOR);
+}
+
+void
+ClusterState::removeExtraElements(const NodeType & type)
+{
     // Simplify the system state by removing the last indexes if the nodes
     // are down.
-    for (uint32_t i=0; i<2; ++i) {
-        const NodeType& type(i == 0 ? NodeType::STORAGE
-                                    : NodeType::DISTRIBUTOR);
-        for (int32_t index = _nodeCount[type]; index >= 0; --index) {
-            Node node(type, index - 1);
-            std::map<Node, NodeState>::iterator it(_nodeStates.find(node));
-            if (it == _nodeStates.end()) break;
-            if (it->second.getState() != State::DOWN) break;
-            if (it->second.getDescription() != "") break;
-            _nodeStates.erase(it);
-            --_nodeCount[type];
-        }
+    for (int32_t index = _nodeCount[type]; index >= 0; --index) {
+        Node node(type, index - 1);
+        const auto it = _nodeStates.find(node);
+        if (it == _nodeStates.end()) break;
+        if (it->second.getState() != State::DOWN) break;
+        if (it->second.getDescription() != "") break;
+        _nodeStates.erase(it);
+        --_nodeCount[type];
     }
 }
 
@@ -421,39 +401,58 @@ ClusterState::printStateGroupwise(std::ostream& out, const Distribution& dist,
 }
 
 namespace {
-    template<typename T>
-    std::string getNumberSpec(const std::vector<T>& numbers) {
-        std::ostringstream ost;
-        bool first = true;
-        uint32_t firstInRange = numbers.size() == 0 ? 0 : numbers[0];;
-        uint32_t lastInRange = firstInRange;
-        for (uint32_t i=1; i<=numbers.size(); ++i) {
-            if (i < numbers.size() && numbers[i] == lastInRange + 1) {
-                ++lastInRange;
+
+template<typename T>
+std::string getNumberSpec(const std::vector<T>& numbers) {
+    std::ostringstream ost;
+    bool first = true;
+    uint32_t firstInRange = numbers.size() == 0 ? 0 : numbers[0];;
+    uint32_t lastInRange = firstInRange;
+    for (uint32_t i=1; i<=numbers.size(); ++i) {
+        if (i < numbers.size() && numbers[i] == lastInRange + 1) {
+            ++lastInRange;
+        } else {
+            if (first) {
+                first = false;
             } else {
-                if (first) {
-                    first = false;
-                } else {
-                    ost << ",";
-                }
-                if (firstInRange == lastInRange) {
-                    ost << firstInRange;
-                } else {
-                    ost << firstInRange << "-" << lastInRange;
-                }
-                if (i < numbers.size()) {
-                    firstInRange = lastInRange = numbers[i];
-                }
+                ost << ",";
+            }
+            if (firstInRange == lastInRange) {
+                ost << firstInRange;
+            } else {
+                ost << firstInRange << "-" << lastInRange;
             }
+            if (i < numbers.size()) {
+                firstInRange = lastInRange = numbers[i];
+            }
+        }
+    }
+    return ost.str();
+}
+
+}
+
+bool
+ClusterState::printStateGroupwise(std::ostream& out, const Group& group, bool verbose,
+                                  const std::string& indent, const NodeType& nodeType) const
+{
+    NodeState defState(nodeType, State::UP);
+    bool printedAny = false;
+    for (uint16_t nodeId : group.getNodes()) {
+        Node node(nodeType, nodeId);
+        const NodeState& state(getNodeState(node));
+        if (state != defState) {
+            out << "\n" << indent << "  " << node << ": ";
+            state.print(out, verbose, indent + "    ");
+            printedAny = true;
         }
-        return ost.str();
     }
+    return printedAny;
 }
 
 void
-ClusterState::printStateGroupwise(std::ostream& out, const Group& group,
-                                  bool verbose, const std::string& indent,
-                                  bool rootGroup) const
+ClusterState::printStateGroupwise(std::ostream& out, const Group& group, bool verbose,
+                                  const std::string& indent, bool rootGroup) const
 {
     if (rootGroup) {
         out << "\n" << indent << "Top group";
@@ -469,34 +468,18 @@ ClusterState::printStateGroupwise(std::ostream& out, const Group& group,
         out << " " << group.getNodes().size() << " node"
             << (group.getNodes().size() != 1 ? "s" : "") << " ["
             << getNumberSpec(group.getNodes()) << "] {";
-        bool printedAny = false;
-        for (uint32_t j=0; j<2; ++j) {
-            const NodeType& nodeType(
-                    j == 0 ? NodeType::DISTRIBUTOR : NodeType::STORAGE);
-            NodeState defState(nodeType, State::UP);
-            for (uint32_t i=0; i<group.getNodes().size(); ++i) {
-                Node node(nodeType, group.getNodes()[i]);
-                const NodeState& state(getNodeState(node));
-                if (state != defState) {
-                    out << "\n" << indent << "  " << node << ": ";
-                    state.print(out, verbose, indent + "    ");
-                    printedAny = true;
-                }
-            }
-        }
+        bool printedAny = printStateGroupwise(out, group, verbose, indent, NodeType::DISTRIBUTOR);
+        printedAny = printedAny || printStateGroupwise(out, group, verbose, indent, NodeType::STORAGE);
         if (!printedAny) {
             out << "\n" << indent << "  All nodes in group up and available.";
         }
     } else {
-        const std::map<uint16_t, Group*>& children(group.getSubGroups());
+        const auto & children(group.getSubGroups());
         out << " " << children.size() << " branch"
             << (children.size() != 1 ? "es" : "") << " with distribution "
             << group.getDistributionSpec() << " {";
-        for (std::map<uint16_t, Group*>::const_iterator it = children.begin();
-             it != children.end(); ++it)
-        {
-            printStateGroupwise(out, *it->second, verbose,
-                                indent + "  ", false);
+        for (const auto & child : children) {
+            printStateGroupwise(out, *child.second, verbose,indent + "  ", false);
         }
     }
     out << "\n" << indent << "}";
diff --git a/vdslib/src/vespa/vdslib/state/clusterstate.h b/vdslib/src/vespa/vdslib/state/clusterstate.h
index 44af81f52ce..47c7bbfd62f 100644
--- a/vdslib/src/vespa/vdslib/state/clusterstate.h
+++ b/vdslib/src/vespa/vdslib/state/clusterstate.h
@@ -11,6 +11,7 @@
 #include "node.h"
 #include "nodestate.h"
 #include <map>
+#include <array>
 
 namespace storage::lib {
 
@@ -19,17 +20,9 @@ class Group;
 struct NodeData;
 
 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 +41,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 +58,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 +66,16 @@ 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;
+    bool printStateGroupwise(std::ostream& out, const Group&, bool verbose, const std::string& indent, const NodeType& type) const;
+    uint32_t           _version;
+    NodeCounts         _nodeCount;
+    const State*       _clusterState;
+    NodeMap            _nodeStates;
+    vespalib::string   _description;
+    uint16_t           _distributionBits;
 };
 
 }
diff --git a/vdslib/src/vespa/vdslib/state/node.h b/vdslib/src/vespa/vdslib/state/node.h
index 2e33e54c638..5dfd6a2ccf4 100644
--- a/vdslib/src/vespa/vdslib/state/node.h
+++ b/vdslib/src/vespa/vdslib/state/node.h
@@ -13,24 +13,24 @@ namespace storage::lib {
 
 class Node {
     const NodeType* _type;
-    uint16_t _index;
+    uint16_t        _index;
 
 public:
     Node() noexcept : _type(&NodeType::STORAGE), _index(0) { }
     Node(const NodeType& type, uint16_t index) noexcept
         : _type(&type), _index(index) { }
 
-    const NodeType& getType() const { return *_type; }
-    uint16_t getIndex() const { return _index; }
+    const NodeType& getType() const noexcept { return *_type; }
+    uint16_t getIndex() const noexcept { return _index; }
 
-    bool operator==(const Node& other) const {
+    bool operator==(const Node& other) const noexcept {
         return (other._index == _index && *other._type == *_type);
     }
-    bool operator!=(const Node& other) const {
+    bool operator!=(const Node& other) const noexcept {
         return (other._index != _index || *other._type != *_type);
     }
 
-    bool operator<(const Node& n) const {
+    bool operator<(const Node& n) const noexcept {
         if (*_type != *n._type) return (*_type < *n._type);
         return (_index < n._index);
     }