google-cloud-spanner 2.4.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6bfbaef2aa9726c4f6546f22d9ad3da14cdd74f1d5704f0af88aaa197285af7
-  data.tar.gz: b21b4f7ce50132358a00b6d4f2723e2299b449edf7cdb50652263f3dc1e7a417
+  metadata.gz: ff8ec17cc028b816dfb1ddb1255c3bd3fd6c2c66baa30b77fd27eb946b2808bd
+  data.tar.gz: d5cd3782cb7840717fc478f882c99a1db02b5a99b72cd8fb832905e0eecbfcb0
 SHA512:
-  metadata.gz: 2b26a10becd37ce0527996754eb16f368635269144f584d5cf1c25f17285d280f847e58ca49ccd942fb7adff59779e2a63f5c90987f548786759a5b65b337e49
-  data.tar.gz: 4e46cc9fddeb100349f410c08ef2b7d21fe0f43f6368e5ee3d2e6231c4da4ed7eb781fafb795408fbfadaca29dbcefc2b55ef290ccd39eab74d953959f59838b
+  metadata.gz: ef2ebdb0b63e720d95d661bdd8d7359d0da83448e16a098fc5f61df8068305ba02b69b47b085ed3404ab9315ce7289b5b68086a0635360f537c7c41836b5a89c
+  data.tar.gz: 3e510b6720968f06a6faf0726afcf67d8afe113005377e4f4782a9f5ba03fda5a45cc035b9f06bfcabc3d3eca210aa00230333c8acab2e557bd2582530380566

data/AUTHENTICATION.md

@@ -95,7 +95,8 @@ client = Google::Cloud::Spanner.new
 
 ### Configuration
 
-The **Project ID** and **Credentials JSON** can be configured instead of placing them in environment variables or providing them as arguments.
+The **Project ID** and the path to the **Credentials JSON** file can be configured
+instead of placing them in environment variables or providing them as arguments.
 
 ```ruby
 require "google/cloud/spanner"

data/CHANGELOG.md

@@ -1,5 +1,61 @@
 # Release History
 
+### 2.8.1 / 2021-07-08
+
+#### Documentation
+
+* Update AUTHENTICATION.md in handwritten packages
+
+### 2.8.0 / 2021-06-17
+
+#### Features
+
+* create instance using processing units/node count ([#11379](https://www.github.com/googleapis/google-cloud-ruby/issues/11379))
+  * create instance using processing units/node count
+  * fix typo
+  * removed node count and processing unit validations
+  * update orignal value on instance save
+  * remove orignal_values to current_valuess
+
+### 2.7.0 / 2021-06-09
+
+#### Features
+
+* add the support of optimizer statistics package ([#7591](https://www.github.com/googleapis/google-cloud-ruby/issues/7591))
+  * feat(spanner): add the support of optimizer statistics package
+  * Fix rubocop issues.
+  * Fix the env issue.
+* database create time access method ([#11617](https://www.github.com/googleapis/google-cloud-ruby/issues/11617))
+  * added database create time method
+  * remove assert for databse create time
+* RPC priority request option. ([#11258](https://www.github.com/googleapis/google-cloud-ruby/issues/11258))
+
+#### Bug Fixes
+
+* extract binary retry info from error ([#11656](https://www.github.com/googleapis/google-cloud-ruby/issues/11656))
+  * fix: extract binary retry info from error
+  * fix: remove unrelated frozen_string_literal change
+  * fix: remove unnecessary parentheses
+
+### 2.6.0 / 2021-03-31
+
+#### Features
+
+* add cmek backup support - ext of [#8142](https://www.github.com/googleapis/google-cloud-ruby/issues/8142) ([#8168](https://www.github.com/googleapis/google-cloud-ruby/issues/8168))
+  * feat(spanner): add cmek backup support
+  * Add encryption_config to restore database.
+  * doc example for backup create with encryption config
+  * create backup with encryption type
+  * backup restore with encryption type changes
+  * fix typo
+* add cmek db support
+
+### 2.5.0 / 2021-03-10
+
+#### Features
+
+* Drop support for Ruby 2.4 and add support for Ruby 3.0
+
 ### 2.4.0 / 2021-02-18
 
 #### Features

data/CONTRIBUTING.md

@@ -24,7 +24,7 @@ be able to accept your pull requests.
 In order to use the google-cloud-spanner console and run the project's tests,
 there is a small amount of setup:
 
-1. Install Ruby. google-cloud-spanner requires Ruby 2.4+. You may choose to
+1. Install Ruby. google-cloud-spanner requires Ruby 2.5+. You may choose to
    manage your Ruby and gem installations with [RVM](https://rvm.io/),
    [rbenv](https://github.com/rbenv/rbenv), or
    [chruby](https://github.com/postmodern/chruby).

data/LOGGING.md

@@ -3,7 +3,7 @@
 To enable logging for this library, set the logger for the underlying
 [gRPC](https://github.com/grpc/grpc/tree/master/src/ruby) library. The logger
 that you set may be a Ruby stdlib
-[`Logger`](https://ruby-doc.org/stdlib-2.5.0/libdoc/logger/rdoc/Logger.html) as
+[`Logger`](https://ruby-doc.org/stdlib/libdoc/logger/rdoc/Logger.html) as
 shown below, or a
 [`Google::Cloud::Logging::Logger`](https://googleapis.dev/ruby/google-cloud-logging/latest)
 that will write logs to [Stackdriver

data/OVERVIEW.md

@@ -316,7 +316,7 @@ spanner = Google::Cloud::Spanner.new
 instance = spanner.instance "my-instance"
 
 instance.delete
-````
+```
 
 ## Additional information
 

