GC void ignoreNewFeatures flag always false.

3 files changed, 20 insertions, 27 deletions

diff --git a/vdslib/src/tests/state/clusterstatetest.cpp b/vdslib/src/tests/state/clusterstatetest.cpp
index a08ec007f55..0b278177453 100644
--- a/vdslib/src/tests/state/clusterstatetest.cpp
+++ b/vdslib/src/tests/state/clusterstatetest.cpp
@@ -13,10 +13,10 @@ using ::testing::ContainsRegex;
 
 namespace storage::lib {
 
-#define VERIFY3(source, result, type, typestr) { \
+#define VERIFY3(source, result, typestr) { \
     vespalib::asciistream ost; \
     try { \
-        state->serialize(ost, type); \
+        state->serialize(ost); \
     } catch (std::exception& e) { \
         FAIL() << ("Failed to serialize system state " \
                 + state->toString(true) + " in " + std::string(typestr) \
@@ -26,24 +26,18 @@ namespace storage::lib {
               vespalib::string(typestr) + " \"" + ost.str() + "\"") << state->toString(true); \
 }
 
-#define VERIFY2(serialized, result, testOld, testNew) { \
+#define VERIFY2(serialized, result) { \
     std::unique_ptr<ClusterState> state; \
     try { \
         state.reset(new ClusterState(serialized)); \
     } catch (std::exception& e) { \
-        FAIL() << ("Failed to parse '" + std::string(serialized) \
-                     + "': " + e.what()); \
+        FAIL() << ("Failed to parse '" + std::string(serialized) + "': " + e.what()); \
     } \
-    if (testOld) VERIFY3(serialized, result, true, "Old") \
-    if (testNew) VERIFY3(serialized, result, false, "New") \
+    VERIFY3(serialized, result, "New") \
 }
 
-#define VERIFYSAMEOLD(serialized) VERIFY2(serialized, serialized, true, false)
-#define VERIFYOLD(serialized, result) VERIFY2(serialized, result, true, false)
-#define VERIFYSAMENEW(serialized) VERIFY2(serialized, serialized, false, true)
-#define VERIFYNEW(serialized, result) VERIFY2(serialized, result, false, true)
-#define VERIFYSAME(serialized) VERIFY2(serialized, serialized, true, true)
-#define VERIFY(serialized, result) VERIFY2(serialized, result, true, true)
+#define VERIFYSAMENEW(serialized) VERIFY2(serialized, serialized)
+#define VERIFYNEW(serialized, result) VERIFY2(serialized, result)
 
 #define VERIFY_FAIL(serialized, error) { \
     try{ \
diff --git a/vdslib/src/vespa/vdslib/state/clusterstate.cpp b/vdslib/src/vespa/vdslib/state/clusterstate.cpp
index ef13c48a1e7..f4314a6624b 100644
--- a/vdslib/src/vespa/vdslib/state/clusterstate.cpp
+++ b/vdslib/src/vespa/vdslib/state/clusterstate.cpp
@@ -209,12 +209,11 @@ serialize_node(vespalib::asciistream & out, const Node & node, const NodeState &
 }
 
 void
-ClusterState::serialize_nodes(vespalib::asciistream & out, bool ignoreNewFeatures,
-                              SeparatorPrinter & sep, const NodeType & nodeType,
+ClusterState::serialize_nodes(vespalib::asciistream & out, SeparatorPrinter & sep, const NodeType & nodeType,
                               const std::vector<NodeStatePair> & nodeStates) const
 {
     uint16_t nodeCount = getNodeCount(nodeType);
-    if (ignoreNewFeatures || nodeCount > 0) {
+    if (nodeCount > 0) {
         out << sep.toString() << nodeType.serialize() << ":" << nodeCount;
         for (const auto & entry : nodeStates) {
             if (entry.first.getType() == nodeType) {
@@ -225,25 +224,25 @@ ClusterState::serialize_nodes(vespalib::asciistream & out, bool ignoreNewFeature
 }
 
 void
-ClusterState::serialize(vespalib::asciistream & out, bool ignoreNewFeatures) const
+ClusterState::serialize(vespalib::asciistream & out) const
 {
     SeparatorPrinter sep;
-    if (!ignoreNewFeatures && _version != 0) {
+    if (_version != 0) {
         out << sep.toString() << "version:" << _version;
     }
-    if (!ignoreNewFeatures && *_clusterState != State::UP) {
+    if (*_clusterState != State::UP) {
         out << sep.toString() << "cluster:" << _clusterState->serialize();
     }
-    if (!ignoreNewFeatures && _distributionBits != 16) {
+    if (_distributionBits != 16) {
         out << sep.toString() << "bits:" << _distributionBits;
     }
 
-    if (! ignoreNewFeatures && ((getNodeCount(NodeType::DISTRIBUTOR) + getNodeCount(NodeType::STORAGE)) == 0u)) return;
+    if ((getNodeCount(NodeType::DISTRIBUTOR) + getNodeCount(NodeType::STORAGE)) == 0u) return;
 
     std::vector<NodeStatePair> nodeStates(_nodeStates.cbegin(), _nodeStates.cend());
     std::sort(nodeStates.begin(), nodeStates.end(), [](const NodeStatePair &a, const NodeStatePair &b) { return a.first < b.first; });
-    serialize_nodes(out, ignoreNewFeatures, sep, NodeType::DISTRIBUTOR, nodeStates);
-    serialize_nodes(out, ignoreNewFeatures, sep, NodeType::STORAGE, nodeStates);
+    serialize_nodes(out, sep, NodeType::DISTRIBUTOR, nodeStates);
+    serialize_nodes(out, sep, NodeType::STORAGE, nodeStates);
 }
 
 bool
@@ -327,7 +326,7 @@ ClusterState::print(std::ostream& out, bool verbose, const std::string&) const
 {
     (void) verbose;
     vespalib::asciistream tmp;
-    serialize(tmp, false);
+    serialize(tmp);
     out << tmp.str();
 }
 
diff --git a/vdslib/src/vespa/vdslib/state/clusterstate.h b/vdslib/src/vespa/vdslib/state/clusterstate.h
index 4cf8ba20d81..90ec7c1aa65 100644
--- a/vdslib/src/vespa/vdslib/state/clusterstate.h
+++ b/vdslib/src/vespa/vdslib/state/clusterstate.h
@@ -38,7 +38,7 @@ public:
     ~ClusterState();
 
     std::string getTextualDifference(const ClusterState& other) const;
-    void serialize(vespalib::asciistream & out, bool ignoreNewFeatures) const;
+    void serialize(vespalib::asciistream & out) const;
 
     bool operator==(const ClusterState& other) const noexcept;
     bool operator!=(const ClusterState& other) const noexcept;
@@ -72,8 +72,8 @@ private:
     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 std::vector<NodeStatePair> & nodeStates) const;
+    void serialize_nodes(vespalib::asciistream & out, SeparatorPrinter & sep, const NodeType & nodeType,
+                         const std::vector<NodeStatePair> & nodeStates) const;
     uint32_t           _version;
     NodeCounts         _nodeCount;
     const State*       _clusterState;