google-cloud-bigquery 0.28.0 → 0.29.0

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

@@ -0,0 +1,280 @@
+# Copyright 2017 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+require "google/cloud/bigquery/convert"
+require "monitor"
+require "concurrent"
+
+module Google
+  module Cloud
+    module Bigquery
+      class Table
+        ##
+        # # AsyncInserter
+        #
+        # Used to insert multiple rows in batches to a topic. See
+        # {Google::Cloud::Bigquery::Table#insert_async}.
+        #
+        # @example
+        #   require "google/cloud/bigquery"
+        #
+        #   bigquery = Google::Cloud::Bigquery.new
+        #   dataset = bigquery.dataset "my_dataset"
+        #   table = dataset.table "my_table"
+        #   inserter = table.insert_async do |response|
+        #     log_insert "inserted #{response.insert_count} rows " \
+        #       "with #{response.error_count} errors"
+        #   end
+        #
+        #   rows = [
+        #     { "first_name" => "Alice", "age" => 21 },
+        #     { "first_name" => "Bob", "age" => 22 }
+        #   ]
+        #   inserter.insert rows
+        #
+        #   inserter.stop.wait!
+        #
+        # @attr_reader [Integer] max_bytes The maximum size of rows to be
+        #   collected before the batch is inserted. Default is 10,000,000
+        #   (10MB).
+        # @attr_reader [Integer] max_rows The maximum number of rows to be
+        #   collected before the batch is inserted. Default is 500.
+        # @attr_reader [Numeric] interval The number of seconds to collect rows
+        #   before the batch is inserted. Default is 10.
+        # @attr_reader [Integer] threads The number of threads used to insert
+        #   rows. Default is 4.
+        #
+        class AsyncInserter
+          include MonitorMixin
+
+          attr_reader :max_bytes, :max_rows, :interval, :threads
+          ##
+          # @private Implementation accessors
+          attr_reader :table, :batch
+
+          ##
+          # @private
+          def initialize table, skip_invalid: nil, ignore_unknown: nil,
+                         max_bytes: 10000000, max_rows: 500, interval: 10,
+                         threads: 4, &block
+            @table = table
+            @skip_invalid = skip_invalid
+            @ignore_unknown = ignore_unknown
+
+            @max_bytes = max_bytes
+            @max_rows = max_rows
+            @interval = interval
+            @threads = threads
+            @callback = block
+
+            @batch = nil
+
+            @thread_pool = Concurrent::FixedThreadPool.new @threads
+
+            @cond = new_cond
+
+            # init MonitorMixin
+            super()
+          end
+
+          ##
+          # Adds rows to the async inserter to be inserted. Rows will be
+          # collected in batches and inserted together.
+          # See {Google::Cloud::Bigquery::Table#insert_async}.
+          #
+          # @param [Hash, Array<Hash>] rows A hash object or array of hash
+          #   objects containing the data.
+          #
+          def insert rows
+            return nil if rows.nil?
+            return nil if rows.is_a?(Array) && rows.empty?
+            rows = [rows] if rows.is_a? Hash
+
+            synchronize do
+              rows.each do |row|
+                if @batch.nil?
+                  @batch = Batch.new max_bytes: @max_bytes, max_rows: @max_rows
+                  @batch.insert row
+                else
+                  unless @batch.try_insert row
+                    push_batch_request!
+
+                    @batch = Batch.new max_bytes: @max_bytes,
+                                       max_rows: @max_rows
+                    @batch.insert row
+                  end
+                end
+
+                @batch_created_at ||= ::Time.now
+                @background_thread ||= Thread.new { run_background }
+
+                push_batch_request! if @batch.ready?
+              end
+
+              @cond.signal
+            end
+
+            true
+          end
+
+          ##
+          # Begins the process of stopping the inserter. Rows already in the
+          # queue will be inserted, but no new rows can be added. Use {#wait!}
+          # to block until the inserter is fully stopped and all pending rows
+          # have been inserted.
+          #
+          # @return [AsyncInserter] returns self so calls can be chained.
+          #
+          def stop
+            synchronize do
+              break if @stopped
+
+              @stopped = true
+              push_batch_request!
+              @cond.signal
+            end
+
+            self
+          end
+
+          ##
+          # Blocks until the inserter is fully stopped, all pending rows
+          # have been inserted, and all callbacks have completed. Does not stop
+          # the inserter. To stop the inserter, first call {#stop} and then
+          # call {#wait!} to block until the inserter is stopped.
+          #
+          # @return [AsyncInserter] returns self so calls can be chained.
+          #
+          def wait! timeout = nil
+            synchronize do
+              @thread_pool.shutdown
+              @thread_pool.wait_for_termination timeout
+            end
+
+            self
+          end
+
+          ##
+          # Forces all rows in the current batch to be inserted immediately.
+          #
+          # @return [AsyncInserter] returns self so calls can be chained.
+          #
+          def flush
+            synchronize do
+              push_batch_request!
+              @cond.signal
+            end
+
+            self
+          end
+
+          ##
+          # Whether the inserter has been started.
+          #
+          # @return [boolean] `true` when started, `false` otherwise.
+          #
+          def started?
+            !stopped?
+          end
+
+          ##
+          # Whether the inserter has been stopped.
+          #
+          # @return [boolean] `true` when stopped, `false` otherwise.
+          #
+          def stopped?
+            synchronize { @stopped }
+          end
+
+          protected
+
+          def run_background
+            synchronize do
+              until @stopped
+                if @batch.nil?
+                  @cond.wait
+                  next
+                end
+
+                time_since_first_publish = ::Time.now - @batch_created_at
+                if time_since_first_publish < @interval
+                  # still waiting for the interval to insert the batch...
+                  @cond.wait(@interval - time_since_first_publish)
+                else
+                  # interval met, insert the batch...
+                  push_batch_request!
+                  @cond.wait
+                end
+              end
+            end
+          end
+
+          def push_batch_request!
+            return unless @batch
+
+            batch_rows = @batch.rows
+            Concurrent::Future.new(executor: @thread_pool) do
+              begin
+                response = @table.insert batch_rows,
+                                         skip_invalid:   @skip_invalid,
+                                         ignore_unknown: @ignore_unknown
+                @callback.call response if @callback
+              rescue => e
+                raise e.inspect
+              end
+            end.execute
+
+            @batch = nil
+            @batch_created_at = nil
+          end
+
+          ##
+          # @private
+          class Batch
+            attr_reader :max_bytes, :max_rows, :rows
+
+            def initialize max_bytes: 10000000, max_rows: 500
+              @max_bytes = max_bytes
+              @max_rows = max_rows
+              @rows = []
+            end
+
+            def insert row
+              @rows << row
+            end
+
+            def try_insert row
+              addl_bytes = row.to_json.bytes.size + 1
+              return false if current_bytes + addl_bytes >= @max_bytes
+              return false if @rows.count + 1 >= @max_rows
+
+              insert row
+              true
+            end
+
+            def ready?
+              current_bytes >= @max_bytes || rows.count >= @max_rows
+            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
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Bigquery
-      VERSION = "0.28.0"
+      VERSION = "0.29.0"
     end
   end
 end

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

