google-cloud-bigtable 0.6.2 → 0.7.0

data/lib/google/cloud/bigtable/status.rb

@@ -0,0 +1,76 @@
+# Copyright 2019 Google LLC
+#
+# 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
+#
+#     https://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.
+
+
+module Google
+  module Cloud
+    module Bigtable
+      ##
+      # # Status
+      #
+      # Represents a logical error model from the Bigtable service, containing an
+      # error code, an error message, and optional error details.
+      #
+      # @attr [Integer] code The status code, which should be an enum value of
+      #   [google.rpc.Code](https://github.com/googleapis/googleapis/blob/master/google/rpc/code.proto).
+      # @attr [String] description The human-readable description for the status code, which should be an enum value of
+      #   [google.rpc.Code](https://github.com/googleapis/googleapis/blob/master/google/rpc/code.proto). For example,
+      #   `INVALID_ARGUMENT`.
+      # @attr [String] message A developer-facing error message, which should be in English.
+      # @attr [Array<String>] details A list of messages that carry the error details.
+      #
+      # @example
+      #   require "google/cloud/bigtable"
+      #
+      #   bigtable = Google::Cloud::Bigtable.new
+      #
+      #   table = bigtable.table("my-instance", "my-table")
+      #
+      #   entries = []
+      #   entries << table.new_mutation_entry("row-1").set_cell("cf1", "field1", "XYZ")
+      #   entries << table.new_mutation_entry("row-2").set_cell("cf1", "field1", "ABC")
+      #   responses = table.mutate_rows(entries)
+      #
+      #   responses.each do |response|
+      #     puts response.status.description
+      #   end
+      #
+      class Status
+        attr_reader :code, :description, :message, :details
+
+        ##
+        # @private Creates a Status object.
+        def initialize code, description, message, details
+          @code = code
+          @description = description
+          @message = message
+          @details = details
+        end
+
+        ##
+        # @private New Status from a Google::Rpc::Status object.
+        def self.from_grpc grpc
+          new grpc.code, description_for(grpc.code), grpc.message, grpc.details
+        end
+
+        # @private Get a descriptive symbol for a google.rpc.Code integer
+        def self.description_for code
+          ["OK", "CANCELLED", "UNKNOWN", "INVALID_ARGUMENT", "DEADLINE_EXCEEDED", "NOT_FOUND", "ALREADY_EXISTS",
+           "PERMISSION_DENIED", "RESOURCE_EXHAUSTED", "FAILED_PRECONDITION", "ABORTED", "OUT_OF_RANGE", "UNIMPLEMENTED",
+           "INTERNAL", "UNAVAILABLE", "DATA_LOSS", "UNAUTHENTICATED"][code]
+        end
+      end
+    end
+  end
+end

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

@@ -17,8 +17,7 @@
 
 require "google/cloud/bigtable/table/list"
 require "google/cloud/bigtable/table/cluster_state"
-require "google/cloud/bigtable/column_family"
-require "google/cloud/bigtable/table/column_family_map"
+require "google/cloud/bigtable/column_family_map"
 require "google/cloud/bigtable/gc_rule"
 require "google/cloud/bigtable/mutation_operations"
 require "google/cloud/bigtable/read_operations"
@@ -26,6 +25,7 @@ require "google/cloud/bigtable/read_operations"
 module Google
   module Cloud
     module Bigtable
+      ##
       # # Table
       #
       # A collection of user data indexed by row, column, and timestamp.
@@ -36,23 +36,14 @@ module Google
       #
       #   bigtable = Google::Cloud::Bigtable.new
       #
-      #   table = bigtable.table("my-instance", "my-table", perform_lookup: true)
+      #   table = bigtable.table("my-instance", "my-table")
       #
-      #   table.column_families.each do |cf|
-      #     p cf.name
-      #     p cf.gc_rule
+      #   if table.exists?
+      #     p "Table exists."
+      #   else
+      #     p "Table does not exist"
       #   end
       #
-      #   # Get column family by name
-      #   cf1 = table.column_families.find_by_name("cf1")
-      #
-      #   # Create column family
-      #   gc_rule = Google::Cloud::Bigtable::GcRule.max_versions(3)
-      #   cf2 = table.column_families.create("cf2", gc_rule)
-      #
-      #   # Delete table
-      #   table.delete
-      #
       class Table
         # @!parse extend MutationOperations
         include MutationOperations
