Modern c++ for loop.

3 files changed, 33 insertions, 37 deletions

diff --git a/storage/src/vespa/storage/bucketdb/bucketinfo.hpp b/storage/src/vespa/storage/bucketdb/bucketinfo.hpp
index 6c2ca657938..ce7adc8af67 100644
--- a/storage/src/vespa/storage/bucketdb/bucketinfo.hpp
+++ b/storage/src/vespa/storage/bucketdb/bucketinfo.hpp
@@ -19,8 +19,8 @@ BucketInfoBase<NodeSeq>::toString() const {
 template <typename NodeSeq>
 bool
 BucketInfoBase<NodeSeq>::emptyAndConsistent() const noexcept {
-    for (uint32_t i = 0; i < _nodes.size(); i++) {
-        if (!_nodes[i].empty()) {
+    for (const auto & n : _nodes) {
+        if (!n.empty()) {
             return false;
         }
     }
@@ -30,8 +30,8 @@ BucketInfoBase<NodeSeq>::emptyAndConsistent() const noexcept {
 template <typename NodeSeq>
 bool
 BucketInfoBase<NodeSeq>::validAndConsistent() const noexcept {
-    for (uint32_t i = 0; i < _nodes.size(); i++) {
-        if (!_nodes[i].valid()) {
+    for (const auto & n : _nodes) {
+        if (!n.valid()) {
             return false;
         }
     }
@@ -41,8 +41,8 @@ BucketInfoBase<NodeSeq>::validAndConsistent() const noexcept {
 template <typename NodeSeq>
 bool
 BucketInfoBase<NodeSeq>::hasInvalidCopy() const noexcept {
-    for (uint32_t i = 0; i < _nodes.size(); i++) {
-        if (!_nodes[i].valid()) {
+    for (const auto & n : _nodes){
+        if (!n.valid()) {
             return true;
         }
     }
@@ -53,8 +53,8 @@ template <typename NodeSeq>
 uint16_t
 BucketInfoBase<NodeSeq>::getTrustedCount() const noexcept {
     uint32_t trustedCount = 0;
-    for (uint32_t i = 0; i < _nodes.size(); i++) {
-        if (_nodes[i].trusted()) {
+    for (const auto & n : _nodes) {
+        if (n.trusted()) {
             trustedCount++;
         }
     }
@@ -151,8 +151,9 @@ template <typename NodeSeq>
 std::vector<uint16_t>
 BucketInfoBase<NodeSeq>::getNodes() const noexcept {
     std::vector<uint16_t> result;
-    for (uint32_t i = 0; i < _nodes.size(); i++) {
-        result.emplace_back(_nodes[i].getNode());
+    result.reserve(_nodes.size());
+    for (const auto & n : _nodes) {
+        result.emplace_back(n.getNode());
     }
     return result;
 }
@@ -161,8 +162,8 @@ template <typename NodeSeq>
 uint32_t
 BucketInfoBase<NodeSeq>::getHighestDocumentCount() const noexcept {
     uint32_t highest = 0;
-    for (uint32_t i = 0; i < _nodes.size(); ++i) {
-        highest = std::max(highest, _nodes[i].getDocumentCount());
+    for (const auto & n : _nodes) {
+        highest = std::max(highest, n.getDocumentCount());
     }
     return highest;
 }
@@ -171,8 +172,8 @@ template <typename NodeSeq>
 uint32_t
 BucketInfoBase<NodeSeq>::getHighestTotalDocumentSize() const noexcept {
     uint32_t highest = 0;
-    for (uint32_t i = 0; i < _nodes.size(); ++i) {
-        highest = std::max(highest, _nodes[i].getTotalDocumentSize());
+    for (const auto & n : _nodes) {
+        highest = std::max(highest, n.getTotalDocumentSize());
     }
     return highest;
 }
@@ -181,8 +182,8 @@ template <typename NodeSeq>
 uint32_t
 BucketInfoBase<NodeSeq>::getHighestMetaCount() const noexcept {
     uint32_t highest = 0;
-    for (uint32_t i = 0; i < _nodes.size(); ++i) {
-        highest = std::max(highest, _nodes[i].getMetaCount());
+    for (const auto & n : _nodes) {
+        highest = std::max(highest, n.getMetaCount());
     }
     return highest;
 }
@@ -191,8 +192,8 @@ template <typename NodeSeq>
 uint32_t
 BucketInfoBase<NodeSeq>::getHighestUsedFileSize() const noexcept {
     uint32_t highest = 0;
-    for (uint32_t i = 0; i < _nodes.size(); ++i) {
-        highest = std::max(highest, _nodes[i].getUsedFileSize());
+    for (const auto & n : _nodes) {
+        highest = std::max(highest, n.getUsedFileSize());
     }
     return highest;
 }
@@ -200,8 +201,8 @@ BucketInfoBase<NodeSeq>::getHighestUsedFileSize() const noexcept {
 template <typename NodeSeq>
 bool
 BucketInfoBase<NodeSeq>::hasRecentlyCreatedEmptyCopy() const noexcept {
-    for (uint32_t i = 0; i < _nodes.size(); ++i) {
-        if (_nodes[i].wasRecentlyCreated()) {
+    for (const auto & n : _nodes) {
+        if (n.wasRecentlyCreated()) {
             return true;
         }
     }
diff --git a/storage/src/vespa/storage/distributor/idealstatemanager.cpp b/storage/src/vespa/storage/distributor/idealstatemanager.cpp
index 5bfb763b626..bc928ca3d41 100644
--- a/storage/src/vespa/storage/distributor/idealstatemanager.cpp
+++ b/storage/src/vespa/storage/distributor/idealstatemanager.cpp
@@ -12,7 +12,7 @@
 #include <vespa/vespalib/util/assert.h>
 
 #include <vespa/log/log.h>
-LOG_SETUP(".distributor.operation.queue");
+LOG_SETUP(".distributor.idealstatemanager");
 
 using document::BucketSpace;
 using storage::lib::Node;
@@ -109,7 +109,8 @@ IdealStateManager::runStateCheckers(StateChecker::Context& c) const
     return highestPri;
 }
 
-void IdealStateManager::verify_only_live_nodes_in_context(const StateChecker::Context& c) const {
+void
+IdealStateManager::verify_only_live_nodes_in_context(const StateChecker::Context& c) const {
     if (_has_logged_phantom_replica_warning) {
         return;
     }
@@ -128,9 +129,7 @@ void IdealStateManager::verify_only_live_nodes_in_context(const StateChecker::Co
 }
 
 StateChecker::Result
-IdealStateManager::generateHighestPriority(
-        const document::Bucket& bucket,
-        NodeMaintenanceStatsTracker& statsTracker) const
+IdealStateManager::generateHighestPriority(const document::Bucket& bucket, NodeMaintenanceStatsTracker& statsTracker) const
 {
     auto& distributorBucketSpace = _op_ctx.bucket_space_repo().get(bucket.getBucketSpace());
     StateChecker::Context c(node_context(), operation_context(), distributorBucketSpace, statsTracker, bucket);
@@ -241,13 +240,15 @@ IdealStateManager::getBucketStatus(BucketSpace bucketSpace, const BucketDatabase
     out << "[" << entry->toString() << "]<br>\n";
 }
 
-void IdealStateManager::dump_bucket_space_db_status(document::BucketSpace bucket_space, std::ostream& out) const {
+void
+IdealStateManager::dump_bucket_space_db_status(document::BucketSpace bucket_space, std::ostream& out) const {
     StatusBucketVisitor proc(*this, bucket_space, out);
     auto& distributorBucketSpace = _op_ctx.bucket_space_repo().get(bucket_space);
     distributorBucketSpace.getBucketDatabase().for_each_upper_bound(proc);
 }
 
-void IdealStateManager::getBucketStatus(std::ostream& out) const {
+void
+IdealStateManager::getBucketStatus(std::ostream& out) const {
     LOG(debug, "Dumping bucket database valid at cluster state version %u",
         operation_context().cluster_state_bundle().getVersion());
 
diff --git a/storage/src/vespa/storage/distributor/idealstatemanager.h b/storage/src/vespa/storage/distributor/idealstatemanager.h
index 0c9e3ffa1c6..39a662e4a81 100644
--- a/storage/src/vespa/storage/distributor/idealstatemanager.h
+++ b/storage/src/vespa/storage/distributor/idealstatemanager.h
@@ -49,18 +49,14 @@ public:
     MaintenanceOperation::SP generate(const document::Bucket& bucket) const override;
 
     // MaintenanceOperationGenerator
-    std::vector<MaintenanceOperation::SP> generateAll(
-            const document::Bucket& bucket,
-            NodeMaintenanceStatsTracker& statsTracker) const override;
+    std::vector<MaintenanceOperation::SP> generateAll(const document::Bucket& bucket, NodeMaintenanceStatsTracker& statsTracker) const override;
 
     /**
      * If the given bucket is too large, generate a split operation for it,
      * with higher priority than the given one.
      */
-    IdealStateOperation::SP generateInterceptingSplit(
-            document::BucketSpace bucketSpace,
-            const BucketDatabase::Entry& e,
-            api::StorageMessage::Priority pri);
+    IdealStateOperation::SP generateInterceptingSplit(document::BucketSpace bucketSpace, const BucketDatabase::Entry& e,
+                                                      api::StorageMessage::Priority pri);
 
     IdealStateMetricSet& getMetrics() noexcept { return _metrics; }
 
@@ -78,9 +74,7 @@ private:
     void verify_only_live_nodes_in_context(const StateChecker::Context& c) const;
     static void fillParentAndChildBuckets(StateChecker::Context& c);
     static void fillSiblingBucket(StateChecker::Context& c);
-    StateChecker::Result generateHighestPriority(
-            const document::Bucket& bucket,
-            NodeMaintenanceStatsTracker& statsTracker) const;
+    StateChecker::Result generateHighestPriority(const document::Bucket& bucket, NodeMaintenanceStatsTracker& statsTracker) const;
     StateChecker::Result runStateCheckers(StateChecker::Context& c) const;
 
     static BucketDatabase::Entry* getEntryForPrimaryBucket(StateChecker::Context& c);