google-cloud-spanner 2.0.0 → 2.5.0

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

@@ -142,7 +142,9 @@ module Google
 
         # @private
         class Statement
-          attr_reader :sql, :params, :types
+          attr_reader :sql
+          attr_reader :params
+          attr_reader :types
 
           def initialize sql, params: nil, types: nil
             @sql = sql

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

@@ -23,6 +23,7 @@ require "google/cloud/spanner/snapshot"
 require "google/cloud/spanner/range"
 require "google/cloud/spanner/column_value"
 require "google/cloud/spanner/convert"
+require "google/cloud/spanner/commit_response"
 
 module Google
   module Cloud
@@ -58,7 +59,7 @@ module Google
           @instance_id = instance_id
           @database_id = database_id
           @session_labels = session_labels
-          @pool = Pool.new self, pool_opts
+          @pool = Pool.new self, **pool_opts
           @query_options = query_options
         end
 
@@ -222,6 +223,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.
@@ -335,8 +349,31 @@ module Google
         #     puts "User #{row[:id]} is #{row[:name]}"
         #   end
         #
+        # @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 }
+        #
+        #   results = db.execute_query \
+        #     "SELECT * FROM users", call_options: call_options
+        #
+        #   results.rows.each do |row|
+        #     puts "User #{row[:id]} is #{row[:name]}"
+        #   end
+        #
         def execute_query sql, params: nil, types: nil, single_use: nil,
-                          query_options: nil
+                          query_options: nil, call_options: nil
           validate_single_use_args! single_use
           ensure_service!
 
@@ -347,7 +384,7 @@ module Google
           @pool.with_session do |session|
             results = session.execute_query \
               sql, params: params, types: types, transaction: single_use_tx,
-              query_options: query_options
+              query_options: query_options, call_options: call_options
           end
           results
         end
@@ -474,14 +511,6 @@ module Google
         #   value in `params`. In these cases, the `types` hash can be used to
         #   specify the exact SQL type for some or all of the SQL query
         #   parameters.
-        # @param [Hash] query_options A hash of values to specify the custom
-        #   query options for executing SQL query. Query options are optional.
-        #   The following settings can be provided:
-        #
-        #   * `:optimizer_version` (String) The version of optimizer to use.
-        #     Empty to use database default. "latest" to use the latest
-        #     available optimizer version.
-        #
         #
         #   The keys of the hash should be query string parameter placeholders,
         #   minus the "@". The values of the hash should be Cloud Spanner type
@@ -499,6 +528,26 @@ module Google
         #     `[:INT64]`.
         #   * {Fields} - Nested Structs are specified by providing a Fields
         #     object.
+        # @param [Hash] query_options A hash of values to specify the custom
+        #   query options for executing SQL query. Query options are optional.
+        #   The following settings can be provided:
+        #
+        #   * `: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 lower bound number of rows that were modified.
         #
         # @example
@@ -529,8 +578,28 @@ module Google
         #   row_count = db.execute_partition_update \
         #    "UPDATE users SET friends = NULL WHERE active = false",
         #    query_options: { optimizer_version: "1" }
+        #
+        # @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 }
+        #
+        #   row_count = db.execute_partition_update \
+        #    "UPDATE users SET friends = NULL WHERE active = false",
+        #    call_options: call_options
+        #
         def execute_partition_update sql, params: nil, types: nil,
-                                     query_options: nil
+                                     query_options: nil, call_options: nil
           ensure_service!
 
           params, types = Convert.to_input_params_and_types params, types
@@ -539,7 +608,7 @@ module Google
             results = session.execute_query \
               sql, params: params, types: types,
               transaction: pdml_transaction(session),
-              query_options: query_options
+              query_options: query_options, call_options: call_options
           end
           # Stream all PartialResultSet to get ResultSetStats
           results.rows.to_a
@@ -620,6 +689,19 @@ module Google
         #       Useful for reading the freshest data available at a nearby
         #       replica, while bounding the possible staleness if the local
         #       replica has fallen behind.
+        # @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.
         #
@@ -649,8 +731,30 @@ module Google
         #     puts "User #{row[:id]} is #{row[:name]}"
         #   end
         #
+        # @example Read using custom timeout and retry.
+        #   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 }
+        #
+        #   results = db.read "users", [:id, :name], call_options: call_options
+        #
+        #   results.rows.each do |row|
+        #     puts "User #{row[:id]} is #{row[:name]}"
+        #   end
+        #
         def read table, columns, keys: nil, index: nil, limit: nil,
-                 single_use: nil
+                 single_use: nil, call_options: nil
           validate_single_use_args! single_use
           ensure_service!
 
