diff options
| author | Tor Brede Vekterli <vekterli@oath.com> | 2017-11-14 14:38:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-14 14:38:14 +0100 |
| commit | 69fcc4a227ffb93c5a825077421d462b1427ba24 (patch) | |
| tree | 495d95e9e420be104ec46bf6f28eca002982ce09 /storage | |
| parent | 8ce7ce2c7fedc3c0f6069c481acad12b3759d8f5 (diff) | |
| parent | 18128ff8ad4de5255bf1b27f72f056096cc5d328 (diff) | |
Merge pull request #4114 from vespa-engine/geirst/reduce-usage-of-place-holder-bucket-space
Reduce use of BucketSpace::placeHolder().
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/src/vespa/storage/distributor/statecheckers.cpp | 2 | ||||
| -rw-r--r-- | storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp | 2 |
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 && |