couchbase 3.4.0 → 3.4.1

data/ext/revisions.rb

@@ -1,2 +1,3 @@
-cmake_flags << "-DEXT_GIT_REVISION=85dacb906e4f4f7531ed2ceab5fffd4329d5eb15"
-cmake_flags << "-DCOUCHBASE_CXX_CLIENT_GIT_REVISION=ec53d752cd494538f79358965364d1c613bad7c8"
+cmake_flags << "-DEXT_GIT_REVISION=97ca42af94afb27b75d35a1f5ea5414a562036a5"
+cmake_flags << "-DCOUCHBASE_CXX_CLIENT_GIT_REVISION=b895551ebe99164be6e633e21147296cd7241c34"
+cmake_flags << "-DCOUCHBASE_CXX_CLIENT_GIT_DESCRIBE=1.0.0-dp.4-10-gb895551"

data/lib/couchbase/binary_collection.rb

@@ -38,7 +38,7 @@ module Couchbase
     #   collection.get("mydoc", Options::Get(transcoder: nil)).content #=> "foobar"
     #
     # @return [Collection::MutationResult]
-    def append(id, content, options = Options::Append.new)
+    def append(id, content, options = Options::Append::DEFAULT)
       resp = @backend.document_append(@collection.bucket_name, @collection.scope_name, @collection.name,
                                       id, content, options.to_backend)
       Collection::MutationResult.new do |res|
@@ -59,7 +59,7 @@ module Couchbase
     #   collection.get("mydoc", Options::Get(transcoder: nil)).content #=> "barfoo"
     #
     # @return [Collection::MutationResult]
-    def prepend(id, content, options = Options::Prepend.new)
+    def prepend(id, content, options = Options::Prepend::DEFAULT)
       resp = @backend.document_prepend(@collection.bucket_name, @collection.scope_name, @collection.name,
                                        id, content, options.to_backend)
       Collection::MutationResult.new do |res|
@@ -80,7 +80,7 @@ module Couchbase
     #   res.content #=> 10
     #
     # @return [CounterResult]
-    def increment(id, options = Options::Increment.new)
+    def increment(id, options = Options::Increment::DEFAULT)
       resp = @backend.document_increment(@collection.bucket_name, @collection.scope_name, @collection.name, id,
                                          options.to_backend)
       CounterResult.new do |res|
@@ -102,7 +102,7 @@ module Couchbase
     #   res.value #=> 98
     #
     # @return [CounterResult]
-    def decrement(id, options = Options::Decrement.new)
+    def decrement(id, options = Options::Decrement::DEFAULT)
       resp = @backend.document_decrement(@collection.bucket_name, @collection.scope_name, @collection.name, id,
                                          options.to_backend)
       CounterResult.new do |res|

data/lib/couchbase/collection.rb

@@ -43,6 +43,11 @@ module Couchbase
       BinaryCollection.new(self)
     end
 
+    # @return [Management::CollectionQueryIndexManager]
+    def query_indexes
+      Management::CollectionQueryIndexManager.new(@backend, @bucket_name, @scope_name, @name)
+    end
+
     # Fetches the full document from the collection
     #
     # @param [String] id the document id which is used to uniquely identify it

data/lib/couchbase/errors.rb

@@ -21,6 +21,11 @@ module Couchbase
       # @return [Hash] attributes associated with the error
       attr_reader :context
 
+      def initialize(msg = nil, context = nil)
+        @context = context unless context.nil?
+        super(msg)
+      end
+
       def to_s
         defined?(@context) ? "#{super}, context=#{JSON.generate(@context)}" : super
       end
@@ -30,6 +35,11 @@ module Couchbase
       # @return [Hash] attributes associated with the error
       attr_reader :context
 
+      def initialize(msg = nil, context = nil)
+        @context = context unless context.nil?
+        super(msg)
+      end
+
       def to_s
         defined?(@context) ? "#{super}, context=#{JSON.generate(@context)}" : super
       end

data/lib/couchbase/management/collection_query_index_manager.rb