@@ -662,7 +766,8 @@ module Google
           @pool.with_session do |session|
             results = session.read \
               table, columns, keys: keys, index: index, limit: limit,
-                              transaction: single_use_tx
+                              transaction: single_use_tx,
+                              call_options: call_options
           end
           results
         end
@@ -705,7 +810,16 @@ module Google
         #   See [Data
         #   types](https://cloud.google.com/spanner/docs/data-definition-language#data_types).
         #
-        # @return [Time] The timestamp at which the operation committed.
+        # @param [Hash] commit_options A hash of commit options.
+        #   e.g., return_commit_stats. Commit options are optional.
+        #   The following options can be provided:
+        #
+        #   * `:return_commit_stats` (Boolean) A boolean value. If `true`,
+        #     then statistics related to the transaction will be included in
+        #     {CommitResponse}. Default value is `false`
+        #
+        # @return [Time, CommitResponse] The timestamp at which the operation
+        #   committed. If commit options are set it returns {CommitResponse}.
         #
         # @example
         #   require "google/cloud/spanner"
@@ -717,9 +831,24 @@ module Google
         #   db.upsert "users", [{ id: 1, name: "Charlie", active: false },
         #                       { id: 2, name: "Harvey",  active: true }]
         #
-        def upsert table, *rows
+        # @example Get commit stats
+        #   require "google/cloud/spanner"
+        #
+        #   spanner = Google::Cloud::Spanner.new
+        #
+        #   db = spanner.client "my-instance", "my-database"
+        #
+        #   records = [{ id: 1, name: "Charlie", active: false },
+        #              { id: 2, name: "Harvey",  active: true }]
+        #   commit_options = { return_commit_stats: true }
+        #   commit_resp = db.upsert "users", records, commit_options: commit_options
+        #
+        #   puts commit_resp.timestamp
+        #   puts commit_resp.stats.mutation_count
+        #
+        def upsert table, rows, commit_options: nil
           @pool.with_session do |session|
-            session.upsert table, rows
+            session.upsert table, rows, commit_options: commit_options
           end
         end
         alias save upsert
@@ -761,7 +890,16 @@ module Google
         #   See [Data
         #   types](https://cloud.google.com/spanner/docs/data-definition-language#data_types).
         #
-        # @return [Time] The timestamp at which the operation committed.
+        # @param [Hash] commit_options A hash of commit options.
+        #   e.g., return_commit_stats. Commit options are optional.
+        #   The following options can be provided:
+        #
+        #   * `:return_commit_stats` (Boolean) A boolean value. If `true`,
+        #     then statistics related to the transaction will be included in
+        #     {CommitResponse}. Default value is `false`
+        #
+        # @return [Time, CommitResponse] The timestamp at which the operation
+        #   committed. If commit options are set it returns {CommitResponse}.
         #
         # @example
         #   require "google/cloud/spanner"
@@ -773,9 +911,24 @@ module Google
         #   db.insert "users", [{ id: 1, name: "Charlie", active: false },
         #                       { id: 2, name: "Harvey",  active: true }]
         #
-        def insert table, *rows
+        # @example Get commit stats
+        #   require "google/cloud/spanner"
+        #
+        #   spanner = Google::Cloud::Spanner.new
+        #
+        #   db = spanner.client "my-instance", "my-database"
+        #
+        #   records = [{ id: 1, name: "Charlie", active: false },
+        #              { id: 2, name: "Harvey",  active: true }]
+        #   commit_options = { return_commit_stats: true }
+        #   commit_resp = db.insert "users", records, commit_options: commit_options
+        #
+        #   puts commit_resp.timestamp
+        #   puts commit_resp.stats.mutation_count
+        #
+        def insert table, rows, commit_options: nil
           @pool.with_session do |session|
-            session.insert table, rows
+            session.insert table, rows, commit_options: commit_options
           end
         end
 
@@ -816,7 +969,16 @@ module Google
         #   See [Data
         #   types](https://cloud.google.com/spanner/docs/data-definition-language#data_types).
         #
-        # @return [Time] The timestamp at which the operation committed.
+        # @param [Hash] commit_options A hash of commit options.
+        #   e.g., return_commit_stats. Commit options are optional.
+        #   The following options can be provided:
+        #
+        #   * `:return_commit_stats` (Boolean) A boolean value. If `true`,
+        #     then statistics related to the transaction will be included in
+        #     {CommitResponse}. Default value is `false`
+        #
+        # @return [Time, CommitResponse] The timestamp at which the operation
+        #   committed. If commit options are set it returns {CommitResponse}.
         #
         # @example
         #   require "google/cloud/spanner"
