diff options
| author | Geir Storli <geirstorli@yahoo.no> | 2017-11-21 12:40:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-21 12:40:26 +0100 |
| commit | 1ebd59a62edca6be20d3f0650cf44227d1148beb (patch) | |
| tree | 04e5ad9969d3380233980cf3216980a3ef3e5f8c /storage | |
| parent | c97abe67cade97dec7697bc03ff303b2ced1aa5e (diff) | |
| parent | 7483622b5ff9e2fb586abceffddd789f0ad5c32a (diff) | |
Merge pull request #4209 from vespa-engine/toregge/remove-unused-distributor-getdistribution-method
Remove unused Distributor::getDistribution() method.
Diffstat (limited to 'storage')
3 files changed, 1 insertions, 16 deletions
diff --git a/storage/src/vespa/storage/distributor/distributor.cpp b/storage/src/vespa/storage/distributor/distributor.cpp index 07d411b21a5..e0995e3e17a 100644 --- a/storage/src/vespa/storage/distributor/distributor.cpp +++ b/storage/src/vespa/storage/distributor/distributor.cpp @@ -534,18 +534,6 @@ Distributor::checkBucketForSplit(document::BucketSpace bucketSpace, } } -const lib::Distribution& -Distributor::getDistribution() const -{ - // FIXME having _distribution be mutable for this is smelly. Is this only - // in place for the sake of tests? - if (!_distribution.get()) { - _distribution = _component.getDistribution(); - } - - return *_distribution; -} - void Distributor::enableNextDistribution() { diff --git a/storage/src/vespa/storage/distributor/distributor.h b/storage/src/vespa/storage/distributor/distributor.h index bb50e69c70e..f8a1d438134 100644 --- a/storage/src/vespa/storage/distributor/distributor.h +++ b/storage/src/vespa/storage/distributor/distributor.h @@ -113,8 +113,6 @@ public: */ void checkBucketForSplit(document::BucketSpace bucketSpace, const BucketDatabase::Entry& e, uint8_t priority) override; - const lib::Distribution& getDistribution() const override; - const lib::ClusterState& getClusterState() const override { return _clusterState; } @@ -252,7 +250,7 @@ private: IdealStateManager _idealStateManager; ExternalOperationHandler _externalOperationHandler; - mutable std::shared_ptr<lib::Distribution> _distribution; + std::shared_ptr<lib::Distribution> _distribution; std::shared_ptr<lib::Distribution> _nextDistribution; using MessageQueue = std::vector<std::shared_ptr<api::StorageMessage>>; diff --git a/storage/src/vespa/storage/distributor/distributorinterface.h b/storage/src/vespa/storage/distributor/distributorinterface.h index 749e8a07651..bf27dc432b6 100644 --- a/storage/src/vespa/storage/distributor/distributorinterface.h +++ b/storage/src/vespa/storage/distributor/distributorinterface.h @@ -20,7 +20,6 @@ class DistributorInterface : public DistributorMessageSender { public: virtual PendingMessageTracker& getPendingMessageTracker() = 0; - virtual const lib::Distribution& getDistribution() const = 0; virtual DistributorMetricSet& getMetrics() = 0; |