google-cloud-bigtable 2.8.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 735e0a2c4fcb24227bbdf5e7f1ee76d6e8f718b6d23cf30bdf56fd8c6f13f830
-  data.tar.gz: fd7c5cb8fa45cd44a7e0a39c78a88bf63e52214c133505dbfbc2977a86b89cd0
+  metadata.gz: bf857acc4d00f606d2712fea755ba9f18d8c7d898599144029ff341081549f4c
+  data.tar.gz: aed266e0fabdd16d2ac25c21dde0501e4a0e4172a828f7cc5e468ec9b9caa190
 SHA512:
-  metadata.gz: 2ee38cb00b572386d02f7b7f4f7abd593b0d8022e4dd366a54b2789bf8f4e8ee04b73a9ece3286707a81ce68006fb8f2f84685a721057c16b607911e4d8da5e2
-  data.tar.gz: a9686ba49ac1a4761761570f0486edcbb6d628eaaa5c8183df65b6f697c9f50022abf8b61f7420f6b79b5f7e00ad4b9a99f1f0f45266ca248fc47ae8e874ec5a
+  metadata.gz: 4f232903645d9d3e5614c862813005f2e35d998e369f6f1b0b949245e3f5a0a8fb5735d57ac3fb721c7b244d2d8e659ae94e7addef250b2fdd6cc01ad76fd6a5
+  data.tar.gz: 81cc42b99915c8fc15b42020a2582075bfaf5108420d9e3f8350dbece58da63a620316216fd1459ce34feb6b2d6c2341375b800a3c840ec2d7e1b647a09e1647

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release History
 
