Unify code layout

3 files changed, 53 insertions, 97 deletions

diff --git a/storage/src/vespa/storage/distributor/idealstatemanager.cpp b/storage/src/vespa/storage/distributor/idealstatemanager.cpp
index cad141e76ed..5bfb763b626 100644
--- a/storage/src/vespa/storage/distributor/idealstatemanager.cpp
+++ b/storage/src/vespa/storage/distributor/idealstatemanager.cpp
@@ -10,7 +10,6 @@
 #include <vespa/storageapi/message/persistence.h>
 #include <vespa/document/bucket/fixed_bucket_spaces.h>
 #include <vespa/vespalib/util/assert.h>
-#include <vespa/vespalib/stllike/hash_map.hpp>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".distributor.operation.queue");
@@ -21,10 +20,9 @@ using storage::lib::NodeType;
 
 namespace storage::distributor {
 
-IdealStateManager::IdealStateManager(
-        const DistributorNodeContext& node_ctx,
-        DistributorStripeOperationContext& op_ctx,
-        IdealStateMetricSet& metrics)
+IdealStateManager::IdealStateManager(const DistributorNodeContext& node_ctx,
+                                     DistributorStripeOperationContext& op_ctx,
+                                     IdealStateMetricSet& metrics)
     : _metrics(metrics),
       _stateCheckers(),
       _splitBucketStateChecker(nullptr),
@@ -56,9 +54,7 @@ IdealStateManager::fillParentAndChildBuckets(StateChecker::Context& c)
 {
     c.db.getAll(c.getBucketId(), c.entries);
     if (c.entries.empty()) {
-        LOG(spam,
-            "Did not find bucket %s in bucket database",
-            c.bucket.toString().c_str());
+        LOG(spam, "Did not find bucket %s in bucket database", c.bucket.toString().c_str());
     }
 }
 void
@@ -85,8 +81,7 @@ namespace {
  * overwriting if already explicitly set.
  */
 bool
-canOverwriteResult(const StateChecker::Result& existing,
-                   const StateChecker::Result& candidate)
+canOverwriteResult(const StateChecker::Result& existing, const StateChecker::Result& candidate)
 {
     return (!existing.getPriority().requiresMaintenance()
             && candidate.getPriority().requiresMaintenance());
@@ -101,9 +96,7 @@ IdealStateManager::runStateCheckers(StateChecker::Context& c) const
     // We go through _all_ active state checkers so that statistics can be
     // collected across all checkers, not just the ones that are highest pri.
     for (const auto & checker : _stateCheckers) {
-        if (!operation_context().distributor_config().stateCheckerIsActive(
-                checker->getName()))
-        {
+        if (!operation_context().distributor_config().stateCheckerIsActive(checker->getName())) {
             LOG(spam, "Skipping state checker %s", checker->getName());
             continue;
         }
@@ -125,11 +118,8 @@ void IdealStateManager::verify_only_live_nodes_in_context(const StateChecker::Co
         const auto& state = c.systemState.getNodeState(lib::Node(lib::NodeType::STORAGE, index));
         // Only nodes in Up, Initializing or Retired should ever be present in the DB.
         if (!state.getState().oneOf("uir")) {
-            LOG(error, "%s in bucket DB is on node %u, which is in unavailable state %s. "
-                       "Current cluster state is '%s'",
-                       c.entry.getBucketId().toString().c_str(),
-                       index,
-                       state.getState().toString().c_str(),
+            LOG(error, "%s in bucket DB is on node %u, which is in unavailable state %s. Current cluster state is '%s'",
+                       c.entry.getBucketId().toString().c_str(), index, state.getState().toString().c_str(),
                        c.systemState.toString().c_str());
             ASSERT_ONCE_OR_LOG(false, "Bucket DB contains replicas on unavailable node", 10000);
             _has_logged_phantom_replica_warning = true;
@@ -159,9 +149,7 @@ IdealStateManager::generateHighestPriority(
 }
 
 MaintenancePriorityAndType
-IdealStateManager::prioritize(
-        const document::Bucket& bucket,
-        NodeMaintenanceStatsTracker& statsTracker) const
+IdealStateManager::prioritize(const document::Bucket& bucket, NodeMaintenanceStatsTracker& statsTracker) const
 {
     StateChecker::Result generated(generateHighestPriority(bucket, statsTracker));
     MaintenancePriority priority(generated.getPriority());
@@ -172,8 +160,7 @@ IdealStateManager::prioritize(
 }
 
 IdealStateOperation::SP
-IdealStateManager::generateInterceptingSplit(BucketSpace bucketSpace,
-                                             const BucketDatabase::Entry& e,
+IdealStateManager::generateInterceptingSplit(BucketSpace bucketSpace, const BucketDatabase::Entry& e,
                                              api::StorageMessage::Priority pri)
 {
     NodeMaintenanceStatsTracker statsTracker;
@@ -199,18 +186,15 @@ MaintenanceOperation::SP
 IdealStateManager::generate(const document::Bucket& bucket) const
 {
     NodeMaintenanceStatsTracker statsTracker;
-    IdealStateOperation::SP op(
-            generateHighestPriority(bucket, statsTracker).createOperation());
+    IdealStateOperation::SP op(generateHighestPriority(bucket, statsTracker).createOperation());
     if (op.get()) {
-        op->setIdealStateManager(
-                const_cast<IdealStateManager*>(this));
+        op->setIdealStateManager(const_cast<IdealStateManager*>(this));
     }
     return op;
 }
 
 std::vector<MaintenanceOperation::SP>
-IdealStateManager::generateAll(const document::Bucket &bucket,
-                               NodeMaintenanceStatsTracker& statsTracker) const
+IdealStateManager::generateAll(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);
@@ -234,15 +218,11 @@ IdealStateManager::generateAll(const document::Bucket &bucket,
 }
 
 void
-IdealStateManager::getBucketStatus(
-        BucketSpace bucketSpace,
-        const BucketDatabase::ConstEntryRef& entry,
-        NodeMaintenanceStatsTracker& statsTracker,
-        std::ostream& out) const
+IdealStateManager::getBucketStatus(BucketSpace bucketSpace, const BucketDatabase::ConstEntryRef& entry,
+                                   NodeMaintenanceStatsTracker& statsTracker, std::ostream& out) const
 {
     document::Bucket bucket(bucketSpace, entry.getBucketId());
-    std::vector<MaintenanceOperation::SP> operations(
-            generateAll(bucket, statsTracker));
+    std::vector<MaintenanceOperation::SP> operations(generateAll(bucket, statsTracker));
     if (operations.empty()) {
         out << entry.getBucketId() << " : ";
     } else {
diff --git a/vdslib/src/vespa/vdslib/distribution/distribution.cpp b/vdslib/src/vespa/vdslib/distribution/distribution.cpp
index 9dda360eea5..e732b9faccd 100644
--- a/vdslib/src/vespa/vdslib/distribution/distribution.cpp
+++ b/vdslib/src/vespa/vdslib/distribution/distribution.cpp
@@ -20,16 +20,19 @@ LOG_SETUP(".vdslib.distribution");
 namespace storage::lib {
 
 namespace {
-    std::vector<uint32_t> getDistributionBitMasks() {
-        std::vector<uint32_t> masks;
-        masks.resize(32 + 1);
-        uint32_t mask = 0;
-        for (uint32_t i=0; i<=32; ++i) {
-            masks[i] = mask;
-            mask = (mask << 1) | 1;
-        }
-        return masks;
+
+std::vector<uint32_t>
+getDistributionBitMasks() {
+    std::vector<uint32_t> masks;
+    masks.resize(32 + 1);
+    uint32_t mask = 0;
+    for (uint32_t i=0; i<=32; ++i) {
+        masks[i] = mask;
+        mask = (mask << 1) | 1;
     }
+    return masks;
+}
+
 }
 
 VESPA_IMPLEMENT_EXCEPTION(NoDistributorsAvailableException, vespalib::Exception);
@@ -65,8 +68,8 @@ Distribution::Distribution(const Distribution& d)
     configure(*reader.read());
 }
 
-Distribution::ConfigWrapper::ConfigWrapper(std::unique_ptr<DistributionConfig> cfg) :
-    _cfg(std::move(cfg))
+Distribution::ConfigWrapper::ConfigWrapper(std::unique_ptr<DistributionConfig> cfg) noexcept
+    : _cfg(std::move(cfg))
 { }
 
 Distribution::ConfigWrapper::~ConfigWrapper() = default;
@@ -150,8 +153,7 @@ Distribution::configure(const vespa::config::content::StorDistributionConfig& co
     if ( ! nodeGraph) {
         throw vespalib::IllegalStateException(
             "Got config that didn't seem to specify even a root group. Must "
-            "have a root group at minimum:\n"
-            + _serialized, VESPA_STRLOC);
+            "have a root group at minimum:\n" + _serialized, VESPA_STRLOC);
     }
     nodeGraph->calculateDistributionHashValues();
     _nodeGraph = std::move(nodeGraph);
@@ -161,14 +163,11 @@ Distribution::configure(const vespa::config::content::StorDistributionConfig& co
     _ensurePrimaryPersisted = config.ensurePrimaryPersisted;
     _readyCopies = config.readyCopies;
     _activePerGroup = config.activePerLeafGroup;
-    _distributorAutoOwnershipTransferOnWholeGroupDown
-            = config.distributorAutoOwnershipTransferOnWholeGroupDown;
+    _distributorAutoOwnershipTransferOnWholeGroupDown = config.distributorAutoOwnershipTransferOnWholeGroupDown;
 }
 
 uint32_t
-Distribution::getGroupSeed(
-        const document::BucketId& bucket, const ClusterState& clusterState,
-        const Group& group) const
+Distribution::getGroupSeed(const document::BucketId& bucket, const ClusterState& clusterState, const Group& group) const
 {
     uint32_t seed(static_cast<uint32_t>(bucket.getRawId())
             & _distributionBitMasks[clusterState.getDistributionBitCount()]);
@@ -177,8 +176,7 @@ Distribution::getGroupSeed(
 }
 
 uint32_t
-Distribution::getDistributorSeed(
-        const document::BucketId& bucket, const ClusterState& state) const
+Distribution::getDistributorSeed(const document::BucketId& bucket, const ClusterState& state) const
 {
     uint32_t seed(static_cast<uint32_t>(bucket.getRawId())
             & _distributionBitMasks[state.getDistributionBitCount()]);
@@ -186,8 +184,7 @@ Distribution::getDistributorSeed(
 }
 
 uint32_t
-Distribution::getStorageSeed(
-        const document::BucketId& bucket, const ClusterState& state) const
+Distribution::getStorageSeed(const document::BucketId& bucket, const ClusterState& state) const
 {
     uint32_t seed(static_cast<uint32_t>(bucket.getRawId())
             & _distributionBitMasks[state.getDistributionBitCount()]);
@@ -262,11 +259,8 @@ namespace {
 }
 
 void
-Distribution::getIdealGroups(const document::BucketId& bucket,
-                             const ClusterState& clusterState,
-                             const Group& parent,
-                             uint16_t redundancy,
-                             std::vector<ResultGroup>& results) const
+Distribution::getIdealGroups(const document::BucketId& bucket, const ClusterState& clusterState, const Group& parent,
+                             uint16_t redundancy, std::vector<ResultGroup>& results) const
 {
     if (parent.isLeafGroup()) {
         results.emplace_back(parent, redundancy);
@@ -300,15 +294,12 @@ Distribution::getIdealGroups(const document::BucketId& bucket,
         // This should never happen. Config should verify that each group
         // has enough groups beneath them.
         assert(group._group != nullptr);
-        getIdealGroups(bucket, clusterState, *group._group,
-                       redundancyArray[i], results);
+        getIdealGroups(bucket, clusterState, *group._group, redundancyArray[i], results);
     }
 }
 
 const Group*
-Distribution::getIdealDistributorGroup(const document::BucketId& bucket,
-                                       const ClusterState& clusterState,
-                                       const Group& parent) const
+Distribution::getIdealDistributorGroup(const document::BucketId& bucket, const ClusterState& clusterState, const Group& parent) const
 {
     if (parent.isLeafGroup()) {
         return &parent;
@@ -357,12 +348,8 @@ Distribution::allDistributorsDown(const Group& g, const ClusterState& cs)
 }
 
 void
-Distribution::getIdealNodes(const NodeType& nodeType,
-                            const ClusterState& clusterState,
-                            const document::BucketId& bucket,
-                            std::vector<uint16_t>& resultNodes,
-                            const char* upStates,
-                            uint16_t redundancy) const
+Distribution::getIdealNodes(const NodeType& nodeType, const ClusterState& clusterState, const document::BucketId& bucket,
+                            std::vector<uint16_t>& resultNodes, const char* upStates, uint16_t redundancy) const
 {
     if (redundancy == DEFAULT_REDUNDANCY) redundancy = _redundancy;
     resultNodes.clear();
@@ -388,8 +375,7 @@ Distribution::getIdealNodes(const NodeType& nodeType,
         const Group* group(getIdealDistributorGroup(bucket, clusterState, *_nodeGraph));
         if (group == nullptr) {
             vespalib::asciistream ss;
-            ss << "There is no legal distributor target in state with version "
-               << clusterState.getVersion();
+            ss << "There is no legal distributor target in state with version " << clusterState.getVersion();
             throw NoDistributorsAvailableException(ss.str(), VESPA_STRLOC);
         }
         _groupDistribution.push_back(ResultGroup(*group, 1));
@@ -474,8 +460,7 @@ Distribution::getIdealDistributorNode(const ClusterState& state, const document:
     assert(nodes.size() <= 1);
     if (nodes.empty()) {
         vespalib::asciistream ss;
-        ss << "There is no legal distributor target in state with version "
-           << state.getVersion();
+        ss << "There is no legal distributor target in state with version " << state.getVersion();
         throw NoDistributorsAvailableException(ss.str(), VESPA_STRLOC);
     }
     return nodes[0];
diff --git a/vdslib/src/vespa/vdslib/distribution/distribution.h b/vdslib/src/vespa/vdslib/distribution/distribution.h
index 355b87884c1..79c31e83c49 100644
--- a/vdslib/src/vespa/vdslib/distribution/distribution.h
+++ b/vdslib/src/vespa/vdslib/distribution/distribution.h
@@ -50,7 +50,7 @@ private:
         ResultGroup(const Group& group, uint16_t redundancy) noexcept
             : _group(&group), _redundancy(redundancy) {}
 
-        bool operator<(const ResultGroup& other) const {
+        bool operator<(const ResultGroup& other) const noexcept {
             return _group->getIndex() < other._group->getIndex();
         }
     };
@@ -59,32 +59,23 @@ private:
      * Get seed to use for ideal state algorithm's random number generator
      * to decide which hierarchical group we should pick.
      */
-    uint32_t getGroupSeed(
-                const document::BucketId&, const ClusterState&,
-                const Group&) const;
+    uint32_t getGroupSeed(const document::BucketId&, const ClusterState&, const Group&) const;
 
     /**
      * Get seed to use for ideal state algorithm's random number generator
      * to decide which distributor node this bucket should be mapped to.
      */
-    uint32_t getDistributorSeed(
-                const document::BucketId&, const ClusterState&) const;
+    uint32_t getDistributorSeed(const document::BucketId&, const ClusterState&) const;
     /**
      * Get seed to use for ideal state algorithm's random number generator
      * to decide which storage node this bucket should be mapped to.
      */
-    uint32_t getStorageSeed(
-                const document::BucketId&, const ClusterState&) const;
+    uint32_t getStorageSeed(const document::BucketId&, const ClusterState&) const;
 
-    void getIdealGroups(const document::BucketId& bucket,
-                        const ClusterState& clusterState,
-                        const Group& parent,
-                        uint16_t redundancy,
-                        std::vector<ResultGroup>& results) const;
+    void getIdealGroups(const document::BucketId& bucket, const ClusterState& clusterState, const Group& parent,
+                        uint16_t redundancy, std::vector<ResultGroup>& results) const;
 
-    const Group* getIdealDistributorGroup(const document::BucketId& bucket,
-                                          const ClusterState& clusterState,
-                                          const Group& parent) const;
+    const Group* getIdealDistributorGroup(const document::BucketId& bucket, const ClusterState& clusterState, const Group& parent) const;
 
     /**
      * Since distribution object may be used often in ideal state calculations
@@ -97,9 +88,9 @@ private:
 public:
     class ConfigWrapper {
     public:
-        ConfigWrapper(ConfigWrapper && rhs) = default;
-        ConfigWrapper & operator = (ConfigWrapper && rhs) = default;
-        ConfigWrapper(std::unique_ptr<DistributionConfig> cfg);
+        ConfigWrapper(ConfigWrapper && rhs) noexcept = default;
+        ConfigWrapper & operator = (ConfigWrapper && rhs) noexcept = default;
+        ConfigWrapper(std::unique_ptr<DistributionConfig> cfg) noexcept;
         ~ConfigWrapper();
         const DistributionConfig & get() const { return *_cfg; }
     private: