diff options
author | Tor Egge <Tor.Egge@oath.com> | 2017-11-21 09:43:56 +0000 |
---|---|---|
committer | Tor Egge <Tor.Egge@oath.com> | 2017-11-21 09:43:56 +0000 |
commit | c20f8795ef33e5e7278ee07b27a097375ac7f718 (patch) | |
tree | fac984bc489cc3bcf4f3aba37a6d7f1f784673e9 /storage | |
parent | 43e822c4ddf4a014dac5b10c86838417dcd848f4 (diff) |
Use shared pointer to const Distribution in DistributorBucketSpace.
Diffstat (limited to 'storage')
5 files changed, 6 insertions, 6 deletions
diff --git a/storage/src/vespa/storage/distributor/distributor.cpp b/storage/src/vespa/storage/distributor/distributor.cpp index 07d411b21a5..868b477acc6 100644 --- a/storage/src/vespa/storage/distributor/distributor.cpp +++ b/storage/src/vespa/storage/distributor/distributor.cpp @@ -559,7 +559,7 @@ Distributor::enableNextDistribution() void Distributor::propagateDefaultDistribution( - std::shared_ptr<lib::Distribution> distribution) + std::shared_ptr<const lib::Distribution> distribution) { _bucketSpaceRepo->setDefaultDistribution(std::move(distribution)); } diff --git a/storage/src/vespa/storage/distributor/distributor.h b/storage/src/vespa/storage/distributor/distributor.h index bb50e69c70e..504d9c67da7 100644 --- a/storage/src/vespa/storage/distributor/distributor.h +++ b/storage/src/vespa/storage/distributor/distributor.h @@ -233,7 +233,7 @@ private: Operation::SP& operation); void enableNextDistribution(); - void propagateDefaultDistribution(std::shared_ptr<lib::Distribution>); + void propagateDefaultDistribution(std::shared_ptr<const lib::Distribution>); lib::ClusterState _clusterState; diff --git a/storage/src/vespa/storage/distributor/distributor_bucket_space.h b/storage/src/vespa/storage/distributor/distributor_bucket_space.h index 17be92126cb..30893e8cfb1 100644 --- a/storage/src/vespa/storage/distributor/distributor_bucket_space.h +++ b/storage/src/vespa/storage/distributor/distributor_bucket_space.h @@ -26,7 +26,7 @@ namespace distributor { */ class DistributorBucketSpace { MapBucketDatabase _bucketDatabase; - std::shared_ptr<lib::Distribution> _distribution; + std::shared_ptr<const lib::Distribution> _distribution; public: DistributorBucketSpace(); ~DistributorBucketSpace(); @@ -43,7 +43,7 @@ public: return _bucketDatabase; } - void setDistribution(lib::Distribution::SP distribution) { + void setDistribution(std::shared_ptr<const lib::Distribution> distribution) { _distribution = std::move(distribution); } diff --git a/storage/src/vespa/storage/distributor/distributor_bucket_space_repo.cpp b/storage/src/vespa/storage/distributor/distributor_bucket_space_repo.cpp index ddf28b3d95d..d414f520bc2 100644 --- a/storage/src/vespa/storage/distributor/distributor_bucket_space_repo.cpp +++ b/storage/src/vespa/storage/distributor/distributor_bucket_space_repo.cpp @@ -29,7 +29,7 @@ DistributorBucketSpaceRepo::add(document::BucketSpace bucketSpace, std::unique_p } void DistributorBucketSpaceRepo::setDefaultDistribution( - std::shared_ptr<lib::Distribution> distr) + std::shared_ptr<const lib::Distribution> distr) { LOG(debug, "Got new default distribution '%s'", distr->toString().c_str()); // TODO all spaces, per-space config transforms diff --git a/storage/src/vespa/storage/distributor/distributor_bucket_space_repo.h b/storage/src/vespa/storage/distributor/distributor_bucket_space_repo.h index b0f367e8be5..c3661b53e69 100644 --- a/storage/src/vespa/storage/distributor/distributor_bucket_space_repo.h +++ b/storage/src/vespa/storage/distributor/distributor_bucket_space_repo.h @@ -34,7 +34,7 @@ public: DistributorBucketSpace &get(document::BucketSpace bucketSpace); const DistributorBucketSpace &get(document::BucketSpace bucketSpace) const; - void setDefaultDistribution(std::shared_ptr<lib::Distribution> distr); + void setDefaultDistribution(std::shared_ptr<const lib::Distribution> distr); BucketSpaceMap::const_iterator begin() const { return _map.begin(); } BucketSpaceMap::const_iterator end() const { return _map.end(); } void add(document::BucketSpace bucketSpace, std::unique_ptr<DistributorBucketSpace> distributorBucketSpace); |