SCBC-479: Update Bucket & Storage Support in SDKs

Supporting Morpheus changes for Magma.

Change-Id: I1758ff189bbd64bba05ae6939fff2b0c59fa27b1
Reviewed-on: https://review.couchbase.org/c/couchbase-jvm-clients/+/228219
Reviewed-by: David Nault <[email protected]>
Tested-by: Build Bot <[email protected]>
Reviewed-by: Michael Reiche <[email protected]>

Author: programmatix

scala-client/src/main/scala/com/couchbase/client/scala/manager/bucket/BucketSettings.scala

@@ -15,6 +15,7 @@
  */
 package com.couchbase.client.scala.manager.bucket
 
+import com.couchbase.client.core.annotation.SinceCouchbase
 import com.couchbase.client.core.annotation.Stability.Internal
 import com.couchbase.client.core.config
 import com.couchbase.client.core.error.CouchbaseException
@@ -221,7 +222,8 @@ case class CreateBucketSettings(
     private[scala] val storageBackend: Option[StorageBackend] = None,
     private[scala] val historyRetentionCollectionDefault: Option[Boolean] = None,
     private[scala] val historyRetentionBytes: Option[Long] = None,
-    private[scala] val historyRetentionDuration: Option[Duration] = None
+    private[scala] val historyRetentionDuration: Option[Duration] = None,
+    private[scala] val numVBuckets: Option[Int] = None
 ) {
 
   def flushEnabled(value: Boolean): CreateBucketSettings = {
@@ -285,6 +287,11 @@ case class CreateBucketSettings(
     copy(historyRetentionDuration = Some(value))
   }
 
+  /** Specifies the number of vbuckets (partitions) the created bucket should have.
+   */
+  @SinceCouchbase("8.0")
+  def numVBuckets(value: Int): CreateBucketSettings = copy(numVBuckets = Some(value))
+
   private[scala] def toCore: CoreBucketSettings = {
     val x = this
     new CoreBucketSettings {
@@ -359,7 +366,7 @@ case class CreateBucketSettings(
         x.historyRetentionDuration.map(v => DurationConversions.scalaDurationToJava(v)).orNull
 
       override def numVBuckets(): Integer =
-        null // TODO https://jira.issues.couchbase.com/browse/SCBC-479
+        x.numVBuckets.map(lang.Integer.valueOf).orNull
     }
   }
 }
@@ -379,7 +386,8 @@ case class BucketSettings(
     storageBackend: Option[StorageBackend] = None,
     historyRetentionCollectionDefault: Option[Boolean] = None,
     historyRetentionBytes: Option[Long] = None,
-    historyRetentionDuration: Option[Duration] = None
+    historyRetentionDuration: Option[Duration] = None,
+    numVBuckets: Option[Int] = None
 ) {
   def toCreateBucketSettings: CreateBucketSettings = {
     CreateBucketSettings(
@@ -397,7 +405,8 @@ case class BucketSettings(
       storageBackend,
       historyRetentionCollectionDefault,
       historyRetentionBytes,
-      historyRetentionDuration
+      historyRetentionDuration,
+      numVBuckets
     )
   }
 }
@@ -452,7 +461,8 @@ private[scala] object BucketSettings {
       if (core.historyRetentionBytes != null) Some(core.historyRetentionBytes) else None,
       if (core.historyRetentionDuration != null)
         Some(core.historyRetentionDuration).map(DurationConversions.javaDurationToScala)
-      else None
+      else None,
+      Some(core.numVBuckets)
     )
     out
   }

scala-fit-performer/src/main/scala/com/couchbase/client/performer/scala/manager/BucketManagerHelper.scala

@@ -25,6 +25,7 @@ import com.couchbase.client.performer.scala.util.OptionsUtil.{
 }
 import com.couchbase.client.protocol.run.Result
 import com.couchbase.client.protocol.sdk.Command
+import com.couchbase.client.protocol.sdk.cluster.bucketmanager
 import com.couchbase.client.protocol.shared.Durability
 import com.couchbase.client.scala.durability.Durability._
 import com.couchbase.client.scala.manager.bucket
@@ -300,6 +301,9 @@ object BucketManagerHelper {
           })
       case _ =>
     }
+    // [if:1.8.2]
+    if (bs.hasNumVbuckets) cs = cs.numVBuckets(bs.getNumVbuckets)
+    // [end]
     cs
   }
 
@@ -393,6 +397,15 @@ object BucketManagerHelper {
     response.historyRetentionCollectionDefault.foreach(v => builder.setHistoryRetentionCollectionDefault(v))
     response.historyRetentionBytes.foreach(v => builder.setHistoryRetentionBytes(v))
     response.historyRetentionDuration.foreach(v => builder.setHistoryRetentionSeconds(v.toSeconds))
+    // [if:1.8.2]
+    response.numVBuckets.foreach(v => builder.setNumVbuckets(v))
+    // [end]
+
+    response.storageBackend match {
+      case Some(StorageBackend.Magma) => builder.setStorageBackend(bucketmanager.StorageBackend.MAGMA)
+      case Some(StorageBackend.Couchstore) => builder.setStorageBackend(bucketmanager.StorageBackend.COUCHSTORE)
+      case _ =>
+    }
 
     builder.build
   }

scala-fit-performer/src/main/scala/com/couchbase/client/performer/scala/util/Capabilities.scala

@@ -82,6 +82,10 @@ object Capabilities {
     out.add(Caps.SDK_ZONE_AWARE_READ_FROM_REPLICA)
     // [end:1.8.0]
 
+    // [start:1.8.2]
+    out.add(Caps.SDK_BUCKET_SETTINGS_NUM_VBUCKETS)
+    // [end:1.8.2]
+
     out
   }