@@ -828,9 +990,24 @@ module Google
         #   db.update "users", [{ id: 1, name: "Charlie", active: false },
         #                       { id: 2, name: "Harvey",  active: true }]
         #
-        def update table, *rows
+        # @example Get commit stats
+        #   require "google/cloud/spanner"
+        #
+        #   spanner = Google::Cloud::Spanner.new
+        #
+        #   db = spanner.client "my-instance", "my-database"
+        #
+        #   records = [{ id: 1, name: "Charlie", active: false },
+        #              { id: 2, name: "Harvey",  active: true }]
+        #   commit_options = { return_commit_stats: true }
+        #   commit_resp = db.update "users", records, commit_options: commit_options
+        #
+        #   puts commit_resp.timestamp
+        #   puts commit_resp.stats.mutation_count
+        #
+        def update table, rows, commit_options: nil
           @pool.with_session do |session|
-            session.update table, rows
+            session.update table, rows, commit_options: commit_options
           end
         end
 
@@ -873,7 +1050,16 @@ module Google
         #   See [Data
         #   types](https://cloud.google.com/spanner/docs/data-definition-language#data_types).
         #
-        # @return [Time] The timestamp at which the operation committed.
+        # @param [Hash] commit_options A hash of commit options.
+        #   e.g., return_commit_stats. Commit options are optional.
+        #   The following options can be provided:
+        #
+        #   * `:return_commit_stats` (Boolean) A boolean value. If `true`,
+        #     then statistics related to the transaction will be included in
+        #     {CommitResponse}. Default value is `false`
+        #
+        # @return [Time, CommitResponse] The timestamp at which the operation
+        #   committed. If commit options are set it returns {CommitResponse}.
         #
         # @example
         #   require "google/cloud/spanner"
@@ -885,9 +1071,24 @@ module Google
         #   db.replace "users", [{ id: 1, name: "Charlie", active: false },
         #                        { id: 2, name: "Harvey",  active: true }]
         #
-        def replace table, *rows
+        # @example Get commit stats
+        #   require "google/cloud/spanner"
+        #
+        #   spanner = Google::Cloud::Spanner.new
+        #
+        #   db = spanner.client "my-instance", "my-database"
+        #
+        #   records = [{ id: 1, name: "Charlie", active: false },
+        #              { id: 2, name: "Harvey",  active: true }]
+        #   commit_options = { return_commit_stats: true }
+        #   commit_resp = db.replace "users", records, commit_options: commit_options
+        #
+        #   puts commit_resp.timestamp
+        #   puts commit_resp.stats.mutation_count
+        #
+        def replace table, rows, commit_options: nil
           @pool.with_session do |session|
-            session.replace table, rows
+            session.replace table, rows, commit_options: commit_options
           end
         end
 
@@ -911,8 +1112,30 @@ module Google
         # @param [Object, Array<Object>] keys A single, or list of keys or key
         #   ranges to match returned data to. Values should have exactly as many
         #   elements as there are columns in the primary key.
-        #
-        # @return [Time] The timestamp at which the operation committed.
+        # @param [Hash] commit_options A hash of commit options.
+        #   e.g., return_commit_stats. Commit options are optional.
+        #   The following options can be provided:
+        #
+        #   * `:return_commit_stats` (Boolean) A boolean value. If `true`,
+        #     then statistics related to the transaction will be included in
+        #     {CommitResponse}. Default value is `false`
+        #
+        # @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 [Time, CommitResponse] The timestamp at which the operation
+        #   committed. If commit options are set it returns {CommitResponse}.
         #
         # @example
         #   require "google/cloud/spanner"
@@ -923,9 +1146,23 @@ module Google
         #
         #   db.delete "users", [1, 2, 3]
         #
-        def delete table, keys = []
+        # @example Get commit stats
+        #   require "google/cloud/spanner"
+        #
+        #   spanner = Google::Cloud::Spanner.new
+        #
+        #   db = spanner.client "my-instance", "my-database"
+        #
+        #   commit_options = { return_commit_stats: true }
+        #   commit_resp = db.delete "users", [1, 2, 3], commit_options: commit_options
+        #
+        #   puts commit_resp.timestamp
+        #   puts commit_resp.stats.mutation_count
+        #
+        def delete table, keys = [], commit_options: nil, call_options: nil
           @pool.with_session do |session|
-            session.delete table, keys
+            session.delete table, keys, commit_options: commit_options,
+                           call_options: call_options
           end
         end
 
@@ -944,10 +1181,33 @@ module Google
         # this method may be appropriate for latency sensitive and/or high
         # throughput blind changes.
         #
