couchbase 3.2.0 → 3.3.0

data/lib/couchbase/management/bucket_manager.rb

@@ -216,6 +216,7 @@ module Couchbase
             compression_mode: settings.compression_mode,
             minimum_durability_level: settings.minimum_durability_level,
             conflict_resolution_type: settings.conflict_resolution_type,
+            storage_backend: settings.storage_backend,
           }, options.to_backend
         )
       end
@@ -242,6 +243,7 @@ module Couchbase
             max_expiry: settings.max_expiry,
             compression_mode: settings.compression_mode,
             minimum_durability_level: settings.minimum_durability_level,
+            storage_backend: settings.storage_backend,
           }, options.to_backend
         )
       end
@@ -331,7 +333,7 @@ module Couchbase
           bucket.eviction_policy = entry[:eviction_policy]
           bucket.minimum_durability_level = entry[:minimum_durability_level]
           bucket.compression_mode = entry[:compression_mode]
-          bucket.instance_variable_set("@healthy", entry[:nodes].all? { |node| node[:status] == "healthy" })
+          bucket.instance_variable_set(:@healthy, entry[:nodes].all? { |node| node[:status] == "healthy" })
         end
       end
     end
@@ -357,6 +359,9 @@ module Couchbase
       # @return [:couchbase, :memcached, :ephemeral] the type of the bucket. Defaults to +:couchbase+
       attr_accessor :bucket_type
 
+      # @return [nil, :couchstore, :magma] the type of the storage backend of the bucket
+      attr_accessor :storage_backend
+
       # Eviction policy to use
       #
       # :full:: During ejection, only the value will be ejected (key and metadata will remain in memory). Value Ejection
@@ -383,7 +388,7 @@ module Couchbase
       # @return [:off, :passive, :active] the compression mode to use
       attr_accessor :compression_mode
 
-      # @return [:timestamp, :sequence_number] conflict resolution policy
+      # @return [:timestamp, :sequence_number, :custom] conflict resolution policy
       attr_accessor :conflict_resolution_type
 
       # @return [nil, :none, :majority, :majority_and_persist_to_active, :persist_to_majority] the minimum durability level
@@ -423,6 +428,7 @@ module Couchbase
         @compression_mode = :passive
         @conflict_resolution_type = :sequence_number
         @eviction_policy = :value_only
+        @storage_backend = nil
         yield self if block_given?
       end
     end

data/lib/couchbase/management/query_index_manager.rb

@@ -349,11 +349,9 @@ module Couchbase
             index.is_primary = idx[:is_primary]
             index.type = idx[:type]
             index.state = idx[:state]
-            index.bucket = idx[:bucket_id]
-            index.collection = idx[:collection_id]
-            index.scope = idx[:scope_id]
-            index.key_space = idx[:keyspace_id]
-            index.name_space = idx[:namespace_id]
+            index.bucket = idx[:bucket_name]
+            index.scope = idx[:scope_name]
+            index.collection = idx[:collection_name]
             index.index_key = idx[:index_key]
             index.condition = idx[:condition]
             index.partition = idx[:partition]
@@ -497,12 +495,6 @@ module Couchbase
       # @return [String, nil] the name of the collection
       attr_accessor :collection
 
-      # @return [String] the key space for the index, typically the bucket name.
-      attr_accessor :key_space
-
-      # @return [String] the namespace for the index. A namespace is a resource pool that contains multiple key spaces.
-      attr_accessor :name_space
-
       # @return [Array<String>] an array of Strings that represent the index key(s). The array is empty in the case of a
       #   PRIMARY INDEX.
       #

data/lib/couchbase/options.rb

@@ -1416,6 +1416,7 @@ module Couchbase
       attr_accessor :metrics # @return [Boolean]
       attr_accessor :profile # @return [Symbol]
       attr_accessor :flex_index # @return [Boolean]
+      attr_accessor :preserve_expiry # @return [Boolean]
       attr_accessor :scope_qualifier # @return [String]
       attr_accessor :transcoder # @return [JsonTranscoder, #decode(String)]
 
@@ -1459,6 +1460,8 @@ module Couchbase
       #     The indexer will wait until all mutations have been processed at the time of request before returning to
       #     the query engine.
       # @param [Boolean, nil] flex_index Tells the query engine to use a flex index (utilizing the search service)
