summaryrefslogtreecommitdiffstats
path: root/storage/src
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@oath.com>2017-11-20 22:28:58 +0000
committerTor Egge <Tor.Egge@oath.com>2017-11-20 22:29:59 +0000
commit7483622b5ff9e2fb586abceffddd789f0ad5c32a (patch)
tree00dafbfb5c4f45e15db94f9609fc605795ce9398 /storage/src
parent43e822c4ddf4a014dac5b10c86838417dcd848f4 (diff)
Remove unused Distributor::getDistribution() method.
Diffstat (limited to 'storage/src')
-rw-r--r--storage/src/vespa/storage/distributor/distributor.cpp12
-rw-r--r--storage/src/vespa/storage/distributor/distributor.h4
-rw-r--r--storage/src/vespa/storage/distributor/distributorinterface.h1
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;