GC last use of hasItem, and use lookup interface directly.

9 files changed, 22 insertions, 26 deletions

diff --git a/storage/src/tests/distributor/btree_bucket_database_test.cpp b/storage/src/tests/distributor/btree_bucket_database_test.cpp
index 14d5a4142a8..40575cacfba 100644
--- a/storage/src/tests/distributor/btree_bucket_database_test.cpp
+++ b/storage/src/tests/distributor/btree_bucket_database_test.cpp
@@ -19,15 +19,15 @@ using document::BucketId;
 
 namespace {
 
-BucketCopy BC(uint32_t node_idx, uint32_t state) {
+BucketCopy BC(uint16_t node_idx, uint32_t state) {
     api::BucketInfo info(0x123, state, state);
-    return BucketCopy(0, node_idx, info);
+    return {0, node_idx, info};
 }
 
 
 BucketInfo BI(uint32_t node_idx, uint32_t state) {
     BucketInfo bi;
-    bi.addNode(BC(node_idx, state), toVector<uint16_t>(0));
+    bi.addNode(BC(node_idx, state), {0});
     return bi;
 }
 
diff --git a/storage/src/tests/distributor/bucketdatabasetest.cpp b/storage/src/tests/distributor/bucketdatabasetest.cpp
index fcc64e0cccf..032b8ad8a9c 100644
--- a/storage/src/tests/distributor/bucketdatabasetest.cpp
+++ b/storage/src/tests/distributor/bucketdatabasetest.cpp
@@ -1,9 +1,9 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "bucketdatabasetest.h"
+#include <vespa/storage/storageutil/utils.h>
 #include <vespa/vespalib/util/benchmark_timer.h>
 #include <chrono>
-#include <iomanip>
 #include <algorithm>
 
 namespace storage::distributor {
@@ -16,21 +16,21 @@ void BucketDatabaseTest::SetUp() {
 
 namespace {
 
-BucketCopy BC(uint32_t nodeIdx) {
+BucketCopy BC(uint16_t nodeIdx) {
     return BucketCopy(0, nodeIdx, api::BucketInfo());
 }
 
-BucketInfo BI(uint32_t nodeIdx) {
+BucketInfo BI(uint16_t nodeIdx) {
     BucketInfo bi;
-    bi.addNode(BC(nodeIdx), toVector<uint16_t>(0));
+    bi.addNode(BC(nodeIdx), {0});
     return bi;
 }
 
-BucketInfo BI3(uint32_t node0, uint32_t node1, uint32_t node2) {
+BucketInfo BI3(uint16_t node0, uint16_t node1, uint16_t node2) {
     BucketInfo bi;
-    bi.addNode(BC(node0), toVector<uint16_t>(node0, node1, node2));
-    bi.addNode(BC(node1), toVector<uint16_t>(node0, node1, node2));
-    bi.addNode(BC(node2), toVector<uint16_t>(node0, node1, node2));
+    bi.addNode(BC(node0), {node0, node1, node2});
+    bi.addNode(BC(node1), {node0, node1, node2});
+    bi.addNode(BC(node2), {node0, node1, node2});
     return bi;
 }
 
diff --git a/storage/src/tests/distributor/bucketdatabasetest.h b/storage/src/tests/distributor/bucketdatabasetest.h
index 33f914f8fd2..f24a62728d3 100644
--- a/storage/src/tests/distributor/bucketdatabasetest.h
+++ b/storage/src/tests/distributor/bucketdatabasetest.h
@@ -2,7 +2,6 @@
 #pragma once
 
 #include <vespa/storage/bucketdb/bucketdatabase.h>
-#include <vespa/storage/storageutil/utils.h>
 #include <vespa/vespalib/gtest/gtest.h>
 #include <functional>
 
@@ -11,19 +10,14 @@ namespace storage::distributor {
 struct BucketDatabaseTest : public ::testing::TestWithParam<std::shared_ptr<BucketDatabase>> {
     void SetUp() override ;
 
-    std::string doFindParents(const std::vector<document::BucketId>& ids,
-                              const document::BucketId& searchId);
-    std::string doFindAll(const std::vector<document::BucketId>& ids,
-                          const document::BucketId& searchId);
+    std::string doFindParents(const std::vector<document::BucketId>& ids, const document::BucketId& searchId);
+    std::string doFindAll(const std::vector<document::BucketId>& ids, const document::BucketId& searchId);
     document::BucketId doCreate(const std::vector<document::BucketId>& ids,
-                                uint32_t minBits,
-                                const document::BucketId& wantedId);
+                                uint32_t minBits, const document::BucketId& wantedId);
 
     BucketDatabase& db() noexcept { return *GetParam(); }
 
-    using UBoundFunc = std::function<
-            document::BucketId(const BucketDatabase&,
-                               const document::BucketId&)>;
+    using UBoundFunc = std::function<document::BucketId(const BucketDatabase&, const document::BucketId&)>;
 
     void doTestUpperBound(const UBoundFunc& f);
 };
diff --git a/storage/src/tests/distributor/bucketstateoperationtest.cpp b/storage/src/tests/distributor/bucketstateoperationtest.cpp
index 42ee4675e26..c9fab0b37e5 100644
--- a/storage/src/tests/distributor/bucketstateoperationtest.cpp
+++ b/storage/src/tests/distributor/bucketstateoperationtest.cpp
@@ -3,6 +3,7 @@
 #include <tests/distributor/distributor_stripe_test_util.h>
 #include <vespa/storage/distributor/operations/idealstate/setbucketstateoperation.h>
 #include <vespa/storage/distributor/top_level_distributor.h>
+#include <vespa/storage/storageutil/utils.h>
 #include <vespa/document/test/make_document_bucket.h>
 #include <vespa/vespalib/gtest/gtest.h>
 #include "dummy_cluster_context.h"
diff --git a/storage/src/tests/distributor/distributor_stripe_test_util.cpp b/storage/src/tests/distributor/distributor_stripe_test_util.cpp
index 6ececa39583..5babde49380 100644
--- a/storage/src/tests/distributor/distributor_stripe_test_util.cpp
+++ b/storage/src/tests/distributor/distributor_stripe_test_util.cpp
@@ -10,6 +10,7 @@
 #include <vespa/storage/distributor/distributormetricsset.h>
 #include <vespa/storage/distributor/ideal_state_total_metrics.h>
 #include <vespa/storage/distributor/node_supported_features_repo.h>
+#include <vespa/storage/storageutil/utils.h>
 #include <vespa/vdslib/distribution/distribution.h>
 #include <vespa/vespalib/text/stringtokenizer.h>
 #include <vespa/vespalib/stllike/hash_map.hpp>
@@ -225,7 +226,7 @@ DistributorStripeTestUtil::addIdealNodes(const lib::ClusterState& state, const d
 
     for (uint32_t i = 0; i < res.size(); ++i) {
         if (state.getNodeState(lib::Node(lib::NodeType::STORAGE, res[i])).getState() != lib::State::MAINTENANCE) {
-            entry->addNode(BucketCopy(0, res[i], api::BucketInfo(1,1,1)), toVector<uint16_t>(0));
+            entry->addNode(BucketCopy(0, res[i], api::BucketInfo(1,1,1)), {0});
         }
     }
 
@@ -324,7 +325,7 @@ DistributorStripeTestUtil::insertBucketInfo(document::BucketId id, uint16_t node
         info2.setActive();
     }
     BucketCopy copy(operation_context().generate_unique_timestamp(), node, info2);
-    entry->addNode(copy.setTrusted(trusted), toVector<uint16_t>(0));
+    entry->addNode(copy.setTrusted(trusted), {0});
     getBucketDatabase().update(entry);
 }
 
diff --git a/storage/src/tests/distributor/distributor_stripe_test_util.h b/storage/src/tests/distributor/distributor_stripe_test_util.h
index 9963b2c96b4..272301bf4a6 100644
--- a/storage/src/tests/distributor/distributor_stripe_test_util.h
+++ b/storage/src/tests/distributor/distributor_stripe_test_util.h
@@ -7,6 +7,7 @@
 #include <tests/common/teststorageapp.h>
 #include <vespa/storage/common/hostreporter/hostinfo.h>
 #include <vespa/storage/distributor/stripe_host_info_notifier.h>
+#include <vespa/storage/storageutil/utils.h>
 
 namespace storage {
 
diff --git a/storage/src/tests/distributor/garbagecollectiontest.cpp b/storage/src/tests/distributor/garbagecollectiontest.cpp
index c2f4836f4cb..9b5056f2066 100644
--- a/storage/src/tests/distributor/garbagecollectiontest.cpp
+++ b/storage/src/tests/distributor/garbagecollectiontest.cpp
@@ -71,8 +71,7 @@ struct GarbageCollectionOperationTest : Test, DistributorStripeTestUtil {
 
     std::shared_ptr<GarbageCollectionOperation> create_op() {
         auto op = std::make_shared<GarbageCollectionOperation>(
-                dummy_cluster_context, BucketAndNodes(makeDocumentBucket(_bucket_id),
-                                                            toVector<uint16_t>(0, 1)));
+                dummy_cluster_context, BucketAndNodes(makeDocumentBucket(_bucket_id), {0, 1}));
         op->setIdealStateManager(&getIdealStateManager());
         return op;
     }
diff --git a/storage/src/tests/distributor/top_level_distributor_test_util.cpp b/storage/src/tests/distributor/top_level_distributor_test_util.cpp
index 9859a6fb237..6bbe7a47da2 100644
--- a/storage/src/tests/distributor/top_level_distributor_test_util.cpp
+++ b/storage/src/tests/distributor/top_level_distributor_test_util.cpp
@@ -10,6 +10,7 @@
 #include <vespa/storage/distributor/distributor_stripe_pool.h>
 #include <vespa/storage/distributor/distributor_stripe_thread.h>
 #include <vespa/storage/distributor/distributor_total_metrics.h>
+#include <vespa/storage/storageutil/utils.h>
 #include <vespa/storage/common/bucket_stripe_utils.h>
 #include <vespa/vdslib/distribution/distribution.h>
 #include <vespa/vespalib/text/stringtokenizer.h>
diff --git a/storage/src/tests/distributor/top_level_distributor_test_util.h b/storage/src/tests/distributor/top_level_distributor_test_util.h
index cd5db7c8f80..51700848733 100644
--- a/storage/src/tests/distributor/top_level_distributor_test_util.h
+++ b/storage/src/tests/distributor/top_level_distributor_test_util.h
@@ -7,7 +7,6 @@
 #include <tests/common/teststorageapp.h>
 #include <vespa/storage/common/hostreporter/hostinfo.h>
 #include <vespa/storage/frameworkimpl/component/distributorcomponentregisterimpl.h>
-#include <vespa/storage/storageutil/utils.h>
 #include <vespa/storageapi/message/state.h>
 #include <vespa/storageframework/defaultimplementation/clock/fakeclock.h>