+      # @param [Boolean, nil] preserve_expiry Tells the query engine to preserve expiration values set on any documents
+      #   modified by this query.
       # @param [String, nil] scope_qualifier Associate scope qualifier (also known as +query_context+) with the query.
       #   The qualifier must be in form +{bucket_name}.{scope_name}+ or +default:{bucket_name}.{scope_name}+.
       # @param [JsonTranscoder] transcoder to decode rows
@@ -1489,6 +1492,7 @@ module Couchbase
                      metrics: nil,
                      profile: :off,
                      flex_index: nil,
+                     preserve_expiry: nil,
                      scope_qualifier: nil,
                      scan_consistency: :not_bounded,
                      mutation_state: nil,
@@ -1513,6 +1517,7 @@ module Couchbase
         @metrics = metrics
         @profile = profile
         @flex_index = flex_index
+        @preserve_expiry = preserve_expiry
         @scope_qualifier = scope_qualifier
         @scan_consistency = scan_consistency
         @mutation_state = mutation_state
@@ -1602,6 +1607,7 @@ module Couchbase
           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_cap: @scan_cap,
           pipeline_batch: @pipeline_batch,
@@ -1629,6 +1635,7 @@ module Couchbase
       attr_accessor :highlight_fields # @return [Array<String>]
       attr_accessor :fields # @return [Array<String>]
       attr_accessor :disable_scoring # @return [Boolean]
+      attr_accessor :include_locations # @return [Boolean]
       attr_accessor :collections # @return [Array<String>, nil]
       attr_accessor :sort # @return [Array<String, Cluster::SearchSort>]
       attr_accessor :facets # @return [Hash<String => Cluster::SearchFacet>]
@@ -1645,6 +1652,7 @@ module Couchbase
       #   were stored while indexing
       # @param [MutationState] mutation_state the mutation tokens this query should be consistent with
       # @param [Boolean] disable_scoring If set to true, the server will not perform any scoring on the hits
+      # @param [Boolean] include_locations UNCOMMITTED: If set to true, will include the vector of search_location in rows
       # @param [Array<String>, nil] collections list of collections by which to filter the results
       # @param [Array<String, Cluster::SearchSort>] sort Ordering rules to apply to the results. The list might contain
       #   either strings or special objects, that derive from {Cluster::SearchSort}. In case of String, the value
@@ -1669,6 +1677,7 @@ module Couchbase
                      fields: nil,
                      mutation_state: nil,
                      disable_scoring: false,
+                     include_locations: false,
                      collections: nil,
                      sort: nil,
                      facets: nil,
@@ -1685,6 +1694,7 @@ module Couchbase
         @highlight_fields = highlight_fields
         @fields = fields
         @disable_scoring = disable_scoring
+        @include_locations = include_locations
         @collections = collections
         @sort = sort
         @facets = facets
@@ -1735,6 +1745,7 @@ module Couchbase
           skip: @skip,
           explain: @explain,
           disable_scoring: @disable_scoring,
+          include_locations: @include_locations,
           scope: scope_name,
           collections: scope_name ? @collections : nil,
           highlight_style: @highlight_style,

data/lib/couchbase/scope.rb

@@ -26,7 +26,7 @@ module Couchbase
 
     # @param [Couchbase::Backend] backend
     # @param [String] bucket_name name of the bucket
-    # @param [String, :_default] scope_name name of the scope
+    # @param [String] scope_name name of the scope
     def initialize(backend, bucket_name, scope_name)
       @backend = backend
       @bucket_name = bucket_name
@@ -81,7 +81,7 @@ module Couchbase
           end
           res[:warnings] = resp[:warnings].map { |warn| Cluster::QueryWarning.new(warn[:code], warn[:message]) } if resp[:warnings]
         end
-        res.instance_variable_set("@rows", resp[:rows])
+        res.instance_variable_set(:@rows, resp[:rows])
       end
     end
 
@@ -121,7 +121,7 @@ module Couchbase
           end
           res[:warnings] = resp[:warnings].map { |warn| Cluster::AnalyticsWarning.new(warn[:code], warn[:message]) } if resp[:warnings]
         end