data/lib/google-cloud-spanner.rb

@@ -156,7 +156,9 @@ Google::Cloud.configure.add_config! :spanner do |config|
   default_query_options = Google::Cloud::Config.deferred do
     query_options = {}
     optimizer_version = ENV["SPANNER_OPTIMIZER_VERSION"]
+    optimizer_stats_pkg = ENV["SPANNER_OPTIMIZER_STATISTICS_PACKAGE"]
     query_options[:optimizer_version] = optimizer_version if optimizer_version
+    query_options[:optimizer_statistics_package] = optimizer_stats_pkg if optimizer_stats_pkg
     query_options = nil if query_options.empty?
     query_options
   end

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

@@ -88,6 +88,12 @@ module Google
           @grpc.database.split("/")[5]
         end
 
+        # Encryption information for a given resource.
+        # @return [Google::Cloud::Spanner::Admin::Database::V1::EncryptionInfo, nil]
+        def encryption_info
+          @grpc.encryption_info
+        end
+
         ##
         # The full path for the backup. Values are of the form
         # `projects/<project>/instances/<instance>/backups/<backup_id>`.
@@ -155,9 +161,9 @@ module Google
           @grpc.expire_time = Convert.time_to_timestamp time
           update_mask = Google::Protobuf::FieldMask.new paths: ["expire_time"]
           @grpc = service.update_backup @grpc, update_mask
-        rescue Google::Cloud::Error => error
+        rescue Google::Cloud::Error => e
           @grpc.expire_time = expire_time_was
-          raise error
+          raise e
         end
 
         ##
@@ -245,6 +251,29 @@ module Google
         #   project and have the same instance configuration as the instance
         #   containing the source backup. Optional. Default value is same as a
         #   backup instance.
+        # @param [Hash] encryption_config An encryption configuration describing
+        #   the encryption type and key resources in Cloud KMS used to
+        #   encrypt/decrypt the database to restore to. If this field is not
+        #   specified, the restored database will use the same encryption
+        #   configuration as the backup by default. Optional. The following
+        #   settings can be provided:
+        #
+        #   * `:kms_key_name` (String) The name of KMS key to use which should
+        #     be the full path, e.g., `projects/<project>/locations/<location>\
+        #     /keyRings/<key_ring>/cryptoKeys/<kms_key_name>`
+        #      This field should be set only when encryption type
+        #     `:CUSTOMER_MANAGED_ENCRYPTION`.
+        #   * `:encryption_type` (Symbol) The encryption type of the backup.
+        #     Valid values are:
+        #       1. `:USE_CONFIG_DEFAULT_OR_BACKUP_ENCRYPTION` - This is the default
+        #         option when config is not specified.
+        #       2. `:GOOGLE_DEFAULT_ENCRYPTION` - Google default encryption.
+        #       3. `:CUSTOMER_MANAGED_ENCRYPTION` - Use customer managed encryption.
+        #         If specified, `:kms_key_name` must contain a valid Cloud KMS key.
+        #
+        #  @raise [ArgumentError] if `:CUSTOMER_MANAGED_ENCRYPTION` specified without
+        #   customer managed kms key.
+        #
         # @return [Database] Restored database.
         #
         # @example
@@ -288,16 +317,50 @@ module Google
         #     database = job.database
         #   end
         #
-        def restore database_id, instance_id: nil
+        # @example Restore database with encryption config
+        #   require "google/cloud/spanner"
+        #
+        #   spanner = Google::Cloud::Spanner.new
+        #
+        #   instance = spanner.instance "my-instance"
+        #   backup = instance.backup "my-backup"
+        #   kms_key_name = "projects/<project>/locations/<location>/keyRings/<key_ring>/cryptoKeys/<kms_key_name>"
+        #   encryption_config = {
+        #     kms_key_name: kms_key_name,
+        #     encryption_type: :CUSTOMER_MANAGED_ENCRYPTION
+        #   }
+        #   job = backup.restore(
+        #     "my-restored-database",
+        #     encryption_config: encryption_config
+        #   )
+        #
+        #   job.done? #=> false
+        #   job.reload! # API call
+        #   job.done? #=> true
+        #
+        #   if job.error?
+        #     status = job.error
+        #   else
+        #     database = job.database
+        #   end
+        #
+        def restore database_id, instance_id: nil, encryption_config: nil
           ensure_service!
 
           instance_id ||= self.instance_id
 
