diff options
author | Tor Egge <Tor.Egge@oath.com> | 2018-02-02 10:50:44 +0000 |
---|---|---|
committer | Tor Egge <Tor.Egge@oath.com> | 2018-02-02 10:50:44 +0000 |
commit | 7bfba0d416c588fa4a71c22bd5246487d371d127 (patch) | |
tree | a8d06765f7e0e8f3735a20126df237e44ca99fda /storageapi | |
parent | 711bf1a14c15796e7be2fa96f30d0ad816465288 (diff) |
Reduce use of document::BucketSpace::placeHolder() in storageapi
protocol serialization and placeholder bucket resolver.
Diffstat (limited to 'storageapi')
-rw-r--r-- | storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_0.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
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 |