summaryrefslogtreecommitdiffstats
path: root/storage
diff options
context:
space:
mode:
authorGeir Storli <geirst@oath.com>2017-11-14 12:29:10 +0000
committerGeir Storli <geirst@oath.com>2017-11-14 12:29:10 +0000
commit18128ff8ad4de5255bf1b27f72f056096cc5d328 (patch)
tree4bc4bdd36616c4d84a30abd4db565ce536ab8092 /storage
parentb66d6bd93cbffbbcb4b3276acde6d343149406f9 (diff)
Reduce use of BucketSpace::placeHolder().
Diffstat (limited to 'storage')
-rw-r--r--storage/src/vespa/storage/distributor/statecheckers.cpp2
-rw-r--r--storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/src/vespa/storage/distributor/statecheckers.cpp b/storage/src/vespa/storage/distributor/statecheckers.cpp
index 4c5301dd8c2..49e9ba9f1c4 100644
--- a/storage/src/vespa/storage/distributor/statecheckers.cpp
+++ b/storage/src/vespa/storage/distributor/statecheckers.cpp
@@ -445,7 +445,7 @@ JoinBucketsStateChecker::computeJoinBucket(const Context& c) const
--level;
target = candidate;
}
- return document::Bucket(BucketSpace::placeHolder(), target);
+ return document::Bucket(c.getBucket().getBucketSpace(), target);
}
StateChecker::Result
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
index fffd559866d..31f712faea2 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
@@ -742,7 +742,7 @@ FileStorHandlerImpl::calculateTargetBasedOnDocId(
std::vector<RemapInfo*>& targets)
{
document::DocumentId id(getDocId(msg));
- document::Bucket bucket(BucketSpace::placeHolder(), _bucketIdFactory.getBucketId(id));
+ document::Bucket bucket(msg.getBucket().getBucketSpace(), _bucketIdFactory.getBucketId(id));
for (uint32_t i = 0; i < targets.size(); i++) {
if (targets[i]->bucket.getBucketId().getRawId() != 0 &&