@@ -15,7 +15,6 @@
 
 require "google/cloud/errors"
 require "google/cloud/bigquery/service"
-require "google/cloud/bigquery/data"
 require "google/cloud/bigquery/table/list"
 require "google/apis/bigquery_v2"
 
@@ -52,16 +51,17 @@ module Google
         attr_accessor :gapi
 
         ##
-        # @private Create an empty Table object.
+        # @private Create an empty View object.
         def initialize
           @service = nil
           @gapi = Google::Apis::BigqueryV2::Table.new
         end
 
         ##
-        # A unique ID for this table.
-        # The ID must contain only letters (a-z, A-Z), numbers (0-9),
-        # or underscores (_). The maximum length is 1,024 characters.
+        # A unique ID for this view.
+        #
+        # @return [String] The ID must contain only letters (a-z, A-Z), numbers
+        #   (0-9), or underscores (_). The maximum length is 1,024 characters.
         #
         # @!group Attributes
         #
@@ -70,7 +70,10 @@ module Google
         end
 
         ##
-        # The ID of the `Dataset` containing this table.
+        # The ID of the `Dataset` containing this view.
+        #
+        # @return [String] The ID must contain only letters (a-z, A-Z), numbers
+        #   (0-9), or underscores (_). The maximum length is 1,024 characters.
         #
         # @!group Attributes
         #
@@ -79,7 +82,9 @@ module Google
         end
 
         ##
-        # The ID of the `Project` containing this table.
+        # The ID of the `Project` containing this view.
+        #
+        # @return [String] The project ID.
         #
         # @!group Attributes
         #
@@ -97,7 +102,7 @@ module Google
         end
 
         ##
