google-cloud-spanner 1.15.0 → 2.1.0

data/lib/google/cloud/spanner/transaction.rb

@@ -155,6 +155,19 @@ module Google
         #   * `:optimizer_version` (String) The version of optimizer to use.
         #     Empty to use database default. "latest" to use the latest
         #     available optimizer version.
+        # @param [Hash] call_options A hash of values to specify the custom
+        #   call options, e.g., timeout, retries, etc. Call options are
+        #   optional. The following settings can be provided:
+        #
+        #   * `:timeout` (Numeric) A numeric value of custom timeout in seconds
+        #     that overrides the default setting.
+        #   * `:retry_policy` (Hash) A hash of values that overrides the default
+        #     setting of retry policy with the following keys:
+        #     * `:initial_delay` (`Numeric`) - The initial delay in seconds.
+        #     * `:max_delay` (`Numeric`) - The max delay in seconds.
+        #     * `:multiplier` (`Numeric`) - The incremental backoff multiplier.
+        #     * `:retry_codes` (`Array<String>`) - The error codes that should
+        #       trigger a retry.
         #
         # @return [Google::Cloud::Spanner::Results] The results of the query
         #   execution.
@@ -274,7 +287,32 @@ module Google
         #     end
         #   end
         #
-        def execute_query sql, params: nil, types: nil, query_options: nil
+        # @example Query using custom timeout and retry policy:
+        #   require "google/cloud/spanner"
+        #
+        #   spanner = Google::Cloud::Spanner.new
+        #   db = spanner.client "my-instance", "my-database"
+        #
+        #   timeout = 30.0
+        #   retry_policy = {
+        #     initial_delay: 0.25,
+        #     max_delay:     32.0,
+        #     multiplier:    1.3,
+        #     retry_codes:   ["UNAVAILABLE"]
+        #   }
+        #   call_options = { timeout: timeout, retry_policy: retry_policy }
+        #
+        #   db.transaction do |tx|
+        #     results = tx.execute_query \
+        #       "SELECT * FROM users", call_options: call_options
+        #
+        #     results.rows.each do |row|
+        #       puts "User #{row[:id]} is #{row[:name]}"
+        #     end
+        #   end
+        #
+        def execute_query sql, params: nil, types: nil, query_options: nil,
+                          call_options: nil
           ensure_session!
 
           @seqno += 1
@@ -282,7 +320,8 @@ module Google
           params, types = Convert.to_input_params_and_types params, types
           session.execute_query sql, params: params, types: types,
                                      transaction: tx_selector, seqno: @seqno,
-                                     query_options: query_options
+                                     query_options: query_options,
+                                     call_options: call_options
         end
         alias execute execute_query
         alias query execute_query
@@ -352,6 +391,19 @@ module Google
         #   * `:optimizer_version` (String) The version of optimizer to use.
         #     Empty to use database default. "latest" to use the latest
         #     available optimizer version.
+        # @param [Hash] call_options A hash of values to specify the custom
+        #   call options, e.g., timeout, retries, etc. Call options are
+        #   optional. The following settings can be provided:
+        #
+        #   * `:timeout` (Numeric) A numeric value of custom timeout in seconds
+        #     that overrides the default setting.
+        #   * `:retry_policy` (Hash) A hash of values that overrides the default
+        #     setting of retry policy with the following keys:
+        #     * `:initial_delay` (`Numeric`) - The initial delay in seconds.
+        #     * `:max_delay` (`Numeric`) - The max delay in seconds.
+        #     * `:multiplier` (`Numeric`) - The incremental backoff multiplier.
+        #     * `:retry_codes` (`Array<String>`) - The error codes that should
+        #       trigger a retry.
         #
         # @return [Integer] The exact number of rows that were modified.
         #
@@ -393,9 +445,33 @@ module Google
         #     )
         #   end
         #
