diff options
author | Geir Storli <geirst@oath.com> | 2017-11-21 13:48:57 +0000 |
---|---|---|
committer | Geir Storli <geirst@oath.com> | 2017-11-22 12:09:09 +0000 |
commit | dc7744b33f8266b3dcd92c74650d842d1f13947a (patch) | |
tree | 70490af72f3aa51cdf35987ac5b694f2926f0ae9 /documentapi | |
parent | 914820e8fb2aa280d839fe5a76849d8a21d2d791 (diff) |
Add named bucket space to StatBucketMessage.
Diffstat (limited to 'documentapi')
6 files changed, 25 insertions, 22 deletions
diff --git a/documentapi/src/tests/messagebus/messagebus_test.cpp b/documentapi/src/tests/messagebus/messagebus_test.cpp index aa3fba01ef9..fc4295278da 100644 --- a/documentapi/src/tests/messagebus/messagebus_test.cpp +++ b/documentapi/src/tests/messagebus/messagebus_test.cpp @@ -110,7 +110,7 @@ void Test::get_document_message_is_not_sequenced() { } void Test::stat_bucket_message_is_not_sequenced() { - StatBucketMessage message(makeDocumentBucket(document::BucketId(16, 1)), ""); + StatBucketMessage message(document::BucketId(16, 1), ""); EXPECT_FALSE(message.hasSequenceId()); } diff --git a/documentapi/src/tests/messages/messages50test.cpp b/documentapi/src/tests/messages/messages50test.cpp index d4052f30958..a3627522562 100644 --- a/documentapi/src/tests/messages/messages50test.cpp +++ b/documentapi/src/tests/messages/messages50test.cpp @@ -134,7 +134,7 @@ Messages50Test::testEmptyBucketsMessage() bool Messages50Test::testStatBucketMessage() { - StatBucketMessage msg(makeDocumentBucket(document::BucketId(16, 123)), "id.user=123"); + StatBucketMessage msg(document::BucketId(16, 123), "id.user=123"); EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 27u, serialize("StatBucketMessage", msg)); @@ -142,7 +142,7 @@ Messages50Test::testStatBucketMessage() mbus::Routable::UP obj = deserialize("StatBucketMessage", DocumentProtocol::MESSAGE_STATBUCKET, lang); if (EXPECT_TRUE(obj.get() != NULL)) { StatBucketMessage &ref = static_cast<StatBucketMessage&>(*obj); - EXPECT_EQUAL(document::BucketId(16, 123), ref.getBucket().getBucketId()); + EXPECT_EQUAL(document::BucketId(16, 123), ref.getBucketId()); EXPECT_EQUAL("id.user=123", ref.getDocumentSelection()); } } diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.cpp index 00aef46cb79..213cc7d9932 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.cpp @@ -3,20 +3,20 @@ #include "statbucketreply.h" #include <vespa/documentapi/messagebus/documentprotocol.h> -using document::BucketSpace; - namespace documentapi { StatBucketMessage::StatBucketMessage() : DocumentMessage(), - _bucket(BucketSpace::placeHolder(), document::BucketId()), - _documentSelection() + _bucketId(document::BucketId()), + _documentSelection(), + _bucketSpace() {} -StatBucketMessage::StatBucketMessage(document::Bucket bucket, const string& documentSelection) : +StatBucketMessage::StatBucketMessage(document::BucketId bucketId, const string& documentSelection) : DocumentMessage(), - _bucket(bucket), - _documentSelection(documentSelection) + _bucketId(bucketId), + _documentSelection(documentSelection), + _bucketSpace() {} StatBucketMessage::~StatBucketMessage() { diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.h index a13d675ee0b..5233205da4a 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.h @@ -2,14 +2,15 @@ #pragma once #include "documentmessage.h" -#include <vespa/document/bucket/bucket.h> +#include <vespa/document/bucket/bucketid.h> namespace documentapi { class StatBucketMessage : public DocumentMessage { private: - document::Bucket _bucket; - string _documentSelection; + document::BucketId _bucketId; + string _documentSelection; + string _bucketSpace; protected: DocumentReply::UP doCreateReply() const override; @@ -23,9 +24,9 @@ public: /** * Constructs a new message with initial content. * - * @param bucket The bucket whose list to retrieve. + * @param bucketId The bucket whose list to retrieve. */ - StatBucketMessage(document::Bucket bucket, const string& documentSelection); + StatBucketMessage(document::BucketId bucket, const string& documentSelection); ~StatBucketMessage(); @@ -34,14 +35,14 @@ public: * * @return The bucket id. */ - document::Bucket getBucket() const { return _bucket; } + document::BucketId getBucketId() const { return _bucketId; } /** * Set the bucket to stat. * - * @param id The identifier to set. + * @param bucketId The identifier to set. */ - void setBucket(document::Bucket bucket) { _bucket = bucket; }; + void setBucketId(document::BucketId bucketId) { _bucketId = bucketId; }; /** * Returns the document selection used to filter the documents @@ -57,6 +58,9 @@ public: * @param value The selection string to set. */ void setDocumentSelection(const string &value) { _documentSelection = value; }; + + const string &getBucketSpace() const { return _bucketSpace; } + void setBucketSpace(const string &value) { _bucketSpace = value; } uint32_t getType() const override; string toString() const override { return "statbucketmessage"; } }; diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/storagepolicy.cpp b/documentapi/src/vespa/documentapi/messagebus/policies/storagepolicy.cpp index b638fd1cabe..6ab3b1100c4 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/storagepolicy.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/policies/storagepolicy.cpp @@ -139,7 +139,7 @@ StoragePolicy::doSelect(mbus::RoutingContext &context) break; case DocumentProtocol::MESSAGE_STATBUCKET: - id = static_cast<const StatBucketMessage&>(msg).getBucket().getBucketId(); + id = static_cast<const StatBucketMessage&>(msg).getBucketId(); break; case DocumentProtocol::MESSAGE_GETBUCKETLIST: diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories50.cpp b/documentapi/src/vespa/documentapi/messagebus/routablefactories50.cpp index 6876b4c3a71..028db2f02c0 100644 --- a/documentapi/src/vespa/documentapi/messagebus/routablefactories50.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories50.cpp @@ -837,8 +837,7 @@ RoutableFactories50::StatBucketMessageFactory::doDecode(document::ByteBuffer &bu DocumentMessage::UP ret(new StatBucketMessage()); StatBucketMessage &msg = static_cast<StatBucketMessage&>(*ret); - document::Bucket bucket(BucketSpace::placeHolder(), document::BucketId(decodeLong(buf))); - msg.setBucket(bucket); + msg.setBucketId(document::BucketId(decodeLong(buf))); msg.setDocumentSelection(decodeString(buf)); return ret; @@ -849,7 +848,7 @@ RoutableFactories50::StatBucketMessageFactory::doEncode(const DocumentMessage &o { const StatBucketMessage &msg = static_cast<const StatBucketMessage&>(obj); - buf.putLong(msg.getBucket().getBucketId().getRawId()); + buf.putLong(msg.getBucketId().getRawId()); buf.putString(msg.getDocumentSelection()); return true; |