RCBC-263: update core and implement legacy durability (#49)

Author: avsej

.github/workflows/tests.yml

@@ -14,7 +14,7 @@ jobs:
           - 7.1.1
           - 7.0.3
           - 6.6.5
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     services:
       couchbase:
         image: couchbase:enterprise-${{ matrix.server }}

ext/couchbase

@@ -279,12 +279,12 @@ def remove(id, options = Options::Remove.new)
     #
     # @return [Array<MutationResult>]
     def remove_multi(ids, options = Options::RemoveMulti.new)
-      resp = @backend.document_remove_multi(ids.map do |id|
+      resp = @backend.document_remove_multi(bucket_name, @scope_name, @name, ids.map do |id|
         case id
         when String
-          [bucket_name, @scope_name, @name, id, nil]
+          [id, nil]
         when Array
-          [bucket_name, @scope_name, @name, id[0], id[1]]
+          id
         else
           raise ArgumentError, "id argument of remove_multi must be a String or Array<String, Integer>, given: #{id.inspect}"
         end
@@ -366,9 +366,9 @@ def upsert(id, content, options = Options::Upsert.new)
     #
     # @return [Array<MutationResult>]
     def upsert_multi(id_content, options = Options::UpsertMulti.new)
-      resp = @backend.document_upsert_multi(id_content.map do |(id, content)|
+      resp = @backend.document_upsert_multi(bucket_name, @scope_name, @name, id_content.map do |(id, content)|
         blob, flags = options.transcoder ? options.transcoder.encode(content) : [content, 0]
-        [bucket_name, @scope_name, @name, id, blob, flags]
+        [id, blob, flags]
       end, options.to_backend)
       resp.map do |entry|
         MutationResult.new do |res|
@@ -475,10 +475,7 @@ def lookup_in(id, specs, options = Options::LookupIn.new)
             f.exists = field[:exists]
             f.index = field[:index]
             f.path = field[:path]
-            f.status = field[:status]
-            f.error = field[:error]
             f.value = field[:value]
-            f.type = field[:type]
           end
         end
       end
@@ -518,31 +515,26 @@ def mutate_in(id, specs, options = Options::MutateIn.new)
           }
         end, options.to_backend
       )
-      result = MutateInResult.new do |res|
+      MutateInResult.new do |res|
         res.transcoder = options.transcoder
         res.cas = resp[:cas]
         res.deleted = resp[:deleted]
         res.mutation_token = extract_mutation_token(resp)
-        res.first_error_index = resp[:first_error_index]
         res.encoded = resp[:fields].map do |field|
           SubDocumentField.new do |f|
-            f.exists = field[:exists]
+            f.index = field[:index]
             f.path = field[:path]
-            f.status = field[:status]
-            f.error = field[:error]
             f.value = field[:value]
-            f.type = field[:type]
           end
         end
       end
-      raise result.first_error unless result.success?
-
-      result
     end
 
     private
 
     def extract_mutation_token(resp)
+      return unless resp.key?(:mutation_token)
+
       MutationToken.new do |token|
         token.partition_id = resp[:mutation_token][:partition_id]
         token.partition_uuid = resp[:mutation_token][:partition_uuid]

ext/couchbase.cxx

@@ -157,22 +157,36 @@ class LookupInResult
       # @return [Integer] holds the CAS value of the fetched document
       attr_accessor :cas
 
-      # Decodes the content at the given index
+      # Decodes the content at the given index (or path)
       #
-      # @param [Integer] index the index of the subdocument value to decode
+      # @param [Integer, String] path_or_index the index (or path) of the subdocument value to decode
       #
       # @return [Object] the decoded
-      def content(index, transcoder = self.transcoder)
-        transcoder.decode(get_field_at_index(index).value, :json)
+      def content(path_or_index, transcoder = self.transcoder)
+        field = get_field_at_index(path_or_index)
+        raise Error::PathNotFound, "Path is not found: #{path_or_index}" unless field.exists
+
+        transcoder.decode(field.value, :json)
       end
 
       # Allows to check if a value at the given index exists
       #
-      # @param [Integer] index the index of the subdocument value to check
+      # @param [Integer, String] path_or_index the index (or path) of the subdocument value to check
       #
       # @return [Boolean] true if a value is present at the index, false otherwise
-      def exists?(index)
-        !encoded[index].nil? && encoded[index].exists
+      def exists?(path_or_index)
+        field =
+          case path_or_index
+          when String
+            encoded.find { |f| f.path == path_or_index }
+          else
+            return false unless path_or_index >= 0 && path_or_index < encoded.size
+
+            encoded[path_or_index]
+          end
+        return false unless field
+
+        field.exists
       end
 
       # @return [Array<SubDocumentField>] holds the encoded subdocument responses
@@ -201,29 +215,27 @@ def deleted?
 
       private
 
-      def get_field_at_index(index)
-        raise Error::PathInvalid, "Index is out of bounds: #{index}" unless index >= 0 && index < encoded.size
-
-        field = encoded[index]
-        raise field.error unless field.success?
+      def get_field_at_index(path_or_index)
+        case path_or_index
+        when String
+          encoded.find { |field| field.path == path_or_index } or raise Error::PathInvalid, "Path is not found: #{path_or_index}"
+        else
+          raise Error::PathInvalid, "Index is out of bounds: #{path_or_index}" unless path_or_index >= 0 && path_or_index < encoded.size
 
-        field
+          encoded[path_or_index]
+        end
       end
     end
 
     class MutateInResult < MutationResult
       # Decodes the content at the given index
       #
-      # @param [Integer] index the index of the subdocument value to decode
+      # @param [Integer, String] path_or_index the index (or path) of the subdocument value to decode
       #
       # @return [Object] the decoded
-      def content(index, transcoder = self.transcoder)
-        field = get_field_at_index(index)
-        if field.type == :counter
-          field.value
-        else
-          transcoder.decode(field.value, :json)
-        end
+      def content(path_or_index, transcoder = self.transcoder)
+        field = get_field_at_index(path_or_index)
+        transcoder.decode(field.value, :json)
       end
 
       # @yieldparam [MutateInResult] self
@@ -232,24 +244,10 @@ def initialize
         yield self if block_given?
       end
 
-      # @api private
-      def success?
-        first_error_index.nil?
-      end
-
-      # @api private
-      def first_error
-        encoded[first_error_index].error unless success?
-      end
-
       # @return [Array<SubDocumentField>] holds the encoded subdocument responses
       # @api private
       attr_accessor :encoded
 
-      # @return [Integer, nil] index of first operation entry that generated an error
-      # @api private
-      attr_accessor :first_error_index
-
       # @return [JsonTranscoder] The default transcoder which should be used
       attr_accessor :transcoder
 
@@ -267,13 +265,15 @@ def deleted?
 
       private
 
-      def get_field_at_index(index)
-        raise Error::PathInvalid, "Index is out of bounds: #{index}" unless index >= 0 && index < encoded.size
-
-        field = encoded[index]
-        raise field.error unless field.success?
+      def get_field_at_index(path_or_index)
+        case path_or_index
+        when String
+          encoded.find { |field| field.path == path_or_index } or raise Error::PathInvalid, "Path is not found: #{path_or_index}"
+        else
+          raise Error::PathInvalid, "Index is out of bounds: #{path_or_index}" unless path_or_index >= 0 && path_or_index < encoded.size
 
-        field
+          encoded[path_or_index]
+        end
       end
     end
 
@@ -291,64 +291,10 @@ class SubDocumentField
       # @return [String] path
       attr_accessor :path
 
-      # Operation type
-      #
-      # * +:set_doc+
-      # * +:counter+
-      # * +:replace+
-      # * +:dict_add+
-      # * +:dict_upsert+
-      # * +:array_push_first+
-      # * +:array_push_last+
-      # * +:array_add_unique+
-      # * +:array_insert+
-      # * +:delete+
-      # * +:get+
-      # * +:exists+
-      # * +:count+
-      # * +:get_doc+
-      #
-      # @return [Symbol]
-      attr_accessor :type
-
-      # Status of the subdocument path operation.
-      #
-      # [+:success+] Indicates a successful response in general.
-      # [+:path_not_found+] The provided path does not exist in the document
-      # [+:path_mismatch+] One of path components treats a non-dictionary as a dictionary, or a non-array as an array, or value the path
-      #   points to is not a number
-      # [+:path_invalid+] The path's syntax was incorrect
-      # [+:path_too_big+] The path provided is too large: either the string is too long, or it contains too many components
-      # [+:value_cannot_insert+] The value provided will invalidate the JSON if inserted
-      # [+:doc_not_json+] The existing document is not valid JSON
-      # [+:num_range+] The existing number is out of the valid range for arithmetic operations
-      # [+:delta_invalid+] The operation would result in a number outside the valid range
-      # [+:path_exists+] The requested operation requires the path to not already exist, but it exists
-      # [+:value_too_deep+] Inserting the value would cause the document to be too deep
-      # [+:invalid_combo+] An invalid combination of commands was specified
-      # [+:xattr_invalid_flag_combo+] An invalid combination of operations, using macros when not using extended attributes
-      # [+:xattr_invalid_key_combo+] Only single xattr key may be accessed at the same time
-      # [+:xattr_unknown_macro+] The server has no knowledge of the requested macro
-      # [+:xattr_unknown_vattr+] Unknown virtual attribute.
-      # [+:xattr_cannot_modify_vattr+] Cannot modify this virtual attribute.
-      # [+:unknown+] Unknown error.
-      #
-      # @return [Symbol]
-      attr_accessor :status
-
-      # @return [nil, Exception]
-      attr_accessor :error
-
       # @yieldparam [SubDocumentField] self
       def initialize
-        @status = :unknown
         yield self if block_given?
       end
-
-      # @return [Boolean] true if the path does not have associated error
-      def success?
-        status == :success
-      end
     end
   end
 end

lib/couchbase/collection.rb

@@ -47,7 +47,7 @@ def initialize(ignore_if_exists: false,
           # @api private
           def to_backend
             {
-              timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+              timeout: Utils::Time.extract_duration(@timeout),
               ignore_if_exists: @ignore_if_exists,
             }
           end
@@ -81,7 +81,7 @@ def initialize(ignore_if_does_not_exist: false,
           # @api private
           def to_backend
             {
-              timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+              timeout: Utils::Time.extract_duration(@timeout),
               ignore_if_does_not_exist: @ignore_if_does_not_exist,
             }
           end
@@ -123,7 +123,7 @@ def initialize(ignore_if_exists: false,
           # @api private
           def to_backend
             {
-              timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+              timeout: Utils::Time.extract_duration(@timeout),
               condition: @condition,
               dataverse_name: @dataverse_name,
               ignore_if_exists: @ignore_if_exists,
@@ -163,7 +163,7 @@ def initialize(ignore_if_does_not_exist: false,
           # @api private
           def to_backend
             {
-              timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+              timeout: Utils::Time.extract_duration(@timeout),
               dataverse_name: @dataverse_name,
               ignore_if_does_not_exist: @ignore_if_does_not_exist,
             }
@@ -221,7 +221,7 @@ def initialize(ignore_if_exists: false,
           # @api private
           def to_backend
             {
-              timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+              timeout: Utils::Time.extract_duration(@timeout),
               dataverse_name: @dataverse_name,
               ignore_if_exists: @ignore_if_exists,
             }
@@ -260,7 +260,7 @@ def initialize(ignore_if_does_not_exist: false,
           # @api private
           def to_backend
             {
-              timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+              timeout: Utils::Time.extract_duration(@timeout),
               dataverse_name: @dataverse_name,
               ignore_if_does_not_exist: @ignore_if_does_not_exist,
             }
@@ -322,7 +322,7 @@ def initialize(link_name: "Local",
           # @api private
           def to_backend
             {
-              timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+              timeout: Utils::Time.extract_duration(@timeout),
               link_name: @link_name,
               force: @force,
               dataverse_name: @dataverse_name,
@@ -361,7 +361,7 @@ def initialize(link_name: "Local",
           # @api private
           def to_backend
             {
-              timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+              timeout: Utils::Time.extract_duration(@timeout),
               link_name: @link_name,
               dataverse_name: @dataverse_name,
             }
@@ -408,7 +408,7 @@ def initialize(timeout: nil,
           # @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
@@ -434,7 +434,7 @@ def initialize(timeout: nil,
           # @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
@@ -460,7 +460,7 @@ def initialize(timeout: nil,
           # @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
@@ -503,7 +503,7 @@ def initialize(link_type: nil,
           # @api private
           def to_backend
             {
-              timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
+              timeout: Utils::Time.extract_duration(@timeout),
               link_type: @link_type.to_s,
               dataverse: @dataverse,
               name: @name,