-        def execute_update sql, params: nil, types: nil, query_options: nil
+        # @example Update using custom timeout and retry policy:
+        #   require "google/cloud/spanner"
+        #
+        #   spanner = Google::Cloud::Spanner.new
+        #   db = spanner.client "my-instance", "my-database"
+        #
+        #   timeout = 30.0
+        #   retry_policy = {
+        #     initial_delay: 0.25,
+        #     max_delay:     32.0,
+        #     multiplier:    1.3,
+        #     retry_codes:   ["UNAVAILABLE"]
+        #   }
+        #   call_options = { timeout: timeout, retry_policy: retry_policy }
+        #
+        #   db.transaction do |tx|
+        #     row_count = tx.execute_update(
+        #       "UPDATE users SET name = 'Charlie' WHERE id = 1",
+        #       call_options: call_options
+        #     )
+        #   end
+        #
+        def execute_update sql, params: nil, types: nil, query_options: nil,
+                           call_options: nil
           results = execute_query sql, params: params, types: types,
-                                  query_options: query_options
+                                  query_options: query_options,
+                                  call_options: call_options
           # Stream all PartialResultSet to get ResultSetStats
           results.rows.to_a
           # Raise an error if there is not a row count returned
@@ -409,6 +485,20 @@ module Google
         ##
         # Executes DML statements in a batch.
         #
+        # @param [Hash] call_options A hash of values to specify the custom
+        #   call options, e.g., timeout, retries, etc. Call options are
+        #   optional. The following settings can be provided:
+        #
+        #   * `:timeout` (Numeric) A numeric value of custom timeout in seconds
+        #     that overrides the default setting.
+        #   * `:retry_policy` (Hash) A hash of values that overrides the default
+        #     setting of retry policy with the following keys:
+        #     * `:initial_delay` (`Numeric`) - The initial delay in seconds.
+        #     * `:max_delay` (`Numeric`) - The max delay in seconds.
+        #     * `:multiplier` (`Numeric`) - The incremental backoff multiplier.
+        #     * `:retry_codes` (`Array<String>`) - The error codes that should
+        #       trigger a retry.
+        #
         # @yield [batch_update] a batch update object
         # @yieldparam [Google::Cloud::Spanner::BatchUpdate] batch_update a batch
         #   update object accepting DML statements and optional parameters and
@@ -464,10 +554,11 @@ module Google
         #     end
         #   end
         #
-        def batch_update &block
+        def batch_update call_options: nil, &block
           ensure_session!
           @seqno += 1
-          session.batch_update tx_selector, @seqno, &block
+          session.batch_update tx_selector, @seqno,
+                               call_options: call_options, &block
         end
 
         ##
@@ -486,6 +577,19 @@ module Google
         #   Optional.
         # @param [Integer] limit If greater than zero, no more than this number
         #   of rows will be returned. The default is no limit.
+        # @param [Hash] call_options A hash of values to specify the custom
+        #   call options, e.g., timeout, retries, etc. Call options are
+        #   optional. The following settings can be provided:
+        #
+        #   * `:timeout` (Numeric) A numeric value of custom timeout in seconds
+        #     that overrides the default setting.
+        #   * `:retry_policy` (Hash) A hash of values that overrides the default
+        #     setting of retry policy with the following keys:
+        #     * `:initial_delay` (`Numeric`) - The initial delay in seconds.
+        #     * `:max_delay` (`Numeric`) - The max delay in seconds.
+        #     * `:multiplier` (`Numeric`) - The incremental backoff multiplier.
+        #     * `:retry_codes` (`Array<String>`) - The error codes that should
+        #       trigger a retry.
         #
         # @return [Google::Cloud::Spanner::Results] The results of the read
         #   operation.
@@ -504,14 +608,16 @@ module Google
         #     end
         #   end
         #
-        def read table, columns, keys: nil, index: nil, limit: nil
+        def read table, columns, keys: nil, index: nil, limit: nil,
+                 call_options: nil
           ensure_session!
 
           columns = Array(columns).map(&:to_s)
           keys = Convert.to_key_set keys
 
           session.read table, columns, keys: keys, index: index, limit: limit,
-                                       transaction: tx_selector
+                                       transaction: tx_selector,
+                                       call_options: call_options
         end
 
         ##
@@ -920,7 +1026,7 @@ module Google
 
         ##
         # @private Creates a new Transaction instance from a
-        # Google::Spanner::V1::Transaction.
+        # `Google::Cloud::Spanner::V1::Transaction`.
         def self.from_grpc grpc, session
           new.tap do |s|
             s.instance_variable_set :@grpc,    grpc
