Merge pull request #28021 from vespa-engine/balder/generate-fast-idealstate-lookup-once

Balder/generate fast idealstate lookup once

2 files changed, 8 insertions, 11 deletions

diff --git a/storage/src/tests/distributor/distributor_bucket_space_test.cpp b/storage/src/tests/distributor/distributor_bucket_space_test.cpp
index 6e5863298ce..3ea4c1ca3c2 100644
--- a/storage/src/tests/distributor/distributor_bucket_space_test.cpp
+++ b/storage/src/tests/distributor/distributor_bucket_space_test.cpp
@@ -106,13 +106,13 @@ DistributorBucketSpaceTest::count_service_layer_buckets(const std::vector<Bucket
         for (uint32_t i = 0; i < 3; ++i) {
             switch (i) {
             case 0:
-                ideal_nodes = ideal_nodes_bundle.get_available_nodes();
+                ideal_nodes = ideal_nodes_bundle.available_nodes();
                 break;
             case 1:
-                ideal_nodes = ideal_nodes_bundle.get_available_nonretired_nodes();
+                ideal_nodes = ideal_nodes_bundle.available_nonretired_nodes();
                 break;
             case 2:
-                ideal_nodes = ideal_nodes_bundle.get_available_nonretired_or_maintenance_nodes();
+                ideal_nodes = ideal_nodes_bundle.available_nonretired_or_maintenance_nodes();
                 break;
             default:
                 ;
diff --git a/storage/src/tests/distributor/statecheckerstest.cpp b/storage/src/tests/distributor/statecheckerstest.cpp
index cd64d81774e..4ca4d70a816 100644
--- a/storage/src/tests/distributor/statecheckerstest.cpp
+++ b/storage/src/tests/distributor/statecheckerstest.cpp
@@ -1588,10 +1588,9 @@ TEST_F(StateCheckersTest, context_populates_ideal_state_containers) {
                             getDistributorBucketSpace(), statsTracker, makeDocumentBucket({17, 0}));
 
     ASSERT_THAT(c.idealState(), ElementsAre(1, 3));
-    // TODO replace with UnorderedElementsAre once we can build gmock without issues
-    std::vector<uint16_t> ideal_state(c.unorderedIdealState.begin(), c.unorderedIdealState.end());
-    std::sort(ideal_state.begin(), ideal_state.end());
-    ASSERT_THAT(ideal_state, ElementsAre(1, 3));
+    for (uint16_t node : c.idealState()) {
+        ASSERT_TRUE(c.idealStateBundle.is_nonretired_or_maintenance(node));
+    }
 }
 
 namespace {
@@ -1606,8 +1605,7 @@ public:
     explicit StateCheckerRunner(StateCheckersTest& fixture);
     ~StateCheckerRunner();
 
-    StateCheckerRunner& addToDb(const document::BucketId& bid,
-                                const std::string& bucketInfo)
+    StateCheckerRunner& addToDb(const document::BucketId& bid, const std::string& bucketInfo)
     {
         _fixture.addNodesToBucketDB(bid, bucketInfo);
         return *this;
@@ -1642,8 +1640,7 @@ public:
         Checker checker;
         StateChecker::Context c(_fixture.node_context(), _fixture.operation_context(),
                                 _fixture.getDistributorBucketSpace(), _statsTracker, makeDocumentBucket(bid));
-        _result = _fixture.testStateChecker(
-                checker, c, false, StateCheckersTest::PendingMessage(), false);
+        _result = _fixture.testStateChecker(checker, c, false, StateCheckersTest::PendingMessage(), false);
     }
 
     const std::string& result() const { return _result; }