+          if encryption_config&.include?(:kms_key_name) &&
+             encryption_config[:encryption_type] != :CUSTOMER_MANAGED_ENCRYPTION
+            raise Google::Cloud::InvalidArgumentError,
+                  "kms_key_name only used with CUSTOMER_MANAGED_ENCRYPTION"
+          end
+
           grpc = service.restore_database \
             self.instance_id,
             backup_id,
             instance_id,
-            database_id
+            database_id,
+            encryption_config: encryption_config
           Restore::Job.from_grpc grpc, service
         end
 

data/lib/google/cloud/spanner/backup/job.rb

@@ -39,7 +39,7 @@ module Google
         #
         #   database = spanner.database "my-instance", "my-database"
         #   expire_time = Time.now + 36000
-        #   job = database.create_backup "my-backup", expire_time: expire_time
+        #   job = database.create_backup "my-backup", expire_time
         #
         #   job.done? #=> false
         #   job.reload! # API call
@@ -80,7 +80,7 @@ module Google
           #
           #   database = spanner.database "my-instance", "my-database"
           #   expire_time = Time.now + 36000
-          #   job = database.create_backup "my-backup", expire_time: expire_time
+          #   job = database.create_backup "my-backup", expire_time
           #
           #   job.done? #=> false
           #   job.reload!
@@ -105,7 +105,7 @@ module Google
           #
           #   database = spanner.database "my-instance", "my-database"
           #   expire_time = Time.now + 36000
-          #   job = database.create_backup "my-backup", expire_time: expire_time
+          #   job = database.create_backup "my-backup", expire_time
           #
           #   job.done? #=> false
           #
@@ -125,7 +125,7 @@ module Google
           #
           #   database = spanner.database "my-instance", "my-database"
           #   expire_time = Time.now + 36000
-          #   job = database.create_backup "my-backup", expire_time: expire_time
+          #   job = database.create_backup "my-backup", expire_time
           #
           #   job.error? #=> false
           #
@@ -147,7 +147,7 @@ module Google
           #
           #   database = spanner.database "my-instance", "my-database"
           #   expire_time = Time.now + 36000
-          #   job = database.create_backup "my-backup", expire_time: expire_time
+          #   job = database.create_backup "my-backup", expire_time
           #
           #   job.error? # true
           #
@@ -172,7 +172,7 @@ module Google
           #
           #   database = spanner.database "my-instance", "my-database"
           #   expire_time = Time.now + 36000
-          #   job = database.create_backup "my-backup", expire_time: expire_time
+          #   job = database.create_backup "my-backup", expire_time
           #
           #   job.done? #=> false
           #   job.reload! # API call
@@ -195,7 +195,7 @@ module Google
           #
           #   database = spanner.database "my-instance", "my-database"
           #   expire_time = Time.now + 36000
-          #   job = database.create_backup "my-backup", expire_time: expire_time
+          #   job = database.create_backup "my-backup", expire_time
           #
           #   job.done? #=> false
           #   job.wait_until_done!
@@ -215,7 +215,7 @@ module Google
           #
           #   database = spanner.database "my-instance", "my-database"
           #   expire_time = Time.now + 36000
-          #   job = database.create_backup "my-backup", expire_time: expire_time
+          #   job = database.create_backup "my-backup", expire_time
           #
           #   job.done? #=> false
           #   job.cancel

data/lib/google/cloud/spanner/backup/job/list.rb

@@ -130,12 +130,12 @@ module Google
             #     job.backup.backup_id
             #   end
             #
-            def all
+            def all &block
               return enum_for :all unless block_given?
 
               results = self
               loop do
-                results.each { |r| yield r }
+                results.each(&block)
                 break unless next?
                 grpc.next_page
                 results = self.class.from_grpc grpc, service

data/lib/google/cloud/spanner/backup/list.rb

@@ -128,12 +128,12 @@ module Google
           #     backup.backup_id
           #   end
           #
-          def all
+          def all &block
             return enum_for :all unless block_given?
 
             results = self
             loop do
-              results.each { |r| yield r }
+              results.each(&block)
               break unless next?
               grpc.next_page
               results = self.class.from_grpc grpc, service

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

@@ -173,6 +173,8 @@ module Google
         #   * `:optimizer_version` (String) The version of optimizer to use.
         #     Empty to use database default. "latest" to use the latest
         #     available optimizer version.
+        #   * `:optimizer_statistics_package` (String) Statistics package to
+        #     use. Empty to use the database default.
         # @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:
@@ -373,9 +375,9 @@ module Google
 
           opts = { call_options: call_options }
           if partition.execute?
-            execute_partition_query partition, opts
+            execute_partition_query partition, **opts
           elsif partition.read?
-            execute_partition_read partition, opts
+            execute_partition_read partition, **opts
           end
         end
 
@@ -473,6 +475,8 @@ module Google
         #   * `:optimizer_version` (String) The version of optimizer to use.
         #     Empty to use database default. "latest" to use the latest
         #     available optimizer version.
+        #   * `:optimizer_statistics_package` (String) Statistics package to
+        #     use. Empty to use the database default.
         # @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:
@@ -598,8 +602,11 @@ module Google
         #   batch_snapshot = batch_client.batch_snapshot
         #
         #   results = batch_snapshot.execute_query \
-        #      "SELECT * FROM users",
-        #      query_options: { optimizer_version: "1" }
+        #     "SELECT * FROM users",
+        #     query_options: {
+        #       optimizer_version: "1",
+        #       optimizer_statistics_package: "auto_20191128_14_47_22UTC"
+        #     }
         #
         #   results.rows.each do |row|
         #     puts "User #{row[:id]} is #{row[:name]}"

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

@@ -42,12 +42,10 @@ module Google
       #
       #   db = spanner.client "my-instance", "my-database"
       #
-      #   db.transaction do |tx|
-      #     results = tx.execute_query "SELECT * FROM users"
+      #   results = db.execute_query "SELECT * FROM users"
       #
-      #     results.rows.each do |row|
-      #       puts "User #{row[:id]} is #{row[:name]}"
-      #     end
+      #   results.rows.each do |row|
+      #     puts "User #{row[:id]} is #{row[:name]}"
       #   end
       #
       class Client
@@ -59,7 +57,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
 
@@ -129,6 +127,7 @@ module Google
         #   | `BOOL`      | `true`/`false` | |
         #   | `INT64`     | `Integer`      | |
         #   | `FLOAT64`   | `Float`        | |
+        #   | `NUMERIC`   | `BigDecimal`   | |
         #   | `STRING`    | `String`       | |
         #   | `DATE`      | `Date`         | |
         #   | `TIMESTAMP` | `Time`, `DateTime` | |
@@ -154,6 +153,7 @@ module Google
         #   * `:BYTES`
         #   * `:DATE`
         #   * `:FLOAT64`
+        #   * `:NUMERIC`
         #   * `:INT64`
         #   * `:STRING`
         #   * `:TIMESTAMP`
@@ -167,6 +167,9 @@ module Google
         # @param [Hash] single_use Perform the read with a single-use snapshot
         #   (read-only transaction). (See
         #   [TransactionOptions](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.v1#transactionoptions).)
+        #   If no value is specified for this parameter, Cloud Spanner will use
+        #   a single use read-only transaction with strong timestamp bound as
+        #   default.
         #   The snapshot can be created by providing exactly one of the
         #   following options in the hash:
         #
@@ -223,6 +226,16 @@ module Google
         #   * `:optimizer_version` (String) The version of optimizer to use.
         #     Empty to use database default. "latest" to use the latest
         #     available optimizer version.
+        #   * `:optimizer_statistics_package` (String) Statistics package to
+        #     use. Empty to use the database default.
+        # @param [Hash] request_options Common request options.
+        #
+        #   * `:priority` (Symbol) The relative priority for requests.
+        #     The priority acts as a hint to the Cloud Spanner scheduler
+        #     and does not guarantee priority or order of execution.
+        #     Valid values are `:PRIORITY_LOW`, `:PRIORITY_MEDIUM`,
+        #     `:PRIORITY_HIGH`. If priority not set then default is
+        #     `PRIORITY_UNSPECIFIED` is equivalent to `:PRIORITY_HIGH`.
         # @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:
@@ -343,7 +356,10 @@ module Google
         #   db = spanner.client "my-instance", "my-database"
         #
         #   results = db.execute_query \
-        #     "SELECT * FROM users", query_options: { optimizer_version: "1" }
+        #     "SELECT * FROM users", query_options: {
+        #       optimizer_version: "1",
+        #       optimizer_statistics_package: "auto_20191128_14_47_22UTC"
+        #     }
         #
         #   results.rows.each do |row|
         #     puts "User #{row[:id]} is #{row[:name]}"
@@ -372,8 +388,24 @@ module Google
         #     puts "User #{row[:id]} is #{row[:name]}"
         #   end
         #
+        # @example Using request options.
+        #   require "google/cloud/spanner"
+        #
+        #   spanner = Google::Cloud::Spanner.new
+        #
+        #   db = spanner.client "my-instance", "my-database"
+        #
+        #   request_options = { priority: :PRIORITY_MEDIUM }
+        #   results = db.execute_query "SELECT * FROM users",
+        #                              request_options: request_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, call_options: nil
+                          query_options: nil, request_options: nil,
+                          call_options: nil
           validate_single_use_args! single_use
           ensure_service!
 
@@ -384,7 +416,8 @@ module Google
           @pool.with_session do |session|
             results = session.execute_query \
               sql, params: params, types: types, transaction: single_use_tx,
-              query_options: query_options, call_options: call_options
+              query_options: query_options, request_options: request_options,
+              call_options: call_options
           end
           results
         end
@@ -408,7 +441,7 @@ module Google
         # once" semantics.
         #
         # Where DML statements must be executed using Transaction (see
-        # {Transaction#execute_update}), Paritioned DML statements are executed
+        # {Transaction#execute_update}), Partitioned DML statements are executed
         # outside of a read/write transaction.
         #
         # Not all DML statements can be executed in the Partitioned DML mode and