@@ -64,7 +55,9 @@ module Google
         # The gRPC Service object.
         attr_accessor :service
 
+        ##
         # @return [String] App profile ID for request routing.
+        #
         attr_accessor :app_profile_id
 
         # @private
@@ -76,36 +69,45 @@ module Google
           @view = view || :SCHEMA_VIEW
         end
 
+        ##
         # The unique identifier for the project.
         #
         # @return [String]
+        #
         def project_id
           @grpc.name.split("/")[1]
         end
 
+        ##
         # The unique identifier for the instance.
         #
         # @return [String]
+        #
         def instance_id
           @grpc.name.split("/")[3]
         end
 
+        ##
         # The unique identifier for the table.
         #
         # @return [String]
+        #
         def name
           @grpc.name.split("/")[5]
         end
         alias table_id name
 
+        ##
         # The full path for the table resource. Values are of the form
         # `projects/<project_id>/instances/<instance_id>/table/<table_id>`.
         #
         # @return [String]
+        #
         def path
           @grpc.name
         end
 
+        ##
         # Reload table information.
         #
         # @param view [Symbol] Table view type.
@@ -118,13 +120,14 @@ module Google
         #   * `:FULL` - Populates all fields
         #
         # @return [Google::Cloud::Bigtable::Table]
-
+        #
         def reload! view: nil
           @view = view || :SCHEMA_VIEW
-          @grpc = service.get_table(instance_id, name, view: view)
+          @grpc = service.get_table instance_id, name, view: view
           self
         end
 
+        ##
         # Map from cluster ID to per-cluster table state.
         # If it could not be determined whether or not the table has data in a
         # particular cluster (for example, if its zone is unavailable), then
@@ -132,32 +135,89 @@ module Google
         # Views: `FULL`
         #
         # @return [Array<Google::Cloud::Bigtable::Table::ClusterState>]
+        #
         def cluster_states
-          check_view_and_load(:REPLICATION_VIEW)
+          check_view_and_load :REPLICATION_VIEW
           @grpc.cluster_states.map do |name, state_grpc|
-            ClusterState.from_grpc(state_grpc, name)
+            ClusterState.from_grpc state_grpc, name
           end
         end
 
-        # The column families configured for this table, mapped by column family ID.
-        # Column-families data only available in table view types `SCHEMA_VIEW`, `FULL`.
+        ##
+        # Returns a frozen object containing the column families configured for
+        # the table, mapped by column family name. Reloads the table if
+        # necessary to retrieve the column families data, since it is only
+        # available in a table with view type `SCHEMA_VIEW` or `FULL`.
+        #
+        # Also accepts a block for making modifications to the table's column
+        # families. After the modifications are completed, the table will be
+        # updated with the changes, and the updated column families will be
+        # returned.
+        #
+        # @yield [column_families] A block for modifying the table's column
+        #   families. Applies multiple column modifications. Performs a series
+        #   of column family modifications on the specified table. Either all or
+        #   none of the modifications will occur before this method returns, but
+        #   data requests received prior to that point may see a table where
+        #   only some modifications have taken effect.
+        # @yieldparam [ColumnFamilyMap] column_families
+        #   A mutable object containing the column families for the table,
+        #   mapped by column family name. Any changes made to this object will
+        #   be stored in API.
+        #
+        # @return [ColumnFamilyMap] A frozen object containing the
+        #   column families for the table, mapped by column family name.
+        #
+        # @example
+        #   require "google/cloud/bigtable"
+        #
+        #   bigtable = Google::Cloud::Bigtable.new
+        #
+        #   table = bigtable.table("my-instance", "my-table", perform_lookup: true)
+        #
+        #   table.column_families.each do |name, cf|
+        #     puts name
+        #     puts cf.gc_rule
+        #   end
+        #
+        #   # Get a column family by name
+        #   cf1 = table.column_families["cf1"]
+        #
+        # @example Modify the table's column families
+        #   require "google/cloud/bigtable"
+        #
+        #   bigtable = Google::Cloud::Bigtable.new
+        #
+        #   table = bigtable.table("my-instance", "my-table", perform_lookup: true)
+        #
+        #   table.column_families do |cfm|
+        #     cfm.add "cf4", gc_rule: Google::Cloud::Bigtable::GcRule.max_age(600)
+        #     cfm.add "cf5", gc_rule: Google::Cloud::Bigtable::GcRule.max_versions(5)
         #
