google-cloud-bigquery 1.0.0 → 1.1.0

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

@@ -228,14 +228,20 @@ module Google
           def push_batch_request!
             return unless @batch
 
-            batch_rows = @batch.rows
+            orig_rows = @batch.rows
+            json_rows = @batch.json_rows
             Concurrent::Future.new(executor: @thread_pool) do
               begin
-                response = @table.insert batch_rows,
-                                         skip_invalid:   @skip_invalid,
-                                         ignore_unknown: @ignore_unknown
-                result = Result.new response
-              rescue => e
+                raise ArgumentError, "No rows provided" if json_rows.empty?
+                options = { skip_invalid: @skip_invalid,
+                            ignore_unknown: @ignore_unknown }
+                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)
+                )
+              rescue StandardError => e
                 result = Result.new nil, e
               ensure
                 @callback.call result if @callback
@@ -249,34 +255,55 @@ module Google
           ##
           # @private
           class Batch
-            attr_reader :max_bytes, :max_rows, :rows
+            attr_reader :max_bytes, :max_rows, :rows, :json_rows
 
             def initialize max_bytes: 10000000, max_rows: 500
               @max_bytes = max_bytes
               @max_rows = max_rows
               @rows = []
+              @json_rows = []
+              @current_bytes = 0
             end
 
             def insert row
-              @rows << row
+              json_row = to_json_row row
+
+              insert_rows_bytes row, json_row, addl_bytes_for_json_row(json_row)
             end
 
             def try_insert row
-              addl_bytes = row.to_json.bytes.size + 1
-              return false if current_bytes + addl_bytes >= @max_bytes
+              json_row = to_json_row row
+              addl_bytes = addl_bytes_for_json_row json_row
+
+              return false if @current_bytes + addl_bytes >= @max_bytes
               return false if @rows.count + 1 >= @max_rows
 
-              insert row
+              insert_rows_bytes row, json_row, addl_bytes
               true
             end
 
             def ready?
-              current_bytes >= @max_bytes || rows.count >= @max_rows
+              @current_bytes >= @max_bytes || rows.count >= @max_rows
+            end
+
+            private
+
+            def insert_rows_bytes row, json_row, addl_bytes
+              @rows << row
+              @json_rows << json_row
+              @current_bytes += addl_bytes
             end
 
-            def current_bytes
-              # TODO: add to a counter instead of calling #to_json each time
-              Convert.to_json_rows(rows).to_json.bytes.size
+            def to_json_row row
+              Convert.to_json_row row
+            end
+
+            def addl_bytes_for row
+              addl_bytes_for_json_row Convert.to_json_row(row)
+            end
+
+            def addl_bytes_for_json_row json_row
+              json_row.to_json.bytesize + 1
             end
           end
 
@@ -357,7 +384,6 @@ module Google
               insert_response.success?
             end
 
-
             ##
             # The count of rows in the response, minus the count of errors for
             # rows that were not inserted.
@@ -370,7 +396,6 @@ module Google
               insert_response.insert_count
             end
 
-
             ##
             # The count of errors for rows that were not inserted.
             #

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

@@ -168,7 +168,7 @@ module Google
           ##
           # Raise an error unless an active service is available.
           def ensure_service!
-            fail "Must have active connection" unless @service
+            raise "Must have active connection" unless @service
           end
         end
       end

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

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Bigquery
-      VERSION = "1.0.0"
+      VERSION = "1.1.0".freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-bigquery
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.19.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.19.8
 - !ruby/object:Gem::Dependency
   name: googleauth
   requirement: !ruby/object:Gem::Requirement
@@ -141,16 +141,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.50.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.50.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -250,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: API Client library for Google BigQuery