summaryrefslogtreecommitdiffstats
path: root/storage
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@yahoo-inc.com>2016-11-23 16:12:53 +0100
committerTor Brede Vekterli <vekterli@yahoo-inc.com>2016-11-23 16:12:53 +0100
commite93b71551b27925e189b2612778a269608f2b5e0 (patch)
treec12721d713d3e28e9f3e77f2978225b1548ba5b9 /storage
parent0191e4b219d82820670bedbd37a4257c665d94b2 (diff)
Remove distributor-global database accessors
Diffstat (limited to 'storage')
-rw-r--r--storage/src/vespa/storage/distributor/distributor.cpp8
-rw-r--r--storage/src/vespa/storage/distributor/distributor.h3
-rw-r--r--storage/src/vespa/storage/distributor/distributorinterface.h4
3 files changed, 0 insertions, 15 deletions
diff --git a/storage/src/vespa/storage/distributor/distributor.cpp b/storage/src/vespa/storage/distributor/distributor.cpp
index dd5e7295fa8..2dd42dbc817 100644
--- a/storage/src/vespa/storage/distributor/distributor.cpp
+++ b/storage/src/vespa/storage/distributor/distributor.cpp
@@ -149,14 +149,6 @@ const ManagedBucketSpace& Distributor::getDefaultBucketSpace() const noexcept {
return _bucketSpaceRepo->getDefaultSpace();
}
-BucketDatabase& Distributor::getBucketDatabase() {
- return getDefaultBucketSpace().getBucketDatabase();
-}
-
-const BucketDatabase& Distributor::getBucketDatabase() const {
- return getDefaultBucketSpace().getBucketDatabase();
-}
-
BucketOwnership
Distributor::checkOwnershipInPendingState(const document::BucketId& b) const
{
diff --git a/storage/src/vespa/storage/distributor/distributor.h b/storage/src/vespa/storage/distributor/distributor.h
index 58a56706936..f7f186699bf 100644
--- a/storage/src/vespa/storage/distributor/distributor.h
+++ b/storage/src/vespa/storage/distributor/distributor.h
@@ -143,9 +143,6 @@ public:
bool initializing() const {
return !_doneInitializing;
}
-
- BucketDatabase& getBucketDatabase();
- const BucketDatabase& getBucketDatabase() const;
const DistributorConfiguration& getConfig() const {
return _component.getTotalDistributorConfig();
diff --git a/storage/src/vespa/storage/distributor/distributorinterface.h b/storage/src/vespa/storage/distributor/distributorinterface.h
index ecbc0163b01..d5f2e8cd6fc 100644
--- a/storage/src/vespa/storage/distributor/distributorinterface.h
+++ b/storage/src/vespa/storage/distributor/distributorinterface.h
@@ -60,10 +60,6 @@ public:
virtual void handleCompletedMerge(const std::shared_ptr<api::MergeBucketReply>&) = 0;
- virtual BucketDatabase& getBucketDatabase() = 0;
-
- virtual const BucketDatabase& getBucketDatabase() const = 0;
-
virtual const char* getStorageNodeUpStates() const = 0;
virtual const DistributorConfiguration& getConfig() const = 0;