Merge pull request #4455 from vespa-engine/vekterli/add-configurable-bucket-space-resolver

Add configurable bucket resolver and fixed space repo/factory

2 files changed, 13 insertions, 11 deletions

diff --git a/document/src/vespa/document/bucket/bucketspace.h b/document/src/vespa/document/bucket/bucketspace.h
index 1198b173a4b..99b510f7aff 100644
--- a/document/src/vespa/document/bucket/bucketspace.h
+++ b/document/src/vespa/document/bucket/bucketspace.h
@@ -16,15 +16,16 @@ class BucketSpace {
 public:
     using Type = uint64_t;
 
-    BucketSpace(const BucketSpace&) noexcept = default;
-    BucketSpace& operator=(const BucketSpace&) noexcept = default;
-    explicit BucketSpace(Type id) noexcept : _id(id) {}
+    constexpr BucketSpace(const BucketSpace&) noexcept = default;
+    constexpr BucketSpace& operator=(const BucketSpace&) noexcept = default;
+    constexpr explicit BucketSpace(Type id) noexcept : _id(id) {}
 
-    bool operator <(const BucketSpace& bucket) const noexcept { return _id < bucket._id; }
-    bool operator==(const BucketSpace& bucket) const noexcept { return _id == bucket._id; }
-    bool operator!=(const BucketSpace& bucket) const noexcept { return _id != bucket._id; }
+    constexpr bool operator <(const BucketSpace& bucket) const noexcept { return _id < bucket._id; }
+    constexpr bool operator==(const BucketSpace& bucket) const noexcept { return _id == bucket._id; }
+    constexpr bool operator!=(const BucketSpace& bucket) const noexcept { return _id != bucket._id; }
 
-    Type getId() const noexcept { return _id; }
+    constexpr Type getId() const noexcept { return _id; }
+    constexpr bool valid() const noexcept { return (_id != 0); }
     vespalib::string toString() const;
 
     struct hash {
@@ -36,7 +37,8 @@ public:
     /*
      * Temporary placeholder value while wiring in use of BucketSpace in APIs.
      */
-    static BucketSpace placeHolder() { return BucketSpace(0); }
+    static constexpr BucketSpace placeHolder() noexcept { return BucketSpace(1); }
+    static constexpr BucketSpace invalid() noexcept { return BucketSpace(0); }
 private:
     Type _id;
 };
diff --git a/document/src/vespa/document/test/make_bucket_space.cpp b/document/src/vespa/document/test/make_bucket_space.cpp
index be8292fcf71..dae0399e75d 100644
--- a/document/src/vespa/document/test/make_bucket_space.cpp
+++ b/document/src/vespa/document/test/make_bucket_space.cpp
@@ -11,12 +11,12 @@ BucketSpace makeBucketSpace()
 
 BucketSpace makeBucketSpace(const vespalib::string &docTypeName)
 {
-    // Used by persistence conformance test to map fron document type name
+    // Used by persistence conformance test to map from document type name
     // to bucket space.  See document::TestDocRepo for known document types.
     if (docTypeName == "no") {
-        return BucketSpace(2);
+        return BucketSpace(3);
     } else if (docTypeName == "testdoctype2") {
-        return BucketSpace(1);
+        return BucketSpace(2);
     } else {
         return makeBucketSpace();
     }