+        #     rule_1 = Google::Cloud::Bigtable::GcRule.max_versions(3)
+        #     rule_2 = Google::Cloud::Bigtable::GcRule.max_age(600)
+        #     rule_union = Google::Cloud::Bigtable::GcRule.union(rule_1, rule_2)
+        #     cfm.update "cf2", gc_rule: rule_union
         #
-        # @return [Array<Google::Bigtable::ColumnFamily>]
+        #     cfm.delete "cf3"
+        #   end
+        #
+        #   puts table.column_families["cf3"] #=> nil
         #
         def column_families
-          check_view_and_load(:SCHEMA_VIEW)
-          @grpc.column_families.map do |cf_name, cf_grpc|
-            ColumnFamily.from_grpc(
-              cf_grpc,
-              service,
-              name: cf_name,
-              instance_id: instance_id,
-              table_id: table_id
-            )
+          check_view_and_load :SCHEMA_VIEW
+
+          if block_given?
+            column_families = ColumnFamilyMap.from_grpc @grpc.column_families
+            yield column_families
+            modifications = column_families.modifications @grpc.column_families
+            @grpc = service.modify_column_families instance_id, table_id, modifications if modifications.any?
           end
+
+          ColumnFamilyMap.from_grpc(@grpc.column_families).freeze
         end
 
+        ##
         # The granularity (e.g. `MILLIS`, `MICROS`) at which timestamps are stored in
         # this table. Timestamps not matching the granularity will be rejected.
         # If unspecified at creation time, the value will be set to `MILLIS`.
@@ -166,10 +226,11 @@ module Google
         # @return [Symbol]
         #
         def granularity
-          check_view_and_load(:SCHEMA_VIEW)
+          check_view_and_load :SCHEMA_VIEW
           @grpc.granularity
         end
 
+        ##
         # The table keeps data versioned at a granularity of 1 ms.
         #
         # @return [Boolean]
@@ -178,6 +239,7 @@ module Google
           granularity == :MILLIS
         end
 
+        ##
         # Permanently deletes the table from a instance.
         #
         # @return [Boolean] Returns `true` if the table was deleted.
@@ -187,15 +249,16 @@ module Google
         #
         #   bigtable = Google::Cloud::Bigtable.new
         #
-        #   instance = bigtable.table("my-instance", "my-table")
+        #   table = bigtable.table("my-instance", "my-table")
         #   table.delete
         #
         def delete
           ensure_service!
-          service.delete_table(instance_id, name)
+          service.delete_table instance_id, name
           true
         end
 
+        ##
         # Checks to see if the table exists.
         #
         # @return [Boolean]
@@ -219,7 +282,7 @@ module Google
         #   bigtable = Google::Cloud::Bigtable.new
         #
         #   instance = bigtable.instance("my-instance")
-        #   table = bigtable.table("my-table")
+        #   table = instance.table("my-table")
         #
         #   if table.exists?
         #     p "Table exists."
@@ -227,199 +290,45 @@ module Google
         #     p "Table does not exist"
         #   end
         #
-
         def exists?
           !service.get_table(instance_id, name, view: :NAME_ONLY).nil?
         rescue Google::Cloud::NotFoundError
           false
         end
 