@@ -933,7 +1039,7 @@ module Google
         # The TransactionSelector to be used for queries
         def tx_selector
           return nil if transaction_id.nil?
-          Google::Spanner::V1::TransactionSelector.new id: transaction_id
+          V1::TransactionSelector.new id: transaction_id
         end
 
         ##

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

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Spanner
-      VERSION = "1.15.0".freeze
+      VERSION = "2.1.0".freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-spanner
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -17,82 +17,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: google-gax
+  name: google-cloud-spanner-admin-database-v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: googleapis-common-protos
+  name: google-cloud-spanner-admin-instance-v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.9
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.9
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: googleapis-common-protos-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: grpc-google-iam-v1
+  name: google-cloud-spanner-v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -127,14 +101,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '5.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '5.14'
 - !ruby/object:Gem::Dependency
   name: minitest-autotest
   requirement: !ruby/object:Gem::Requirement
@@ -253,14 +227,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.26.0
+        version: 1.28.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.26.0
+        version: 1.28.0
 - !ruby/object:Gem::Dependency
   name: grpc-tools
   requirement: !ruby/object:Gem::Requirement
@@ -295,40 +269,13 @@ files:
 - TROUBLESHOOTING.md
 - lib/google-cloud-spanner.rb
 - lib/google/cloud/spanner.rb
-- lib/google/cloud/spanner/admin/database.rb
 - lib/google/cloud/spanner/admin/database/credentials.rb
-- lib/google/cloud/spanner/admin/database/v1.rb
-- lib/google/cloud/spanner/admin/database/v1/credentials.rb
-- lib/google/cloud/spanner/admin/database/v1/database_admin_client.rb
-- lib/google/cloud/spanner/admin/database/v1/database_admin_client_config.json
-- lib/google/cloud/spanner/admin/database/v1/doc/google/iam/v1/iam_policy.rb
-- lib/google/cloud/spanner/admin/database/v1/doc/google/iam/v1/options.rb
-- lib/google/cloud/spanner/admin/database/v1/doc/google/iam/v1/policy.rb
-- lib/google/cloud/spanner/admin/database/v1/doc/google/longrunning/operations.rb
-- lib/google/cloud/spanner/admin/database/v1/doc/google/protobuf/any.rb
-- lib/google/cloud/spanner/admin/database/v1/doc/google/protobuf/empty.rb
-- lib/google/cloud/spanner/admin/database/v1/doc/google/protobuf/field_mask.rb
-- lib/google/cloud/spanner/admin/database/v1/doc/google/protobuf/timestamp.rb
-- lib/google/cloud/spanner/admin/database/v1/doc/google/rpc/status.rb
-- lib/google/cloud/spanner/admin/database/v1/doc/google/spanner/admin/database/v1/backup.rb
-- lib/google/cloud/spanner/admin/database/v1/doc/google/spanner/admin/database/v1/spanner_database_admin.rb
-- lib/google/cloud/spanner/admin/database/v1/doc/google/type/expr.rb
-- lib/google/cloud/spanner/admin/instance.rb
 - lib/google/cloud/spanner/admin/instance/credentials.rb
-- lib/google/cloud/spanner/admin/instance/v1.rb
-- lib/google/cloud/spanner/admin/instance/v1/credentials.rb
-- lib/google/cloud/spanner/admin/instance/v1/doc/google/iam/v1/iam_policy.rb
-- lib/google/cloud/spanner/admin/instance/v1/doc/google/iam/v1/options.rb
-- lib/google/cloud/spanner/admin/instance/v1/doc/google/iam/v1/policy.rb
-- lib/google/cloud/spanner/admin/instance/v1/doc/google/longrunning/operations.rb
-- lib/google/cloud/spanner/admin/instance/v1/doc/google/protobuf/any.rb
-- lib/google/cloud/spanner/admin/instance/v1/doc/google/protobuf/empty.rb
-- lib/google/cloud/spanner/admin/instance/v1/doc/google/protobuf/field_mask.rb
-- lib/google/cloud/spanner/admin/instance/v1/doc/google/rpc/status.rb
-- lib/google/cloud/spanner/admin/instance/v1/doc/google/spanner/admin/instance/v1/spanner_instance_admin.rb
-- lib/google/cloud/spanner/admin/instance/v1/doc/google/type/expr.rb
-- lib/google/cloud/spanner/admin/instance/v1/instance_admin_client.rb
-- lib/google/cloud/spanner/admin/instance/v1/instance_admin_client_config.json
+- lib/google/cloud/spanner/backup.rb
+- lib/google/cloud/spanner/backup/job.rb
+- lib/google/cloud/spanner/backup/job/list.rb
+- lib/google/cloud/spanner/backup/list.rb
+- lib/google/cloud/spanner/backup/restore/job.rb
 - lib/google/cloud/spanner/batch_client.rb
 - lib/google/cloud/spanner/batch_snapshot.rb
 - lib/google/cloud/spanner/batch_update.rb
