couchbase 3.3.0 → 3.4.0

data/lib/couchbase/options.rb

@@ -13,6 +13,7 @@
 #  limitations under the License.
 
 require "couchbase/utils/time"
+require "couchbase/config_profiles"
 
 module Couchbase
   # Definition of the Option classes for data APIs
@@ -44,7 +45,7 @@ module Couchbase
       # @api private
       def to_backend
         {
-          timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+          timeout: Utils::Time.extract_duration(@timeout),
         }
       end
     end
@@ -109,7 +110,7 @@ module Couchbase
       # @api private
       def to_backend
         options = {
-          timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+          timeout: Utils::Time.extract_duration(@timeout),
         }
         options.update(with_expiry: true) if @with_expiry
         unless @projections&.empty?
@@ -120,6 +121,9 @@ module Couchbase
         end
         options
       end
+
+      # @api private
+      DEFAULT = Get.new.freeze
     end
 
     # Options for {Collection#get_multi}
@@ -149,9 +153,12 @@ module Couchbase
       # @api private
       def to_backend
         {
-          timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+          timeout: Utils::Time.extract_duration(@timeout),
         }
       end
+
+      # @api private
+      DEFAULT = GetMulti.new.freeze
     end
 
     # Options for {Collection#get_and_lock}
@@ -181,9 +188,12 @@ module Couchbase
       # @api private
       def to_backend
         {
-          timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+          timeout: Utils::Time.extract_duration(@timeout),
         }
       end
+
+      # @api private
+      DEFAULT = GetAndLock.new.freeze
     end
 
     # Options for {Collection#get_and_touch}
@@ -213,9 +223,12 @@ module Couchbase
       # @api private
       def to_backend
         {
-          timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+          timeout: Utils::Time.extract_duration(@timeout),
         }
       end
+
+      # @api private
+      DEFAULT = GetAndTouch.new.freeze
     end
 
     # Options for {Collection#get_all_replicas}
@@ -245,9 +258,12 @@ module Couchbase
       # @api private
       def to_backend
         {
-          timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+          timeout: Utils::Time.extract_duration(@timeout),
         }
       end
+
+      # @api private
+      DEFAULT = GetAllReplicas.new.freeze
     end
 
     # Options for {Collection#get_any_replica}
@@ -277,9 +293,12 @@ module Couchbase
       # @api private
       def to_backend
         {
-          timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+          timeout: Utils::Time.extract_duration(@timeout),
         }
       end
+
+      # @api private
+      DEFAULT = GetAnyReplica.new.freeze
     end
 
     # Options for {Collection#exists}
@@ -303,9 +322,12 @@ module Couchbase
       # @api private
       def to_backend
         {
-          timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+          timeout: Utils::Time.extract_duration(@timeout),
         }
       end
+
+      # @api private
+      DEFAULT = Exists.new.freeze
     end
 
     # Options for {Collection#touch}
@@ -329,9 +351,12 @@ module Couchbase
       # @api private
       def to_backend
         {
-          timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+          timeout: Utils::Time.extract_duration(@timeout),
         }
       end
+
+      # @api private
+      DEFAULT = Touch.new.freeze
     end
 
     # Options for {Collection#unlock}
@@ -355,9 +380,12 @@ module Couchbase
       # @api private
       def to_backend
         {
-          timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+          timeout: Utils::Time.extract_duration(@timeout),
         }
       end
+
+      # @api private
+      DEFAULT = Unlock.new.freeze
     end
 
     # Options for {Collection#remove}
@@ -381,6 +409,18 @@ module Couchbase
       #  +:persist_to_majority+::
       #     The mutation must be persisted to a majority of the Data Service nodes.
       #     Accordingly, it will be written to disk on those nodes.
+      # @param [Symbol] replicate_to number of nodes to replicate
+      #  +:none+:: do not apply any replication requirements.
+      #  +:one+::  wait for replication to at least one node.
+      #  +:two+::  wait for replication to at least two nodes.
+      #  +:three+:: wait for replication to at least three nodes.
+      # @param [Symbol] persist_to number of nodes to persist
+      #  +:none+:: do not apply any persistence requirements.
+      #  +:active+::  wait for persistence to active node
+      #  +:one+::  wait for persistence to at least one node.
+      #  +:two+:: wait for persistence to at least two nodes.
+      #  +:three+:: wait for persistence to at least three nodes.
+      #  +:four+:: wait for persistence to four nodes (active and replicas).
       #
       # @param [Integer, #in_milliseconds, nil] timeout
       # @param [Proc, nil] retry_strategy the custom retry strategy, if set
@@ -390,12 +430,20 @@ module Couchbase
       # @yieldparam [Remove]
       def initialize(cas: nil,
                      durability_level: :none,
+                     replicate_to: :none,
+                     persist_to: :none,
                      timeout: nil,
                      retry_strategy: nil,
                      client_context: nil,
                      parent_span: nil)
         super(timeout: timeout, retry_strategy: retry_strategy, client_context: client_context, parent_span: parent_span)
         @cas = cas
