Rename methods to follow style in class

5 files changed, 11 insertions, 13 deletions

diff --git a/storage/src/vespa/storage/distributor/ideal_service_layer_nodes_bundle.h b/storage/src/vespa/storage/distributor/ideal_service_layer_nodes_bundle.h
index 38ec0e37044..1fce5bf0813 100644
--- a/storage/src/vespa/storage/distributor/ideal_service_layer_nodes_bundle.h
+++ b/storage/src/vespa/storage/distributor/ideal_service_layer_nodes_bundle.h
@@ -57,12 +57,8 @@ public:
     bool is_nonretired_or_maintenance(uint16_t node) const noexcept {
         return nonretired_or_maintenance_index(node) != Index::invalid();
     }
-    NonRetiredOrMaintenance2Index nonRetiredOrMaintenance2Index() const noexcept {
-        return NonRetiredOrMaintenance2Index(*this);
-    }
-    ConstNodesRef2Index available2Index() const noexcept {
-        return ConstNodesRef2Index(available_nodes());
-    }
+    NonRetiredOrMaintenance2Index nonretired_or_maintenance_to_index() const noexcept { return {*this}; }
+    ConstNodesRef2Index available_to_index() const noexcept { return {available_nodes()}; }
 private:
     struct LookupMap;
     Index nonretired_or_maintenance_index(uint16_t node) const noexcept;
diff --git a/storage/src/vespa/storage/distributor/operations/external/putoperation.cpp b/storage/src/vespa/storage/distributor/operations/external/putoperation.cpp
index 5414c6221fc..854e7d15f82 100644
--- a/storage/src/vespa/storage/distributor/operations/external/putoperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/external/putoperation.cpp
@@ -66,7 +66,7 @@ PutOperation::insertDatabaseEntryAndScheduleCreateBucket(const OperationTargetLi
         assert(!multipleBuckets);
         (void) multipleBuckets;
         BucketDatabase::Entry entry(_bucket_space.getBucketDatabase().get(lastBucket));
-        active = ActiveCopy::calculate(_bucket_space.get_ideal_service_layer_nodes_bundle(lastBucket).available2Index(), _bucket_space.getDistribution(), entry,
+        active = ActiveCopy::calculate(_bucket_space.get_ideal_service_layer_nodes_bundle(lastBucket).available_to_index(), _bucket_space.getDistribution(), entry,
                                        _op_ctx.distributor_config().max_activation_inhibited_out_of_sync_groups());
         LOG(debug, "Active copies for bucket %s: %s", entry.getBucketId().toString().c_str(), active.toString().c_str());
         for (uint32_t i=0; i<active.size(); ++i) {
diff --git a/storage/src/vespa/storage/distributor/operationtargetresolverimpl.cpp b/storage/src/vespa/storage/distributor/operationtargetresolverimpl.cpp
index 17b4dcd4f42..eb08cf51f43 100644
--- a/storage/src/vespa/storage/distributor/operationtargetresolverimpl.cpp
+++ b/storage/src/vespa/storage/distributor/operationtargetresolverimpl.cpp
@@ -52,7 +52,7 @@ BucketInstanceList::populate(const document::BucketId& specificId, const Distrib
     std::vector<BucketDatabase::Entry> entries;
     db.getParents(specificId, entries);
     for (const auto & entry : entries) {
-        auto node2Index = distributor_bucket_space.get_ideal_service_layer_nodes_bundle(entry.getBucketId()).nonRetiredOrMaintenance2Index();
+        auto node2Index = distributor_bucket_space.get_ideal_service_layer_nodes_bundle(entry.getBucketId()).nonretired_or_maintenance_to_index();
         add(entry, node2Index);
     }
 }
@@ -82,7 +82,7 @@ BucketInstanceList::limitToRedundancyCopies(uint16_t redundancy)
 document::BucketId
 BucketInstanceList::leastSpecificLeafBucketInSubtree(const document::BucketId& candidateId,
                                                      const document::BucketId& mostSpecificId,
-                                                     const BucketDatabase& db) const
+                                                     const BucketDatabase& db)
 {
     assert(candidateId.contains(mostSpecificId));
     document::BucketId treeNode = candidateId;
diff --git a/storage/src/vespa/storage/distributor/operationtargetresolverimpl.h b/storage/src/vespa/storage/distributor/operationtargetresolverimpl.h
index f3d2ce233ef..07cf21f230f 100644
--- a/storage/src/vespa/storage/distributor/operationtargetresolverimpl.h
+++ b/storage/src/vespa/storage/distributor/operationtargetresolverimpl.h
@@ -42,9 +42,10 @@ class BucketInstanceList : public vespalib::AsciiPrintable {
      * Postconditions:
      *   <return value>.contains(mostSpecificId)
      */
-    document::BucketId leastSpecificLeafBucketInSubtree(const document::BucketId& candidateId,
-                                                        const document::BucketId& mostSpecificId,
-                                                        const BucketDatabase& db) const;
+    static document::BucketId
+    leastSpecificLeafBucketInSubtree(const document::BucketId& candidateId,
+                                     const document::BucketId& mostSpecificId,
+                                     const BucketDatabase& db);
 
 public:
     void add(const BucketInstance& instance) { _instances.push_back(instance); }
diff --git a/storage/src/vespa/storage/distributor/statecheckers.cpp b/storage/src/vespa/storage/distributor/statecheckers.cpp
index d23aa15e23a..2aef2d17f54 100644
--- a/storage/src/vespa/storage/distributor/statecheckers.cpp
+++ b/storage/src/vespa/storage/distributor/statecheckers.cpp
@@ -970,7 +970,8 @@ BucketStateStateChecker::check(Context& c) const
         return Result::noMaintenanceNeeded();
     }
 
-    ActiveList activeNodes = ActiveCopy::calculate(c.idealStateBundle.nonRetiredOrMaintenance2Index(), c.distribution, c.entry,
+    ActiveList activeNodes = ActiveCopy::calculate(c.idealStateBundle.nonretired_or_maintenance_to_index(),
+                                                   c.distribution, c.entry,
                                                    c.distributorConfig.max_activation_inhibited_out_of_sync_groups());
     if (activeNodes.empty()) {
         return Result::noMaintenanceNeeded();