diff options
| -rw-r--r-- | storage/src/vespa/storage/storageserver/communicationmanager.cpp | 9 | ||||
| -rw-r--r-- | storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.cpp | 10 |
2 files changed, 11 insertions, 8 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); } }; diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.cpp b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.cpp index e5c8c490a53..ece1445b18c 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.cpp +++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.cpp @@ -6,8 +6,10 @@ #include "storagereply.h" #include <vespa/storageapi/message/bucketsplitting.h> #include <vespa/storageapi/message/multioperation.h> +#include <vespa/document/bucket/fixed_bucket_spaces.h> using document::BucketSpace; +using document::FixedBucketSpaces; namespace storage { namespace mbusprot { @@ -16,26 +18,26 @@ document::Bucket ProtocolSerialization5_0::getBucket(document::ByteBuffer& buf) const { document::BucketId bucketId(SH::getLong(buf)); - return document::Bucket(BucketSpace::placeHolder(), bucketId); + return document::Bucket(FixedBucketSpaces::default_space(), bucketId); } void ProtocolSerialization5_0::putBucket(const document::Bucket& bucket, vespalib::GrowableByteBuffer& buf) const { buf.putLong(bucket.getBucketId().getRawId()); - assert(bucket.getBucketSpace() == document::BucketSpace::placeHolder()); + assert(bucket.getBucketSpace() == FixedBucketSpaces::default_space()); } document::BucketSpace ProtocolSerialization5_0::getBucketSpace(document::ByteBuffer&) const { - return BucketSpace::placeHolder(); + return FixedBucketSpaces::default_space(); } void ProtocolSerialization5_0::putBucketSpace(document::BucketSpace bucketSpace, vespalib::GrowableByteBuffer&) const { - assert(bucketSpace == document::BucketSpace::placeHolder()); + assert(bucketSpace == FixedBucketSpaces::default_space()); } api::BucketInfo |