-        res.instance_variable_set("@rows", resp[:rows])
+        res.instance_variable_set(:@rows, resp[:rows])
       end
     end
 
@@ -161,19 +161,21 @@ module Couchbase
             row.id = r[:id]
             row.score = r[:score]
             row.fragments = r[:fragments]
-            row.locations = SearchRowLocations.new(
-              r[:locations].map do |loc|
-                SearchRowLocation.new do |location|
-                  location.field = loc[:field]
-                  location.term = loc[:term]
-                  location.position = loc[:position]
-                  location.start_offset = loc[:start_offset]
-                  location.end_offset = loc[:end_offset]
-                  location.array_positions = loc[:array_positions]
+            unless r[:locations].empty?
+              row.locations = SearchRowLocations.new(
+                r[:locations].map do |loc|
+                  SearchRowLocation.new do |location|
+                    location.field = loc[:field]
+                    location.term = loc[:term]
+                    location.position = loc[:position]
+                    location.start_offset = loc[:start_offset]
+                    location.end_offset = loc[:end_offset]
+                    location.array_positions = loc[:array_positions]
+                  end
                 end
-              end
-            )
-            row.instance_variable_set("@fields", r[:fields])
+              )
+            end
+            row.instance_variable_set(:@fields, r[:fields])
             row.explanation = JSON.parse(r[:explanation]) if r[:explanation]
           end
         end

data/lib/couchbase/search_options.rb

@@ -42,6 +42,9 @@ module Couchbase
         # @return [Integer]
         attr_accessor :fuzziness
 
+        # @return [nil, :or, :and]
+        attr_accessor :operator
+
         # @param [String] match
         # @yieldparam [MatchQuery] self
         def initialize(match)
@@ -79,6 +82,9 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
+        # @return [nil, :or, :and]
+        attr_accessor :operator
+
         # @return [String]
         attr_accessor :field
 
@@ -98,6 +104,7 @@ module Couchbase
         def to_json(*args)
           data = {"match_phrase" => @match_phrase}
           data["boost"] = boost if boost
+          data["operator"] = operator.to_s if operator
           data["field"] = field if field
           data["analyzer"] = analyzer if analyzer
           data.to_json(*args)
@@ -119,6 +126,9 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
+        # @return [nil, :or, :and]
+        attr_accessor :operator
+
         # @return [String]
         attr_accessor :field
 
@@ -135,6 +145,7 @@ module Couchbase
         def to_json(*args)
           data = {"regexp" => @regexp}
           data["boost"] = boost if boost
+          data["operator"] = operator.to_s if operator
           data["field"] = field if field
           data.to_json(*args)
         end
@@ -155,6 +166,9 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
+        # @return [nil, :or, :and]
+        attr_accessor :operator
+
         # @param [String] query_string
         #
         # @yieldparam [QueryStringQuery] self
@@ -168,6 +182,7 @@ module Couchbase
         def to_json(*args)
           data = {"query" => @query_string}
           data["boost"] = boost if boost
+          data["operator"] = operator.to_s if operator
           data.to_json(*args)
         end
       end
@@ -187,6 +202,9 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
+        # @return [nil, :or, :and]
+        attr_accessor :operator
+
         # @return [String]
         attr_accessor :field
 
@@ -203,6 +221,7 @@ module Couchbase
         def to_json(*args)
           data = {"wildcard" => @wildcard}
           data["boost"] = boost if boost
+          data["operator"] = operator.to_s if operator
           data["field"] = field if field
           data.to_json(*args)
         end
@@ -223,6 +242,9 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
+        # @return [nil, :or, :and]
+        attr_accessor :operator
+
         # @return [String]
         attr_accessor :field
 
@@ -239,6 +261,7 @@ module Couchbase
         def to_json(*args)
           data = {"doc_ids" => @doc_ids.flatten.uniq}
           data["boost"] = boost if boost
+          data["operator"] = operator.to_s if operator
           data["field"] = field if field
           data.to_json(*args)
         end
@@ -259,6 +282,9 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
+        # @return [nil, :or, :and]
+        attr_accessor :operator
+
         # @return [String]
         attr_accessor :field
 
