- Reduce visibility of ClusterState and Distribution.

2 files changed, 13 insertions, 23 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/server/buckethandler.cpp b/searchcore/src/vespa/searchcore/proton/server/buckethandler.cpp
index eee67ce6c6b..b639ae17bde 100644
--- a/searchcore/src/vespa/searchcore/proton/server/buckethandler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/buckethandler.cpp
@@ -4,6 +4,7 @@
 #include "ibucketstatechangedhandler.h"
 #include <vespa/searchcore/proton/bucketdb/bucket_db_owner.h>
 #include <vespa/vespalib/util/lambdatask.h>
+#include <cassert>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.server.buckethandler");
@@ -35,12 +36,8 @@ BucketHandler::performSetCurrentState(BucketId bucketId,
     LOG(debug, "performSetCurrentState(%s, %s)",
         bucketId.toString().c_str(), (active ? "ACTIVE" : "NOT_ACTIVE"));
     _ready->setBucketState(bucketId, active);
-    if (!_changedHandlers.empty()) {
-        typedef std::vector<IBucketStateChangedHandler *> Chv;
-        Chv &chs(_changedHandlers);
-        for (Chv::const_iterator itr = chs.begin(); itr != chs.end(); ++itr) {
-            (*itr)->notifyBucketStateChanged(bucketId, newState);
-        }
+    for (const auto & ch : _changedHandlers) {
+        ch->notifyBucketStateChanged(bucketId, newState);
     }
     resultHandler->handle(Result());
 }
diff --git a/searchcore/src/vespa/searchcore/proton/server/buckethandler.h b/searchcore/src/vespa/searchcore/proton/server/buckethandler.h
index 2ff93ad7cfc..1732a6cdd54 100644
--- a/searchcore/src/vespa/searchcore/proton/server/buckethandler.h
+++ b/searchcore/src/vespa/searchcore/proton/server/buckethandler.h
@@ -2,11 +2,11 @@
 
 #pragma once
 
-#include <vespa/searchcore/proton/documentmetastore/i_bucket_handler.h>
-#include <vespa/searchcore/proton/persistenceengine/resulthandler.h>
-#include <vespa/vespalib/util/threadstackexecutorbase.h>
 #include "iclusterstatechangedhandler.h"
 #include "ibucketstatechangednotifier.h"
+#include <vespa/searchcore/proton/documentmetastore/i_bucket_handler.h>
+#include <vespa/searchcore/proton/persistenceengine/resulthandler.h>
+#include <vespa/vespalib/util/executor.h>
 
 namespace proton {
 
@@ -30,15 +30,13 @@ private:
                                 storage::spi::BucketInfo::ActiveState newState,
                                 IGenericResultHandler *resultHandler);
 
-    void
-    performPopulateActiveBuckets(document::BucketId::List buckets,
-                                 IGenericResultHandler *resultHandler);
+    void performPopulateActiveBuckets(document::BucketId::List buckets,
+                                      IGenericResultHandler *resultHandler);
     /**
      * Deactivate all active buckets when this node transitions from
      * up to down in cluster state.  Called by document db executor thread.
      */
-    void
-    deactivateAllActiveBuckets();
+    void deactivateAllActiveBuckets();
 
 public:
     /**
@@ -47,9 +45,7 @@ public:
      * @param executor The executor in which to run all tasks.
      */
     BucketHandler(vespalib::Executor &executor);
-
-    virtual
-    ~BucketHandler();
+    ~BucketHandler() override;
 
     void setReadyBucketHandler(documentmetastore::IBucketHandler &ready);
 
@@ -67,14 +63,11 @@ public:
                                      IGenericResultHandler &resultHandler);
 
     // Implements IClusterStateChangedHandler
-    virtual void
-    notifyClusterStateChanged(const IBucketStateCalculator::SP &newCalc) override;
+    void notifyClusterStateChanged(const IBucketStateCalculator::SP &newCalc) override;
 
     // Implement IBucketStateChangedNotifier
-    virtual void
-    addBucketStateChangedHandler(IBucketStateChangedHandler *handler) override;
-    virtual void
-    removeBucketStateChangedHandler(IBucketStateChangedHandler *handler) override;
+    void addBucketStateChangedHandler(IBucketStateChangedHandler *handler) override;
+    void removeBucketStateChangedHandler(IBucketStateChangedHandler *handler) override;
 };
 
 } // namespace proton