Merge pull request #27989 from vespa-engine/balder/faster-bucketdb-metrics

Move where possible

3 files changed, 9 insertions, 17 deletions

diff --git a/storage/src/tests/distributor/bucketdbmetricupdatertest.cpp b/storage/src/tests/distributor/bucketdbmetricupdatertest.cpp
index c4536c6fa2c..4d04e3ca51a 100644
--- a/storage/src/tests/distributor/bucketdbmetricupdatertest.cpp
+++ b/storage/src/tests/distributor/bucketdbmetricupdatertest.cpp
@@ -7,7 +7,6 @@
 #include <vespa/vespalib/util/memoryusage.h>
 #include <vespa/vespalib/gtest/gtest.h>
 #include <string>
-#include <sstream>
 
 namespace storage::distributor {
 
@@ -16,19 +15,16 @@ using namespace ::testing;
 
 struct BucketDBMetricUpdaterTest : Test {
     void visitBucketWith2Copies1Trusted(BucketDBMetricUpdater& metricUpdater);
-    void visitBucketWith2CopiesBothTrusted(
-            BucketDBMetricUpdater& metricUpdater);
+    void visitBucketWith2CopiesBothTrusted(BucketDBMetricUpdater& metricUpdater);
     void visitBucketWith1Copy(BucketDBMetricUpdater& metricUpdater);
 
-    using NodeToReplicasMap = std::unordered_map<uint16_t, uint32_t>;
+    using NodeToReplicasMap = MinReplicaMap;
     NodeToReplicasMap replicaStatsOf(BucketDBMetricUpdater& metricUpdater);
 
     BucketDBMetricUpdaterTest();
 };
 
-BucketDBMetricUpdaterTest::BucketDBMetricUpdaterTest()
-{
-}
+BucketDBMetricUpdaterTest::BucketDBMetricUpdaterTest() = default;
 
 namespace {
 
@@ -38,8 +34,6 @@ void addNode(BucketInfo& info, uint16_t node, uint32_t crc) {
     info.addNode(BucketCopy(1234, node, apiInfo), order);
 }
 
-using Trusted = bool;
-
 BucketInfo
 makeInfo(uint32_t copy0Crc)
 {
@@ -271,8 +265,7 @@ TEST_F(BucketDBMetricUpdaterTest, complete_round_clears_working_state) {
 
 // Replicas on nodes 0 and 1.
 void
-BucketDBMetricUpdaterTest::visitBucketWith2Copies1Trusted(
-        BucketDBMetricUpdater& metricUpdater)
+BucketDBMetricUpdaterTest::visitBucketWith2Copies1Trusted(BucketDBMetricUpdater& metricUpdater)
 {
     BucketInfo info;
     addNode(info, 0, 100);
@@ -283,8 +276,7 @@ BucketDBMetricUpdaterTest::visitBucketWith2Copies1Trusted(
 
 // Replicas on nodes 0 and 2.
 void
-BucketDBMetricUpdaterTest::visitBucketWith2CopiesBothTrusted(
-        BucketDBMetricUpdater& metricUpdater)
+BucketDBMetricUpdaterTest::visitBucketWith2CopiesBothTrusted(BucketDBMetricUpdater& metricUpdater)
 {
     BucketInfo info;
     addNode(info, 0, 200);
diff --git a/storage/src/tests/distributor/distributor_host_info_reporter_test.cpp b/storage/src/tests/distributor/distributor_host_info_reporter_test.cpp
index 6dfab5abc21..a72dfec2d94 100644
--- a/storage/src/tests/distributor/distributor_host_info_reporter_test.cpp
+++ b/storage/src/tests/distributor/distributor_host_info_reporter_test.cpp
@@ -14,7 +14,7 @@ namespace storage::distributor {
 
 using End = vespalib::JsonStream::End;
 using File = vespalib::File;
-using MinReplicaStats = std::unordered_map<uint16_t, uint32_t>;
+using MinReplicaStats = MinReplicaMap;
 using Object = vespalib::JsonStream::Object;
 using PerNodeBucketSpacesStats = BucketSpacesStatsProvider::PerNodeBucketSpacesStats;
 using BucketSpacesStats = BucketSpacesStatsProvider::BucketSpacesStats;
@@ -36,7 +36,7 @@ struct MockedMinReplicaProvider : MinReplicaProvider
     MinReplicaStats minReplica;
 
     ~MockedMinReplicaProvider() override;
-    std::unordered_map<uint16_t, uint32_t> getMinReplica() const override {
+    MinReplicaMap getMinReplica() const override {
         return minReplica;
     }
 };
diff --git a/storage/src/tests/distributor/top_level_distributor_test.cpp b/storage/src/tests/distributor/top_level_distributor_test.cpp
index dad6f477d83..94f8821f9c8 100644
--- a/storage/src/tests/distributor/top_level_distributor_test.cpp
+++ b/storage/src/tests/distributor/top_level_distributor_test.cpp
@@ -92,7 +92,7 @@ struct TopLevelDistributorTest : Test, TopLevelDistributorTestUtil {
         return _distributor->getBucketSpacesStats();
     }
 
-    std::unordered_map<uint16_t, uint32_t> distributor_min_replica_stats() {
+    MinReplicaMap distributor_min_replica_stats() {
         return _distributor->getMinReplica();
     }
 
@@ -504,7 +504,7 @@ void assert_invalid_bucket_stats_for_all_spaces(
     ASSERT_FALSE(space_iter->second.valid());
 }
 
-void assert_min_replica_stats_zeroed(const std::unordered_map<uint16_t, uint32_t>& stats, uint16_t node_index) {
+void assert_min_replica_stats_zeroed(const MinReplicaMap & stats, uint16_t node_index) {
     auto iter = stats.find(node_index);
     ASSERT_TRUE(iter != stats.cend());
     EXPECT_EQ(iter->second, 0);