@@ -339,8 +286,11 @@ files:
 - lib/google/cloud/spanner/credentials.rb
 - lib/google/cloud/spanner/data.rb
 - lib/google/cloud/spanner/database.rb
+- lib/google/cloud/spanner/database/backup_info.rb
 - lib/google/cloud/spanner/database/job.rb
+- lib/google/cloud/spanner/database/job/list.rb
 - lib/google/cloud/spanner/database/list.rb
+- lib/google/cloud/spanner/database/restore_info.rb
 - lib/google/cloud/spanner/errors.rb
 - lib/google/cloud/spanner/fields.rb
 - lib/google/cloud/spanner/instance.rb
@@ -359,38 +309,7 @@ files:
 - lib/google/cloud/spanner/snapshot.rb
 - lib/google/cloud/spanner/status.rb
 - lib/google/cloud/spanner/transaction.rb
-- lib/google/cloud/spanner/v1.rb
-- lib/google/cloud/spanner/v1/credentials.rb
-- lib/google/cloud/spanner/v1/doc/google/protobuf/any.rb
-- lib/google/cloud/spanner/v1/doc/google/protobuf/duration.rb
-- lib/google/cloud/spanner/v1/doc/google/protobuf/empty.rb
-- lib/google/cloud/spanner/v1/doc/google/protobuf/struct.rb
-- lib/google/cloud/spanner/v1/doc/google/protobuf/timestamp.rb
-- lib/google/cloud/spanner/v1/doc/google/rpc/status.rb
-- lib/google/cloud/spanner/v1/doc/google/spanner/v1/keys.rb
-- lib/google/cloud/spanner/v1/doc/google/spanner/v1/mutation.rb
-- lib/google/cloud/spanner/v1/doc/google/spanner/v1/query_plan.rb
-- lib/google/cloud/spanner/v1/doc/google/spanner/v1/result_set.rb
-- lib/google/cloud/spanner/v1/doc/google/spanner/v1/spanner.rb
-- lib/google/cloud/spanner/v1/doc/google/spanner/v1/transaction.rb
-- lib/google/cloud/spanner/v1/doc/google/spanner/v1/type.rb
-- lib/google/cloud/spanner/v1/spanner_client.rb
-- lib/google/cloud/spanner/v1/spanner_client_config.json
 - lib/google/cloud/spanner/version.rb
-- lib/google/spanner/admin/database/v1/backup_pb.rb
-- lib/google/spanner/admin/database/v1/common_pb.rb
-- lib/google/spanner/admin/database/v1/spanner_database_admin_pb.rb
-- lib/google/spanner/admin/database/v1/spanner_database_admin_services_pb.rb
-- lib/google/spanner/admin/instance/v1/spanner_instance_admin_pb.rb
-- lib/google/spanner/admin/instance/v1/spanner_instance_admin_services_pb.rb
-- lib/google/spanner/v1/keys_pb.rb
-- lib/google/spanner/v1/mutation_pb.rb
-- lib/google/spanner/v1/query_plan_pb.rb
-- lib/google/spanner/v1/result_set_pb.rb
-- lib/google/spanner/v1/spanner_pb.rb
-- lib/google/spanner/v1/spanner_services_pb.rb
-- lib/google/spanner/v1/transaction_pb.rb
-- lib/google/spanner/v1/type_pb.rb
 homepage: https://github.com/googleapis/google-cloud-ruby/tree/master/google-cloud-spanner
 licenses:
 - Apache-2.0
@@ -410,7 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: API Client library for Google Cloud Spanner API