@@ -494,6 +527,7 @@ module Google
         #   | `BOOL`      | `true`/`false` | |
         #   | `INT64`     | `Integer`      | |
         #   | `FLOAT64`   | `Float`        | |
+        #   | `NUMERIC`   | `BigDecimal`   | |
         #   | `STRING`    | `String`       | |
         #   | `DATE`      | `Date`         | |
         #   | `TIMESTAMP` | `Time`, `DateTime` | |
@@ -520,6 +554,7 @@ module Google
         #   * `:BYTES`
         #   * `:DATE`
         #   * `:FLOAT64`
+        #   * `:NUMERIC`
         #   * `:INT64`
         #   * `:STRING`
         #   * `:TIMESTAMP`
@@ -535,6 +570,16 @@ module Google
         #   * `:optimizer_version` (String) The version of optimizer to use.
         #     Empty to use database default. "latest" to use the latest
         #     available optimizer version.
+        #   * `:optimizer_statistics_package` (String) Statistics package to
+        #     use. Empty to use the database default.
+        # @param [Hash] request_options Common request options.
+        #
+        #   * `:priority` (String) The relative priority for requests.
+        #     The priority acts as a hint to the Cloud Spanner scheduler
+        #     and does not guarantee priority or order of execution.
+        #     Valid values are `:PRIORITY_LOW`, `:PRIORITY_MEDIUM`,
+        #     `:PRIORITY_HIGH`. If priority not set then default is
+        #     `PRIORITY_UNSPECIFIED` is equivalent to `:PRIORITY_HIGH`.
         # @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:
@@ -577,7 +622,10 @@ module Google
         #
         #   row_count = db.execute_partition_update \
         #    "UPDATE users SET friends = NULL WHERE active = false",
-        #    query_options: { optimizer_version: "1" }
+        #    query_options: {
+        #      optimizer_version: "1",
+        #      optimizer_statistics_package: "auto_20191128_14_47_22UTC"
+        #    }
         #
         # @example Query using custom timeout and retry policy:
         #   require "google/cloud/spanner"
@@ -598,8 +646,20 @@ module Google
         #    "UPDATE users SET friends = NULL WHERE active = false",
         #    call_options: call_options
         #
+        # @example Using request options.
+        #   require "google/cloud/spanner"
+        #
+        #   spanner = Google::Cloud::Spanner.new
+        #   db = spanner.client "my-instance", "my-database"
+        #
+        #   request_options = { priority: :PRIORITY_MEDIUM }
+        #   row_count = db.execute_partition_update \
+        #    "UPDATE users SET friends = NULL WHERE active = @active",
+        #    params: { active: false }, request_options: request_options
+        #
         def execute_partition_update sql, params: nil, types: nil,
-                                     query_options: nil, call_options: nil
+                                     query_options: nil, request_options: nil,
+                                     call_options: nil
           ensure_service!
 
           params, types = Convert.to_input_params_and_types params, types
@@ -608,7 +668,8 @@ module Google
             results = session.execute_query \
               sql, params: params, types: types,
               transaction: pdml_transaction(session),
-              query_options: query_options, call_options: call_options
+              query_options: query_options, request_options: request_options,
+              call_options: call_options
           end
           # Stream all PartialResultSet to get ResultSetStats
           results.rows.to_a
@@ -640,6 +701,9 @@ module Google
         # @param [Hash] single_use Perform the read with a single-use snapshot
         #   (read-only transaction). (See
         #   [TransactionOptions](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.v1#transactionoptions).)
+        #   If no value is specified for this parameter, Cloud Spanner will use
+        #   a single use read-only transaction with strong timestamp bound as
+        #   default.
         #   The snapshot can be created by providing exactly one of the
         #   following options in the hash:
         #
@@ -689,6 +753,14 @@ 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] request_options Common request options.
+        #
+        #   * `:priority` (Symbol) The relative priority for requests.
+        #     The priority acts as a hint to the Cloud Spanner scheduler
+        #     and does not guarantee priority or order of execution.
+        #     Valid values are `:PRIORITY_LOW`, `:PRIORITY_MEDIUM`,
+        #     `:PRIORITY_HIGH`. If priority not set then default is
+        #     `PRIORITY_UNSPECIFIED` is equivalent to `:PRIORITY_HIGH`.
         # @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:
@@ -753,8 +825,23 @@ module Google
         #     puts "User #{row[:id]} is #{row[:name]}"
         #   end
         #
+        # @example Using request options.
+        #   require "google/cloud/spanner"
+        #
+        #   spanner = Google::Cloud::Spanner.new
+        #
+        #   db = spanner.client "my-instance", "my-database"
+        #
+        #   request_options = { priority: :PRIORITY_MEDIUM }
+        #   results = db.read "users", [:id, :name],
+        #                     request_options: request_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, call_options: nil
+                 single_use: nil, request_options: nil, call_options: nil
           validate_single_use_args! single_use
           ensure_service!
 
