Add bucket space to StatBucketMessage.

6 files changed, 16 insertions, 13 deletions

diff --git a/documentapi/src/tests/messagebus/messagebus_test.cpp b/documentapi/src/tests/messagebus/messagebus_test.cpp
index 742b680509a..e0b016fdceb 100644
--- a/documentapi/src/tests/messagebus/messagebus_test.cpp
+++ b/documentapi/src/tests/messagebus/messagebus_test.cpp
@@ -116,7 +116,7 @@ void Test::get_document_message_is_not_sequenced() {
 }
 
 void Test::stat_bucket_message_is_not_sequenced() {
-    StatBucketMessage message(document::BucketId(16, 1), "");
+    StatBucketMessage message(makeDocumentBucket(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 20e21518d13..f25e3f19b08 100644
--- a/documentapi/src/tests/messages/messages50test.cpp
+++ b/documentapi/src/tests/messages/messages50test.cpp
@@ -135,7 +135,7 @@ Messages50Test::testEmptyBucketsMessage()
 bool
 Messages50Test::testStatBucketMessage()
 {
-    StatBucketMessage msg(document::BucketId(16, 123), "id.user=123");
+    StatBucketMessage msg(makeDocumentBucket(document::BucketId(16, 123)), "id.user=123");
 
     EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 27u, serialize("StatBucketMessage", msg));
 
@@ -143,7 +143,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.getBucketId());
+            EXPECT_EQUAL(document::BucketId(16, 123), ref.getBucket().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 4208c9974bc..00aef46cb79 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.cpp
@@ -3,15 +3,17 @@
 #include "statbucketreply.h"
 #include <vespa/documentapi/messagebus/documentprotocol.h>
 
+using document::BucketSpace;
+
 namespace documentapi {
 
 StatBucketMessage::StatBucketMessage() :
     DocumentMessage(),
-    _bucket(),
+    _bucket(BucketSpace::placeHolder(), document::BucketId()),
     _documentSelection()
 {}
 
-StatBucketMessage::StatBucketMessage(document::BucketId bucket, const string& documentSelection) :
+StatBucketMessage::StatBucketMessage(document::Bucket bucket, const string& documentSelection) :
     DocumentMessage(),
     _bucket(bucket),
     _documentSelection(documentSelection)
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.h
index 74e908f4a85..a13d675ee0b 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.h
@@ -2,13 +2,13 @@
 #pragma once
 
 #include "documentmessage.h"
-#include <vespa/document/bucket/bucketid.h>
+#include <vespa/document/bucket/bucket.h>
 
 namespace documentapi {
 
 class StatBucketMessage : public DocumentMessage {
 private:
-    document::BucketId _bucket;
+    document::Bucket _bucket;
     string        _documentSelection;
 
 protected:
@@ -25,7 +25,7 @@ public:
      *
      * @param bucket The bucket whose list to retrieve.
      */
-    StatBucketMessage(document::BucketId bucket, const string& documentSelection);
+    StatBucketMessage(document::Bucket bucket, const string& documentSelection);
 
     ~StatBucketMessage();
 
@@ -34,14 +34,14 @@ public:
      *
      * @return The bucket id.
      */
-    document::BucketId getBucketId() const { return _bucket; }
+    document::Bucket getBucket() const { return _bucket; }
 
     /**
      * Set the bucket to stat.
      *
      * @param id The identifier to set.
      */
-    void setBucketId(document::BucketId id) { _bucket = id; };
+    void setBucket(document::Bucket bucket) { _bucket = bucket; };
 
     /**
      * Returns the document selection used to filter the documents
diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/storagepolicy.cpp b/documentapi/src/vespa/documentapi/messagebus/policies/storagepolicy.cpp
index 6ab3b1100c4..b638fd1cabe 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).getBucketId();
+            id = static_cast<const StatBucketMessage&>(msg).getBucket().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 f9e244dfad6..fff46c0128d 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routablefactories50.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories50.cpp
@@ -837,7 +837,8 @@ RoutableFactories50::StatBucketMessageFactory::doDecode(document::ByteBuffer &bu
     DocumentMessage::UP ret(new StatBucketMessage());
     StatBucketMessage &msg = static_cast<StatBucketMessage&>(*ret);
 
-    msg.setBucketId(document::BucketId(decodeLong(buf)));
+    document::Bucket bucket(BucketSpace::placeHolder(), document::BucketId(decodeLong(buf)));
+    msg.setBucket(bucket);
     msg.setDocumentSelection(decodeString(buf));
 
     return ret;
@@ -848,7 +849,7 @@ RoutableFactories50::StatBucketMessageFactory::doEncode(const DocumentMessage &o
 {
     const StatBucketMessage &msg = static_cast<const StatBucketMessage&>(obj);
 
-    buf.putLong(msg.getBucketId().getRawId());
+    buf.putLong(msg.getBucket().getBucketId().getRawId());
     buf.putString(msg.getDocumentSelection());
 
     return true;