google-cloud-spanner 1.16.2 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e20c16755d63cea713e0e2b48f0ad0d470e24da1429e8aa1cb62945ee6388ddd
-  data.tar.gz: 347112cc47df35de0d4cbdb24b39447860ba4c6c5f477e46d9bdbb45ab464796
+  metadata.gz: f6bfbaef2aa9726c4f6546f22d9ad3da14cdd74f1d5704f0af88aaa197285af7
+  data.tar.gz: b21b4f7ce50132358a00b6d4f2723e2299b449edf7cdb50652263f3dc1e7a417
 SHA512:
-  metadata.gz: 14ddd7286340c3520e2b1e0bedc018b48ceef0025fe78043f92c91af5af795e7f7eed027f61659fb232135cf45d6f249d083831bb95d960c622f2cf38dbf582e
-  data.tar.gz: 126b39a51fdd3a1673a1a8acd93548ad54ef29938b6dfc793bfd24f728eae6844ade5ca0e6780c3cfeae9aa22a31b307259585b14ec8da65e7e199c7c04393ee
+  metadata.gz: 2b26a10becd37ce0527996754eb16f368635269144f584d5cf1c25f17285d280f847e58ca49ccd942fb7adff59779e2a63f5c90987f548786759a5b65b337e49
+  data.tar.gz: 4e46cc9fddeb100349f410c08ef2b7d21fe0f43f6368e5ee3d2e6231c4da4ed7eb781fafb795408fbfadaca29dbcefc2b55ef290ccd39eab74d953959f59838b

data/AUTHENTICATION.md

@@ -76,7 +76,7 @@ The environment variables that google-cloud-spanner checks for project ID are:
 1. `SPANNER_PROJECT`
 2. `GOOGLE_CLOUD_PROJECT`
 
-The environment variables that google-cloud-spanner checks for credentials are configured on {Google::Cloud::Spanner::V1::Credentials}:
+The environment variables that google-cloud-spanner checks for credentials are configured on `Google::Cloud::Spanner::V1::Spanner::Credentials`:
 
 1. `SPANNER_CREDENTIALS` - Path to JSON file, or JSON contents
 2. `SPANNER_KEYFILE` - Path to JSON file, or JSON contents

data/CHANGELOG.md

@@ -1,5 +1,71 @@
 # Release History
 