+        if durability_level != :none && (replicate_to != :none || persist_to != :none)
+          raise ArgumentError, "durability_level conflicts with replicate_to and persist_to options"
+        end
+
+        @persist_to = persist_to
+        @replicate_to = replicate_to
         @durability_level = durability_level
         yield self if block_given?
       end
@@ -403,11 +451,16 @@ module Couchbase
       # @api private
       def to_backend
         {
-          timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+          timeout: Utils::Time.extract_duration(@timeout),
           durability_level: @durability_level,
+          persist_to: @persist_to,
+          replicate_to: @replicate_to,
           cas: @cas,
         }
       end
+
+      # @api private
+      DEFAULT = Remove.new.freeze
     end
 
     # Options for {Collection#remove_multi}
@@ -429,6 +482,18 @@ module Couchbase
       #  +:persist_to_majority+::
       #     The mutation must be persisted to a majority of the Data Service nodes.
       #     Accordingly, it will be written to disk on those nodes.
+      # @param [Symbol] replicate_to number of nodes to replicate
+      #  +:none+:: do not apply any replication requirements.
+      #  +:one+::  wait for replication to at least one node.
+      #  +:two+::  wait for replication to at least two nodes.
+      #  +:three+:: wait for replication to at least three nodes.
+      # @param [Symbol] persist_to number of nodes to persist
+      #  +:none+:: do not apply any persistence requirements.
+      #  +:active+::  wait for persistence to active node
+      #  +:one+::  wait for persistence to at least one node.
+      #  +:two+:: wait for persistence to at least two nodes.
+      #  +:three+:: wait for persistence to at least three nodes.
+      #  +:four+:: wait for persistence to four nodes (active and replicas).
       #
       # @param [Integer, #in_milliseconds, nil] timeout
       # @param [Proc, nil] retry_strategy the custom retry strategy, if set
@@ -437,11 +502,19 @@ module Couchbase
       #
       # @yieldparam [Remove]
       def initialize(durability_level: :none,
+                     replicate_to: :none,
+                     persist_to: :none,
                      timeout: nil,
                      retry_strategy: nil,
                      client_context: nil,
                      parent_span: nil)
         super(timeout: timeout, retry_strategy: retry_strategy, client_context: client_context, parent_span: parent_span)
+        if durability_level != :none && (replicate_to != :none || persist_to != :none)
+          raise ArgumentError, "durability_level conflicts with replicate_to and persist_to options"
+        end
+
+        @persist_to = persist_to
+        @replicate_to = replicate_to
         @durability_level = durability_level
         yield self if block_given?
       end
@@ -449,10 +522,15 @@ module Couchbase
       # @api private
       def to_backend
         {
-          timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+          timeout: Utils::Time.extract_duration(@timeout),
           durability_level: @durability_level,
+          persist_to: @persist_to,
+          replicate_to: @replicate_to,
         }
       end
+
+      # @api private
+      DEFAULT = RemoveMulti.new.freeze
     end
 
     # Options for {Collection#insert}
@@ -478,6 +556,18 @@ module Couchbase
       #  +:persist_to_majority+::
       #     The mutation must be persisted to a majority of the Data Service nodes.
       #     Accordingly, it will be written to disk on those nodes.
+      # @param [Symbol] replicate_to number of nodes to replicate
+      #  +:none+:: do not apply any replication requirements.
+      #  +:one+::  wait for replication to at least one node.
+      #  +:two+::  wait for replication to at least two nodes.
+      #  +:three+:: wait for replication to at least three nodes.
+      # @param [Symbol] persist_to number of nodes to persist
+      #  +:none+:: do not apply any persistence requirements.
+      #  +:active+::  wait for persistence to active node
+      #  +:one+::  wait for persistence to at least one node.
+      #  +:two+:: wait for persistence to at least two nodes.
+      #  +:three+:: wait for persistence to at least three nodes.
+      #  +:four+:: wait for persistence to four nodes (active and replicas).
       #
       # @param [Integer, #in_milliseconds, nil] timeout
       # @param [Proc, nil] retry_strategy the custom retry strategy, if set
