Revert "Finalize ClusterStateBundle to return derived cluster state if bucket…"

4 files changed, 3 insertions, 84 deletions

diff --git a/vdslib/src/tests/state/CMakeLists.txt b/vdslib/src/tests/state/CMakeLists.txt
index 8b1957a91bb..8e394fc18c5 100644
--- a/vdslib/src/tests/state/CMakeLists.txt
+++ b/vdslib/src/tests/state/CMakeLists.txt
@@ -1,7 +1,6 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(vdslib_teststate
     SOURCES
-    cluster_state_bundle_test.cpp
     clusterstatetest.cpp
     nodestatetest.cpp
     DEPENDS
diff --git a/vdslib/src/tests/state/cluster_state_bundle_test.cpp b/vdslib/src/tests/state/cluster_state_bundle_test.cpp
deleted file mode 100644
index 4798fe505f8..00000000000
--- a/vdslib/src/tests/state/cluster_state_bundle_test.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include <vespa/vdslib/state/cluster_state_bundle.h>
-#include <vespa/vdslib/state/clusterstate.h>
-
-#include <cppunit/extensions/HelperMacros.h>
-
-using document::BucketSpace;
-
-namespace storage::lib {
-
-using ClusterStatePtr = std::shared_ptr<const ClusterState>;
-
-struct ClusterStateBundleTest : public CppUnit::TestFixture {
-    CPPUNIT_TEST_SUITE(ClusterStateBundleTest);
-    CPPUNIT_TEST(derived_state_is_returned_if_bucket_space_is_found);
-    CPPUNIT_TEST(baseline_state_is_returned_if_bucket_space_is_not_found);
-    CPPUNIT_TEST(verify_equality_operator);
-    CPPUNIT_TEST_SUITE_END();
-
-    void derived_state_is_returned_if_bucket_space_is_found();
-    void baseline_state_is_returned_if_bucket_space_is_not_found();
-    void verify_equality_operator();
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION(ClusterStateBundleTest);
-
-struct Fixture {
-    ClusterState baselineState;
-    ClusterStatePtr derivedState;
-    ClusterStateBundle bundle;
-    Fixture()
-        : baselineState("storage:2"),
-          derivedState(std::make_shared<const ClusterState>("storage:2 .1.s:m")),
-          bundle(baselineState, {{BucketSpace(1), derivedState}})
-    {}
-    ~Fixture() {}
-};
-
-void
-ClusterStateBundleTest::derived_state_is_returned_if_bucket_space_is_found()
-{
-    Fixture f;
-    CPPUNIT_ASSERT_EQUAL(*f.derivedState, *f.bundle.getDerivedClusterState(BucketSpace(1)));
-}
-
-void
-ClusterStateBundleTest::baseline_state_is_returned_if_bucket_space_is_not_found()
-{
-    Fixture f;
-    CPPUNIT_ASSERT_EQUAL(f.baselineState, *f.bundle.getDerivedClusterState(BucketSpace(2)));
-}
-
-ClusterStateBundle
-makeBundle(const vespalib::string &baselineState, const std::map<BucketSpace, vespalib::string> &derivedStates)
-{
-    ClusterStateBundle::BucketSpaceStateMapping derivedBucketSpaceStates;
-    for (const auto &entry : derivedStates) {
-        derivedBucketSpaceStates[entry.first] = std::make_shared<const ClusterState>(entry.second);
-    }
-    return ClusterStateBundle(ClusterState(baselineState), std::move(derivedBucketSpaceStates));
-}
-
-void
-ClusterStateBundleTest::verify_equality_operator()
-{
-    Fixture f;
-    CPPUNIT_ASSERT(f.bundle != makeBundle("storage:3", {{BucketSpace(1), "storage:2 .1.s:m"}}));
-    CPPUNIT_ASSERT(f.bundle != makeBundle("storage:2", {}));
-    CPPUNIT_ASSERT(f.bundle != makeBundle("storage:2", {{BucketSpace(1), "storage:2 .0.s:m"}}));
-    CPPUNIT_ASSERT(f.bundle != makeBundle("storage:2", {{BucketSpace(2), "storage:2 .1.s:m"}}));
-
-    CPPUNIT_ASSERT_EQUAL(f.bundle, makeBundle("storage:2", {{BucketSpace(1), "storage:2 .1.s:m"}}));
-}
-
-}
-
diff --git a/vdslib/src/vespa/vdslib/state/cluster_state_bundle.cpp b/vdslib/src/vespa/vdslib/state/cluster_state_bundle.cpp
index ed561d67f6d..cf9c0ba6dff 100644
--- a/vdslib/src/vespa/vdslib/state/cluster_state_bundle.cpp
+++ b/vdslib/src/vespa/vdslib/state/cluster_state_bundle.cpp
@@ -28,12 +28,10 @@ ClusterStateBundle::getBaselineClusterState() const
 }
 
 const std::shared_ptr<const lib::ClusterState> &
-ClusterStateBundle::getDerivedClusterState(document::BucketSpace bucketSpace) const
+ClusterStateBundle::getDerivedClusterState(document::BucketSpace) const
 {
-    auto itr = _derivedBucketSpaceStates.find(bucketSpace);
-    if (itr != _derivedBucketSpaceStates.end()) {
-        return itr->second;
-    }
+    // For now, just return the baseline cluster state.
+    // TODO use _derivedBucketSpaceStates
     return _baselineClusterState;
 }
 
diff --git a/vdslib/src/vespa/vdslib/state/cluster_state_bundle.h b/vdslib/src/vespa/vdslib/state/cluster_state_bundle.h
index a64416762b8..a8ee0b54713 100644
--- a/vdslib/src/vespa/vdslib/state/cluster_state_bundle.h
+++ b/vdslib/src/vespa/vdslib/state/cluster_state_bundle.h
@@ -36,7 +36,6 @@ public:
     }
     uint32_t getVersion() const;
     bool operator==(const ClusterStateBundle &rhs) const;
-    bool operator!=(const ClusterStateBundle &rhs) const { return !operator==(rhs); }
 };
 
 std::ostream& operator<<(std::ostream&, const ClusterStateBundle&);