summaryrefslogtreecommitdiffstats
path: root/storage
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@oath.com>2017-11-17 11:16:44 +0000
committerTor Egge <Tor.Egge@oath.com>2017-11-17 12:52:17 +0000
commit3e1ae84fc0e47a984319fe607ae4f26731d4535f (patch)
tree248b9de5d4020c30b727a26468b35ac51008417a /storage
parent8307b856d58a3696c47772e552a1f06973b775c7 (diff)
Remove old unused distributor component methods.
Diffstat (limited to 'storage')
-rw-r--r--storage/src/vespa/storage/distributor/distributor_bucket_space_component.h13
-rw-r--r--storage/src/vespa/storage/distributor/distributorcomponent.cpp5
-rw-r--r--storage/src/vespa/storage/distributor/distributorcomponent.h11
3 files changed, 0 insertions, 29 deletions
diff --git a/storage/src/vespa/storage/distributor/distributor_bucket_space_component.h b/storage/src/vespa/storage/distributor/distributor_bucket_space_component.h
index 9c04cb6b67f..fa6f2412c5e 100644
--- a/storage/src/vespa/storage/distributor/distributor_bucket_space_component.h
+++ b/storage/src/vespa/storage/distributor/distributor_bucket_space_component.h
@@ -19,19 +19,6 @@ public:
DistributorBucketSpace& bucketSpace,
DistributorComponentRegister& compReg,
const std::string& name);
-
- BucketDatabase& getBucketDatabase() override {
- return _bucketSpace.getBucketDatabase();
- }
-
- const BucketDatabase& getBucketDatabase() const override {
- return _bucketSpace.getBucketDatabase();
- }
-
- const lib::Distribution& getDistribution() const override {
- return _bucketSpace.getDistribution();
- }
-
};
}
diff --git a/storage/src/vespa/storage/distributor/distributorcomponent.cpp b/storage/src/vespa/storage/distributor/distributorcomponent.cpp
index eadc79b9a7d..f0643eec37e 100644
--- a/storage/src/vespa/storage/distributor/distributorcomponent.cpp
+++ b/storage/src/vespa/storage/distributor/distributorcomponent.cpp
@@ -138,11 +138,6 @@ DistributorComponent::nodeAddress(uint16_t nodeIndex) const
nodeIndex);
}
-uint16_t
-DistributorComponent::getRedundancy() const {
- return getDistribution().getRedundancy();
-}
-
bool
DistributorComponent::checkDistribution(
api::StorageCommand &cmd,
diff --git a/storage/src/vespa/storage/distributor/distributorcomponent.h b/storage/src/vespa/storage/distributor/distributorcomponent.h
index 307ddc20299..33e86d423e7 100644
--- a/storage/src/vespa/storage/distributor/distributorcomponent.h
+++ b/storage/src/vespa/storage/distributor/distributorcomponent.h
@@ -89,11 +89,6 @@ public:
bool storageNodeIsUp(uint32_t nodeIndex) const;
/**
- * Returns the current desired redundancy level.
- */
- uint16_t getRedundancy() const;
-
- /**
* Verifies that the given command has been received at the
* correct distributor based on the current system state.
*/
@@ -157,12 +152,6 @@ public:
return _distributor;
}
- virtual BucketDatabase& getBucketDatabase() = 0;
- virtual const BucketDatabase& getBucketDatabase() const = 0;
- // FIXME this hides the StorageComponent::getDistribution method, which
- // even has a different signature altogether...!
- virtual const lib::Distribution& getDistribution() const = 0;
-
DistributorBucketSpaceRepo &getBucketSpaceRepo() { return _bucketSpaceRepo; }
const DistributorBucketSpaceRepo &getBucketSpaceRepo() const { return _bucketSpaceRepo; }