google-cloud-bigquery 1.16.0 → 1.17.0

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

@@ -209,8 +209,7 @@ module Google
         #
         def time_partitioning_type= type
           reload! unless resource_full?
-          @gapi.time_partitioning ||= \
-            Google::Apis::BigqueryV2::TimePartitioning.new
+          @gapi.time_partitioning ||= Google::Apis::BigqueryV2::TimePartitioning.new
           @gapi.time_partitioning.type = type
           patch_gapi! :time_partitioning
         end
@@ -267,8 +266,7 @@ module Google
         #
         def time_partitioning_field= field
           reload! unless resource_full?
-          @gapi.time_partitioning ||= \
-            Google::Apis::BigqueryV2::TimePartitioning.new
+          @gapi.time_partitioning ||= Google::Apis::BigqueryV2::TimePartitioning.new
           @gapi.time_partitioning.field = field
           patch_gapi! :time_partitioning
         end
@@ -286,9 +284,9 @@ module Google
         def time_partitioning_expiration
           return nil if reference?
           ensure_full_data!
-          @gapi.time_partitioning.expiration_ms / 1_000 if
-              time_partitioning? &&
-              !@gapi.time_partitioning.expiration_ms.nil?
+          return nil unless time_partitioning?
+          return nil if @gapi.time_partitioning.expiration_ms.nil?
+          @gapi.time_partitioning.expiration_ms / 1_000
         end
 
         ##
@@ -319,8 +317,7 @@ module Google
         #
         def time_partitioning_expiration= expiration
           reload! unless resource_full?
-          @gapi.time_partitioning ||= \
-            Google::Apis::BigqueryV2::TimePartitioning.new
+          @gapi.time_partitioning ||= Google::Apis::BigqueryV2::TimePartitioning.new
           @gapi.time_partitioning.expiration_ms = expiration * 1000
           patch_gapi! :time_partitioning
         end
@@ -891,8 +888,7 @@ module Google
           return nil if reference?
           ensure_full_data!
           return nil if @gapi.encryption_configuration.nil?
-          EncryptionConfiguration.from_gapi(@gapi.encryption_configuration)
-                                 .freeze
+          EncryptionConfiguration.from_gapi(@gapi.encryption_configuration).freeze
         end
 
         ##
@@ -985,7 +981,7 @@ module Google
         def buffer_bytes
           return nil if reference?
           ensure_full_data!
-          @gapi.streaming_buffer.estimated_bytes if @gapi.streaming_buffer
+          @gapi.streaming_buffer&.estimated_bytes
         end
 
         ##
@@ -1003,7 +999,7 @@ module Google
         def buffer_rows
           return nil if reference?
           ensure_full_data!
-          @gapi.streaming_buffer.estimated_rows if @gapi.streaming_buffer
+          @gapi.streaming_buffer&.estimated_rows
         end
 
         ##
@@ -1032,7 +1028,7 @@ module Google
         # @!group Attributes
         #
         def query
-          @gapi.view.query if @gapi.view
+          @gapi.view&.query
         end
 
         ##
@@ -1102,10 +1098,11 @@ module Google
         #
         def set_query query, standard_sql: nil, legacy_sql: nil, udfs: nil
           use_legacy_sql = Convert.resolve_legacy_sql standard_sql, legacy_sql
-          @gapi.view = Google::Apis::BigqueryV2::ViewDefinition.new \
+          @gapi.view = Google::Apis::BigqueryV2::ViewDefinition.new(
             query:                           query,
             use_legacy_sql:                  use_legacy_sql,
             user_defined_function_resources: udfs_gapi(udfs)
+          )
           patch_gapi! :view
         end
 
@@ -1201,8 +1198,7 @@ module Google
           ensure_service!
           reload! unless resource_full?
           options = { token: token, max: max, start: start }
-          data_json = service.list_tabledata \
-            dataset_id, table_id, options
+          data_json = service.list_tabledata dataset_id, table_id, options
           Data.from_gapi_json data_json, gapi, nil, service
         end
 
@@ -1301,11 +1297,9 @@ module Google
         #
         # @!group Data
         #
-        def copy_job destination_table, create: nil, write: nil, job_id: nil,
-                     prefix: nil, labels: nil, dryrun: nil
+        def copy_job destination_table, create: nil, write: nil, job_id: nil, prefix: nil, labels: nil, dryrun: nil
           ensure_service!
