PYCBC-1667: Update Bucket & Storage Support in SDKs

Motivation
==========
The server is adding support for creating Magma buckets with 128 vBuckets. We are adding a numVBuckets parameter to bucket_settings to allow configuring the number of vbuckets.

Changes
=======
Add numVBuckets to BucketSettings

Results
=======
All relevant FIT tests pass

Change-Id: Ibbfec1baec8e0ff6067c6236e419671c0159d5c6
Reviewed-on: https://review.couchbase.org/c/couchbase-python-client/+/226147
Tested-by: Build Bot <build@couchbase.com>
Reviewed-by: Jared Casey <jared.casey@couchbase.com>

Author: Matt-Woz

couchbase/management/logic/buckets_logic.py

@@ -411,6 +411,9 @@ class BucketSettings(dict):
         BidirectionalTransform("history_retention_duration",
                                ParamTransform("historyRetentionDuration", TimeDeltaToSeconds(int)),
                                ParamTransform("historyRetentionDuration", SecondsToTimeDelta(timedelta))),
+        BidirectionalTransform("num_vbuckets",
+                               ParamTransform("numVBuckets", Identity(int)),
+                               ParamTransform("numVBuckets", Identity(int))),
     ])
 
     @overload
@@ -429,7 +432,8 @@ def __init__(self,
                  storage_backend=None,  # type: StorageBackend
                  history_retention_collection_default=None,  # type: Optional[bool]
                  history_retention_bytes=None,  # type: int
-                 history_retention_duration=None  # type: timedelta
+                 history_retention_duration=None,  # type: timedelta
+                 num_vbuckets=None  # type: int
                  ):
         # type: (...) -> None
         """BucketSettings provides a means of mapping bucket settings into an object.
@@ -540,6 +544,13 @@ def history_retention_duration(self) -> Optional[timedelta]:
         """
         return self.get('history_retention_duration')
 
+    @property
+    def num_vbuckets(self) -> Optional[int]:
+        """
+        The number of vBuckets in this bucket
+        """
+        return self.get('num_vbuckets')
+
     def transform_to_dest(self) -> Dict[str, Any]:
         kwargs = {**self}
         # needed?
@@ -577,7 +588,8 @@ def __init__(self,  # nosec
                  storage_backend=None,  # type: StorageBackend
                  history_retention_collection_default=None,  # type: Optional[bool]
                  history_retention_bytes=None,  # type: int
-                 history_retention_duration=None  # type: timedelta
+                 history_retention_duration=None,  # type: timedelta
+                 num_vbuckets=None  # type: int
                  ):
         """
         Bucket creation settings.
@@ -600,6 +612,7 @@ def __init__(self,  # nosec
             written to disk for all collections in this bucket
         :param history_retention_duration: specifies the maximum duration to be covered by the change history that
             is written to disk for all collections in this bucket
+        :param num_vbuckets: specifies the number of vBuckets in the bucket.
 
         .. note::
            History retention settings are only supported for Magma buckets, the server will ignore retention settings

src/management/bucket_management.cxx

@@ -295,6 +295,16 @@ build_bucket_settings(couchbase::core::management::cluster::bucket_settings sett
     Py_DECREF(pyObj_tmp);
   }
 
+  if (settings.num_vbuckets.has_value()) {
+    pyObj_tmp = PyLong_FromUnsignedLong(settings.num_vbuckets.value());
+    if (-1 == PyDict_SetItemString(pyObj_bucket_settings, "numVBuckets", pyObj_tmp)) {
+      Py_DECREF(pyObj_bucket_settings);
+      Py_XDECREF(pyObj_tmp);
+      return nullptr;
+    }
+    Py_DECREF(pyObj_tmp);
+  }
+
   return pyObj_bucket_settings;
 }
 
@@ -721,6 +731,11 @@ get_bucket_settings(PyObject* settings)
       static_cast<uint32_t>(PyLong_AsUnsignedLong(pyObj_history_retention_duration));
   }
 
+  PyObject* pyObj_num_vbuckets = PyDict_GetItemString(settings, "numVBuckets");
+  if (pyObj_num_vbuckets != nullptr) {
+    bucket_settings.num_vbuckets = static_cast<uint16_t>(PyLong_AsUnsignedLong(pyObj_num_vbuckets));
+  }
+
   return bucket_settings;
 }