@@ -488,6 +578,8 @@ module Couchbase
       def initialize(expiry: nil,
                      transcoder: JsonTranscoder.new,
                      durability_level: :none,
+                     replicate_to: :none,
+                     persist_to: :none,
                      timeout: nil,
                      retry_strategy: nil,
                      client_context: nil,
@@ -495,6 +587,12 @@ module Couchbase
         super(timeout: timeout, retry_strategy: retry_strategy, client_context: client_context, parent_span: parent_span)
         @expiry = Utils::Time.extract_expiry_time(expiry)
         @transcoder = transcoder
+        if durability_level != :none && (replicate_to != :none || persist_to != :none)
+          raise ArgumentError, "durability_level conflicts with replicate_to and persist_to options"
+        end
+
+        @persist_to = persist_to
+        @replicate_to = replicate_to
         @durability_level = durability_level
         yield self if block_given?
       end
@@ -502,11 +600,16 @@ module Couchbase
       # @api private
       def to_backend
         {
-          timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+          timeout: Utils::Time.extract_duration(@timeout),
           expiry: @expiry,
           durability_level: @durability_level,
+          persist_to: @persist_to,
+          replicate_to: @replicate_to,
         }
       end
+
+      # @api private
+      DEFAULT = Insert.new.freeze
     end
 
     # Options for {Collection#upsert}
@@ -535,6 +638,18 @@ module Couchbase
       #  +:persist_to_majority+::
       #     The mutation must be persisted to a majority of the Data Service nodes.
       #     Accordingly, it will be written to disk on those nodes.
+      # @param [Symbol] replicate_to number of nodes to replicate
+      #  +:none+:: do not apply any replication requirements.
+      #  +:one+::  wait for replication to at least one node.
+      #  +:two+::  wait for replication to at least two nodes.
+      #  +:three+:: wait for replication to at least three nodes.
+      # @param [Symbol] persist_to number of nodes to persist
+      #  +:none+:: do not apply any persistence requirements.
+      #  +:active+::  wait for persistence to active node
+      #  +:one+::  wait for persistence to at least one node.
+      #  +:two+:: wait for persistence to at least two nodes.
+      #  +:three+:: wait for persistence to at least three nodes.
+      #  +:four+:: wait for persistence to four nodes (active and replicas).
       #
       # @param [Integer, #in_milliseconds, nil] timeout
       # @param [Proc, nil] retry_strategy the custom retry strategy, if set
@@ -546,6 +661,8 @@ module Couchbase
                      preserve_expiry: false,
                      transcoder: JsonTranscoder.new,
                      durability_level: :none,
+                     replicate_to: :none,
+                     persist_to: :none,
                      timeout: nil,
                      retry_strategy: nil,
                      client_context: nil,
@@ -554,18 +671,29 @@ module Couchbase
         @expiry = Utils::Time.extract_expiry_time(expiry)
         @preserve_expiry = preserve_expiry
         @transcoder = transcoder
+        if durability_level != :none && (replicate_to != :none || persist_to != :none)
+          raise ArgumentError, "durability_level conflicts with replicate_to and persist_to options"
+        end
+
+        @persist_to = persist_to
+        @replicate_to = replicate_to
         @durability_level = durability_level
         yield self if block_given?
       end
 
       def to_backend
         {
-          timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+          timeout: Utils::Time.extract_duration(@timeout),
           expiry: @expiry,
           preserve_expiry: @preserve_expiry,
           durability_level: @durability_level,
+          persist_to: @persist_to,
+          replicate_to: @replicate_to,
         }
       end
+
+      # @api private
+      DEFAULT = Upsert.new.freeze
     end
 
     # Options for {Collection#upsert_multi}
@@ -594,6 +722,18 @@ module Couchbase
       #  +:persist_to_majority+::
       #     The mutation must be persisted to a majority of the Data Service nodes.
       #     Accordingly, it will be written to disk on those nodes.
+      # @param [Symbol] replicate_to number of nodes to replicate
+      #  +:none+:: do not apply any replication requirements.
+      #  +:one+::  wait for replication to at least one node.
+      #  +:two+::  wait for replication to at least two nodes.
+      #  +:three+:: wait for replication to at least three nodes.
+      # @param [Symbol] persist_to number of nodes to persist
+      #  +:none+:: do not apply any persistence requirements.
+      #  +:active+::  wait for persistence to active node
+      #  +:one+::  wait for persistence to at least one node.
+      #  +:two+:: wait for persistence to at least two nodes.
+      #  +:three+:: wait for persistence to at least three nodes.
+      #  +:four+:: wait for persistence to four nodes (active and replicas).
       #
       # @param [Integer, #in_milliseconds, nil] timeout
       # @param [Proc, nil] retry_strategy the custom retry strategy, if set
@@ -605,6 +745,8 @@ module Couchbase
                      preserve_expiry: false,
                      transcoder: JsonTranscoder.new,
                      durability_level: :none,
+                     replicate_to: :none,
+                     persist_to: :none,
                      timeout: nil,
                      retry_strategy: nil,
                      client_context: nil,
@@ -613,18 +755,29 @@ module Couchbase
         @expiry = Utils::Time.extract_expiry_time(expiry)
         @preserve_expiry = preserve_expiry
         @transcoder = transcoder
+        if durability_level != :none && (replicate_to != :none || persist_to != :none)
+          raise ArgumentError, "durability_level conflicts with replicate_to and persist_to options"
+        end
+
+        @persist_to = persist_to
+        @replicate_to = replicate_to
         @durability_level = durability_level
         yield self if block_given?
       end
 
       def to_backend
         {
-          timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+          timeout: Utils::Time.extract_duration(@timeout),
           expiry: @expiry,
           preserve_expiry: @preserve_expiry,
           durability_level: @durability_level,
+          persist_to: @persist_to,
+          replicate_to: @replicate_to,
         }
       end
+
+      # @api private
+      DEFAULT = UpsertMulti.new.freeze
     end
 
     # Options for {Collection#replace}
@@ -655,6 +808,18 @@ module Couchbase
       #  +:persist_to_majority+::
       #     The mutation must be persisted to a majority of the Data Service nodes.
       #     Accordingly, it will be written to disk on those nodes.
+      # @param [Symbol] replicate_to number of nodes to replicate
+      #  +:none+:: do not apply any replication requirements.
+      #  +:one+::  wait for replication to at least one node.
+      #  +:two+::  wait for replication to at least two nodes.
+      #  +:three+:: wait for replication to at least three nodes.
+      # @param [Symbol] persist_to number of nodes to persist
+      #  +:none+:: do not apply any persistence requirements.
+      #  +:active+::  wait for persistence to active node
+      #  +:one+::  wait for persistence to at least one node.
+      #  +:two+:: wait for persistence to at least two nodes.
+      #  +:three+:: wait for persistence to at least three nodes.
+      #  +:four+:: wait for persistence to four nodes (active and replicas).
       #
       # @param [Integer, #in_milliseconds, nil] timeout
       # @param [Proc, nil] retry_strategy the custom retry strategy, if set
@@ -667,6 +832,8 @@ module Couchbase
                      transcoder: JsonTranscoder.new,
                      cas: nil,
                      durability_level: :none,
+                     replicate_to: :none,
+                     persist_to: :none,
                      timeout: nil,
                      retry_strategy: nil,
                      client_context: nil,
@@ -676,19 +843,30 @@ module Couchbase
         @preserve_expiry = preserve_expiry
         @transcoder = transcoder
         @cas = cas
+        if durability_level != :none && (replicate_to != :none || persist_to != :none)
+          raise ArgumentError, "durability_level conflicts with replicate_to and persist_to options"
+        end
+
+        @persist_to = persist_to
+        @replicate_to = replicate_to
         @durability_level = durability_level
         yield self if block_given?
       end
 
       def to_backend
         {
-          timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+          timeout: Utils::Time.extract_duration(@timeout),
           expiry: @expiry,
           preserve_expiry: @preserve_expiry,
           durability_level: @durability_level,
+          persist_to: @persist_to,
+          replicate_to: @replicate_to,
           cas: @cas,
         }
       end
+
+      # @api private
+      DEFAULT = Replace.new.freeze
     end
 
     # Options for {Collection#mutate_in}
@@ -725,6 +903,18 @@ module Couchbase
       #  +:persist_to_majority+::
       #     The mutation must be persisted to a majority of the Data Service nodes.
       #     Accordingly, it will be written to disk on those nodes.
+      # @param [Symbol] replicate_to number of nodes to replicate
+      #  +:none+:: do not apply any replication requirements.
+      #  +:one+::  wait for replication to at least one node.
+      #  +:two+::  wait for replication to at least two nodes.
+      #  +:three+:: wait for replication to at least three nodes.
+      # @param [Symbol] persist_to number of nodes to persist
+      #  +:none+:: do not apply any persistence requirements.
+      #  +:active+::  wait for persistence to active node
+      #  +:one+::  wait for persistence to at least one node.
+      #  +:two+:: wait for persistence to at least two nodes.
+      #  +:three+:: wait for persistence to at least three nodes.
+      #  +:four+:: wait for persistence to four nodes (active and replicas).
       # @param [JsonTranscoder, #encode(Object)] transcoder used for encoding
       #
       # @param [Integer, #in_milliseconds, nil] timeout
@@ -740,6 +930,8 @@ module Couchbase
                      access_deleted: false,
                      create_as_deleted: false,
                      durability_level: :none,
+                     replicate_to: :none,
+                     persist_to: :none,
                      transcoder: JsonTranscoder.new,
                      timeout: nil,
                      retry_strategy: nil,
@@ -752,6 +944,12 @@ module Couchbase
         @cas = cas
         @access_deleted = access_deleted
         @create_as_deleted = create_as_deleted
+        if durability_level != :none && (replicate_to != :none || persist_to != :none)
+          raise ArgumentError, "durability_level conflicts with replicate_to and persist_to options"
+        end
+
+        @persist_to = persist_to
+        @replicate_to = replicate_to
         @durability_level = durability_level
         @transcoder = transcoder
         yield self if block_given?
@@ -760,10 +958,12 @@ module Couchbase
       # @api private
       def to_backend
         {
-          timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+          timeout: Utils::Time.extract_duration(@timeout),
           expiry: @expiry,
           preserve_expiry: @preserve_expiry,
           durability_level: @durability_level,
+          persist_to: @persist_to,
+          replicate_to: @replicate_to,
           cas: @cas,
           store_semantics: @store_semantics,
           access_deleted: @access_deleted,
@@ -778,6 +978,9 @@ module Couchbase
       # @api private
       # @return [Boolean]
       attr_accessor :create_as_deleted
+
+      # @api private
+      DEFAULT = MutateIn.new.freeze
     end
 
     # Options for {Collection#lookup_in}
@@ -810,7 +1013,7 @@ module Couchbase
       # @api private
       def to_backend
         {
-          timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+          timeout: Utils::Time.extract_duration(@timeout),
           access_deleted: @access_deleted,
         }
       end
@@ -818,6 +1021,9 @@ module Couchbase
       # @api private
       # @return [Boolean]
       attr_accessor :access_deleted
+
+      # @api private
+      DEFAULT = LookupIn.new.freeze
     end
 
     # Options for {BinaryCollection#append}
@@ -847,10 +1053,13 @@ module Couchbase
       # @api private
       def to_backend
         {
-          timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+          timeout: Utils::Time.extract_duration(@timeout),
           cas: @cas,
         }
       end
+
+      # @api private
+      DEFAULT = Append.new.freeze
     end
 
     # Options for {BinaryCollection#prepend}
@@ -881,10 +1090,13 @@ module Couchbase
       # @api private
       def to_backend
         {
-          timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+          timeout: Utils::Time.extract_duration(@timeout),
           cas: @cas,
         }
       end
+
+      # @api private
+      DEFAULT = Prepend.new.freeze
     end
 
     # Options for {BinaryCollection#increment}
@@ -893,15 +1105,12 @@ module Couchbase
       attr_accessor :initial # @return [Integer]
       attr_accessor :expiry # @return [Integer, #in_seconds]
       attr_accessor :durability_level # @return [Symbol]
-      attr_accessor :preserve_expiry # @return [Boolean]
 
       # Creates an instance of options for {BinaryCollection#increment}
       #
       # @param [Integer] delta the delta for the operation
       # @param [Integer] initial if present, holds the initial value
       # @param [Integer, #in_seconds, Time, nil] expiry if set, holds the expiration for the operation
-      # @param [Boolean] preserve_expiry if true and the document exists, the server will preserve current expiration
-      #  for the document, otherwise will use {expiry} from the operation.
       # @param [Symbol] durability_level level of durability
       #  +:none+::
       #     no enhanced durability required for the mutation
@@ -915,6 +1124,18 @@ module Couchbase
       #  +:persist_to_majority+::
       #     The mutation must be persisted to a majority of the Data Service nodes.
       #     Accordingly, it will be written to disk on those nodes.
+      # @param [Symbol] replicate_to number of nodes to replicate
+      #  +:none+:: do not apply any replication requirements.
+      #  +:one+::  wait for replication to at least one node.
+      #  +:two+::  wait for replication to at least two nodes.
+      #  +:three+:: wait for replication to at least three nodes.
+      # @param [Symbol] persist_to number of nodes to persist
+      #  +:none+:: do not apply any persistence requirements.
+      #  +:active+::  wait for persistence to active node
+      #  +:one+::  wait for persistence to at least one node.
+      #  +:two+:: wait for persistence to at least two nodes.
+      #  +:three+:: wait for persistence to at least three nodes.
+      #  +:four+:: wait for persistence to four nodes (active and replicas).
       #
       # @param [Integer, #in_milliseconds, nil] timeout
       # @param [Proc, nil] retry_strategy the custom retry strategy, if set
@@ -925,8 +1146,9 @@ module Couchbase
       def initialize(delta: 1,
                      initial: nil,
                      expiry: nil,
-                     preserve_expiry: false,
                      durability_level: :none,
+                     replicate_to: :none,
+                     persist_to: :none,
                      timeout: nil,
                      retry_strategy: nil,
                      client_context: nil,
@@ -937,7 +1159,12 @@ module Couchbase
         @delta = delta
         @initial = initial
         @expiry = Utils::Time.extract_expiry_time(expiry)
-        @preserve_expiry = preserve_expiry
+        if durability_level != :none && (replicate_to != :none || persist_to != :none)
+          raise ArgumentError, "durability_level conflicts with replicate_to and persist_to options"
+        end
+
+        @persist_to = persist_to
+        @replicate_to = replicate_to
         @durability_level = durability_level
         yield self if block_given?
       end
@@ -952,14 +1179,18 @@ module Couchbase
       # @api private
       def to_backend
         {
-          timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+          timeout: Utils::Time.extract_duration(@timeout),
           delta: @delta,
           initial_value: @initial,
           expiry: @expiry,
-          preserve_expiry: @preserve_expiry,
           durability_level: @durability_level,
+          persist_to: @persist_to,
+          replicate_to: @replicate_to,
         }
       end
+
+      # @api private
+      DEFAULT = Increment.new.freeze
     end
 
     # Options for {BinaryCollection#decrement}
@@ -968,15 +1199,12 @@ module Couchbase
       attr_accessor :initial # @return [Integer]
       attr_accessor :expiry # @return [Integer, #in_seconds]
       attr_accessor :durability_level # @return [Symbol]
-      attr_accessor :preserve_expiry # @return [Boolean]
 
       # Creates an instance of options for {BinaryCollection#decrement}
       #
       # @param [Integer] delta the delta for the operation
       # @param [Integer] initial if present, holds the initial value
       # @param [Integer, #in_seconds, Time, nil] expiry if set, holds the expiration for the operation
-      # @param [Boolean] preserve_expiry if true and the document exists, the server will preserve current expiration
-      #  for the document, otherwise will use {expiry} from the operation.
       # @param [Symbol] durability_level level of durability
       #  +:none+::
       #     no enhanced durability required for the mutation
@@ -990,6 +1218,18 @@ module Couchbase
       #  +:persist_to_majority+::
       #     The mutation must be persisted to a majority of the Data Service nodes.
       #     Accordingly, it will be written to disk on those nodes.
+      # @param [Symbol] replicate_to number of nodes to replicate
+      #  +:none+:: do not apply any replication requirements.
+      #  +:one+::  wait for replication to at least one node.
+      #  +:two+::  wait for replication to at least two nodes.
+      #  +:three+:: wait for replication to at least three nodes.
+      # @param [Symbol] persist_to number of nodes to persist
+      #  +:none+:: do not apply any persistence requirements.
+      #  +:active+::  wait for persistence to active node
+      #  +:one+::  wait for persistence to at least one node.
+      #  +:two+:: wait for persistence to at least two nodes.
+      #  +:three+:: wait for persistence to at least three nodes.
+      #  +:four+:: wait for persistence to four nodes (active and replicas).
       #
       # @param [Integer, #in_milliseconds, nil] timeout
       # @param [Proc, nil] retry_strategy the custom retry strategy, if set
@@ -1000,8 +1240,9 @@ module Couchbase
       def initialize(delta: 1,
                      initial: nil,
                      expiry: nil,
-                     preserve_expiry: false,
                      durability_level: :none,
+                     replicate_to: :none,
+                     persist_to: :none,
                      timeout: nil,
                      retry_strategy: nil,
                      client_context: nil,
@@ -1012,7 +1253,12 @@ module Couchbase
         @delta = delta
         @initial = initial
         @expiry = Utils::Time.extract_expiry_time(expiry)
-        @preserve_expiry = preserve_expiry
+        if durability_level != :none && (replicate_to != :none || persist_to != :none)
+          raise ArgumentError, "durability_level conflicts with replicate_to and persist_to options"
+        end
+
+        @persist_to = persist_to
+        @replicate_to = replicate_to
         @durability_level = durability_level
         yield self if block_given?
       end
@@ -1027,14 +1273,18 @@ module Couchbase
       # @api private
       def to_backend
         {
-          timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+          timeout: Utils::Time.extract_duration(@timeout),
           delta: @delta,
           initial_value: @initial,
           expiry: @expiry,
-          preserve_expiry: @preserve_expiry,
           durability_level: @durability_level,
+          persist_to: @persist_to,
+          replicate_to: @replicate_to,
         }
       end
+
+      # @api private
+      DEFAULT = Decrement.new.freeze
     end
 
     # Options for {Datastructures::CouchbaseList#initialize}
@@ -1146,6 +1396,22 @@ module Couchbase
     end
 
     # Options for {Couchbase::Cluster.connect}
+    #
+    # @example Pass authenticator object to Options
+    #   Cluster.connect("couchbase://localhost",
+    #     Options::Cluster(authenticator: PasswordAuthenticator.new("Administrator", "password")))
+    #
+    # @example Shorter version, more useful for interactive sessions
+    #   Cluster.connect("couchbase://localhost", "Administrator", "password")
+    #
+    # @example Authentication with TLS client certificate (note +couchbases://+ schema)
+    #   Cluster.connect("couchbases://localhost?trust_certificate=/tmp/ca.pem",
+    #     Options::Cluster(authenticator: CertificateAuthenticator.new("/tmp/certificate.pem", "/tmp/private.key")))
+    #
+    # @see https://docs.couchbase.com/server/current/manage/manage-security/configure-client-certificates.html
+    #
+    # @see .Cluster
+    #
     class Cluster
       attr_accessor :authenticator # @return [PasswordAuthenticator, CertificateAuthenticator]
 
@@ -1163,9 +1429,33 @@ module Couchbase
       attr_accessor :analytics_threshold # @return [nil, Integer, #in_milliseconds]
       attr_accessor :management_threshold # @return [nil, Integer, #in_milliseconds]
 
+      attr_accessor :bootstrap_timeout # @return [nil, Integer, #in_milliseconds]
+      attr_accessor :resolve_timeout # @return [nil, Integer, #in_milliseconds]
+      attr_accessor :connect_timeout # @return [nil, Integer, #in_milliseconds]
+      attr_accessor :key_value_timeout # @return [nil, Integer, #in_milliseconds]
+      attr_accessor :view_timeout # @return [nil, Integer, #in_milliseconds]
+      attr_accessor :query_timeout # @return [nil, Integer, #in_milliseconds]
+      attr_accessor :analytics_timeout # @return [nil, Integer, #in_milliseconds]
+      attr_accessor :search_timeout # @return [nil, Integer, #in_milliseconds]
+      attr_accessor :management_timeout # @return [nil, Integer, #in_milliseconds]
+      attr_accessor :dns_srv_timeout # @return [nil, Integer, #in_milliseconds]
+      attr_accessor :tcp_keep_alive_interval # @return [nil, Integer, #in_milliseconds]
+      attr_accessor :config_poll_interval # @return [nil, Integer, #in_milliseconds]
+      attr_accessor :config_poll_floor # @return [nil, Integer, #in_milliseconds]
+      attr_accessor :config_idle_redial_timeout # @return [nil, Integer, #in_milliseconds]
+      attr_accessor :idle_http_connection_timeout # @return [nil, Integer, #in_milliseconds]
+
       # Creates an instance of options for {Couchbase::Cluster.connect}
       #
       # @param [PasswordAuthenticator, CertificateAuthenticator] authenticator
+      # @param [nil, Integer, #in_milliseconds] key_value_timeout default timeout for Key/Value operations, e.g. {Collection#get}
+      # @param [nil, Integer, #in_milliseconds] view_timeout default timeout for View query
+      # @param [nil, Integer, #in_milliseconds] query_timeout default timeout for N1QL query
+      # @param [nil, Integer, #in_milliseconds] analytics_timeout default timeout for Analytics query
+      # @param [nil, Integer, #in_milliseconds] search_timeout default timeout for Search query
+      # @param [nil, Integer, #in_milliseconds] management_timeout default timeout for management operations
+      #
+      # @see .Cluster
       #
       # @yieldparam [Cluster] self
       def initialize(authenticator: nil,
@@ -1181,7 +1471,22 @@ module Couchbase
                      view_threshold: nil,
                      search_threshold: nil,
                      analytics_threshold: nil,
-                     management_threshold: nil)
+                     management_threshold: nil,
+                     bootstrap_timeout: nil,
+                     resolve_timeout: nil,
+                     connect_timeout: nil,
+                     key_value_timeout: nil,
+                     view_timeout: nil,
+                     query_timeout: nil,
+                     analytics_timeout: nil,
+                     search_timeout: nil,
+                     management_timeout: nil,
+                     dns_srv_timeout: nil,
+                     tcp_keep_alive_interval: nil,
+                     config_poll_interval: nil,
+                     config_poll_floor: nil,
+                     config_idle_redial_timeout: nil,
+                     idle_http_connection_timeout: nil)
         @authenticator = authenticator
         @enable_metrics = enable_metrics
         @metrics_emit_interval = metrics_emit_interval
@@ -1196,6 +1501,21 @@ module Couchbase
         @search_threshold = search_threshold
         @analytics_threshold = analytics_threshold
         @management_threshold = management_threshold
+        @bootstrap_timeout = bootstrap_timeout
+        @resolve_timeout = resolve_timeout
+        @connect_timeout = connect_timeout
+        @key_value_timeout = key_value_timeout
+        @view_timeout = view_timeout
+        @query_timeout = query_timeout
+        @analytics_timeout = analytics_timeout
+        @search_timeout = search_timeout
+        @management_timeout = management_timeout
+        @dns_srv_timeout = dns_srv_timeout
+        @tcp_keep_alive_interval = tcp_keep_alive_interval
+        @config_poll_interval = config_poll_interval
+        @config_poll_floor = config_poll_floor
+        @config_idle_redial_timeout = config_idle_redial_timeout
+        @idle_http_connection_timeout = idle_http_connection_timeout
         yield self if block_given?
       end
 
@@ -1205,6 +1525,11 @@ module Couchbase
         @authenticator = PasswordAuthenticator.new(username, password)
       end
 
+      # @param [String] profile_name The name of the configuration profile to apply (e.g. "wan_development")
+      def apply_profile(profile_name)
+        ConfigProfiles::KNOWN_PROFILES.apply(profile_name, self)
+      end
+
       # @api private
       def to_backend
         {
@@ -1221,6 +1546,21 @@ module Couchbase
           search_threshold: Utils::Time.extract_duration(@search_threshold),
           analytics_threshold: Utils::Time.extract_duration(@analytics_threshold),
           management_threshold: Utils::Time.extract_duration(@management_threshold),
+          bootstrap_timeout: Utils::Time.extract_duration(@bootstrap_timeout),
+          resolve_timeout: Utils::Time.extract_duration(@resolve_timeout),
+          connect_timeout: Utils::Time.extract_duration(@connect_timeout),
+          key_value_timeout: Utils::Time.extract_duration(@key_value_timeout),
+          view_timeout: Utils::Time.extract_duration(@view_timeout),
+          query_timeout: Utils::Time.extract_duration(@query_timeout),
+          analytics_timeout: Utils::Time.extract_duration(@analytics_timeout),
+          search_timeout: Utils::Time.extract_duration(@search_timeout),
+          management_timeout: Utils::Time.extract_duration(@management_timeout),
+          dns_srv_timeout: Utils::Time.extract_duration(@dns_srv_timeout),
+          tcp_keep_alive_interval: Utils::Time.extract_duration(@tcp_keep_alive_interval),
+          config_poll_interval: Utils::Time.extract_duration(@config_poll_interval),
+          config_poll_floor: Utils::Time.extract_duration(@config_poll_floor),
+          config_idle_redial_timeout: Utils::Time.extract_duration(@config_idle_redial_timeout),
+          idle_http_connection_timeout: Utils::Time.extract_duration(@idle_http_connection_timeout),
         }
       end
     end
@@ -1238,6 +1578,9 @@ module Couchbase
         @report_id = report_id
         yield self if block_given?
       end
+
+      # @api private
+      DEFAULT = Diagnostics.new.freeze
     end
 
     # Options for {Couchbase::Bucket#ping}
@@ -1265,11 +1608,14 @@ module Couchbase
       # @api private
       def to_backend
         {
-          timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+          timeout: Utils::Time.extract_duration(@timeout),
           service_types: @service_types,
           report_id: @report_id,
         }
       end
+
+      # @api private
+      DEFAULT = Ping.new.freeze
     end
 
     # Options for {Couchbase::Cluster#analytics_query}
@@ -1370,7 +1716,7 @@ module Couchbase
       # @api private
       def to_backend(scope_name: nil, bucket_name: nil)
         {
-          timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+          timeout: Utils::Time.extract_duration(@timeout),
           client_context_id: @client_context_id,
           scan_consistency: @scan_consistency,
           readonly: @readonly,
@@ -1384,6 +1730,9 @@ module Couchbase
         }
       end
 
+      # @api private
+      DEFAULT = Analytics.new.freeze
+
       private
 
       # @api private
@@ -1600,15 +1949,18 @@ module Couchbase
 
       # @api private
       def to_backend(scope_name: nil, bucket_name: nil)
+        if scope_name && bucket_name
+          default_query_context = format("default:`%<bucket>s`.`%<scope>s`", bucket: bucket_name, scope: scope_name)
+        end
         {
-          timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+          timeout: Utils::Time.extract_duration(@timeout),
           adhoc: @adhoc,
           client_context_id: @client_context_id,
           max_parallelism: @max_parallelism,
           readonly: @readonly,
           flex_index: @flex_index,
           preserve_expiry: @preserve_expiry,
-          scan_wait: @scan_wait.respond_to?(:in_milliseconds) ? @scan_wait.public_send(:in_milliseconds) : @scan_wait,
+          scan_wait: Utils::Time.extract_duration(@scan_wait),
           scan_cap: @scan_cap,
           pipeline_batch: @pipeline_batch,
           pipeline_cap: @pipeline_cap,
@@ -1619,11 +1971,12 @@ module Couchbase
           raw_parameters: @raw_parameters,
           scan_consistency: @scan_consistency,
           mutation_state: @mutation_state&.to_a,
-          scope_qualifier: @scope_qualifier,
-          scope_name: scope_name,
-          bucket_name: bucket_name,
+          query_context: @scope_qualifier || default_query_context,
         }
       end
+
+      # @api private
+      DEFAULT = Query.new.freeze
     end
 
     # Options for {Couchbase::Cluster#search_query}
@@ -1740,7 +2093,7 @@ module Couchbase
       # @api private
       def to_backend(scope_name: nil)
         {
-          timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+          timeout: Utils::Time.extract_duration(@timeout),
           limit: @limit,
           skip: @skip,
           explain: @explain,
@@ -1757,6 +2110,9 @@ module Couchbase
           mutation_state: @mutation_state&.to_a,
         }
       end
+
+      # @api private
+      DEFAULT = Search.new.freeze
     end
 
     # Options for {Couchbase::Cluster#view_query}
@@ -1859,7 +2215,7 @@ module Couchbase
       # @api private
       def to_backend
         {
-          timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+          timeout: Utils::Time.extract_duration(@timeout),
           scan_consistency: @scan_consistency,
           skip: @skip,
           limit: @limit,
@@ -1878,6 +2234,9 @@ module Couchbase
           debug: @debug,
         }
       end
+
+      # @api private
+      DEFAULT = View.new.freeze
     end
 
     # @api private
@@ -2131,18 +2490,7 @@ module Couchbase
 
     # Construct {Cluster} options for {Cluster.connect}
     #
-    # @example Pass authenticator object to Options
-    #   Cluster.connect("couchbase://localhost",
-    #     Options::Cluster(authenticator: PasswordAuthenticator.new("Administrator", "password")))
-    #
-    # @example Shorter version, more useful for interactive sessions
-    #   Cluster.connect("couchbase://localhost", "Administrator", "password")
-    #
-    # @example Authentication with TLS client certificate (note +couchbases://+ schema)
-    #   Cluster.connect("couchbases://localhost?trust_certificate=/tmp/ca.pem",
-    #     Options::Cluster(authenticator: CertificateAuthenticator.new("/tmp/certificate.pem", "/tmp/private.key")))
-    #
-    # @see https://docs.couchbase.com/server/current/manage/manage-security/configure-client-certificates.html
+    # It forwards all its arguments to {Cluster#initialize}
     #
     # @return [Cluster]
     def Cluster(**args)