+### 2.4.0 / 2021-02-18
+
+#### Features
+
+* Point In Time Recovery (PITR) ([#8169](https://www.github.com/googleapis/google-cloud-ruby/issues/8169))
+  * feat(spanner): support pitr-lite
+  * feature(spanner): adds test for throttled
+  * feat(spanner): adds version time to backup
+  * test(spanner): adds unit test for create backup
+  * feat(spanner): exposes version time in backup
+  * chore: fixes rubocop violations
+  * fix: addresses PR comments
+  * test: adds integration tests for pitr backup
+
+### 2.3.0 / 2021-02-09
+
+#### Features
+
+* CommitStats in CommitResponse ([#8058](https://www.github.com/googleapis/google-cloud-ruby/issues/8058))
+* optionalize `credentials` when using cloud spanner emulator host ([#8416](https://www.github.com/googleapis/google-cloud-ruby/issues/8416))
+  * Optionalize `credentials` when using Cloud Spanner Emulator
+  * Remove unnecessary credentials stub for emulator_host in Google::Cloud::Spanner.new
+  * Add test of explicit project_id in Google::Cloud::Spanner.new
+  * Update document for `emulator_host` without credentials
+  * Tidy code according to rubocop settings
+
+### 2.2.0 / 2020-09-15
+
+#### Features
+
+* quota_project can be set via library configuration
+* Support numeric type.
+
+#### Bug Fixes
+
+* retry or resume eos and rst_stream errors
+
+### 2.1.0 / 2020-08-05
+
+#### Features
+
+* Support custom setting of timeout and retry
+
+### 2.0.0 / 2020-07-23
+
+This is a major update that removes the "low-level" client interface code, and
+instead adds `google-cloud-spanner-v1`, `google-cloud-spanner-admin-database-v1`,
+and `google-cloud-spanner-admin-instance-v1` as dependencies.
+The new dependencies are rewritten low-level clients, produced by a next-
+generation client code generator, with improved performance and stability.
+
+This change should have no effect on the high-level interface that most users
+will use. The one exception is that the (mostly undocumented) `client_config`
+argument, for adjusting low-level parameters such as RPC retry settings on
+client objects, has been removed. If you need to adjust these parameters, use
+the configuration interface in low-level clients.
+
+Substantial changes have been made in the low-level interfaces, however. If you
+are using the low-level classes under the old `Google::Spanner::V1` module,
+please review the docs for the new `google-cloud-spanner-v1` gem. In particular:
+
+* Some classes have been renamed, notably the client class itself.
+* The client constructor takes a configuration block instead of configuration
+  keyword arguments.
+* All RPC method arguments are now keyword arguments.
+
 ### 1.16.2 / 2020-05-28
 
 #### Documentation

data/CONTRIBUTING.md

@@ -45,7 +45,7 @@ there is a small amount of setup:
 
    ```sh
    $ cd google-cloud-spanner/
-   $ bundle exec rake bundleupdate
+   $ bundle install
    ```
 
 ## Console

data/lib/google-cloud-spanner.rb

@@ -43,8 +43,6 @@ module Google
     #   * `https://www.googleapis.com/auth/spanner`
     #   * `https://www.googleapis.com/auth/spanner.data`
     # @param [Integer] timeout Default timeout to use in requests. Optional.
-    # @param [Hash] client_config A hash of values to override the default
-    #   behavior of the API client. Optional.
     # @param [String] lib_name Library name. This will be added as a prefix
     #   to the API call tracking header `x-goog-api-client` with provided
     #   lib version for telemetry. Optional. For example prefix looks like
@@ -75,11 +73,9 @@ module Google
     #   platform_scope = "https://www.googleapis.com/auth/cloud-platform"
     #   spanner = gcloud.spanner scope: platform_scope
     #
-    def spanner scope: nil, timeout: nil, client_config: nil, lib_name: nil,
-                lib_version: nil
+    def spanner scope: nil, timeout: nil, lib_name: nil, lib_version: nil
       Google::Cloud.spanner @project, @keyfile, scope: scope,
                                                 timeout: (timeout || @timeout),
-                                                client_config: client_config,
                                                 lib_name: lib_name,
                                                 lib_version: lib_version
     end
@@ -107,8 +103,6 @@ module Google
     #   * `https://www.googleapis.com/auth/spanner`
     #   * `https://www.googleapis.com/auth/spanner.data`
     # @param [Integer] timeout Default timeout to use in requests. Optional.
-    # @param [Hash] client_config A hash of values to override the default
-    #   behavior of the API client. Optional.
     # @param [String] lib_name Library name. This will be added as a prefix
     #   to the API call tracking header `x-goog-api-client` with provided
     #   lib version for telemetry. Optional. For example prefix looks like
@@ -132,13 +126,11 @@ module Google
     #   spanner = Google::Cloud.spanner
     #
     def self.spanner project_id = nil, credentials = nil, scope: nil,
-                     timeout: nil, client_config: nil, lib_name: nil,
-                     lib_version: nil
+                     timeout: nil, lib_name: nil, lib_version: nil
       require "google/cloud/spanner"
       Google::Cloud::Spanner.new project_id: project_id,
                                  credentials: credentials,
                                  scope: scope, timeout: timeout,
-                                 client_config: client_config,
                                  lib_name: lib_name, lib_version: lib_version
     end
   end
@@ -169,16 +161,22 @@ Google::Cloud.configure.add_config! :spanner do |config|
     query_options
   end
 
+  default_scopes = [
+    "https://www.googleapis.com/auth/cloud-platform",
+    "https://www.googleapis.com/auth/spanner.admin",
+    "https://www.googleapis.com/auth/spanner.data"
+  ]
+
   config.add_field! :project_id, default_project, match: String, allow_nil: true
   config.add_alias! :project, :project_id
   config.add_field! :credentials, default_creds,
                     match: [String, Hash, Google::Auth::Credentials],
                     allow_nil: true
   config.add_alias! :keyfile, :credentials
-  config.add_field! :scope, nil, match: [String, Array]
+  config.add_field! :scope, default_scopes, match: [String, Array]
+  config.add_field! :quota_project, nil, match: String
   config.add_field! :timeout, nil, match: Integer
-  config.add_field! :client_config, nil, match: Hash
-  config.add_field! :endpoint, nil, match: String
+  config.add_field! :endpoint, "spanner.googleapis.com", match: String
   config.add_field! :emulator_host, default_emulator, match: String, allow_nil: true
   config.add_field! :lib_name, nil, match: String, allow_nil: true
   config.add_field! :lib_version, nil, match: String, allow_nil: true

data/lib/google/cloud/spanner.rb

@@ -49,6 +49,8 @@ module Google
       # @param [String, Hash, Google::Auth::Credentials] credentials The path to
       #   the keyfile as a String, the contents of the keyfile as a Hash, or a
       #   Google::Auth::Credentials object. (See {Spanner::Credentials})
+      #   If `emulator_host` is present, this becomes optional and the value is
+      #   internally overriden with `:this_channel_is_insecure`.
       # @param [String, Array<String>] scope The OAuth 2.0 scopes controlling
       #   the set of resources and operations that the connection can access.
       #   See [Using OAuth 2.0 to Access Google
@@ -59,10 +61,8 @@ module Google
       #   * `https://www.googleapis.com/auth/spanner`
       #   * `https://www.googleapis.com/auth/spanner.data`
       # @param [Integer] timeout Default timeout to use in requests. Optional.
-      # @param [Hash] client_config A hash of values to override the default
-      #   behavior of the API client. Optional.
       # @param [String] endpoint Override of the endpoint host name. Optional.
-      #   If the param is nil, uses the default endpoint.
+      #   If the param is nil, uses `emulator_host` or the default endpoint.
       # @param [String] project Alias for the `project_id` argument. Deprecated.
       # @param [String] keyfile Alias for the `credentials` argument.
       #   Deprecated.
@@ -91,22 +91,21 @@ module Google
       #   spanner = Google::Cloud::Spanner.new
       #
       def self.new project_id: nil, credentials: nil, scope: nil, timeout: nil,
-                   client_config: nil, endpoint: nil, project: nil, keyfile: nil,
+                   endpoint: nil, project: nil, keyfile: nil,
                    emulator_host: nil, lib_name: nil, lib_version: nil
-        project_id    ||= (project || default_project_id)
+        project_id    ||= project || default_project_id
         scope         ||= configure.scope
         timeout       ||= configure.timeout
-        client_config ||= configure.client_config
-        endpoint      ||= configure.endpoint
-        credentials   ||= (keyfile || default_credentials(scope: scope))
         emulator_host ||= configure.emulator_host
+        endpoint      ||= emulator_host || configure.endpoint
+        credentials   ||= keyfile
         lib_name      ||= configure.lib_name
         lib_version   ||= configure.lib_version
 
         if emulator_host
           credentials = :this_channel_is_insecure
-          endpoint = emulator_host
         else
+          credentials ||= default_credentials scope: scope
           unless credentials.is_a? Google::Auth::Credentials
             credentials = Spanner::Credentials.new credentials, scope: scope
           end
@@ -122,8 +121,8 @@ module Google
         Spanner::Project.new(
           Spanner::Service.new(
             project_id, credentials,
-            host: endpoint, timeout: timeout, client_config: client_config,
-            lib_name: lib_name, lib_version: lib_version
+            host: endpoint, timeout: timeout, lib_name: lib_name,
+            lib_version: lib_version
           ),
           query_options: configure.query_options
         )
@@ -145,8 +144,6 @@ module Google
       # * `scope` - (String, Array<String>) The OAuth 2.0 scopes controlling
       #   the set of resources and operations that the connection can access.
       # * `timeout` - (Integer) Default timeout to use in requests.
-      # * `client_config` - (Hash) A hash of values to override the default
-      #   behavior of the API client.
       # * `endpoint` - (String) Override of the endpoint host name, or `nil`
       #   to use the default endpoint.
       # * `emulator_host` - (String) Host name of the emulator. Defaults to
@@ -184,4 +181,7 @@ module Google
       end
     end
   end
+
+  # @private
+  Spanner = Cloud::Spanner unless const_defined? :Spanner
 end

data/lib/google/cloud/spanner/admin/database/credentials.rb

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-require "googleauth"
+require "google/cloud/spanner/admin/database/v1/database_admin/credentials"
 
 module Google
   module Cloud
@@ -23,7 +23,7 @@ module Google
           ##
           # @deprecated Use version-specific credentials classes
           #
-          Credentials = Google::Cloud::Spanner::Admin::Database::V1::Credentials
+          Credentials = V1::DatabaseAdmin::Credentials
         end
       end
     end

data/lib/google/cloud/spanner/admin/instance/credentials.rb

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-require "googleauth"
+require "google/cloud/spanner/admin/instance/v1/instance_admin/credentials"
 
 module Google
   module Cloud
@@ -23,7 +23,7 @@ module Google
           ##
           # @deprecated Use version-specific credentials classes
           #
-          Credentials = Google::Cloud::Spanner::Admin::Instance::V1::Credentials
+          Credentials = V1::InstanceAdmin::Credentials
         end
       end
     end

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

@@ -160,6 +160,14 @@ module Google
           raise error
         end
 
+        ##
+        # The timestamp when a consistent copy of the database for the backup was
+        # taken. The version time has microseconds granularity.
+        # @return [Time]
+        def version_time
+          Convert.timestamp_to_time @grpc.version_time
+        end
+
         ##
         # Create time is approximately the time when the backup request was
         # received.
@@ -296,7 +304,7 @@ module Google
         ##
         # @private
         # Creates a new Backup instance from a
-        # {Google::Spanner::Admin::Database::V1::Backup}.
+        # `Google::Cloud::Spanner::Admin::Database::V1::Backup`.
         def self.from_grpc grpc, service
           new grpc, service
         end

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

@@ -53,7 +53,7 @@ module Google
         #
         class Job
           ##
-          # @private The Google::Gax::Operation gRPC object.
+          # @private The `Gapic::Operation` gRPC object.
           attr_accessor :grpc
 
           ##
@@ -260,7 +260,7 @@ module Google
           end
 
           ##
-          # @private New Backup::Job from a Google::Gax::Operation object.
+          # @private New Backup::Job from a `Gapic::Operation` object.
           def self.from_grpc grpc, service
             new.tap do |job|
               job.instance_variable_set :@grpc, grpc

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

@@ -146,7 +146,7 @@ module Google
             # @private
             #
             # New Backup::Job::List from a
-            # Google::Gax::PagedEnumerable<Google::Longrunning::Operation>
+            # `Gapic::PagedEnumerable<Google::Longrunning::Operation>`
             # object. Operation object is a backup operation.
             #
             def self.from_grpc grpc, service
@@ -154,7 +154,7 @@ module Google
                 service.databases.instance_variable_get "@operations_client"
               jobs = new(Array(grpc.response.operations).map do |job_grpc|
                 Job.from_grpc \
-                  Google::Gax::Operation.new(job_grpc, operations_client),
+                  Gapic::Operation.new(job_grpc, operations_client),
                   service
               end)
               jobs.grpc = grpc

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

@@ -143,8 +143,7 @@ module Google
           ##
           # @private
           # New Backup::List from a
-          # Google::Gax::PagedEnumerable<Google::Spanner::Admin::Database::\
-          #   V1::Backup>
+          # `Gapic::PagedEnumerable<Google::Cloud::Spanner::Admin::Database::V1::Backup>`
           # object.
           def self.from_grpc grpc, service
             backups = List.new(Array(grpc.response.backups).map do |backup|

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

@@ -53,7 +53,7 @@ module Google
           #
           class Job
             ##
-            # @private The Google::Gax::Operation gRPC object.
+            # @private The `Gapic::Operation` gRPC object.
             attr_accessor :grpc
 
             ##
@@ -231,7 +231,7 @@ module Google
             end
 
             ##
-            # @private New Restore::Job from a Google::Gax::Operation object.
+            # @private New Restore::Job from a `Gapic::Operation` object.
             def self.from_grpc grpc, service
               new.tap do |job|
                 job.instance_variable_set :@grpc, grpc

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

@@ -407,8 +407,8 @@ module Google
         def session
           ensure_service!
           grpc = @project.service.create_session \
-            Admin::Database::V1::DatabaseAdminClient.database_path(
-              project_id, instance_id, database_id
+            V1::Spanner::Paths.database_path(
+              project: project_id, instance: instance_id, database: database_id
             ),
             labels: @session_labels
           Session.from_grpc grpc, @project.service, query_options: @query_options

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

@@ -173,6 +173,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 [Array<Google::Cloud::Spanner::Partition>] The partitions
         #   created by the query partition.
@@ -196,7 +209,7 @@ module Google
         #
         def partition_query sql, params: nil, types: nil,
                             partition_size_bytes: nil, max_partitions: nil,
-                            query_options: nil
+                            query_options: nil, call_options: nil
           ensure_session!
 
           params, types = Convert.to_input_params_and_types params, types
@@ -204,10 +217,11 @@ module Google
           results = session.partition_query \
             sql, tx_selector, params: params, types: types,
                               partition_size_bytes: partition_size_bytes,
-                              max_partitions: max_partitions
+                              max_partitions: max_partitions,
+                              call_options: call_options
           results.partitions.map do |grpc|
             # Convert partition protos to execute sql request protos
-            execute_sql_grpc = Google::Spanner::V1::ExecuteSqlRequest.new(
+            execute_sql_grpc = V1::ExecuteSqlRequest.new(
               {
                 session: session.path,
                 sql: sql,
@@ -248,6 +262,19 @@ module Google
         #   partitions to return. For example, this may be set to the number of
         #   workers available. This is only a hint and may provide different
         #   results based on the request.
+        # @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 [Array<Google::Cloud::Spanner::Partition>] The partitions
         #   created by the read partition.
@@ -268,7 +295,8 @@ module Google
         #   batch_snapshot.close
         #
         def partition_read table, columns, keys: nil, index: nil,
-                           partition_size_bytes: nil, max_partitions: nil
+                           partition_size_bytes: nil, max_partitions: nil,
+                           call_options: nil
           ensure_session!
 
           columns = Array(columns).map(&:to_s)
@@ -278,11 +306,12 @@ module Google
             table, columns, tx_selector,
             keys: keys, index: index,
             partition_size_bytes: partition_size_bytes,
-            max_partitions: max_partitions
+            max_partitions: max_partitions,
+            call_options: call_options
 
           results.partitions.map do |grpc|
             # Convert partition protos to read request protos
-            read_grpc = Google::Spanner::V1::ReadRequest.new(
+            read_grpc = V1::ReadRequest.new(
               {
                 session: session.path,
                 table: table,
@@ -304,6 +333,19 @@ module Google
         #
         # @param [Google::Cloud::Spanner::Partition] partition The partition to
         #   be executed.
+        # @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.
         #
         # @example
         #   require "google/cloud/spanner"
@@ -320,7 +362,7 @@ module Google
         #
         #   batch_snapshot.close
         #
-        def execute_partition partition
+        def execute_partition partition, call_options: nil
           ensure_session!
 
           partition = Partition.load partition unless partition.is_a? Partition
@@ -329,10 +371,11 @@ module Google
           # TODO: raise if session.path != partition.session
           # TODO: raise if grpc.transaction != partition.transaction
 
+          opts = { call_options: call_options }
           if partition.execute?
-            execute_partition_query partition
+            execute_partition_query partition, opts
           elsif partition.read?
-            execute_partition_read partition
+            execute_partition_read partition, opts
           end
         end
 
@@ -430,6 +473,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.
@@ -549,14 +605,40 @@ module Google
         #     puts "User #{row[:id]} is #{row[:name]}"
         #   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
+        #   batch_client = spanner.batch_client "my-instance", "my-database"
+        #   batch_snapshot = batch_client.batch_snapshot
+        #
+        #   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 = batch_snapshot.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, query_options: nil,
+                          call_options: nil
           ensure_session!
 
           params, types = Convert.to_input_params_and_types params, types
 
           session.execute_query sql, params: params, types: types,
                                 transaction: tx_selector,
-                                query_options: query_options
+                                query_options: query_options,
+                                call_options: call_options
         end
         alias execute execute_query
         alias query execute_query
@@ -578,6 +660,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.
@@ -595,14 +690,16 @@ module Google
         #     puts "User #{row[:id]} is #{row[:name]}"
         #   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
 
         ##
@@ -663,17 +760,15 @@ module Google
         def self.load data, service: nil, query_options: nil
           data = JSON.parse data, symbolize_names: true unless data.is_a? Hash
 
-          session_grpc = Google::Spanner::V1::Session.decode \
-            Base64.decode64(data[:session])
-          transaction_grpc = Google::Spanner::V1::Transaction.decode \
-            Base64.decode64(data[:transaction])
+          session_grpc = V1::Session.decode Base64.decode64(data[:session])
+          transaction_grpc = V1::Transaction.decode Base64.decode64(data[:transaction])
 
           from_grpc transaction_grpc, Session.from_grpc(session_grpc, service, query_options: query_options)
         end
 
         ##
         # @private Creates a new BatchSnapshot instance from a
-        # Google::Spanner::V1::Transaction.
+        # `Google::Cloud::Spanner::V1::Transaction`.
         def self.from_grpc grpc, session
           new grpc, session
         end
@@ -682,7 +777,7 @@ module Google
 
         # The TransactionSelector to be used for queries
         def tx_selector
-          Google::Spanner::V1::TransactionSelector.new id: transaction_id
+          V1::TransactionSelector.new id: transaction_id
         end
 
         ##
@@ -692,7 +787,7 @@ module Google
           raise "Must have active connection to service" unless session
         end
 
-        def execute_partition_query partition
+        def execute_partition_query partition, call_options: nil
           query_options = partition.execute.query_options
           query_options = query_options.to_h unless query_options.nil?
           session.execute_query \
@@ -701,16 +796,18 @@ module Google
             types: partition.execute.param_types.to_h,
             transaction: partition.execute.transaction,
             partition_token: partition.execute.partition_token,
-            query_options: query_options
+            query_options: query_options,
+            call_options: call_options
         end
 
-        def execute_partition_read partition
+        def execute_partition_read partition, call_options: nil
           session.read partition.read.table,
                        partition.read.columns.to_a,
                        keys: partition.read.key_set,
                        index: partition.read.index,
                        transaction: partition.read.transaction,
-                       partition_token: partition.read.partition_token
+                       partition_token: partition.read.partition_token,
+                       call_options: call_options
         end
       end
     end