@@ -0,0 +1,183 @@
+#  Copyright 2023 Couchbase, Inc.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+require "couchbase/management/query_index_manager"
+require "couchbase/utils/time"
+
+module Couchbase
+  module Management
+    class CollectionQueryIndexManager
+      alias inspect to_s
+
+      # @param [Couchbase::Backend] backend
+      # @param [String] bucket_name name of the bucket
+      # @param [String] scope_name name of the scope
+      # @param [String] collection_name name of the collection
+      def initialize(backend, bucket_name, scope_name, collection_name)
+        @backend = backend
+        @bucket_name = bucket_name
+        @scope_name = scope_name
+        @collection_name = collection_name
+      end
+
+      # Fetches all indexes from the server
+      #
+      # @param [Options::Query::GetAllIndexes] options
+      #
+      # @return [Array<QueryIndex>]
+      #
+      # @raise [ArgumentError]
+      def get_all_indexes(options = Options::Query::GetAllIndexes.new)
+        res = @backend.collection_query_index_get_all(@bucket_name, @scope_name, @collection_name, options.to_backend)
+        res[:indexes].map do |idx|
+          QueryIndex.new do |index|
+            index.name = idx[:name]
+            index.is_primary = idx[:is_primary]
+            index.type = idx[:type]
+            index.state = idx[:state]
+            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]
+          end
+        end
+      end
+
+      # Creates a new index
+      #
+      # @param [String] index_name name of the index
+      # @param [Array<String>] fields the lists of fields to create th index over
+      # @param [Options::Query::CreateIndex] options
+      #
+      # @return void
+      #
+      # @raise [ArgumentError]
+      # @raise [Error::IndexExists]
+      def create_index(index_name, fields, options = Options::Query::CreateIndex.new)
+        unless options.scope_name.nil?
+          raise ArgumentError, "Scope name cannot be set in the options when using the Query Index manager at the collection level"
+        end
+
+        unless options.collection_name.nil?
+          raise ArgumentError, "Collection name cannot be set in the options when using the Query Index manager at the collection level"
+        end
+
+        @backend.collection_query_index_create(@bucket_name, @scope_name, @collection_name, index_name, fields, options.to_backend)
+      end
+
+      # Creates new primary index
+      #
+      # @param [Options::Query::CreatePrimaryIndex] options
+      #
+      # @return void
+      #
+      # @raise [ArgumentError]
+      # @raise [Error::IndexExists]
+      def create_primary_index(options = Options::Query::CreatePrimaryIndex.new)
+        unless options.scope_name.nil?
+          raise ArgumentError, "Scope name cannot be set in the options when using the Query Index manager at the collection level"
+        end
+
+        unless options.collection_name.nil?
+          raise ArgumentError, "Collection name cannot be set in the options when using the Query Index manager at the collection level"
+        end
+
+        @backend.collection_query_index_create_primary(@bucket_name, @scope_name, @collection_name, options.to_backend)
+      end
+
+      # Drops the index
+      #
+      # @param [String] index_name name of the index
+      # @param [Options::Query::DropIndex] options
+      #
+      # @return void
+      #
+      # @raise [ArgumentError]
+      # @raise [Error::IndexNotFound]
+      def drop_index(index_name, options = Options::Query::DropIndex.new)
+        unless options.scope_name.nil?
+          raise ArgumentError, "Scope name cannot be set in the options when using the Query Index manager at the collection level"
+        end
+
+        unless options.collection_name.nil?
+          raise ArgumentError, "Collection name cannot be set in the options when using the Query Index manager at the collection level"
+        end
+
+        @backend.collection_query_index_drop(@bucket_name, @scope_name, @collection_name, index_name, options.to_backend)
+      end
+
+      # Drops the primary index
+      #
+      # @param [Options::Query::DropPrimaryIndex] options
+      #
+      # @return void
+      #
+      # @raise [ArgumentError]
+      # @raise [Error::IndexNotFound]
+      def drop_primary_index(options = Options::Query::DropPrimaryIndex.new)
+        unless options.scope_name.nil?
+          raise ArgumentError, "Scope name cannot be set in the options when using the Query Index manager at the collection level"
+        end
+
+        unless options.collection_name.nil?
+          raise ArgumentError, "Collection name cannot be set in the options when using the Query Index manager at the collection level"
+        end
+
+        @backend.collection_query_index_drop_primary(@bucket_name, @scope_name, @collection_name, options.to_backend)
+      end
+
+      # Build all indexes which are currently in deferred state
+      #
+      # @param [Options::Query::BuildDeferredIndexes] options
+      #
+      # @return void
+      #
+      # @raise [ArgumentError]
+      def build_deferred_indexes(options = Options::Query::BuildDeferredIndexes.new)
+        @backend.collection_query_index_build_deferred(@bucket_name, @scope_name, @collection_name, options.to_backend)
+      end
+
+      # Polls indexes until they are online
+      #
+      # @param [Array<String>] index_names names of the indexes to watch
+      # @param [Integer, #in_milliseconds] timeout the time in milliseconds allowed for the operation to complete
+      # @param [Options::Query::WatchIndexes] options
+      #
+      # @raise [ArgumentError]
+      # @raise [Error::IndexNotFound]
+      def watch_indexes(index_names, timeout, options = Options::Query::WatchIndexes.new)
+        index_names.append("#primary") if options.watch_primary
+
+        interval_millis = 50
+        deadline = Time.now + (Utils::Time.extract_duration(timeout) * 0.001)
+        while Time.now <= deadline
+          get_all_opts = Options::Query::GetAllIndexes.new(timeout: ((deadline - Time.now) * 1000).round)
+          indexes = get_all_indexes(get_all_opts).select { |idx| index_names.include? idx.name }
+          indexes_not_found = index_names - indexes.map(&:name)
+          raise Error::IndexNotFound, "Failed to find the indexes: #{indexes_not_found.join(', ')}" unless indexes_not_found.empty?
+
+          all_online = indexes.all? { |idx| idx.state == :online }
+          return if all_online
+
+          sleep(interval_millis / 1000)
+          interval_millis += 500
+          interval_millis = 1000 if interval_millis > 1000
+        end
+        raise Error::UnambiguousTimeout, "Failed to find all indexes online within the allotted time"
+      end
+    end
+  end
+end