-        # Returns a column family object that can be used to perform create,
-        # update, or delete operations.
-        #
-        # @param name [String] Name of the column family
-        # @param gc_rule [Google::Cloud::Bigtable::GcRule] The garbage
-        #   collection rule to be used for the column family. Optional. The
-        #   service default value will be used when not specified.
-        #
-        # @example Create column family
-        #   require "google/cloud/bigtable"
-        #
-        #   bigtable = Google::Cloud::Bigtable.new
-        #
-        #   table = bigtable.table("my-instance", my-table)
-        #
-        #   # OR get table from Instance object.
-        #   instance = bigtable.instance("my-instance")
-        #   table = instance.table("my-table")
-        #
-        #   gc_rule = Google::Cloud::Bigtable::GcRule.max_versions(5)
-        #   column_family = table.column_family("cf1", gc_rule)
-        #   column_family.create
-        #
-        # @example Update column family
-        #   require "google/cloud/bigtable"
-        #
-        #   bigtable = Google::Cloud::Bigtable.new
-        #
-        #   table = bigtable.table("my-instance", "my-table")
-        #
-        #   gc_rule = Google::Cloud::Bigtable::GcRule.max_age(1800)
-        #   column_family = table.column_family("cf2", gc_rule)
-        #   column_family.save
-        #   # OR Using alias method update.
-        #   column_family.update
-        #
-        # @example Delete column family
-        #   require "google/cloud/bigtable"
-        #
-        #   bigtable = Google::Cloud::Bigtable.new
-        #
-        #   table = bigtable.table("my-instance", "my-table")
-        #
-        #   column_family = table.column_family("cf3")
-        #   column_family.delete
-        #
-        def column_family name, gc_rule = nil
-          cf_grpc = Google::Bigtable::Admin::V2::ColumnFamily.new
-          cf_grpc.gc_rule = gc_rule.to_grpc if gc_rule
-
-          ColumnFamily.from_grpc(
-            cf_grpc,
-            service,
-            name: name,
-            instance_id: instance_id,
-            table_id: table_id
-          )
-        end
-
-        # Applies multitple column modifications.
-        # Performs a series of column family modifications on the specified table.
-        # Either all or none of the modifications will occur before this method
-        # returns, but data requests received prior to that point may see a table
-        # where only some modifications have taken effect.
-        #
-        # @param modifications [Array<Google::Cloud::Bigtable::ColumnFamilyModification>]
-        #   Modifications to be atomically applied to the specified table's families.
-        #   Entries are applied in order, meaning that earlier modifications can be
-        #   masked by later ones (in the case of repeated updates to the same family,
-        #   for example).
-        # @return [Google::Cloud::Bigtable::Table] Table with updated column families.
-        #
-        # @example Apply multiple modificationss
-        #   require "google/cloud/bigtable"
-        #
-        #   bigtable = Google::Cloud::Bigtable.new
-        #
-        #   instance = bigtable.instance("my-instance")
-        #   table = instance.table("my-table")
-        #
-        #   modifications = []
-        #   modifications << Google::Cloud::Bigtable::ColumnFamily.create_modification(
-        #     "cf1", Google::Cloud::Bigtable::GcRule.max_age(600))
-        #   )
-        #
-        #   modifications << Google::Cloud::Bigtable::ColumnFamily.update_modification(
-        #     "cf2", Google::Cloud::Bigtable::GcRule.max_versions(5)
-        #   )
-        #
-        #   gc_rule_1 = Google::Cloud::Bigtable::GcRule.max_versions(3)
-        #   gc_rule_2 = Google::Cloud::Bigtable::GcRule.max_age(600)
-        #   modifications << Google::Cloud::Bigtable::ColumnFamily.update_modification(
-        #     "cf3", Google::Cloud::Bigtable::GcRule.union(gc_rule_1, gc_rule_2)
-        #   )
-        #
-        #   max_age_gc_rule = Google::Cloud::Bigtable::GcRule.max_age(300)
-        #   modifications << Google::Cloud::Bigtable::ColumnFamily.update_modification(
-        #     "cf4", Google::Cloud::Bigtable::GcRule.union(max_version_gc_rule)
-        #   )
-        #
-        #   modifications << Google::Cloud::Bigtable::ColumnFamily.drop_modification("cf5")
-        #
-        #   table = bigtable.modify_column_families(modifications)
-        #
-        #   p table.column_families
-
-        def modify_column_families modifications
-          ensure_service!
-          self.class.modify_column_families(
-            service,
-            instance_id,
-            table_id,
-            modifications
-          )
-        end
-
-        # @private
-        #
-        # Performs a series of column family modifications on the specified table.
-        # Either all or none of the modifications will occur before this method
-        # returns, but data requests received prior to that point may see a table
-        # where only some modifications have taken effect.
-        #
-        # @param service [Google::Cloud::Bigtable::Service]
-        # @param instance_id [String]
-        #   The unique ID of the instance the table is in.
-        # @param table_id [String]
-        #   The unique ID of the table whose families should be modified.
-        # @param modifications [Array<Google::Bigtable::Admin::V2::ModifyColumnFamiliesRequest::Modification> | Google::Bigtable::Admin::V2::ModifyColumnFamiliesRequest::Modification]
-        #   Modifications to be atomically applied to the specified table's families.
-        #   Entries are applied in order, meaning that earlier modifications can be
-        #   masked by later ones (in the case of repeated updates to the same family,
-        #   for example).
-        # @return [Google::Cloud::Bigtable::Table] Table with updated column families.
-        #
-        def self.modify_column_families \
-            service,
-            instance_id,
-            table_id,
-            modifications
-          modifications = [modifications] unless modifications.is_a?(Array)
-          grpc = service.modify_column_families(
-            instance_id,
-            table_id,
-            modifications
-          )
-          from_grpc(grpc, service)
-        end
-
         # @private
         # Creates a table.
         #
         # @param service [Google::Cloud::Bigtable::Service]
         # @param instance_id [String]
         # @param table_id [String]
