summaryrefslogtreecommitdiffstats
path: root/storage
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@oath.com>2018-02-02 10:50:44 +0000
committerTor Egge <Tor.Egge@oath.com>2018-02-02 10:50:44 +0000
commit7bfba0d416c588fa4a71c22bd5246487d371d127 (patch)
treea8d06765f7e0e8f3735a20126df237e44ca99fda /storage
parent711bf1a14c15796e7be2fa96f30d0ad816465288 (diff)
Reduce use of document::BucketSpace::placeHolder() in storageapi
protocol serialization and placeholder bucket resolver.
Diffstat (limited to 'storage')
-rw-r--r--storage/src/vespa/storage/storageserver/communicationmanager.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/storage/src/vespa/storage/storageserver/communicationmanager.cpp b/storage/src/vespa/storage/storageserver/communicationmanager.cpp
index e64f28ca6e9..5b927d36bb5 100644
--- a/storage/src/vespa/storage/storageserver/communicationmanager.cpp
+++ b/storage/src/vespa/storage/storageserver/communicationmanager.cpp
@@ -23,6 +23,7 @@
LOG_SETUP(".communication.manager");
using vespalib::make_string;
+using document::FixedBucketSpaces;
namespace storage {
@@ -268,14 +269,14 @@ namespace {
struct PlaceHolderBucketResolver : public BucketResolver {
virtual document::Bucket bucketFromId(const document::DocumentId &) const override {
- return document::Bucket(document::BucketSpace::placeHolder(), document::BucketId(0));
+ return document::Bucket(FixedBucketSpaces::default_space(), document::BucketId(0));
}
virtual document::BucketSpace bucketSpaceFromName(const vespalib::string &) const override {
- return document::BucketSpace::placeHolder();
+ return FixedBucketSpaces::default_space();
}
virtual vespalib::string nameFromBucketSpace(const document::BucketSpace &bucketSpace) const override {
- assert(bucketSpace == document::FixedBucketSpaces::default_space());
- return document::FixedBucketSpaces::to_string(bucketSpace);
+ assert(bucketSpace == FixedBucketSpaces::default_space());
+ return FixedBucketSpaces::to_string(bucketSpace);
}
};