Rename bucket space classes to avoid ambiguities

Already a BucketSpace class present in the document namespace

15 files changed, 69 insertions, 65 deletions

diff --git a/storage/src/vespa/storage/distributor/CMakeLists.txt b/storage/src/vespa/storage/distributor/CMakeLists.txt
index ac4286458bb..4f6dd7da153 100644
--- a/storage/src/vespa/storage/distributor/CMakeLists.txt
+++ b/storage/src/vespa/storage/distributor/CMakeLists.txt
@@ -30,9 +30,9 @@ vespa_add_library(storage_distributor
     distributor_host_info_reporter.cpp
     latency_statistics_provider.cpp
     ownership_transfer_safe_time_point_calculator.cpp
-    bucket_space.cpp
-    bucket_space_component.cpp
-    bucket_space_repo.cpp
+    managed_bucket_space.cpp
+    managed_bucket_space_component.cpp
+    managed_bucket_space_repo.cpp
     $<TARGET_OBJECTS:storage_distributoroperation>
     $<TARGET_OBJECTS:storage_distributoroperationexternal>
     $<TARGET_OBJECTS:storage_distributoroperationidealstate>
diff --git a/storage/src/vespa/storage/distributor/bucketdbupdater.cpp b/storage/src/vespa/storage/distributor/bucketdbupdater.cpp
index abb079cdea5..6af7d075e5e 100644
--- a/storage/src/vespa/storage/distributor/bucketdbupdater.cpp
+++ b/storage/src/vespa/storage/distributor/bucketdbupdater.cpp
@@ -23,7 +23,7 @@ namespace storage {
 namespace distributor {
 
 BucketDBUpdater::BucketDBUpdater(Distributor& owner,
-                                 BucketSpace& bucketSpace,
+                                 ManagedBucketSpace& bucketSpace,
                                  DistributorMessageSender& sender,
                                  DistributorComponentRegister& compReg)
     : framework::StatusReporter("bucketdb", "Bucket DB Updater"),
diff --git a/storage/src/vespa/storage/distributor/bucketdbupdater.h b/storage/src/vespa/storage/distributor/bucketdbupdater.h
index 42afb6b3d27..aaef7e2f2ad 100644
--- a/storage/src/vespa/storage/distributor/bucketdbupdater.h
+++ b/storage/src/vespa/storage/distributor/bucketdbupdater.h
@@ -14,7 +14,7 @@
 #include <vespa/storage/distributor/distributorcomponent.h>
 #include <vespa/storage/distributor/distributormessagesender.h>
 #include <vespa/storage/distributor/pendingclusterstate.h>
-#include <vespa/storage/distributor/bucket_space_component.h>
+#include <vespa/storage/distributor/managed_bucket_space_component.h>
 #include <vespa/storageframework/generic/memory/memorymanagerinterface.h>
 #include <vespa/storageapi/messageapi/messagehandler.h>
 
@@ -33,7 +33,7 @@ public:
     // TODO take in BucketSpaceRepo instead, this class needs access to all
     // bucket spaces.
     BucketDBUpdater(Distributor& owner,
-                    BucketSpace& bucketSpace,
+                    ManagedBucketSpace& bucketSpace,
                     DistributorMessageSender& sender,
                     DistributorComponentRegister& compReg);
     ~BucketDBUpdater();
@@ -81,7 +81,7 @@ public:
     }
 
 private:
-    BucketSpaceComponent _distributorComponent;
+    ManagedBucketSpaceComponent _distributorComponent;
     class MergeReplyGuard {
     public:
         MergeReplyGuard(BucketDBUpdater& updater,
diff --git a/storage/src/vespa/storage/distributor/distributor.cpp b/storage/src/vespa/storage/distributor/distributor.cpp
index 0dbde475402..dd5e7295fa8 100644
--- a/storage/src/vespa/storage/distributor/distributor.cpp
+++ b/storage/src/vespa/storage/distributor/distributor.cpp
@@ -9,7 +9,7 @@
 #include <vespa/storage/distributor/throttlingoperationstarter.h>
 #include <vespa/storage/distributor/idealstatemetricsset.h>
 #include <vespa/storage/distributor/ownership_transfer_safe_time_point_calculator.h>
-#include <vespa/storage/distributor/bucket_space_repo.h>
+#include <vespa/storage/distributor/managed_bucket_space_repo.h>
 #include <vespa/storage/common/nodestateupdater.h>
 #include <vespa/storage/common/hostreporter/hostinfo.h>
 
@@ -64,7 +64,7 @@ Distributor::Distributor(DistributorComponentRegister& compReg,
       framework::StatusReporter("distributor", "Distributor"),
       _compReg(compReg),
       _component(compReg, "distributor"),
-      _bucketSpaceRepo(std::make_unique<BucketSpaceRepo>()),
+      _bucketSpaceRepo(std::make_unique<ManagedBucketSpaceRepo>()),
       _metrics(new DistributorMetricSet(
    	       _component.getLoadTypes()->getMetricLoadTypes())),
       _operationOwner(*this, _component.getClock()),
@@ -141,11 +141,11 @@ Distributor::getPendingMessageTracker() const
     return _pendingMessageTracker;
 }
 
-BucketSpace& Distributor::getDefaultBucketSpace() noexcept {
+ManagedBucketSpace& Distributor::getDefaultBucketSpace() noexcept {
     return _bucketSpaceRepo->getDefaultSpace();
 }
 
-const BucketSpace& Distributor::getDefaultBucketSpace() const noexcept {
+const ManagedBucketSpace& Distributor::getDefaultBucketSpace() const noexcept {
     return _bucketSpaceRepo->getDefaultSpace();
 }
 
diff --git a/storage/src/vespa/storage/distributor/distributor.h b/storage/src/vespa/storage/distributor/distributor.h
index 5bcf1f6d885..58a56706936 100644
--- a/storage/src/vespa/storage/distributor/distributor.h
+++ b/storage/src/vespa/storage/distributor/distributor.h
@@ -31,7 +31,7 @@ class HostInfo;
 
 namespace distributor {
 
-class BucketSpaceRepo;
+class ManagedBucketSpaceRepo;
 class SimpleMaintenanceScanner;
 class BlockingOperationStarter;
 class ThrottlingOperationStarter;
@@ -169,8 +169,8 @@ public:
         return *_bucketIdHasher;
     }
 
-    BucketSpace& getDefaultBucketSpace() noexcept;
-    const BucketSpace& getDefaultBucketSpace() const noexcept;
+    ManagedBucketSpace& getDefaultBucketSpace() noexcept;
+    const ManagedBucketSpace& getDefaultBucketSpace() const noexcept;
 
 private:
     friend class Distributor_Test;
@@ -247,7 +247,7 @@ private:
 
     DistributorComponentRegister& _compReg;
     storage::DistributorComponent _component;
-    std::unique_ptr<BucketSpaceRepo> _bucketSpaceRepo;
+    std::unique_ptr<ManagedBucketSpaceRepo> _bucketSpaceRepo;
     std::shared_ptr<DistributorMetricSet> _metrics;
 
     OperationOwner _operationOwner;
diff --git a/storage/src/vespa/storage/distributor/externaloperationhandler.cpp b/storage/src/vespa/storage/distributor/externaloperationhandler.cpp
index 88edeea1225..28f5aa91c2c 100644
--- a/storage/src/vespa/storage/distributor/externaloperationhandler.cpp
+++ b/storage/src/vespa/storage/distributor/externaloperationhandler.cpp
@@ -39,11 +39,11 @@ namespace distributor {
 
 ExternalOperationHandler::ExternalOperationHandler(
         Distributor& owner,
-        BucketSpace& bucketSpace,
+        ManagedBucketSpace& bucketSpace,
         const MaintenanceOperationGenerator& gen,
         DistributorComponentRegister& compReg)
-    : BucketSpaceComponent(owner, bucketSpace, compReg,
-                           "External operation handler"),
+    : ManagedBucketSpaceComponent(owner, bucketSpace, compReg,
+                                  "External operation handler"),
       _visitorMetrics(getLoadTypes()->getMetricLoadTypes(),
                       *&VisitorMetricSet(NULL)),
       _operationGenerator(gen),
diff --git a/storage/src/vespa/storage/distributor/externaloperationhandler.h b/storage/src/vespa/storage/distributor/externaloperationhandler.h
index f0daf169967..dac4b8ce146 100644
--- a/storage/src/vespa/storage/distributor/externaloperationhandler.h
+++ b/storage/src/vespa/storage/distributor/externaloperationhandler.h
@@ -6,7 +6,7 @@
 #include <vespa/vdslib/state/clusterstate.h>
 #include <vespa/storage/distributor/distributorcomponent.h>
 #include <vespa/storage/distributor/visitormetricsset.h>
-#include <vespa/storage/distributor/bucket_space_component.h>
+#include <vespa/storage/distributor/managed_bucket_space_component.h>
 #include <vespa/storageapi/messageapi/messagehandler.h>
 #include <vespa/storageframework/storageframework.h>
 #include <chrono>
@@ -21,7 +21,7 @@ namespace distributor {
 class Distributor;
 class MaintenanceOperationGenerator;
 
-class ExternalOperationHandler : public BucketSpaceComponent,
+class ExternalOperationHandler : public ManagedBucketSpaceComponent,
                                  public api::MessageHandler
 {
 public:
@@ -39,7 +39,7 @@ public:
     DEF_MSG_COMMAND_H(GetBucketList);
 
     ExternalOperationHandler(Distributor& owner,
-                             BucketSpace& bucketSpace,
+                             ManagedBucketSpace& bucketSpace,
                              const MaintenanceOperationGenerator&,
                              DistributorComponentRegister& compReg);
 
diff --git a/storage/src/vespa/storage/distributor/idealstatemanager.cpp b/storage/src/vespa/storage/distributor/idealstatemanager.cpp
index af748993e1e..eba37435462 100644
--- a/storage/src/vespa/storage/distributor/idealstatemanager.cpp
+++ b/storage/src/vespa/storage/distributor/idealstatemanager.cpp
@@ -30,7 +30,7 @@ namespace distributor {
 
 IdealStateManager::IdealStateManager(
         Distributor& owner,
-        BucketSpace& bucketSpace,
+        ManagedBucketSpace& bucketSpace,
         DistributorComponentRegister& compReg,
         bool manageActiveBucketCopies)
     : HtmlStatusReporter("idealstateman", "Ideal state manager"),
diff --git a/storage/src/vespa/storage/distributor/idealstatemanager.h b/storage/src/vespa/storage/distributor/idealstatemanager.h
index 665db1caa5e..b177278bd20 100644
--- a/storage/src/vespa/storage/distributor/idealstatemanager.h
+++ b/storage/src/vespa/storage/distributor/idealstatemanager.h
@@ -4,7 +4,7 @@
 #include <deque>
 #include <map>
 #include <set>
-#include <vespa/storage/distributor/bucket_space_component.h>
+#include <vespa/storage/distributor/managed_bucket_space_component.h>
 #include <vespa/storage/distributor/statechecker.h>
 #include <vespa/storage/distributor/maintenance/maintenanceprioritygenerator.h>
 #include <vespa/storage/distributor/maintenance/maintenanceoperationgenerator.h>
@@ -42,7 +42,7 @@ class IdealStateManager : public framework::HtmlStatusReporter,
 public:
 
     IdealStateManager(Distributor& owner,
-                      BucketSpace& bucketSpace,
+                      ManagedBucketSpace& bucketSpace,
                       DistributorComponentRegister& compReg,
                       bool manageActiveBucketCopies);
 
@@ -113,7 +113,7 @@ private:
     std::vector<StateChecker::SP> _stateCheckers;
     SplitBucketStateChecker* _splitBucketStateChecker;
 
-    BucketSpaceComponent _distributorComponent;
+    ManagedBucketSpaceComponent _distributorComponent;
 
     std::vector<IdealStateOperation::SP> generateOperationsForBucket(
             StateChecker::Context& c) const;
diff --git a/storage/src/vespa/storage/distributor/bucket_space.cpp b/storage/src/vespa/storage/distributor/managed_bucket_space.cpp
index 2e0d6f55873..72372cc4f8d 100644
--- a/storage/src/vespa/storage/distributor/bucket_space.cpp
+++ b/storage/src/vespa/storage/distributor/managed_bucket_space.cpp
@@ -1,15 +1,14 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include "bucket_space.h"
-#include <vespa/storage/frameworkimpl/component/distributorcomponentregisterimpl.h>
+#include "managed_bucket_space.h"
 
 namespace storage {
 namespace distributor {
 
-BucketSpace::BucketSpace() {
+ManagedBucketSpace::ManagedBucketSpace() {
 }
 
-BucketSpace::~BucketSpace() {
+ManagedBucketSpace::~ManagedBucketSpace() {
 }
 
 }
diff --git a/storage/src/vespa/storage/distributor/bucket_space.h b/storage/src/vespa/storage/distributor/managed_bucket_space.h
index 22edc2b75b3..8a9ffcc9802 100644
--- a/storage/src/vespa/storage/distributor/bucket_space.h
+++ b/storage/src/vespa/storage/distributor/managed_bucket_space.h
@@ -6,21 +6,30 @@
 #include <memory>
 
 namespace storage {
+
+namespace lib {
+class Distribution;
+}
+
 namespace distributor {
 
 /**
- * A managed bucket space holds specific state and information required for a
- * keeping track of and computing operations for a single bucket space:
- *  - Bucket database instance
- *  - Distribution config
- *  - Cluster state
+ * A managed bucket space holds specific state and information required for
+ * keeping track of, and computing operations for, a single bucket space:
+ *
+ * Bucket database instance
+ *   Each bucket space has its own entirely separate bucket database.
+ * Distribution config
+ *   Each bucket space _may_ operate with its own distribution config, in
+ *   particular so that redundancy, ready copies etc can differ across
+ *   bucket spaces.
  */
-class BucketSpace {
+class ManagedBucketSpace {
     MapBucketDatabase _bucketDatabase;
-    lib::Distribution::SP _distribution;
+    std::shared_ptr<lib::Distribution> _distribution;
 public:
-    BucketSpace();
-    ~BucketSpace();
+    ManagedBucketSpace();
+    ~ManagedBucketSpace();
 
     MapBucketDatabase& getBucketDatabase() noexcept {
         return _bucketDatabase;
diff --git a/storage/src/vespa/storage/distributor/bucket_space_component.cpp b/storage/src/vespa/storage/distributor/managed_bucket_space_component.cpp
index 840bbf8985c..f847390a0ce 100644
--- a/storage/src/vespa/storage/distributor/bucket_space_component.cpp
+++ b/storage/src/vespa/storage/distributor/managed_bucket_space_component.cpp
@@ -1,14 +1,14 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/fastos/fastos.h>
-#include <vespa/storage/distributor/bucket_space_component.h>
+#include <vespa/storage/distributor/managed_bucket_space_component.h>
 
 namespace storage {
 namespace distributor {
 
-BucketSpaceComponent::BucketSpaceComponent(
+ManagedBucketSpaceComponent::ManagedBucketSpaceComponent(
         DistributorInterface& distributor,
-        BucketSpace& bucketSpace,
+        ManagedBucketSpace& bucketSpace,
         DistributorComponentRegister& compReg,
         const std::string& name)
     : DistributorComponent(distributor, compReg, name),
diff --git a/storage/src/vespa/storage/distributor/bucket_space_component.h b/storage/src/vespa/storage/distributor/managed_bucket_space_component.h
index f939220926d..6544d747029 100644
--- a/storage/src/vespa/storage/distributor/bucket_space_component.h
+++ b/storage/src/vespa/storage/distributor/managed_bucket_space_component.h
@@ -2,7 +2,7 @@
 #pragma once
 
 #include "distributorcomponent.h"
-#include "bucket_space.h"
+#include "managed_bucket_space.h"
 
 namespace storage {
 namespace distributor {
@@ -11,13 +11,13 @@ namespace distributor {
  * Component bound to a specific bucket space, with utility operations to
  * operate on buckets in this space.
  */
-class BucketSpaceComponent : public DistributorComponent {
-    BucketSpace& _bucketSpace;
+class ManagedBucketSpaceComponent : public DistributorComponent {
+    ManagedBucketSpace& _bucketSpace;
 public:
-    BucketSpaceComponent(DistributorInterface& distributor,
-                         BucketSpace& bucketSpace,
-                         DistributorComponentRegister& compReg,
-                         const std::string& name);
+    ManagedBucketSpaceComponent(DistributorInterface& distributor,
+                                ManagedBucketSpace& bucketSpace,
+                                DistributorComponentRegister& compReg,
+                                const std::string& name);
 
     BucketDatabase& getBucketDatabase() override {
         return _bucketSpace.getBucketDatabase();
diff --git a/storage/src/vespa/storage/distributor/bucket_space_repo.cpp b/storage/src/vespa/storage/distributor/managed_bucket_space_repo.cpp
index 9dd60b997dd..d59d7238731 100644
--- a/storage/src/vespa/storage/distributor/bucket_space_repo.cpp
+++ b/storage/src/vespa/storage/distributor/managed_bucket_space_repo.cpp
@@ -1,24 +1,24 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include "bucket_space_repo.h"
+#include "managed_bucket_space_repo.h"
 #include <vespa/vdslib/distribution/distribution.h>
 
 #include <vespa/log/log.h>
-LOG_SETUP(".distributor.bucket_space_repo");
+LOG_SETUP(".distributor.managed_bucket_space_repo");
 
 namespace storage {
 namespace distributor {
 
-BucketSpaceRepo::BucketSpaceRepo() {
+ManagedBucketSpaceRepo::ManagedBucketSpaceRepo() {
 }
 
-BucketSpaceRepo::~BucketSpaceRepo() {
+ManagedBucketSpaceRepo::~ManagedBucketSpaceRepo() {
 }
 
-void BucketSpaceRepo::setDefaultDistribution(
+void ManagedBucketSpaceRepo::setDefaultDistribution(
         std::shared_ptr<lib::Distribution> distr)
 {
-    LOG(debug, "Got new distribution '%s'", distr->toString().c_str());
+    LOG(spam, "Got new distribution '%s'", distr->toString().c_str());
     // TODO all spaces, per-space config transforms
     _defaultSpace.setDistribution(std::move(distr));
 }
diff --git a/storage/src/vespa/storage/distributor/bucket_space_repo.h b/storage/src/vespa/storage/distributor/managed_bucket_space_repo.h
index 1cf8207cc75..a1299908626 100644
--- a/storage/src/vespa/storage/distributor/bucket_space_repo.h
+++ b/storage/src/vespa/storage/distributor/managed_bucket_space_repo.h
@@ -1,26 +1,22 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include "bucket_space.h"
+#include "managed_bucket_space.h"
 #include <memory>
 
 namespace storage {
 
-namespace lib {
-class Distribution;
-}
-
 namespace distributor {
 
-class BucketSpaceRepo {
+class ManagedBucketSpaceRepo {
     // TODO: multiple spaces. This is just to start re-wiring things.
-    BucketSpace _defaultSpace;
+    ManagedBucketSpace _defaultSpace;
 public:
-    BucketSpaceRepo();
-    ~BucketSpaceRepo();
+    ManagedBucketSpaceRepo();
+    ~ManagedBucketSpaceRepo();
 
-    BucketSpace& getDefaultSpace() noexcept { return _defaultSpace; }
-    const BucketSpace& getDefaultSpace() const noexcept {
+    ManagedBucketSpace& getDefaultSpace() noexcept { return _defaultSpace; }
+    const ManagedBucketSpace& getDefaultSpace() const noexcept {
         return _defaultSpace;
     }