@@ -275,6 +301,7 @@ module Couchbase
         def to_json(*args)
           data = {"bool" => @value}
           data["boost"] = boost if boost
+          data["operator"] = operator.to_s if operator
           data["field"] = field if field
           data.to_json(*args)
         end
@@ -294,6 +321,9 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
+        # @return [nil, :or, :and]
+        attr_accessor :operator
+
         # @return [String]
         attr_accessor :field
 
@@ -341,6 +371,7 @@ module Couchbase
 
           data = {}
           data["boost"] = boost if boost
+          data["operator"] = operator.to_s if operator
           data["field"] = field if field
           data["datetime_parser"] = date_time_parser if date_time_parser
           if @start_time
@@ -377,6 +408,9 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
+        # @return [nil, :or, :and]
+        attr_accessor :operator
+
         # @return [String]
         attr_accessor :field
 
@@ -418,6 +452,7 @@ module Couchbase
 
           data = {}
           data["boost"] = boost if boost
+          data["operator"] = operator.to_s if operator
           data["field"] = field if field
           if @min
             data["min"] = @min
@@ -445,6 +480,9 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
+        # @return [nil, :or, :and]
+        attr_accessor :operator
+
         # @return [String]
         attr_accessor :field
 
@@ -486,6 +524,7 @@ module Couchbase
 
           data = {}
           data["boost"] = boost if boost
+          data["operator"] = operator.to_s if operator
           data["field"] = field if field
           if @min
             data["min"] = @min
@@ -517,6 +556,9 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
+        # @return [nil, :or, :and]
+        attr_accessor :operator
+
         # @return [String]
         attr_accessor :field
 
@@ -539,6 +581,7 @@ module Couchbase
             "distance" => @distance,
           }
           data["boost"] = boost if boost
+          data["operator"] = operator.to_s if operator
           data["field"] = field if field
           data.to_json(*args)
         end
@@ -563,6 +606,9 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
+        # @return [nil, :or, :and]
+        attr_accessor :operator
+
         # @return [String]
         attr_accessor :field
 
@@ -588,6 +634,7 @@ module Couchbase
             "bottom_right" => [@bottom_right_longitude, @bottom_right_latitude],
           }
           data["boost"] = boost if boost
+          data["operator"] = operator.to_s if operator
           data["field"] = field if field
           data.to_json(*args)
         end
@@ -628,6 +675,9 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
+        # @return [nil, :or, :and]
+        attr_accessor :operator
+
         # @return [String]
         attr_accessor :field
 
@@ -646,6 +696,7 @@ module Couchbase
             "polygon_points" => @coordinates.map { |coord| [coord.longitude, coord.latitude] },
           }
           data["boost"] = boost if boost
+          data["operator"] = operator.to_s if operator
           data["field"] = field if field
           data.to_json(*args)
         end
@@ -665,6 +716,9 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
+        # @return [nil, :or, :and]
+        attr_accessor :operator
+
         # @yieldparam [ConjunctionQuery] self
         #
         # @param [*SearchQuery] queries
@@ -689,6 +743,7 @@ module Couchbase
 
           data = {"conjuncts" => @queries.uniq}
           data["boost"] = boost if boost
+          data["operator"] = operator.to_s if operator
           data.to_json(*args)
         end
       end
@@ -707,6 +762,9 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
+        # @return [nil, :or, :and]
+        attr_accessor :operator
+
         # @return [Integer]
         attr_accessor :min
 
@@ -739,6 +797,7 @@ module Couchbase
             data["min"] = min
           end
           data["boost"] = boost if boost
+          data["operator"] = operator.to_s if operator
           data.to_json(*args)
         end
       end
@@ -757,6 +816,9 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
+        # @return [nil, :or, :and]
+        attr_accessor :operator
+
         # @yieldparam [BooleanQuery] self
         def initialize
           super()
@@ -801,6 +863,7 @@ module Couchbase
           data["must_not"] = @must_not unless @must_not.empty?
           data["should"] = @should unless @should.empty?
           data["boost"] = boost if boost
+          data["operator"] = operator.to_s if operator
           data.to_json(*args)
         end
       end