@@ -767,6 +854,7 @@ module Google
             results = session.read \
               table, columns, keys: keys, index: index, limit: limit,
                               transaction: single_use_tx,
+                              request_options: request_options,
                               call_options: call_options
           end
           results
@@ -801,6 +889,7 @@ module Google
         #   | `BOOL`      | `true`/`false` | |
         #   | `INT64`     | `Integer`      | |
         #   | `FLOAT64`   | `Float`        | |
+        #   | `NUMERIC`   | `BigDecimal`   | |
         #   | `STRING`    | `String`       | |
         #   | `DATE`      | `Date`         | |
         #   | `TIMESTAMP` | `Time`, `DateTime` | |
@@ -817,6 +906,14 @@ module Google
         #   * `: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] request_options Common request options.
+        #
+        #   * `:priority` (String) The relative priority for requests.
+        #     The priority acts as a hint to the Cloud Spanner scheduler
+        #     and does not guarantee priority or order of execution.
+        #     Valid values are `:PRIORITY_LOW`, `:PRIORITY_MEDIUM`,
+        #     `:PRIORITY_HIGH`. If priority not set then default is
+        #     `PRIORITY_UNSPECIFIED` is equivalent to `:PRIORITY_HIGH`.
         #
         # @return [Time, CommitResponse] The timestamp at which the operation
         #   committed. If commit options are set it returns {CommitResponse}.
@@ -846,9 +943,21 @@ module Google
         #   puts commit_resp.timestamp
         #   puts commit_resp.stats.mutation_count
         #
-        def upsert table, rows, commit_options: nil
+        # @example Using request options.
+        #   require "google/cloud/spanner"
+        #
+        #   spanner = Google::Cloud::Spanner.new
+        #
+        #   db = spanner.client "my-instance", "my-database"
+        #
+        #   request_options = { priority: :PRIORITY_MEDIUM }
+        #   db.upsert "users", [{ id: 1, name: "Charlie", active: false }],
+        #                      request_options: request_options
+        #
+        def upsert table, rows, commit_options: nil, request_options: nil
           @pool.with_session do |session|
-            session.upsert table, rows, commit_options: commit_options
+            session.upsert table, rows, commit_options: commit_options,
+                           request_options: request_options
           end
         end
         alias save upsert
@@ -881,6 +990,7 @@ module Google
         #   | `BOOL`      | `true`/`false` | |
         #   | `INT64`     | `Integer`      | |
         #   | `FLOAT64`   | `Float`        | |
+        #   | `NUMERIC`   | `BigDecimal`   | |
         #   | `STRING`    | `String`       | |
         #   | `DATE`      | `Date`         | |
         #   | `TIMESTAMP` | `Time`, `DateTime` | |
@@ -897,6 +1007,14 @@ module Google
         #   * `: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] request_options Common request options.
+        #
+        #   * `:priority` (String) The relative priority for requests.
+        #     The priority acts as a hint to the Cloud Spanner scheduler
+        #     and does not guarantee priority or order of execution.
+        #     Valid values are `:PRIORITY_LOW`, `:PRIORITY_MEDIUM`,
+        #     `:PRIORITY_HIGH`. If priority not set then default is
+        #     `PRIORITY_UNSPECIFIED` is equivalent to `:PRIORITY_HIGH`.
         #
         # @return [Time, CommitResponse] The timestamp at which the operation
         #   committed. If commit options are set it returns {CommitResponse}.
@@ -926,9 +1044,21 @@ module Google
         #   puts commit_resp.timestamp
         #   puts commit_resp.stats.mutation_count
         #
-        def insert table, rows, commit_options: nil
+        # @example Using request options.
+        #   require "google/cloud/spanner"
+        #
+        #   spanner = Google::Cloud::Spanner.new
+        #
+        #   db = spanner.client "my-instance", "my-database"
+        #
+        #   request_options = { priority: :PRIORITY_MEDIUM }
+        #   db.insert "users", [{ id: 1, name: "Charlie", active: false }],
+        #                      request_options: request_options
+        #
+        def insert table, rows, commit_options: nil, request_options: nil
           @pool.with_session do |session|
-            session.insert table, rows, commit_options: commit_options
+            session.insert table, rows, commit_options: commit_options,
+                           request_options: request_options
           end
         end
 
@@ -960,6 +1090,7 @@ module Google
         #   | `BOOL`      | `true`/`false` | |
         #   | `INT64`     | `Integer`      | |
         #   | `FLOAT64`   | `Float`        | |
+        #   | `NUMERIC`   | `BigDecimal`   | |
         #   | `STRING`    | `String`       | |
         #   | `DATE`      | `Date`         | |
         #   | `TIMESTAMP` | `Time`, `DateTime` | |
@@ -976,6 +1107,14 @@ module Google
         #   * `: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] request_options Common request options.