-        # @param column_families [Hash{String => Google::Cloud::Bigtable::ColumnFamily}]
+        # @param column_families [ColumnFamilyMap]
         # @param granularity [Symbol]
         # @param initial_splits [Array<String>]
         # @yield [column_families] A block for adding column_families.
-        # @yieldparam [Hash{String => Google::Cloud::Bigtable::ColumnFamily}]
+        # @yieldparam [ColumnFamilyMap]
         #
         # @return [Google::Cloud::Bigtable::Table]
-        def self.create \
-            service,
-            instance_id,
-            table_id,
-            column_families: nil,
-            granularity: nil,
-            initial_splits: nil
-          column_families ||= Table::ColumnFamilyMap.new
+        #
+        def self.create service, instance_id, table_id, column_families: nil, granularity: nil, initial_splits: nil
+          if column_families
+            # create an un-frozen and duplicate object
+            column_families = ColumnFamilyMap.from_grpc column_families.to_grpc
+          end
+          column_families ||= ColumnFamilyMap.new
+
           yield column_families if block_given?
 
           table = Google::Bigtable::Admin::V2::Table.new({
-            column_families: column_families.to_h,
-            granularity: granularity
+            column_families: column_families.to_grpc_hash,
+            granularity:     granularity
           }.delete_if { |_, v| v.nil? })
 
-          grpc = service.create_table(
-            instance_id,
-            table_id,
-            table,
-            initial_splits: initial_splits
-          )
-          from_grpc(grpc, service)
+          grpc = service.create_table instance_id, table_id, table, initial_splits: initial_splits
+          from_grpc grpc, service
         end
 
+        ##
         # Generates a consistency token for a table. The token can be used in
         # CheckConsistency to check whether mutations to the table that finished
         # before this call started have been replicated. The tokens will be available
@@ -439,10 +348,11 @@ module Google
         #
         def generate_consistency_token
           ensure_service!
-          response = service.generate_consistency_token(instance_id, name)
+          response = service.generate_consistency_token instance_id, name
           response.consistency_token
         end
 
+        ##
         # Checks replication consistency based on a consistency token. Replication is
         # considered consistent if replication has caught up based on the conditions
         # specified in the token and the check request.
@@ -465,10 +375,11 @@ module Google
         #
         def check_consistency token
           ensure_service!
-          response = service.check_consistency(instance_id, name, token)
+          response = service.check_consistency instance_id, name, token
           response.consistent
         end
 
+        ##
         # Wait for replication to check replication consistency.
         # Checks replication consistency by generating a consistency token and
         # making the `check_consistency` API call 5 times (by default).
@@ -487,7 +398,7 @@ module Google
         #
         #   bigtable = Google::Cloud::Bigtable.new
         #
-        #   table = bigtable.table("instance_id", "my-table", perform_lookup: true)
+        #   table = bigtable.table("my-instance", "my-table", perform_lookup: true)
         #
         #   if table.wait_for_replication
         #     puts "Replication done"
@@ -499,21 +410,16 @@ module Google
         #   end
         #
         def wait_for_replication timeout: 600, check_interval: 5
-          if check_interval > timeout
-            raise(
-              InvalidArgumentError,
-              "'check_interval' can not be greather then timeout"
-            )
-          end
+          raise InvalidArgumentError, "'check_interval' can not be greather then timeout" if check_interval > timeout
           token = generate_consistency_token
           status = false
           start_at = Time.now
 
           loop do