-        # The combined Project ID, Dataset ID, and Table ID for this table, in
+        # The combined Project ID, Dataset ID, and Table ID for this view, in
         # the format specified by the [Legacy SQL Query
         # Reference](https://cloud.google.com/bigquery/query-reference#from):
         # `project_name:datasetId.tableId`. To use this value in queries see
@@ -144,7 +149,9 @@ module Google
         end
 
         ##
-        # The name of the table.
+        # The name of the view.
+        #
+        # @return [String] The friendly name.
         #
         # @!group Attributes
         #
@@ -153,7 +160,9 @@ module Google
         end
 
         ##
-        # Updates the name of the table.
+        # Updates the name of the view.
+        #
+        # @param [String] new_name The new friendly name.
         #
         # @!group Attributes
         #
@@ -163,7 +172,9 @@ module Google
         end
 
         ##
-        # A string hash of the dataset.
+        # The ETag hash of the view.
+        #
+        # @return [String] The ETag hash.
         #
         # @!group Attributes
         #
@@ -173,7 +184,9 @@ module Google
         end
 
         ##
-        # A URL that can be used to access the dataset using the REST API.
+        # A URL that can be used to access the view using the REST API.
+        #
+        # @return [String] A REST URL for the resource.
         #
         # @!group Attributes
         #
@@ -183,7 +196,9 @@ module Google
         end
 
         ##
-        # The description of the table.
+        # A user-friendly description of the view.
+        #
+        # @return [String] The description.
         #
         # @!group Attributes
         #
@@ -193,7 +208,9 @@ module Google
         end
 
         ##
-        # Updates the description of the table.
+        # Updates the user-friendly description of the view.
+        #
+        # @param [String] new_description The new user-friendly description.
         #
         # @!group Attributes
         #
@@ -203,7 +220,9 @@ module Google
         end
 
         ##
-        # The time when this table was created.
+        # The time when this view was created.
+        #
+        # @return [Time, nil] The creation time.
         #
         # @!group Attributes
         #
@@ -217,9 +236,11 @@ module Google
         end
 
         ##
-        # The time when this table expires.
-        # If not present, the table will persist indefinitely.
-        # Expired tables will be deleted and their storage reclaimed.
+        # The time when this view expires.
+        # If not present, the view will persist indefinitely.
+        # Expired views will be deleted and their storage reclaimed.
+        #
+        # @return [Time, nil] The expiration time.
         #
         # @!group Attributes
         #
@@ -233,7 +254,9 @@ module Google
         end
 
         ##
-        # The date when this table was last modified.
+        # The date when this view was last modified.
+        #
+        # @return [Time, nil] The last modified time.
         #
         # @!group Attributes
         #
@@ -247,7 +270,9 @@ module Google
         end
 
         ##
-        # Checks if the table's type is "TABLE".
+        # Checks if the view's type is "TABLE".
+        #
+        # @return [Boolean] `true` when the type is `TABLE`, `false` otherwise.
         #
         # @!group Attributes
         #
@@ -256,7 +281,9 @@ module Google
         end
 
         ##
-        # Checks if the table's type is "VIEW".
+        # Checks if the view's type is "VIEW".
+        #
+        # @return [Boolean] `true` when the type is `VIEW`, `false` otherwise.
         #
         # @!group Attributes
         #
@@ -265,8 +292,22 @@ module Google
         end
 
         ##
-        # The geographic location where the table should reside. Possible
-        # values include EU and US. The default value is US.
+        # Checks if the view's type is "EXTERNAL".
+        #
+        # @return [Boolean] `true` when the type is `EXTERNAL`, `false`
+        #   otherwise.
+        #
+        # @!group Attributes
+        #
+        def external?
+          @gapi.type == "EXTERNAL"
+        end
+
+        ##
+        # The geographic location where the view should reside. Possible
+        # values include `EU` and `US`. The default value is `US`.
+        #
+        # @return [String] The location code.
         #
         # @!group Attributes
         #
@@ -275,9 +316,83 @@ module Google
           @gapi.location
         end
 