+        # @param [Hash] commit_options A hash of commit options.
+        #   e.g., return_commit_stats. Commit options are optional.
+        #   The following options can be provided:
+        #
+        #   * `:return_commit_stats` (Boolean) A boolean value. If `true`,
+        #     then statistics related to the transaction will be included in
+        #     {CommitResponse}. Default value is `false`
+        #
+        # @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 [commit] The block for mutating the data.
         # @yieldparam [Google::Cloud::Spanner::Commit] commit The Commit object.
         #
-        # @return [Time] The timestamp at which the operation committed.
+        # @return [Time, CommitResponse] The timestamp at which the operation
+        #   committed. If commit options are set it returns {CommitResponse}.
         #
         # @example
         #   require "google/cloud/spanner"
@@ -961,11 +1221,29 @@ module Google
         #     c.insert "users", [{ id: 2, name: "Harvey",  active: true }]
         #   end
         #
-        def commit &block
+        # @example Get commit stats
+        #   require "google/cloud/spanner"
+        #
+        #   spanner = Google::Cloud::Spanner.new
+        #
+        #   db = spanner.client "my-instance", "my-database"
+        #
+        #   commit_options = { return_commit_stats: true }
+        #   commit_resp = db.commit commit_options: commit_options do |c|
+        #     c.update "users", [{ id: 1, name: "Charlie", active: false }]
+        #     c.insert "users", [{ id: 2, name: "Harvey",  active: true }]
+        #   end
+        #
+        #   puts commit_resp.timestamp
+        #   puts commit_resp.stats.mutation_count
+        #
+        def commit commit_options: nil, call_options: nil, &block
           raise ArgumentError, "Must provide a block" unless block_given?
 
           @pool.with_session do |session|
-            session.commit(&block)
+            session.commit(
+              commit_options: commit_options, call_options: call_options, &block
+            )
           end
         end
 
@@ -988,12 +1266,34 @@ module Google
         #
         # @param [Numeric] deadline The total amount of time in seconds the
         #   transaction has to succeed. The default is `120`.
+        # @param [Hash] commit_options A hash of commit options.
+        #   e.g., return_commit_stats. Commit options are optional.
+        #   The following options can be provided:
+        #
+        #   * `:return_commit_stats` (Boolean) A boolean value. If `true`,
+        #     then statistics related to the transaction will be included in
+        #     {CommitResponse}. Default value is `false`
+        #
+        # @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 [transaction] The block for reading and writing data.
         # @yieldparam [Google::Cloud::Spanner::Transaction] transaction The
         #   Transaction object.
         #
-        # @return [Time] The timestamp at which the transaction committed.
+        # @return [Time, CommitResponse] The timestamp at which the operation
+        #   committed. If commit options are set it returns {CommitResponse}.
         #
         # @example
         #   require "google/cloud/spanner"
@@ -1029,7 +1329,28 @@ module Google
         #     end
         #   end
         #
-        def transaction deadline: 120
+        # @example Get commit stats
+        #   require "google/cloud/spanner"
+        #
+        #   spanner = Google::Cloud::Spanner.new
+        #   db = spanner.client "my-instance", "my-database"
+        #
+        #   commit_options = { return_commit_stats: true }
+        #   commit_resp = db.transaction commit_options: commit_options do |tx|
+        #     results = tx.execute_query "SELECT * FROM users"
+        #
+        #     results.rows.each do |row|
+        #       puts "User #{row[:id]} is #{row[:name]}"
+        #     end
+        #
+        #     tx.update "users", [{ id: 1, name: "Charlie", active: false }]
+        #     tx.insert "users", [{ id: 2, name: "Harvey",  active: true }]
+        #   end
+        #
+        #   puts commit_resp.timestamp
+        #   puts commit_resp.stats.mutation_count
+        #
+        def transaction deadline: 120, commit_options: nil, call_options: nil
           ensure_service!
           unless Thread.current[:transaction_id].nil?
             raise "Nested transactions are not allowed"
@@ -1040,35 +1361,37 @@ module Google
           start_time = current_time
 
           @pool.with_transaction do |tx|