-            status = check_consistency(token)
+            status = check_consistency token
 
             break if status || (Time.now - start_at) >= timeout
-            sleep(check_interval)
+            sleep check_interval
           end
           status
         end
@@ -527,6 +433,7 @@ module Google
           service.client
         end
 
+        ##
         # Deletes all rows.
         #
         # @param timeout [Integer] Call timeout in seconds
@@ -547,9 +454,10 @@ module Google
         #   table.delete_all_rows(timeout: 120) # 120 seconds.
         #
         def delete_all_rows timeout: nil
-          drop_row_range(delete_all_data: true, timeout: timeout)
+          drop_row_range delete_all_data: true, timeout: timeout
         end
 
+        ##
         # Deletes rows using row key prefix.
         #
         # @param prefix [String] Row key prefix (for example, "user")
@@ -565,12 +473,13 @@ module Google
         #   table.delete_rows_by_prefix("user-100")
         #
         #   # With timeout
-        #   table.delete_all_rows("user-1", timeout: 120) # 120 seconds.
+        #   table.delete_rows_by_prefix("user-1", timeout: 120) # 120 seconds.
         #
         def delete_rows_by_prefix prefix, timeout: nil
-          drop_row_range(row_key_prefix: prefix, timeout: timeout)
+          drop_row_range row_key_prefix: prefix, timeout: timeout
         end
 
+        ##
         # Drops row range by row key prefix or deletes all.
         #
         # @param row_key_prefix [String] Row key prefix (for example, "user")
@@ -585,22 +494,19 @@ module Google
         #   table = bigtable.table("my-instance", "my-table")
         #
         #   # Delete rows using row key prefix.
-        #   table.drop_row_range("user-100")
+        #   table.drop_row_range(row_key_prefix: "user-100")
         #
         #   # Delete all data With timeout
         #   table.drop_row_range(delete_all_data: true, timeout: 120) # 120 seconds.
         #
-        def drop_row_range \
-            row_key_prefix: nil,
-            delete_all_data: nil,
-            timeout: nil
+        def drop_row_range row_key_prefix: nil, delete_all_data: nil, timeout: nil
           ensure_service!
           service.drop_row_range(
             instance_id,
             name,
-            row_key_prefix: row_key_prefix,
+            row_key_prefix:             row_key_prefix,
             delete_all_data_from_table: delete_all_data,
-            timeout: timeout
+            timeout:                    timeout
           )
           true
         end
@@ -614,7 +520,7 @@ module Google
         # @return [Google::Cloud::Bigtable::Table]
         #
         def self.from_grpc grpc, service, view: nil
-          new(grpc, service, view: view)
+          new grpc, service, view: view
         end
 
         # @private
@@ -627,8 +533,8 @@ module Google
         # @return [Google::Cloud::Bigtable::Table]
         #
         def self.from_path path, service
-          grpc = Google::Bigtable::Admin::V2::Table.new(name: path)
-          new(grpc, service, view: :NAME_ONLY)
+          grpc = Google::Bigtable::Admin::V2::Table.new name: path
+          new grpc, service, view: :NAME_ONLY
         end
 
         protected
@@ -642,9 +548,9 @@ module Google
         end
 
         FIELDS_BY_VIEW = {
-          SCHEMA_VIEW: %w[granularity column_families],
+          SCHEMA_VIEW:      ["granularity", "column_families"],
           REPLICATION_VIEW: ["cluster_states"],
-          FULL: %w[granularity column_families cluster_states]
+          FULL:             ["granularity", "column_families", "cluster_states"]
         }.freeze
 
         # @private
@@ -653,13 +559,12 @@ module Google
         # @param view [Symbol] Expected view type.
         #
         def check_view_and_load view
-          @loaded_views ||= Set.new([@view])
+          ensure_service!
+          @loaded_views ||= Set.new [@view]
 
-          if @loaded_views.include?(view) || @loaded_views.include?(:FULL)
-            return
-          end
+          return if @loaded_views.include?(view) || @loaded_views.include?(:FULL)
 
-          grpc = service.get_table(instance_id, table_id, view: view)
+          grpc = service.get_table instance_id, table_id, view: view
           @loaded_views << view
 
           FIELDS_BY_VIEW[view].each do |field|