data/lib/couchbase/management/query_index_manager.rb

@@ -14,6 +14,7 @@
 
 require "couchbase/errors"
 require "couchbase/options"
+require "couchbase/utils/time"
 
 module Couchbase
   module Management
@@ -371,6 +372,10 @@ module Couchbase
       # @raise [ArgumentError]
       # @raise [Error::IndexExists]
       def create_index(bucket_name, index_name, fields, options = Options::Query::CreateIndex.new)
+        unless options.scope_name.nil? && options.collection_name.nil?
+          warn "The attributes 'scope_name' and 'collection_name' have been deprecated. Use 'collection.query_indexes' instead"
+        end
+
         @backend.query_index_create(bucket_name, index_name, fields, options.to_backend)
       end
 
@@ -384,6 +389,10 @@ module Couchbase
       # @raise [ArgumentError]
       # @raise [Error::IndexExists]
       def create_primary_index(bucket_name, options = Options::Query::CreatePrimaryIndex.new)
+        unless options.scope_name.nil? && options.collection_name.nil?
+          warn "The attributes 'scope_name' and 'collection_name' have been deprecated. Use 'collection.query_indexes' instead"
+        end
+
         @backend.query_index_create_primary(bucket_name, options.to_backend)
       end
 
@@ -398,8 +407,11 @@ module Couchbase
       # @raise [ArgumentError]
       # @raise [Error::IndexNotFound]
       def drop_index(bucket_name, index_name, options = Options::Query::DropIndex.new)
+        unless options.scope_name.nil? && options.collection_name.nil?
+          warn "The attributes 'scope_name' and 'collection_name' have been deprecated. Use 'collection.query_indexes' instead"
+        end
+
         @backend.query_index_drop(bucket_name, index_name, options.to_backend)
-        true
       end
 
       # Drops the primary index
@@ -412,8 +424,11 @@ module Couchbase
       # @raise [ArgumentError]
       # @raise [Error::IndexNotFound]
       def drop_primary_index(bucket_name, options = Options::Query::DropPrimaryIndex.new)
+        unless options.scope_name.nil? && options.collection_name.nil?
+          warn "The attributes 'scope_name' and 'collection_name' have been deprecated. Use 'collection.query_indexes' instead"
+        end
+
         @backend.query_index_drop_primary(bucket_name, options.to_backend)
-        true
       end
 
       # Build all indexes which are currently in deferred state
@@ -438,7 +453,24 @@ module Couchbase
       # @raise [ArgumentError]
       # @raise [Error::IndexNotFound]
       def watch_indexes(bucket_name, index_names, timeout, options = Options::Query::WatchIndexes.new)
-        @backend.query_index_watch(bucket_name, index_names, Utils::Time.extract_duration(timeout), options.to_backend)
+        index_names.append("#primary") if options.watch_primary
+
+        interval_millis = 50
+        deadline = Time.now + (Utils::Time.extract_duration(timeout) * 0.001)
+        while Time.now <= deadline
+          get_all_opts = Options::Query::GetAllIndexes.new(timeout: ((deadline - Time.now) * 1000).round)
+          indexes = get_all_indexes(bucket_name, get_all_opts).select { |idx| index_names.include? idx.name }
+          indexes_not_found = index_names - indexes.map(&:name)
+          raise Error::IndexNotFound, "Failed to find the indexes: #{indexes_not_found.join(', ')}" unless indexes_not_found.empty?
+
+          all_online = indexes.all? { |idx| idx.state == :online }
+          return if all_online
+
+          sleep(interval_millis / 1000)
+          interval_millis += 500
+          interval_millis = 1000 if interval_millis > 1000
+        end
+        raise Error::UnambiguousTimeout, "Failed to find all indexes online within the allotted time"
       end
 
       # @api private

data/lib/couchbase/management.rb

@@ -22,6 +22,7 @@ require "couchbase/management/analytics_index_manager"
 require "couchbase/management/bucket_manager"
 require "couchbase/management/collection_manager"
 require "couchbase/management/query_index_manager"
