RPC refactoring

src/api/bucket.cc

@@ -34,16 +34,14 @@ Bucket::Bucket(const std::string &initial_name,
                             std::to_string(kMaxBucketNameSize));
   } else {
     id_ = GetOrCreateBucketId(&hermes_->context_, &hermes_->rpc_, name_);
-    if (!Bucket::IsValid()) {
+    if (!IsValid()) {
       throw std::runtime_error("Bucket id is invalid.");
     }
   }
 }
 
 bool Bucket::IsValid() const {
-  bool result = id_.as_int != 0;
-
-  return result;
+  return !IsNullBucketId(id_);
 }
 
 Status Bucket::Put(const std::string &name, const u8 *data, size_t size,

src/api/vbucket.cc

@@ -23,6 +23,10 @@ namespace hermes {
 
 namespace api {
 
+bool VBucket::IsValid() const {
+  return !IsNullVBucketId(id_);
+}
+
 Status VBucket::Link(std::string blob_name, std::string bucket_name,
                      Context& ctx) {
   (void)ctx;

src/api/vbucket.h

@@ -35,10 +35,10 @@ class VBucket {
   std::list<Trait *> attached_traits_;
   Blob local_blob;
   bool persist;
+  /** internal Hermes object owned by vbucket */
   std::shared_ptr<Hermes> hermes_;
 
  public:
-  /** internal Hermes object owned by vbucket */
   VBucket(std::string initial_name, std::shared_ptr<Hermes> const &h,
           bool persist, Context ctx)
       : name_(initial_name),
@@ -52,8 +52,13 @@ class VBucket {
     (void)ctx;
     if (IsVBucketNameTooLong(name_)) {
       id_.as_int = 0;
+      throw std::length_error("VBucket name exceeds maximum size of " +
+                              std::to_string(kMaxVBucketNameSize));
     } else {
       id_ = GetOrCreateVBucketId(&hermes_->context_, &hermes_->rpc_, name_);
+      if (!IsValid()) {
+        throw std::runtime_error("Could not open or create VBucket");
+      }
     }
   }
 
@@ -62,6 +67,8 @@ class VBucket {
     linked_blobs_.clear();
   }
 
+  bool IsValid() const;
+
   /** get the name of vbucket */
   std::string GetName() const { return this->name_; }