+        ##
+        # A hash of user-provided labels associated with this view. Labels
+        # are used to organize and group views and views. See [Using
+        # Labels](https://cloud.google.com/bigquery/docs/labels).
+        #
+        # The returned hash is frozen and changes are not allowed. Use
+        # {#labels=} to replace the entire hash.
+        #
+        # @return [Hash<String, String>] A hash containing key/value pairs.
+        #
+        # @example
+        #   require "google/cloud/bigquery"
+        #
+        #   bigquery = Google::Cloud::Bigquery.new
+        #   dataset = bigquery.dataset "my_dataset"
+        #   view = dataset.table "my_view"
+        #
+        #   labels = view.labels
+        #   labels["department"] #=> "shipping"
+        #
+        # @!group Attributes
+        #
+        def labels
+          m = @gapi.labels
+          m = m.to_h if m.respond_to? :to_h
+          m.dup.freeze
+        end
+
+        ##
+        # Updates the hash of user-provided labels associated with this view.
+        # Labels are used to organize and group tables and views. See [Using
+        # Labels](https://cloud.google.com/bigquery/docs/labels).
+        #
+        # @param [Hash<String, String>] labels A hash containing key/value
+        #   pairs.
+        #
+        #   * Label keys and values can be no longer than 63 characters.
+        #   * Label keys and values can contain only lowercase letters, numbers,
+        #     underscores, hyphens, and international characters.
+        #   * Label keys and values cannot exceed 128 bytes in size.
+        #   * Label keys must begin with a letter.
+        #   * Label keys must be unique within a view.
+        #
+        # @example
+        #   require "google/cloud/bigquery"
+        #
+        #   bigquery = Google::Cloud::Bigquery.new
+        #   dataset = bigquery.dataset "my_dataset"
+        #   view = dataset.table "my_view"
+        #
+        #   view.labels = { "department" => "shipping" }
+        #
+        # @!group Attributes
+        #
+        def labels= labels
+          @gapi.labels = labels
+          patch_gapi! :labels
+        end
+
         ##
         # The schema of the view.
         #
+        # The returned object is frozen and changes are not allowed.
+        #
+        # @return [Schema] A schema object.
+        #
+        # @example
+        #   require "google/cloud/bigquery"
+        #
+        #   bigquery = Google::Cloud::Bigquery.new
+        #   dataset = bigquery.dataset "my_dataset"
+        #   view = dataset.table "my_view"
+        #
+        #   schema = view.schema
+        #   field = schema.field "name"
+        #   field.required? #=> true
+        #
         # @!group Attributes
         #
         def schema
@@ -286,7 +401,20 @@ module Google
         end
 
         ##
-        # The fields of the view.
+        # The fields of the view, obtained from its schema.
+        #
+        # @return [Array<Schema::Field>] An array of field objects.
+        #
+        # @example
+        #   require "google/cloud/bigquery"
+        #
+        #   bigquery = Google::Cloud::Bigquery.new
+        #   dataset = bigquery.dataset "my_dataset"
+        #   view = dataset.table "my_view"
+        #
+        #   view.fields.each do |field|
+        #     puts field.name
+        #   end
         #
         # @!group Attributes
         #
@@ -295,7 +423,20 @@ module Google
         end
 
         ##
-        # The names of the columns in the view.
+        # The names of the columns in the view, obtained from its schema.
+        #
+        # @return [Array<Symbol>] An array of column names.
+        #
+        # @example
+        #   require "google/cloud/bigquery"
+        #
+        #   bigquery = Google::Cloud::Bigquery.new
+        #   dataset = bigquery.dataset "my_dataset"
+        #   view = dataset.table "my_view"
+        #
+        #   view.headers.each do |header|
+        #     puts header
+        #   end
         #
         # @!group Attributes
         #
@@ -306,6 +447,8 @@ module Google
         ##
         # The query that executes each time the view is loaded.
         #
+        # @return [String] The query that defines the view.
+        #
         # @!group Attributes
         #
         def query
@@ -315,10 +458,39 @@ module Google
         ##
         # Updates the query that executes each time the view is loaded.
         #
+        # This sets the query using standard SQL. To specify legacy SQL or to
+        # use user-defined function resources use (#set_query) instead.
+        #
         # @see https://cloud.google.com/bigquery/query-reference BigQuery Query
         #   Reference
         #
         # @param [String] new_query The query that defines the view.
