aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@oath.com>2018-01-11 13:41:34 +0100
committerGitHub <noreply@github.com>2018-01-11 13:41:34 +0100
commitb6db8a09a19685e165a0759a5d4f7e70b60fa96b (patch)
tree14c93b8d479a2bed8f6372fa2c9cc58956cf00f9
parentd7aa21bf229babfd7931fa02e111a44fe50fa987 (diff)
parent5a219071d9fcf8a2f055a72eab811d693a5646cf (diff)
Merge pull request #4621 from vespa-engine/toregge/reduce-bucketspace-placeholder-usage-pass-1
Reduce use of BucketSpace::placeHolder().
-rw-r--r--storage/src/vespa/storage/visiting/visitor.cpp2
-rw-r--r--storageapi/src/vespa/storageapi/messageapi/storagemessage.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/src/vespa/storage/visiting/visitor.cpp b/storage/src/vespa/storage/visiting/visitor.cpp
index 0d230745875..2f028b5c9fa 100644
--- a/storage/src/vespa/storage/visiting/visitor.cpp
+++ b/storage/src/vespa/storage/visiting/visitor.cpp
@@ -243,7 +243,7 @@ Visitor::Visitor(StorageComponent& component)
_visitorTarget(),
_state(STATE_NOT_STARTED),
_buckets(),
- _bucketSpace(BucketSpace::placeHolder()),
+ _bucketSpace(BucketSpace::invalid()),
_currentBucket(),
_bucketStates(),
_calledStartingVisitor(false),
diff --git a/storageapi/src/vespa/storageapi/messageapi/storagemessage.h b/storageapi/src/vespa/storageapi/messageapi/storagemessage.h
index 32f6c769e87..1625be88418 100644
--- a/storageapi/src/vespa/storageapi/messageapi/storagemessage.h
+++ b/storageapi/src/vespa/storageapi/messageapi/storagemessage.h
@@ -348,7 +348,7 @@ protected:
StorageMessage(const MessageType& code, Id id);
StorageMessage(const StorageMessage&, Id id);
- static document::Bucket getDummyBucket() { return document::Bucket(document::BucketSpace::placeHolder(), document::BucketId()); }
+ static document::Bucket getDummyBucket() { return document::Bucket(document::BucketSpace::invalid(), document::BucketId()); }
public:
virtual ~StorageMessage();