+### 2.9.0 (2023-09-14)
+
+#### Features
+
+* Add support for channel pooling ([#22747](https://github.com/googleapis/google-cloud-ruby/issues/22747)) 
+
 ### 2.8.0 (2023-08-17)
 
 #### Features

data/lib/google/cloud/bigtable/convert.rb

@@ -17,6 +17,13 @@
 
 require "time"
 require "date"
+require "gapic/protobuf"
+require "gapic/call_options"
+require "gapic/headers"
+require "google/cloud/bigtable/version"
+require "google/cloud/bigtable/v2/version"
+require "google/bigtable/v2/bigtable_pb"
+require "google/cloud/bigtable/admin/v2"
 
 module Google
   module Cloud
@@ -89,6 +96,33 @@ module Google
           return [value].pack "q>" if value.is_a? Integer
           value
         end
+
+        def ping_and_warm_request table_path, app_profile_id, timeout
+          request = {
+            name: table_path.split("/").slice(0, 4).join("/"),
+            app_profile_id: app_profile_id
+          }
+          request = ::Gapic::Protobuf.coerce request, to: ::Google::Cloud::Bigtable::V2::PingAndWarmRequest
+
+          header_params = {}
+          if request.name && %r{^projects/[^/]+/instances/[^/]+/?$}.match?(request.name)
+            header_params["name"] = request.name
+          end
+          if request.app_profile_id && !request.app_profile_id.empty?
+            header_params["app_profile_id"] = request.app_profile_id
+          end
+          request_params_header = URI.encode_www_form header_params
+          metadata = {
+            "x-goog-request-params": request_params_header,
+            "x-goog-api-client":
+              ::Gapic::Headers.x_goog_api_client(lib_name: "gccl",
+                                                 lib_version: ::Google::Cloud::Bigtable::VERSION,
+                                                 gapic_version: ::Google::Cloud::Bigtable::V2::VERSION),
+            "google-cloud-resource-prefix": "projects/#{table_path.split('/')[1]}"
+          }
+          options = ::Gapic::CallOptions.new timeout: timeout, metadata: metadata
+          [request, options]
+        end
       end
     end
   end

data/lib/google/cloud/bigtable/instance.rb

@@ -521,15 +521,12 @@ module Google
           ensure_service!
 
           view ||= :SCHEMA_VIEW
-          table = if perform_lookup
-                    grpc = service.get_table instance_id, table_id, view: view
-                    Table.from_grpc grpc, service, view: view
-                  else
-                    Table.from_path service.table_path(instance_id, table_id), service
-                  end
-
-          table.app_profile_id = app_profile_id
-          table
+          if perform_lookup
+            grpc = service.get_table instance_id, table_id, view: view
+            Table.from_grpc grpc, service, view: view, app_profile_id: app_profile_id
+          else
+            Table.from_path service.table_path(instance_id, table_id), service, app_profile_id: app_profile_id
+          end
         rescue Google::Cloud::NotFoundError
           nil
         end

data/lib/google/cloud/bigtable/project.rb

@@ -343,15 +343,12 @@ module Google
           ensure_service!
 
           view ||= :SCHEMA_VIEW
-          table = if perform_lookup
-                    grpc = service.get_table instance_id, table_id, view: view
-                    Table.from_grpc grpc, service, view: view
-                  else
-                    Table.from_path service.table_path(instance_id, table_id), service
-                  end
-
-          table.app_profile_id = app_profile_id
-          table
+          if perform_lookup
+            grpc = service.get_table instance_id, table_id, view: view
+            Table.from_grpc grpc, service, view: view, app_profile_id: app_profile_id
+          else
+            Table.from_path service.table_path(instance_id, table_id), service, app_profile_id: app_profile_id
+          end
         rescue Google::Cloud::NotFoundError
           nil
         end

data/lib/google/cloud/bigtable/service.rb

@@ -20,6 +20,9 @@ require "google/cloud/bigtable/errors"
 require "google/cloud/bigtable/credentials"
 require "google/cloud/bigtable/v2"
 require "google/cloud/bigtable/admin/v2"
+require "google/cloud/bigtable/convert"
+require "gapic/lru_hash"
+require "concurrent"
 
 module Google
   module Cloud
@@ -49,12 +52,17 @@ module Google
         # @param timeout [Integer]
         #   The default timeout, in seconds, for calls made through this client.
         #
-        def initialize project_id, credentials, host: nil, host_admin: nil, timeout: nil
+        def initialize project_id, credentials, host: nil, host_admin: nil, timeout: nil,
+                       channel_selection: nil, channel_count: nil
           @project_id = project_id
           @credentials = credentials
           @host = host
           @host_admin = host_admin
           @timeout = timeout
+          @channel_selection = channel_selection
+          @channel_count = channel_count
+          @bigtable_clients = ::Gapic::LruHash.new 10
+          @mutex = Mutex.new
         end
 
         def instances
@@ -83,15 +91,15 @@ module Google
         end
         attr_accessor :mocked_tables
 
-        def client
+        def client table_path, app_profile_id
           return mocked_client if mocked_client
-          @client ||= V2::Bigtable::Client.new do |config|
-            config.credentials = credentials if credentials
-            config.timeout = timeout if timeout
-            config.endpoint = host if host
-            config.lib_name = "gccl"
-            config.lib_version = Google::Cloud::Bigtable::VERSION
-            config.metadata = { "google-cloud-resource-prefix": "projects/#{@project_id}" }
+          table_key = "#{table_path}_#{app_profile_id}"
+          @mutex.synchronize do
+            if @bigtable_clients.get(table_key).nil?
+              bigtable_client = create_bigtable_client table_path, app_profile_id
+              @bigtable_clients.put table_key, bigtable_client
+            end
+            @bigtable_clients.get table_key
           end
         end
         attr_accessor :mocked_client
@@ -649,7 +657,7 @@ module Google
         end
 
         def read_rows instance_id, table_id, app_profile_id: nil, rows: nil, filter: nil, rows_limit: nil
-          client.read_rows(
+          client(table_path(instance_id, table_id), app_profile_id).read_rows(
             **{
               table_name:     table_path(instance_id, table_id),
               rows:           rows,
@@ -661,11 +669,11 @@ module Google
         end
 
         def sample_row_keys table_name, app_profile_id: nil
-          client.sample_row_keys table_name: table_name, app_profile_id: app_profile_id
+          client(table_name, app_profile_id).sample_row_keys table_name: table_name, app_profile_id: app_profile_id
         end
 
         def mutate_row table_name, row_key, mutations, app_profile_id: nil
-          client.mutate_row(
+          client(table_name, app_profile_id).mutate_row(
             **{
               table_name:     table_name,
               app_profile_id: app_profile_id,
@@ -676,7 +684,7 @@ module Google
         end
 
         def mutate_rows table_name, entries, app_profile_id: nil
-          client.mutate_rows(
+          client(table_name, app_profile_id).mutate_rows(
             **{
               table_name:     table_name,
               app_profile_id: app_profile_id,
@@ -691,7 +699,7 @@ module Google
                                  predicate_filter: nil,
                                  true_mutations: nil,
                                  false_mutations: nil
-          client.check_and_mutate_row(
+          client(table_name, app_profile_id).check_and_mutate_row(
             **{
               table_name:       table_name,
               app_profile_id:   app_profile_id,
@@ -704,7 +712,7 @@ module Google
         end
 
         def read_modify_write_row table_name, row_key, rules, app_profile_id: nil
-          client.read_modify_write_row(
+          client(table_name, app_profile_id).read_modify_write_row(
             **{
               table_name:     table_name,
               app_profile_id: app_profile_id,
@@ -885,6 +893,23 @@ module Google
         def inspect
           "#{self.class}(#{@project_id})"
         end
+
+        def create_bigtable_client table_path, app_profile_id
+          V2::Bigtable::Client.new do |config|
+            config.credentials = credentials if credentials
+            config.timeout = timeout if timeout
+            config.endpoint = host if host
+            config.lib_name = "gccl"
+            config.lib_version = Google::Cloud::Bigtable::VERSION
+            config.metadata = { "google-cloud-resource-prefix": "projects/#{@project_id}" }
+            config.channel_pool.channel_selection = @channel_selection
+            config.channel_pool.channel_count = @channel_count
+            request, options = Convert.ping_and_warm_request table_path, app_profile_id, timeout
+            config.channel_pool.on_channel_create = proc do |channel|
+              channel.call_rpc :ping_and_warm, request, options: options
+            end
+          end
+        end
       end
     end
   end

data/lib/google/cloud/bigtable/table.rb

@@ -72,11 +72,13 @@ module Google
         # @private
         #
         # Creates a new Table instance.
-        def initialize grpc, service, view:
+        def initialize grpc, service, view:, app_profile_id: nil
           @grpc = grpc
           @service = service
+          @app_profile_id = app_profile_id
           raise ArgumentError, "view must not be nil" if view.nil?
           @loaded_views = Set[view]
+          @service.client path, app_profile_id
         end
 
         ##
@@ -659,8 +661,8 @@ module Google
         # @param view [Symbol] View type.
         # @return [Google::Cloud::Bigtable::Table]
         #
-        def self.from_grpc grpc, service, view:
-          new grpc, service, view: view
+        def self.from_grpc grpc, service, view:, app_profile_id: nil
+          new grpc, service, view: view, app_profile_id: app_profile_id
         end
 
         # @private
@@ -672,9 +674,9 @@ module Google
         # @param service [Google::Cloud::Bigtable::Service]
         # @return [Google::Cloud::Bigtable::Table]
         #
-        def self.from_path path, service
+        def self.from_path path, service, app_profile_id: nil
           grpc = Google::Cloud::Bigtable::Admin::V2::Table.new name: path
-          new grpc, service, view: :NAME_ONLY
+          new grpc, service, view: :NAME_ONLY, app_profile_id: app_profile_id
         end
 
         protected

data/lib/google/cloud/bigtable/version.rb

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Bigtable
-      VERSION = "2.8.0".freeze
+      VERSION = "2.9.0".freeze
     end
   end
 end

data/lib/google/cloud/bigtable.rb

@@ -63,6 +63,10 @@ module Google
       #   updater_proc is supplied.
       # @param timeout [Integer]
       #   The default timeout, in seconds, for calls made through this client. Optional.
+      # @param channel_selection [Symbol] The algorithm for selecting a channel from the
+      #   pool of available channels. This parameter can have the following symbols:
+      #   *  `:least_loaded` selects the channel having least number of concurrent streams.
+      # @param channel_count [Integer] The number of channels in the pool.
       # @return [Google::Cloud::Bigtable::Project]
       #
       # @example
@@ -70,19 +74,25 @@ module Google
       #
       #   client = Google::Cloud::Bigtable.new
       #
+      # rubocop:disable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/AbcSize
       def self.new project_id: nil,
                    credentials: nil,
                    emulator_host: nil,
                    scope: nil,
                    endpoint: nil,
                    endpoint_admin: nil,
-                   timeout: nil
-        project_id    ||= default_project_id
-        scope         ||= configure.scope
-        timeout       ||= configure.timeout
+                   timeout: nil,
+                   channel_selection: nil,
+                   channel_count: nil
+        project_id ||= default_project_id
+        scope ||= configure.scope
+        timeout ||= configure.timeout
         emulator_host ||= configure.emulator_host
-        endpoint      ||= configure.endpoint
+        endpoint ||= configure.endpoint
         endpoint_admin ||= configure.endpoint_admin
+        channel_selection ||= configure.channel_selection
+        channel_count ||= configure.channel_count
 
         return new_with_emulator project_id, emulator_host, timeout if emulator_host
 
@@ -90,10 +100,15 @@ module Google
         project_id = resolve_project_id project_id, credentials
         raise ArgumentError, "project_id is missing" if project_id.empty?
 
-        service = Bigtable::Service.new \
-          project_id, credentials, host: endpoint, host_admin: endpoint_admin, timeout: timeout
+        service = Bigtable::Service.new project_id, credentials, host: endpoint,
+                                        host_admin: endpoint_admin, timeout: timeout,
+                                        channel_selection: channel_selection,
+                                        channel_count: channel_count
         Bigtable::Project.new service
       end
+      # rubocop:enable Metrics/CyclomaticComplexity
+      # rubocop:enable Metrics/AbcSize
+
 
       ##
       # Configure the Google Cloud Bigtable library.
@@ -116,6 +131,10 @@ module Google
       #   to use the default endpoint.
       # * `endpoint_admin` - (String) Override of the admin service endpoint
       #   host name, or `nil` to use the default admin endpoint.
+      # * `channel_selection` - (Symbol) The algorithm for selecting a channel from the
+      #   pool of available channels. This parameter can have the following symbols:
+      #     `:least_loaded` selects the channel having least number of concurrent streams.
+      # * `channel_count` - (Integer) The number of channels in the pool.
       #
       # @return [Google::Cloud::Config] The configuration object the
       #   Google::Cloud::Bigtable library uses.

data/lib/google-cloud-bigtable.rb

@@ -171,4 +171,6 @@ Google::Cloud.configure.add_config! :bigtable do |config|
   config.add_field! :emulator_host, default_emulator, match: String, allow_nil: true
   config.add_field! :endpoint, "bigtable.googleapis.com", match: String
   config.add_field! :endpoint_admin, "bigtableadmin.googleapis.com", match: String
+  config.add_field! :channel_selection, :least_loaded, match: Symbol
+  config.add_field! :channel_count, 1, match: Integer
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-bigtable
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Google LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-17 00:00:00.000000000 Z
+date: 2023-09-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: google-cloud-bigtable-admin-v2
   requirement: !ruby/object:Gem::Requirement
@@ -30,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
   requirement: !ruby/object:Gem::Requirement
@@ -249,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.2
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: API Client library for Cloud Bigtable API