+        #
+        #   * `:priority` (String) The relative priority for requests.
+        #     The priority acts as a hint to the Cloud Spanner scheduler
+        #     and does not guarantee priority or order of execution.
+        #     Valid values are `:PRIORITY_LOW`, `:PRIORITY_MEDIUM`,
+        #     `:PRIORITY_HIGH`. If priority not set then default is
+        #     `PRIORITY_UNSPECIFIED` is equivalent to `:PRIORITY_HIGH`.
         #
         # @return [Time, CommitResponse] The timestamp at which the operation
         #   committed. If commit options are set it returns {CommitResponse}.
@@ -1005,9 +1144,21 @@ module Google
         #   puts commit_resp.timestamp
         #   puts commit_resp.stats.mutation_count
         #
-        def update table, rows, commit_options: nil
+        # @example Using request options.
+        #   require "google/cloud/spanner"
+        #
+        #   spanner = Google::Cloud::Spanner.new
+        #
+        #   db = spanner.client "my-instance", "my-database"
+        #
+        #   request_options = { priority: :PRIORITY_MEDIUM }
+        #   db.update "users", [{ id: 1, name: "Charlie", active: false }],
+        #                      request_options: request_options
+        #
+        def update table, rows, commit_options: nil, request_options: nil
           @pool.with_session do |session|
-            session.update table, rows, commit_options: commit_options
+            session.update table, rows, commit_options: commit_options,
+                           request_options: request_options
           end
         end
 
@@ -1041,6 +1192,7 @@ module Google
         #   | `BOOL`      | `true`/`false` | |
         #   | `INT64`     | `Integer`      | |
         #   | `FLOAT64`   | `Float`        | |
+        #   | `NUMERIC`   | `BigDecimal`   | |
         #   | `STRING`    | `String`       | |
         #   | `DATE`      | `Date`         | |
         #   | `TIMESTAMP` | `Time`, `DateTime` | |
@@ -1057,6 +1209,14 @@ module Google
         #   * `: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] request_options Common request options.
+        #
+        #   * `:priority` (String) The relative priority for requests.
+        #     The priority acts as a hint to the Cloud Spanner scheduler
+        #     and does not guarantee priority or order of execution.
+        #     Valid values are `:PRIORITY_LOW`, `:PRIORITY_MEDIUM`,
+        #     `:PRIORITY_HIGH`. If priority not set then default is
+        #     `PRIORITY_UNSPECIFIED` is equivalent to `:PRIORITY_HIGH`.
         #
         # @return [Time, CommitResponse] The timestamp at which the operation
         #   committed. If commit options are set it returns {CommitResponse}.
@@ -1086,9 +1246,21 @@ module Google
         #   puts commit_resp.timestamp
         #   puts commit_resp.stats.mutation_count
         #
-        def replace table, rows, commit_options: nil
+        # @example Using request options.
+        #   require "google/cloud/spanner"
+        #
+        #   spanner = Google::Cloud::Spanner.new
+        #
+        #   db = spanner.client "my-instance", "my-database"
+        #
+        #   request_options = { priority: :PRIORITY_MEDIUM }
+        #   db.replace "users", [{ id: 1, name: "Charlie", active: false }],
+        #                       request_options: request_options
+        #
+        def replace table, rows, commit_options: nil, request_options: nil
           @pool.with_session do |session|
-            session.replace table, rows, commit_options: commit_options
+            session.replace table, rows, commit_options: commit_options,
+                            request_options: request_options
           end
         end
 
@@ -1119,7 +1291,14 @@ module Google
         #   * `: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] request_options Common request options.
+        #
+        #   * `:priority` (String) The relative priority for requests.
+        #     The priority acts as a hint to the Cloud Spanner scheduler
+        #     and does not guarantee priority or order of execution.
+        #     Valid values are `:PRIORITY_LOW`, `:PRIORITY_MEDIUM`,
+        #     `:PRIORITY_HIGH`. If priority not set then default is
+        #     `PRIORITY_UNSPECIFIED` is equivalent to `:PRIORITY_HIGH`.
         # @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:
@@ -1159,9 +1338,21 @@ module Google
         #   puts commit_resp.timestamp
         #   puts commit_resp.stats.mutation_count
         #
-        def delete table, keys = [], commit_options: nil, call_options: nil
+        # @example With request optinos
+        #   require "google/cloud/spanner"
+        #
+        #   spanner = Google::Cloud::Spanner.new
+        #
+        #   db = spanner.client "my-instance", "my-database"
+        #
+        #   request_options = { priority: :PRIORITY_MEDIUM }
+        #   db.delete "users", [1, 2, 3], request_options: request_options
+        #
+        def delete table, keys = [], commit_options: nil, request_options: nil,
+                   call_options: nil
           @pool.with_session do |session|
             session.delete table, keys, commit_options: commit_options,
+                           request_options: request_options,
                            call_options: call_options
           end
         end
@@ -1188,7 +1379,14 @@ module Google
         #   * `: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] request_options Common request options.
+        #
+        #   * `:priority` (String) The relative priority for requests.
+        #     The priority acts as a hint to the Cloud Spanner scheduler
+        #     and does not guarantee priority or order of execution.
+        #     Valid values are `:PRIORITY_LOW`, `:PRIORITY_MEDIUM`,
+        #     `:PRIORITY_HIGH`. If priority not set then default is
+        #     `PRIORITY_UNSPECIFIED` is equivalent to `:PRIORITY_HIGH`.
         # @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:
@@ -1237,19 +1435,33 @@ module Google
         #   puts commit_resp.timestamp
         #   puts commit_resp.stats.mutation_count
         #
-        def commit commit_options: nil, call_options: nil, &block
+        # @example With request options
+        #   require "google/cloud/spanner"
+        #
+        #   spanner = Google::Cloud::Spanner.new
+        #
+        #   db = spanner.client "my-instance", "my-database"
+        #
+        #   db.commit request_options: { priority: :PRIORITY_MEDIUM } do |c|
+        #     c.update "users", [{ id: 1, name: "Charlie", active: false }]
+        #     c.insert "users", [{ id: 2, name: "Harvey",  active: true }]
+        #   end
+        #
+        def commit commit_options: nil, request_options: nil,
+                   call_options: nil, &block
           raise ArgumentError, "Must provide a block" unless block_given?
 
           @pool.with_session do |session|
             session.commit(
-              commit_options: commit_options, call_options: call_options, &block
+              commit_options: commit_options, request_options: request_options,
+              call_options: call_options, &block
             )
           end
         end
 
         # rubocop:disable Metrics/AbcSize
-        # rubocop:disable Metrics/BlockLength
         # rubocop:disable Metrics/MethodLength
+        # rubocop:disable Metrics/BlockLength
 
         ##
         # Creates a transaction for reads and writes that execute atomically at
@@ -1274,7 +1486,14 @@ module Google
         #   * `: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] request_options Common request options.
+        #
+        #   * `:priority` (String) The relative priority for requests.
+        #     The priority acts as a hint to the Cloud Spanner scheduler
+        #     and does not guarantee priority or order of execution.
+        #     Valid values are `:PRIORITY_LOW`, `:PRIORITY_MEDIUM`,
+        #     `:PRIORITY_HIGH`. If priority not set then default is
+        #     `PRIORITY_UNSPECIFIED` is equivalent to `:PRIORITY_HIGH`.
         # @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:
@@ -1351,7 +1570,23 @@ module Google
         #   puts commit_resp.timestamp
         #   puts commit_resp.stats.mutation_count
         #
-        def transaction deadline: 120, commit_options: nil, call_options: nil
+        # @example Using request options.
+        #   require "google/cloud/spanner"
+        #
+        #   spanner = Google::Cloud::Spanner.new
+        #   db = spanner.client "my-instance", "my-database"
+        #
+        #   db.transaction request_options: { priority: :PRIORITY_MEDIUM } do |tx|
+        #     tx.update "users", [{ id: 1, name: "Charlie", active: false }]
+        #     tx.insert "users", [{ id: 2, name: "Harvey",  active: true }]
+        #
+        #     request_options = { priority: :PRIORITY_LOW }
+        #     results = tx.execute_query "SELECT * FROM users",
+        #                               request_options: request_options
+        #   end
+        #
+        def transaction deadline: 120, commit_options: nil,
+                        request_options: nil, call_options: nil
           ensure_service!
           unless Thread.current[:transaction_id].nil?
             raise "Nested transactions are not allowed"
@@ -1362,45 +1597,44 @@ 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,
-                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 => 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,
+              request_options: request_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
 
         # rubocop:enable Metrics/AbcSize
-        # rubocop:enable Metrics/BlockLength
         # rubocop:enable Metrics/MethodLength
+        # rubocop:enable Metrics/BlockLength
 
         ##
         # Creates a snapshot read-only transaction for reads that execute
@@ -1481,18 +1715,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),
-                              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
+            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
@@ -1514,12 +1746,13 @@ module Google
         #   Hash values must contain the type value. If a Hash is used the
         #   fields will be created using the same order as the Hash keys.
         #
-        #   Supported type values incude:
+        #   Supported type values include:
         #
         #   * `:BOOL`
         #   * `:BYTES`
         #   * `:DATE`
         #   * `:FLOAT64`
+        #   * `:NUMERIC`
         #   * `:INT64`
         #   * `:STRING`
         #   * `:TIMESTAMP`
@@ -1691,7 +1924,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
@@ -1795,7 +2028,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
 
@@ -1810,13 +2043,12 @@ module Google
         # GRPC::Aborted
         def delay_from_aborted err
           return nil if err.nil?
-          if err.respond_to?(:metadata) && err.metadata["retryDelay"]
-            # a correct metadata will look like this:
-            # "{\"retryDelay\":{\"seconds\":60}}"
-            seconds = err.metadata["retryDelay"]["seconds"].to_i
-            nanos = err.metadata["retryDelay"]["nanos"].to_i
+          if err.respond_to?(:metadata) && err.metadata["google.rpc.retryinfo-bin"]
+            retry_info = Google::Rpc::RetryInfo.decode err.metadata["google.rpc.retryinfo-bin"]
+            seconds = retry_info["retry_delay"].seconds
+            nanos = retry_info["retry_delay"].nanos
             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