Pass bucket space to PersistenceThread::getBucket().

3 files changed, 11 insertions, 11 deletions

diff --git a/storage/src/vespa/storage/persistence/persistencethread.cpp b/storage/src/vespa/storage/persistence/persistencethread.cpp
index 2f1dafbb388..13a2bbd906b 100644
--- a/storage/src/vespa/storage/persistence/persistencethread.cpp
+++ b/storage/src/vespa/storage/persistence/persistencethread.cpp
@@ -54,18 +54,18 @@ PersistenceThread::~PersistenceThread()
 }
 
 spi::Bucket
-PersistenceThread::getBucket(const DocumentId& id, const BucketId& bucket) const
+PersistenceThread::getBucket(const DocumentId& id, const document::Bucket &bucket) const
 {
     BucketId docBucket(_env._bucketFactory.getBucketId(id));
-    docBucket.setUsedBits(bucket.getUsedBits());
-    if (bucket != docBucket) {
+    docBucket.setUsedBits(bucket.getBucketId().getUsedBits());
+    if (bucket.getBucketId() != docBucket) {
         docBucket = _env._bucketFactory.getBucketId(id);
         throw vespalib::IllegalStateException("Document " + id.toString()
                 + " (bucket " + docBucket.toString() + ") does not belong in "
-                + "bucket " + bucket.toString() + ".", VESPA_STRLOC);
+                + "bucket " + bucket.getBucketId().toString() + ".", VESPA_STRLOC);
     }
 
-    return spi::Bucket(document::Bucket(document::BucketSpace::placeHolder(), bucket), spi::PartitionId(_env._partition));
+    return spi::Bucket(bucket, spi::PartitionId(_env._partition));
 }
 
 bool
@@ -116,7 +116,7 @@ PersistenceThread::handlePut(api::PutCommand& cmd)
     }
 
     spi::Result response =
-        _spi.put(getBucket(cmd.getDocumentId(), cmd.getBucketId()),
+        _spi.put(getBucket(cmd.getDocumentId(), cmd.getBucket()),
                  spi::Timestamp(cmd.getTimestamp()),
                  cmd.getDocument(),
                  _context);
@@ -136,7 +136,7 @@ PersistenceThread::handleRemove(api::RemoveCommand& cmd)
     }
 
     spi::RemoveResult response =
-        _spi.removeIfFound(getBucket(cmd.getDocumentId(), cmd.getBucketId()),
+        _spi.removeIfFound(getBucket(cmd.getDocumentId(), cmd.getBucket()),
                     spi::Timestamp(cmd.getTimestamp()),
                     cmd.getDocumentId(), _context);
     if (checkForError(response, *tracker)) {
@@ -162,7 +162,7 @@ PersistenceThread::handleUpdate(api::UpdateCommand& cmd)
     }
     
     spi::UpdateResult response =
-        _spi.update(getBucket(cmd.getUpdate()->getId(), cmd.getBucketId()),
+        _spi.update(getBucket(cmd.getUpdate()->getId(), cmd.getBucket()),
                     spi::Timestamp(cmd.getTimestamp()),
                     cmd.getUpdate(), _context);
     if (checkForError(response, *tracker)) {
@@ -184,7 +184,7 @@ PersistenceThread::handleGet(api::GetCommand& cmd)
     document::FieldSet::UP fieldSet = repo.parse(*_env._component.getTypeRepo(),
                                                  cmd.getFieldSet());
     spi::GetResult result =
-        _spi.get(getBucket(cmd.getDocumentId(), cmd.getBucketId()),
+        _spi.get(getBucket(cmd.getDocumentId(), cmd.getBucket()),
                  *fieldSet,
                  cmd.getDocumentId(),
                  _context);
diff --git a/storage/src/vespa/storage/persistence/persistencethread.h b/storage/src/vespa/storage/persistence/persistencethread.h
index 14992aa0344..2977f44090e 100644
--- a/storage/src/vespa/storage/persistence/persistencethread.h
+++ b/storage/src/vespa/storage/persistence/persistencethread.h
@@ -81,7 +81,7 @@ private:
     // Thread main loop
     void run(framework::ThreadHandle&) override;
     bool checkForError(const spi::Result& response, MessageTracker& tracker);
-    spi::Bucket getBucket(const DocumentId& id, const BucketId& bucket) const;
+    spi::Bucket getBucket(const DocumentId& id, const document::Bucket &bucket) const;
 
     void flushAllReplies(const document::Bucket& bucket, std::vector<MessageTracker::UP>& trackers);
 
diff --git a/storage/src/vespa/storage/persistence/testandsethelper.cpp b/storage/src/vespa/storage/persistence/testandsethelper.cpp
index ef8a60ae0f6..70a6bdf21db 100644
--- a/storage/src/vespa/storage/persistence/testandsethelper.cpp
+++ b/storage/src/vespa/storage/persistence/testandsethelper.cpp
@@ -33,7 +33,7 @@ void TestAndSetHelper::parseDocumentSelection() {
 
 spi::GetResult TestAndSetHelper::retrieveDocument(const document::FieldSet & fieldSet) { 
     return _thread._spi.get(
-        _thread.getBucket(_docId, _cmd.getBucketId()),
+        _thread.getBucket(_docId, _cmd.getBucket()),
         fieldSet,
         _cmd.getDocumentId(),
         _thread._context);