+        #
+        # @example
+        #   require "google/cloud/bigquery"
+        #
+        #   bigquery = Google::Cloud::Bigquery.new
+        #   dataset = bigquery.dataset "my_dataset"
+        #   view = dataset.table "my_view"
+        #
+        #   view.query = "SELECT first_name FROM " \
+        #                  "`my_project.my_dataset.my_table`"
+        #
+        # @!group Lifecycle
+        #
+        def query= new_query
+          set_query new_query
+        end
+
+        ##
+        # Updates the query that executes each time the view is loaded. Allows
+        # setting of standard vs. legacy SQL and user-defined function
+        # resources.
+        #
+        # @see https://cloud.google.com/bigquery/query-reference BigQuery Query
+        #   Reference
+        #
+        # @param [String] query The query that defines the view.
         # @param [Boolean] standard_sql Specifies whether to use BigQuery's
         #   [standard
         #   SQL](https://cloud.google.com/bigquery/docs/reference/standard-sql/)
@@ -327,6 +499,13 @@ module Google
         #   [legacy
         #   SQL](https://cloud.google.com/bigquery/docs/reference/legacy-sql)
         #   dialect. Optional. The default value is false.
+        # @param [Array<String>, String] udfs User-defined function resources
+        #   used in the query. May be either a code resource to load from a
+        #   Google Cloud Storage URI (`gs://bucket/path`), or an inline resource
+        #   that contains code for a user-defined function (UDF). Providing an
+        #   inline code resource is equivalent to providing a URI for a file
+        #   containing the same code. See [User-Defined
+        #   Functions](https://cloud.google.com/bigquery/docs/reference/standard-sql/user-defined-functions).
         #
         # @example
         #   require "google/cloud/bigquery"
@@ -335,21 +514,71 @@ module Google
         #   dataset = bigquery.dataset "my_dataset"
         #   view = dataset.table "my_view"
         #
-        #   view.query = "SELECT first_name FROM " \
-        #                "`my_project.my_dataset.my_table`"
+        #   view.set_query "SELECT first_name FROM " \
+        #                    "`my_project.my_dataset.my_table`",
+        #                  standard_sql: true
         #
         # @!group Lifecycle
         #
-        def query= new_query, standard_sql: nil, legacy_sql: nil
-          @gapi.view ||= Google::Apis::BigqueryV2::ViewDefinition.new
-          @gapi.view.update! query: new_query
-          @gapi.view.update! use_legacy_sql: \
-            Convert.resolve_legacy_sql(standard_sql, legacy_sql)
-          patch_view_gapi! :query
+        def set_query query, standard_sql: nil, legacy_sql: nil, udfs: nil
+          @gapi.view = Google::Apis::BigqueryV2::ViewDefinition.new \
+            query: query,
+            use_legacy_sql: Convert.resolve_legacy_sql(standard_sql,
+                                                       legacy_sql),
+            user_defined_function_resources: udfs_gapi(udfs)
+          patch_view_gapi!
         end
 
         ##
-        # Runs a query to retrieve all data from the view.
+        # Checks if the view's query is using legacy sql.
+        #
+        # @return [Boolean] `true` when legacy sql is used, `false` otherwise.
+        #
+        # @!group Attributes
+        #
+        def query_legacy_sql?
+          val = @gapi.view.use_legacy_sql
+          return true if val.nil?
+          val
+        end
+
+        ##
+        # Checks if the view's query is using standard sql.
+        #
+        # @return [Boolean] `true` when standard sql is used, `false` otherwise.
+        #
+        # @!group Attributes
+        #
+        def query_standard_sql?
+          !query_legacy_sql?
+        end
+
+        ##
+        # The user-defined function resources used in the view's query. May be
+        # either a code resource to load from a Google Cloud Storage URI
+        # (`gs://bucket/path`), or an inline resource that contains code for a
+        # user-defined function (UDF). Providing an inline code resource is
+        # equivalent to providing a URI for a file containing the same code. See
+        # [User-Defined
+        # Functions](https://cloud.google.com/bigquery/docs/reference/standard-sql/user-defined-functions).
+        #
+        # @return [Array<String>] An array containing Google Cloud Storage URIs
+        #   and/or inline source code.
+        #
+        # @!group Attributes
+        #
+        def query_udfs
+          udfs_gapi = @gapi.view.user_defined_function_resources
+          return [] if udfs_gapi.nil?
+          Array(udfs_gapi).map { |udf| udf.inline_code || udf.resource_uri }
+        end
+
+        ##
+        # Runs a query to retrieve all data from the view, in a synchronous
+        # method that blocks for a response. In this method, a {QueryJob} is
+        # created and its results are saved to a temporary table, then read from
+        # the table. Timeouts and transient errors are generally handled as
+        # needed to complete the query.
         #
         # @param [Integer] max The maximum number of rows of data to return per
         #   page of results. Setting this flag to a small value such as 1000 and