-            begin
-              Thread.current[:transaction_id] = tx.transaction_id
-              yield tx
-              commit_resp = @project.service.commit \
-                tx.session.path, tx.mutations, transaction_id: tx.transaction_id
-              return Convert.timestamp_to_time commit_resp.commit_timestamp
-            rescue GRPC::Aborted, Google::Cloud::AbortedError => err
-              # Re-raise if deadline has passed
-              if current_time - start_time > deadline
-                if err.is_a? GRPC::BadStatus
-                  err = Google::Cloud::Error.from_error err
-                end
-                raise err
+            Thread.current[:transaction_id] = tx.transaction_id
+            yield tx
+            commit_resp = @project.service.commit \
+              tx.session.path, tx.mutations,
+              transaction_id: tx.transaction_id,
+              commit_options: commit_options,
+              call_options: call_options
+            resp = CommitResponse.from_grpc commit_resp
+            commit_options ? resp : resp.timestamp
+          rescue GRPC::Aborted, Google::Cloud::AbortedError => e
+            # Re-raise if deadline has passed
+            if current_time - start_time > deadline
+              if e.is_a? GRPC::BadStatus
+                e = Google::Cloud::Error.from_error e
               end
-              # Sleep the amount from RetryDelay, or incremental backoff
-              sleep(delay_from_aborted(err) || backoff *= 1.3)
-              # Create new transaction on the session and retry the block
-              tx = tx.session.create_transaction
-              retry
-            rescue StandardError => err
-              # Rollback transaction when handling unexpected error
-              tx.session.rollback tx.transaction_id
-              # Return nil if raised with rollback.
-              return nil if err.is_a? Rollback
-              # Re-raise error.
-              raise err
-            ensure
-              Thread.current[:transaction_id] = nil
+              raise e
             end
+            # Sleep the amount from RetryDelay, or incremental backoff
+            sleep(delay_from_aborted(e) || backoff *= 1.3)
+            # Create new transaction on the session and retry the block
+            tx = tx.session.create_transaction
+            retry
+          rescue StandardError => e
+            # Rollback transaction when handling unexpected error
+            tx.session.rollback tx.transaction_id
+            # Return nil if raised with rollback.
+            return nil if e.is_a? Rollback
+            # Re-raise error.
+            raise e
+          ensure
+            Thread.current[:transaction_id] = nil
           end
         end
 
@@ -1109,6 +1432,19 @@ module Google
         #   timestamp negotiation overhead of single-use `staleness`. (See
         #   [TransactionOptions](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.v1#transactionoptions).)
         # @param [Numeric] exact_staleness Same as `staleness`.
+        # @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 [snapshot] The block for reading and writing data.
         # @yieldparam [Google::Cloud::Spanner::Snapshot] snapshot The Snapshot
@@ -1129,7 +1465,7 @@ module Google
         #   end
         #
         def snapshot strong: nil, timestamp: nil, read_timestamp: nil,
-                     staleness: nil, exact_staleness: nil
+                     staleness: nil, exact_staleness: nil, call_options: nil
           validate_snapshot_args! strong: strong, timestamp: timestamp,
                                   read_timestamp: read_timestamp,
                                   staleness: staleness,
@@ -1141,17 +1477,16 @@ module Google
           end
 
           @pool.with_session do |session|
-            begin
-              snp_grpc = @project.service.create_snapshot \
-                session.path, strong: strong,
-                              timestamp: (timestamp || read_timestamp),
-                              staleness: (staleness || exact_staleness)
-              Thread.current[:transaction_id] = snp_grpc.id
-              snp = Snapshot.from_grpc snp_grpc, session
-              yield snp if block_given?
-            ensure
-              Thread.current[:transaction_id] = nil
-            end
+            snp_grpc = @project.service.create_snapshot \
+              session.path, strong: strong,
+                            timestamp: (timestamp || read_timestamp),
+                            staleness: (staleness || exact_staleness),
+                            call_options: call_options
+            Thread.current[:transaction_id] = snp_grpc.id
+            snp = Snapshot.from_grpc snp_grpc, session
+            yield snp if block_given?
+          ensure
+            Thread.current[:transaction_id] = nil
           end
           nil
         end
@@ -1350,7 +1685,7 @@ module Google
         def batch_create_new_sessions total
           sessions = []
           remaining = total
-          while remaining > 0
+          while remaining.positive?
             sessions += batch_create_sessions remaining
             remaining = total - sessions.count
           end
@@ -1454,7 +1789,7 @@ module Google
 
         def validate_deadline deadline
           return 120 unless deadline.is_a? Numeric
-          return 120 if deadline < 0
+          return 120 if deadline.negative?
           deadline
         end
 
@@ -1475,7 +1810,7 @@ module Google
             seconds = err.metadata["retryDelay"]["seconds"].to_i
             nanos = err.metadata["retryDelay"]["nanos"].to_i
             return seconds if nanos.zero?
-            return seconds + (nanos / 1000000000.0)
+            return seconds + (nanos / 1_000_000_000.0)
           end
           # No metadata? Try the inner error
           delay_from_aborted err.cause