-          options = { create: create, write: write, dryrun: dryrun,
-                      labels: labels, job_id: job_id, prefix: prefix }
+          options = { create: create, write: write, dryrun: dryrun, labels: labels, job_id: job_id, prefix: prefix }
           updater = CopyJob::Updater.from_options(
             service,
             table_ref,
@@ -1474,15 +1468,12 @@ module Google
         #
         # @!group Data
         #
-        def extract_job extract_url, format: nil, compression: nil,
-                        delimiter: nil, header: nil, job_id: nil, prefix: nil,
-                        labels: nil, dryrun: nil
+        def extract_job extract_url, format: nil, compression: nil, delimiter: nil, header: nil, job_id: nil,
+                        prefix: nil, labels: nil, dryrun: nil
           ensure_service!
-          options = { format: format, compression: compression,
-                      delimiter: delimiter, header: header, dryrun: dryrun,
+          options = { format: format, compression: compression, delimiter: delimiter, header: header, dryrun: dryrun,
                       job_id: job_id, prefix: prefix, labels: labels }
-          updater = ExtractJob::Updater.from_options service, table_ref,
-                                                     extract_url, options
+          updater = ExtractJob::Updater.from_options service, table_ref, extract_url, options
           updater.location = location if location # may be table reference
 
           yield updater if block_given?
@@ -1553,8 +1544,7 @@ module Google
         #
         # @!group Data
         #
-        def extract extract_url, format: nil, compression: nil, delimiter: nil,
-                    header: nil, &block
+        def extract extract_url, format: nil, compression: nil, delimiter: nil, header: nil, &block
           job = extract_job extract_url,
                             format:      format,
                             compression: compression,
@@ -1750,28 +1740,18 @@ module Google
         #
         # @!group Data
         #
-        def load_job files, format: nil, create: nil, write: nil,
-                     projection_fields: nil, jagged_rows: nil,
-                     quoted_newlines: nil, encoding: nil, delimiter: nil,
-                     ignore_unknown: nil, max_bad_records: nil, quote: nil,
-                     skip_leading: nil, job_id: nil, prefix: nil, labels: nil,
-                     autodetect: nil, null_marker: nil, dryrun: nil
+        def load_job files, format: nil, create: nil, write: nil, projection_fields: nil, jagged_rows: nil,
+                     quoted_newlines: nil, encoding: nil, delimiter: nil, ignore_unknown: nil, max_bad_records: nil,
+                     quote: nil, skip_leading: nil, job_id: nil, prefix: nil, labels: nil, autodetect: nil,
+                     null_marker: nil, dryrun: nil
           ensure_service!
 
-          updater = load_job_updater format: format, create: create,
-                                     write: write,
-                                     projection_fields: projection_fields,
-                                     jagged_rows: jagged_rows,
-                                     quoted_newlines: quoted_newlines,
-                                     encoding: encoding,
-                                     delimiter: delimiter,
-                                     ignore_unknown: ignore_unknown,
-                                     max_bad_records: max_bad_records,
-                                     quote: quote, skip_leading: skip_leading,
-                                     dryrun: dryrun, job_id: job_id,
-                                     prefix: prefix, schema: schema,
-                                     labels: labels, autodetect: autodetect,
-                                     null_marker: null_marker
+          updater = load_job_updater format: format, create: create, write: write, projection_fields: projection_fields,
+                                     jagged_rows: jagged_rows, quoted_newlines: quoted_newlines, encoding: encoding,
+                                     delimiter: delimiter, ignore_unknown: ignore_unknown,
+                                     max_bad_records: max_bad_records, quote: quote, skip_leading: skip_leading,
+                                     dryrun: dryrun, job_id: job_id, prefix: prefix, schema: schema, labels: labels,
+                                     autodetect: autodetect, null_marker: null_marker
 
           yield updater if block_given?
 
@@ -1945,20 +1925,13 @@ module Google
         #
         # @!group Data
         #
-        def load files, format: nil, create: nil, write: nil,
-                 projection_fields: nil, jagged_rows: nil, quoted_newlines: nil,
-                 encoding: nil, delimiter: nil, ignore_unknown: nil,
-                 max_bad_records: nil, quote: nil, skip_leading: nil,
-                 autodetect: nil, null_marker: nil, &block
-          job = load_job files, format: format, create: create, write: write,
-                                projection_fields: projection_fields,
-                                jagged_rows: jagged_rows,
-                                quoted_newlines: quoted_newlines,
-                                encoding: encoding, delimiter: delimiter,
-                                ignore_unknown: ignore_unknown,
-                                max_bad_records: max_bad_records,
-                                quote: quote, skip_leading: skip_leading,
-                                autodetect: autodetect,
+        def load files, format: nil, create: nil, write: nil, projection_fields: nil, jagged_rows: nil,
+                 quoted_newlines: nil, encoding: nil, delimiter: nil, ignore_unknown: nil, max_bad_records: nil,
+                 quote: nil, skip_leading: nil, autodetect: nil, null_marker: nil, &block
+          job = load_job files, format: format, create: create, write: write, projection_fields: projection_fields,
+                                jagged_rows: jagged_rows, quoted_newlines: quoted_newlines, encoding: encoding,
+                                delimiter: delimiter, ignore_unknown: ignore_unknown, max_bad_records: max_bad_records,
+                                quote: quote, skip_leading: skip_leading, autodetect: autodetect,
                                 null_marker: null_marker, &block
 
           job.wait_until_done!
@@ -2031,15 +2004,13 @@ module Google
         def insert rows, insert_ids: nil, skip_invalid: nil, ignore_unknown: nil
           rows = [rows] if rows.is_a? Hash
           insert_ids = Array insert_ids
-          if insert_ids.count > 0 && insert_ids.count != rows.count
+          if insert_ids.count.positive? && insert_ids.count != rows.count
             raise ArgumentError, "insert_ids must be the same size as rows"
           end
           rows = [rows] if rows.is_a? Hash
           raise ArgumentError, "No rows provided" if rows.empty?
           ensure_service!
-          options = { skip_invalid:   skip_invalid,
-                      ignore_unknown: ignore_unknown,
-                      insert_ids:     insert_ids }
+          options = { skip_invalid: skip_invalid, ignore_unknown: ignore_unknown, insert_ids: insert_ids }
           gapi = service.insert_tabledata dataset_id, table_id, rows, options
           InsertResponse.from_gapi rows, gapi
         end
@@ -2091,15 +2062,12 @@ module Google
         #
         #   inserter.stop.wait!
         #
-        def insert_async skip_invalid: nil, ignore_unknown: nil,
-                         max_bytes: 10000000, max_rows: 500, interval: 10,
+        def insert_async skip_invalid: nil, ignore_unknown: nil, max_bytes: 10_000_000, max_rows: 500, interval: 10,
                          threads: 4, &block
           ensure_service!
 
-          AsyncInserter.new self, skip_invalid: skip_invalid,
-                                  ignore_unknown: ignore_unknown,
-                                  max_bytes: max_bytes, max_rows: max_rows,
-                                  interval: interval, threads: threads, &block
+          AsyncInserter.new self, skip_invalid: skip_invalid, ignore_unknown: ignore_unknown, max_bytes: max_bytes,
+                                  max_rows: max_rows, interval: interval, threads: threads, &block
         end
 
         ##
@@ -2341,9 +2309,7 @@ module Google
         def patch_gapi! *attributes
           return if attributes.empty?
           ensure_service!
-          patch_args = Hash[attributes.map do |attr|
-            [attr, @gapi.send(attr)]
-          end]
+          patch_args = Hash[attributes.map { |attr| [attr, @gapi.send(attr)] }]
           patch_gapi = Google::Apis::BigqueryV2::Table.new patch_args
           patch_gapi.etag = etag if etag
           @gapi = service.patch_table dataset_id, table_id, patch_gapi
@@ -2381,11 +2347,8 @@ module Google
           )
         end
 
-        def load_job_csv_options! job, jagged_rows: nil,
-                                  quoted_newlines: nil,
-                                  delimiter: nil,
-                                  quote: nil, skip_leading: nil,
-                                  null_marker: nil
+        def load_job_csv_options! job, jagged_rows: nil, quoted_newlines: nil, delimiter: nil, quote: nil,
+                                  skip_leading: nil, null_marker: nil
           job.jagged_rows = jagged_rows unless jagged_rows.nil?
           job.quoted_newlines = quoted_newlines unless quoted_newlines.nil?
           job.delimiter = delimiter unless delimiter.nil?
@@ -2394,17 +2357,11 @@ module Google
           job.skip_leading = skip_leading unless skip_leading.nil?
         end
 
-        def load_job_file_options! job, format: nil,
-                                   projection_fields: nil,
-                                   jagged_rows: nil, quoted_newlines: nil,
-                                   encoding: nil, delimiter: nil,
-                                   ignore_unknown: nil, max_bad_records: nil,
-                                   quote: nil, skip_leading: nil,
-                                   null_marker: nil
+        def load_job_file_options! job, format: nil, projection_fields: nil, jagged_rows: nil, quoted_newlines: nil,
+                                   encoding: nil, delimiter: nil, ignore_unknown: nil, max_bad_records: nil, quote: nil,
+                                   skip_leading: nil, null_marker: nil
           job.format = format unless format.nil?
-          unless projection_fields.nil?
-            job.projection_fields = projection_fields
-          end
+          job.projection_fields = projection_fields unless projection_fields.nil?
           job.encoding = encoding unless encoding.nil?
           job.ignore_unknown = ignore_unknown unless ignore_unknown.nil?
           job.max_bad_records = max_bad_records unless max_bad_records.nil?
@@ -2416,16 +2373,11 @@ module Google
                                      null_marker:     null_marker
         end
 
-        def load_job_updater format: nil, create: nil,
-                             write: nil, projection_fields: nil,
-                             jagged_rows: nil, quoted_newlines: nil,
-                             encoding: nil, delimiter: nil,
-                             ignore_unknown: nil, max_bad_records: nil,
-                             quote: nil, skip_leading: nil, dryrun: nil,
-                             schema: nil, job_id: nil, prefix: nil, labels: nil,
-                             autodetect: nil, null_marker: nil
-          new_job = load_job_gapi table_id, dryrun, job_id: job_id,
-                                                    prefix: prefix
+        def load_job_updater format: nil, create: nil, write: nil, projection_fields: nil, jagged_rows: nil,
+                             quoted_newlines: nil, encoding: nil, delimiter: nil, ignore_unknown: nil,
+                             max_bad_records: nil, quote: nil, skip_leading: nil, dryrun: nil, schema: nil, job_id: nil,
+                             prefix: nil, labels: nil, autodetect: nil, null_marker: nil
+          new_job = load_job_gapi table_id, dryrun, job_id: job_id, prefix: prefix
           LoadJob::Updater.new(new_job).tap do |job|
             job.location = location if location # may be table reference
             job.create = create unless create.nil?
@@ -2463,9 +2415,7 @@ module Google
             job_gapi.configuration.load.update! source_uris: urls
             if job_gapi.configuration.load.source_format.nil?
               source_format = Convert.derive_source_format_from_list urls
-              unless source_format.nil?
-                job_gapi.configuration.load.source_format = source_format
-              end
+              job_gapi.configuration.load.source_format = source_format unless source_format.nil?
             end
           end
 
@@ -2477,9 +2427,7 @@ module Google
           path = Pathname(file).to_path
           if job_gapi.configuration.load.source_format.nil?
             source_format = Convert.derive_source_format path
-            unless source_format.nil?
-              job_gapi.configuration.load.source_format = source_format
-            end
+            job_gapi.configuration.load.source_format = source_format unless source_format.nil?
           end
 
           gapi = service.load_table_file file, job_gapi
@@ -2499,10 +2447,8 @@ module Google
         def storage_url? files
           [files].flatten.all? do |file|
             file.respond_to?(:to_gs_url) ||
-              (file.respond_to?(:to_str) &&
-                  file.to_str.downcase.start_with?("gs://")) ||
-              (file.is_a?(URI) &&
-                  file.to_s.downcase.start_with?("gs://"))
+              (file.respond_to?(:to_str) && file.to_str.downcase.start_with?("gs://")) ||
+              (file.is_a?(URI) && file.to_s.downcase.start_with?("gs://"))
           end
         end
 

data/lib/google/cloud/bigquery/table/async_inserter.rb

@@ -71,9 +71,8 @@ module Google
 
           ##
           # @private
-          def initialize table, skip_invalid: nil, ignore_unknown: nil,
-                         max_bytes: 10000000, max_rows: 500, interval: 10,
-                         threads: 4, &block
+          def initialize table, skip_invalid: nil, ignore_unknown: nil, max_bytes: 10_000_000, max_rows: 500,
+                         interval: 10, threads: 4, &block
             @table = table
             @skip_invalid = skip_invalid
             @ignore_unknown = ignore_unknown
@@ -86,8 +85,7 @@ module Google
 
             @batch = nil
 
-            @thread_pool = Concurrent::ThreadPoolExecutor.new \
-              max_threads: @threads
+            @thread_pool = Concurrent::ThreadPoolExecutor.new max_threads: @threads
 
             @cond = new_cond
 
@@ -136,8 +134,7 @@ module Google
                   unless @batch.try_insert row, insert_id
                     push_batch_request!
 
-                    @batch = Batch.new max_bytes: @max_bytes,
-                                       max_rows:  @max_rows
+                    @batch = Batch.new max_bytes: @max_bytes, max_rows: @max_rows
                     @batch.insert row, insert_id
                   end
                 end
@@ -228,7 +225,7 @@ module Google
           def validate_insert_args rows, insert_ids
             rows = [rows] if rows.is_a? Hash
             insert_ids = Array insert_ids
-            if insert_ids.count > 0 && insert_ids.count != rows.count
+            if insert_ids.count.positive? && insert_ids.count != rows.count
               raise ArgumentError, "insert_ids must be the same size as rows"
             end
             [rows, insert_ids]
@@ -265,19 +262,15 @@ module Google
             Concurrent::Future.new executor: @thread_pool do
               begin
                 raise ArgumentError, "No rows provided" if json_rows.empty?
-                options = { skip_invalid:   @skip_invalid,
-                            ignore_unknown: @ignore_unknown,
-                            insert_ids:     insert_ids }
+                options = { skip_invalid: @skip_invalid, ignore_unknown: @ignore_unknown, insert_ids: insert_ids }
                 insert_resp = @table.service.insert_tabledata_json_rows(
                   @table.dataset_id, @table.table_id, json_rows, options
                 )
-                result = Result.new(
-                  InsertResponse.from_gapi(orig_rows, insert_resp)
-                )
+                result = Result.new InsertResponse.from_gapi(orig_rows, insert_resp)
               rescue StandardError => e
                 result = Result.new nil, e
               ensure
-                @callback.call result if @callback
+                @callback&.call result
               end
             end.execute
 
@@ -290,7 +283,7 @@ module Google
           class Batch
             attr_reader :max_bytes, :max_rows, :rows, :json_rows, :insert_ids
 
-            def initialize max_bytes: 10000000, max_rows: 500
+            def initialize max_bytes: 10_000_000, max_rows: 500
               @max_bytes = max_bytes
               @max_rows = max_rows
               @rows = []
@@ -306,8 +299,7 @@ module Google
               insert_id ||= SecureRandom.uuid
               json_row = to_json_row row
 
-              insert_rows_bytes \
-                row, json_row, insert_id, addl_bytes_for(json_row, insert_id)
+              insert_rows_bytes row, json_row, insert_id, addl_bytes_for(json_row, insert_id)
             end
 
             def try_insert row, insert_id

data/lib/google/cloud/bigquery/table/list.rb

@@ -133,15 +133,13 @@ module Google
           #
           def all request_limit: nil
             request_limit = request_limit.to_i if request_limit
-            unless block_given?
-              return enum_for :all, request_limit: request_limit
-            end
+            return enum_for :all, request_limit: request_limit unless block_given?
             results = self
             loop do
               results.each { |r| yield r }
               if request_limit
                 request_limit -= 1
-                break if request_limit < 0
+                break if request_limit.negative?
               end
               break unless results.next?
               results = results.next
@@ -151,9 +149,7 @@ module Google
           ##
           # @private New Table::List from a response object.
           def self.from_gapi gapi_list, service, dataset_id = nil, max = nil
-            tables = List.new(Array(gapi_list.tables).map do |gapi_object|
-              Table.from_gapi gapi_object, service
-            end)
+            tables = List.new(Array(gapi_list.tables).map { |gapi_object| Table.from_gapi gapi_object, service })
             tables.instance_variable_set :@token,      gapi_list.next_page_token
             tables.instance_variable_set :@etag,       gapi_list.etag
             tables.instance_variable_set :@total,      gapi_list.total_items