@@ -821,6 +884,9 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
+        # @return [nil, :or, :and]
+        attr_accessor :operator
+
         # @return [String]
         attr_accessor :field
 
@@ -843,6 +909,8 @@ module Couchbase
         def to_json(*args)
           data = {"term" => @term}
           data["boost"] = boost if boost
+          data["operator"] = operator.to_s if operator
+          data["operator"] = operator.to_s if operator
           data["field"] = field if field
           if fuzziness
             data["fuzziness"] = fuzziness
@@ -867,6 +935,9 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
+        # @return [nil, :or, :and]
+        attr_accessor :operator
+
         # @return [String]
         attr_accessor :field
 
@@ -883,6 +954,7 @@ module Couchbase
         def to_json(*args)
           data = {"prefix" => @prefix}
           data["boost"] = boost if boost
+          data["operator"] = operator.to_s if operator
           data["field"] = field if field
           data.to_json(*args)
         end
@@ -904,6 +976,9 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
+        # @return [nil, :or, :and]
+        attr_accessor :operator
+
         # @return [String]
         attr_accessor :field
 
@@ -920,6 +995,7 @@ module Couchbase
         def to_json(*args)
           data = {"terms" => @terms.flatten.uniq}
           data["boost"] = boost if boost
+          data["operator"] = operator.to_s if operator
           data["field"] = field if field
           data.to_json(*args)
         end
@@ -939,6 +1015,9 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
+        # @return [nil, :or, :and]
+        attr_accessor :operator
+
         # @yieldparam [MatchAllQuery] self
         def initialize
           super()
@@ -949,6 +1028,7 @@ module Couchbase
         def to_json(*args)
           data = {"match_all" => nil}
           data["boost"] = boost if boost
+          data["operator"] = operator.to_s if operator
           data.to_json(*args)
         end
       end
@@ -967,6 +1047,9 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
+        # @return [nil, :or, :and]
+        attr_accessor :operator
+
         # @yieldparam [MatchNoneQuery] self
         def initialize
           super()
@@ -977,6 +1060,7 @@ module Couchbase
         def to_json(*args)
           data = {"match_none" => nil}
           data["boost"] = boost if boost
+          data["operator"] = operator.to_s if operator
           data.to_json(*args)
         end
       end

data/lib/couchbase/version.rb

@@ -17,21 +17,21 @@ module Couchbase
   #
   # @example Display version and all dependencies in command line
   #   # ruby -rcouchbase -e 'pp Couchbase::VERSION'
-  #   {:sdk=>"3.1.1",
-  #    :backend=>"1.5.0",
-  #    :build_timestamp=>"2021-04-08 16:29:43",
-  #    :revision=>"a79d098eb238b3883e49e1738c35167642e8834f",
-  #    :platform=>"Linux-4.15.0-66-generic",
+  #   {:sdk=>"3.2.0",
+  #    :backend=>"1.6.0",
+  #    :build_timestamp=>"2021-08-04 10:10:35",
+  #    :revision=>"6c069e4e6965117c7240b331847dc3f62afe0554",
+  #    :platform=>"Linux-4.18.0-326.el8.x86_64",
   #    :cpu=>"x86_64",
-  #    :cc=>"GNU 9.3.1",
-  #    :cxx=>"GNU 9.3.1",
+  #    :cc=>"GNU 8.5.0",
+  #    :cxx=>"GNU 8.5.0",
   #    :ruby=>"2.7.0",
   #    :spdlog=>"1.8.1",
   #    :asio=>"1.18.0",
   #    :snappy=>"1.1.8",
   #    :http_parser=>"2.9.4",
-  #    :openssl_headers=>"OpenSSL 1.1.1g FIPS  21 Apr 2020",
-  #    :openssl_runtime=>"OpenSSL 1.1.1g FIPS  21 Apr 2020"}
+  #    :openssl_headers=>"OpenSSL 1.1.1k  FIPS 25 Mar 2021",
+  #    :openssl_runtime=>"OpenSSL 1.1.1k  FIPS 25 Mar 2021"}
   VERSION = {} unless defined?(VERSION) # rubocop:disable Style/MutableConstant
-  VERSION.update(:sdk => "3.2.0".freeze)
+  VERSION.update(:sdk => "3.3.0".freeze)
 end