@@ -357,23 +586,13 @@ module Google
         #   result set is large. In addition to this limit, responses are also
         #   limited to 10 MB. By default, there is no maximum row count, and
         #   only the byte limit applies.
-        # @param [Integer] timeout How long to wait for the query to complete,
-        #   in milliseconds, before the request times out and returns. Note that
-        #   this is only a timeout for the request, not the query. If the query
-        #   takes longer to run than the timeout value, the call returns without
-        #   any results and with QueryData#complete? set to false. The default
-        #   value is 10000 milliseconds (10 seconds).
         # @param [Boolean] cache Whether to look for the result in the query
         #   cache. The query cache is a best-effort cache that will be flushed
         #   whenever tables in the query are modified. The default value is
         #   true. For more information, see [query
         #   caching](https://developers.google.com/bigquery/querying-data).
-        # @param [Boolean] dryrun If set to `true`, BigQuery doesn't run the
-        #   job. Instead, if the query is valid, BigQuery returns statistics
-        #   about the job such as how many bytes would be processed. If the
-        #   query is invalid, an error returns. The default value is `false`.
         #
-        # @return [Google::Cloud::Bigquery::QueryData]
+        # @return [Google::Cloud::Bigquery::Data]
         #
         # @example
         #   require "google/cloud/bigquery"
@@ -390,18 +609,31 @@ module Google
         #
         # @!group Data
         #
-        def data max: nil, timeout: 10000, cache: true, dryrun: nil
+        def data max: nil, cache: true
           sql = "SELECT * FROM #{query_id}"
           ensure_service!
-          options = { max: max, timeout: timeout, cache: cache, dryrun: dryrun }
-          gapi = service.query sql, options
-          QueryData.from_gapi gapi, service
+
+          gapi = service.query_job sql, cache: cache
+          job = Job.from_gapi gapi, service
+          job.wait_until_done!
+
+          if job.failed?
+            begin
+              # raise to activate ruby exception cause handling
+              fail job.gapi_error
+            rescue => e
+              # wrap Google::Apis::Error with Google::Cloud::Error
+              raise Google::Cloud::Error.from_error(e)
+            end
+          end
+
+          job.data max: max
         end
 
         ##
-        # Permanently deletes the table.
+        # Permanently deletes the view.
         #
-        # @return [Boolean] Returns `true` if the table was deleted.
+        # @return [Boolean] Returns `true` if the view was deleted.
         #
         # @example
         #   require "google/cloud/bigquery"
@@ -421,7 +653,7 @@ module Google
         end
 
         ##
-        # Reloads the table with current data from the BigQuery service.
+        # Reloads the view with current data from the BigQuery service.
         #
         # @!group Lifecycle
         #
@@ -449,12 +681,6 @@ module Google
           fail "Must have active connection" unless service
         end
 
-        def resolve_legacy_sql legacy_sql, standard_sql
-          return legacy_sql unless legacy_sql.nil?
-          return !standard_sql unless standard_sql.nil?
-          false
-        end
-
         def patch_gapi! *attributes
           return if attributes.empty?
           patch_args = Hash[attributes.map do |attr|
@@ -463,21 +689,19 @@ module Google
           patch_table_gapi patch_args
         end
 
-        def patch_view_gapi! *attributes
-          return if attributes.empty?
-          patch_args = Hash[attributes.map do |attr|
-            [attr, @gapi.view.send(attr)]
-          end]
-          patch_view_args = Google::Apis::BigqueryV2::ViewDefinition.new(
-            patch_args
-          )
-          patch_table_gapi view: patch_view_args
-        end
-
         def patch_table_gapi patch_args
           ensure_service!
           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
+
+          # TODO: restore original impl after acceptance test indicates that
+          # service etag bug is fixed
+          reload!
+        end
+
+        def patch_view_gapi!
+          patch_table_gapi view: @gapi.view
         end
 
         ##
@@ -496,6 +720,19 @@ module Google
         def data_complete?
           @gapi.is_a? Google::Apis::BigqueryV2::Table
         end
+
+        def udfs_gapi array_or_str
+          return [] if array_or_str.nil?
+          Array(array_or_str).map do |uri_or_code|
+            resource = Google::Apis::BigqueryV2::UserDefinedFunctionResource.new
+            if uri_or_code.start_with?("gs://")
+              resource.resource_uri = uri_or_code
+            else
+              resource.inline_code = uri_or_code
+            end
+            resource
+          end
+        end
       end
     end
   end