+require "couchbase/management/collection_query_index_manager"
 require "couchbase/management/search_index_manager"
 require "couchbase/management/user_manager"
 require "couchbase/management/view_index_manager"

data/lib/couchbase/options.rb

@@ -2091,7 +2091,7 @@ module Couchbase
       attr_reader :scan_consistency
 
       # @api private
-      def to_backend(scope_name: nil)
+      def to_backend(*)
         {
           timeout: Utils::Time.extract_duration(@timeout),
           limit: @limit,
@@ -2099,8 +2099,7 @@ module Couchbase
           explain: @explain,
           disable_scoring: @disable_scoring,
           include_locations: @include_locations,
-          scope: scope_name,
-          collections: scope_name ? @collections : nil,
+          collections: @collections,
           highlight_style: @highlight_style,
           highlight_fields: @highlight_fields,
           fields: @fields,

data/lib/couchbase/version.rb

@@ -19,5 +19,5 @@ module Couchbase
   #   $ ruby -rcouchbase -e 'pp Couchbase::VERSION'
   #   {:sdk=>"3.4.0", :ruby_abi=>"3.1.0", :revision=>"416fe68e6029ec8a4c40611cf6e6b30d3b90d20f"}
   VERSION = {} unless defined?(VERSION) # rubocop:disable Style/MutableConstant
-  VERSION.update(:sdk => "3.4.0".freeze)
+  VERSION.update(:sdk => "3.4.1".freeze)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couchbase
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Sergey Avseyev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-19 00:00:00.000000000 Z
+date: 2023-03-20 00:00:00.000000000 Z
 dependencies: []
 description: Modern SDK for Couchbase Server
 email:
@@ -41,6 +41,7 @@ files:
 - ext/couchbase/cmake/build_config.hxx.in
 - ext/couchbase/cmake/build_version.hxx.in
 - ext/couchbase/cmake/test_filesystem.cpp.in
+- ext/couchbase/cmake/test_openssl.cxx
 - ext/couchbase/core/CMakeLists.txt
 - ext/couchbase/core/agent.cxx
 - ext/couchbase/core/agent.hxx
@@ -175,6 +176,7 @@ files:
 - ext/couchbase/core/impl/subdoc/upsert.cxx
 - ext/couchbase/core/impl/touch.cxx
 - ext/couchbase/core/impl/transaction_error_category.cxx
+- ext/couchbase/core/impl/transaction_get_result.cxx
 - ext/couchbase/core/impl/transaction_op_error_category.cxx
 - ext/couchbase/core/impl/unlock.cxx
 - ext/couchbase/core/impl/upsert.cxx
@@ -893,6 +895,7 @@ files:
 - ext/couchbase/test/test_integration_crud.cxx
 - ext/couchbase/test/test_integration_diagnostics.cxx
 - ext/couchbase/test/test_integration_durability.cxx
+- ext/couchbase/test/test_integration_examples.cxx
 - ext/couchbase/test/test_integration_management.cxx
 - ext/couchbase/test/test_integration_meter.cxx
 - ext/couchbase/test/test_integration_query.cxx
@@ -2226,6 +2229,7 @@ files:
 - lib/couchbase/management/analytics_index_manager.rb
 - lib/couchbase/management/bucket_manager.rb
 - lib/couchbase/management/collection_manager.rb
+- lib/couchbase/management/collection_query_index_manager.rb
 - lib/couchbase/management/query_index_manager.rb
 - lib/couchbase/management/search_index_manager.rb
 - lib/couchbase/management/user_manager.rb
@@ -2251,9 +2255,9 @@ metadata:
   homepage_uri: https://docs.couchbase.com/ruby-sdk/current/hello-world/start-using-sdk.html
   bug_tracker_uri: https://couchbase.com/issues/browse/RCBC
   mailing_list_uri: https://forums.couchbase.com/c/ruby-sdk
-  source_code_uri: https://github.com/couchbase/couchbase-ruby-client/tree/3.4.0
-  changelog_uri: https://github.com/couchbase/couchbase-ruby-client/releases/tag/3.4.0
-  documentation_uri: https://docs.couchbase.com/sdk-api/couchbase-ruby-client-3.4.0/index.html
+  source_code_uri: https://github.com/couchbase/couchbase-ruby-client/tree/3.4.1
+  changelog_uri: https://github.com/couchbase/couchbase-ruby-client/releases/tag/3.4.1
+  documentation_uri: https://docs.couchbase.com/sdk-api/couchbase-ruby-client-3.4.1/index.html
   github_repo: ssh://github.com/couchbase/couchbase-ruby-client
   rubygems_mfa_required: 'true'
 post_install_message: