google-cloud-bigtable 0.6.2 → 1.0.2

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

@@ -19,10 +19,12 @@ require "google/cloud/bigtable/mutation_entry"
 require "google/cloud/bigtable/row"
 require "google/cloud/bigtable/rows_mutator"
 require "google/cloud/bigtable/read_modify_write_rule"
+require "google/cloud/bigtable/status"
 
 module Google
   module Cloud
     module Bigtable
+      ##
       # # MutationOperations
       #
       # Collection of mutations APIs.
@@ -33,30 +35,29 @@ module Google
       #   * Check and mutate row
       #
       module MutationOperations
-        # Mutate row.
-        #
+        ##
         # Mutates a row atomically. Cells in the row are left
-        # unchanged unless explicitly changed by +mutation+.
+        # unchanged unless explicitly changed by the mutations.
         # Changes to be atomically applied to the specified row. Entries are applied
         # in order, meaning that earlier mutations can be masked by later mutations.
-        # Must contain at least one mutation entry and at most 100,000.
+        # Must contain at least one mutation and at most 100,000.
         #
         # @param entry [Google::Cloud::Bigtable::MutationEntry]
         #   Mutation entry with row key and list of mutations.
         # @return [Boolean]
         # @example Single mutation on row.
-        #   require "google/cloud"
+        #   require "google/cloud/bigtable"
         #
         #   bigtable = Google::Cloud::Bigtable.new
         #
         #   table = bigtable.table("my-instance", "my-table")
         #
-        #   entry = table.new_mutation_entry.new("user-1")
+        #   entry = table.new_mutation_entry("user-1")
         #   entry.set_cell("cf1", "field1", "XYZ")
         #   table.mutate_row(entry)
         #
         # @example Multiple mutations on row.
-        #   require "google/cloud"
+        #   require "google/cloud/bigtable"
         #
         #   bigtable = Google::Cloud::Bigtable.new
         #
@@ -73,17 +74,13 @@ module Google
         #   table.mutate_row(entry)
         #
         def mutate_row entry
-          client.mutate_row(
-            path,
-            entry.row_key,
-            entry.mutations,
-            app_profile_id: @app_profile_id
-          )
+          service.mutate_row path, entry.row_key, entry.mutations, app_profile_id: @app_profile_id
           true
         end
 
+        ##
         # Mutates multiple rows in a batch. Each individual row is mutated
-        # atomically as in MutateRow, but the entire batch is not executed
+        # atomically as in #{mutate_row}, but the entire batch is not executed
         # atomically.
         #
         # @param entries [Array<Google::Cloud::Bigtable::MutationEntry>]
@@ -95,7 +92,7 @@ module Google
         # @return [Array<Google::Bigtable::V2::MutateRowsResponse::Entry>]
         #
         # @example
-        #   require "google/cloud"
+        #   require "google/cloud/bigtable"
         #
         #   bigtable = Google::Cloud::Bigtable.new
         #
@@ -104,12 +101,18 @@ module Google
         #   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")
-        #   table.mutate_row(entries)
+        #   responses = table.mutate_rows(entries)
+        #
+        #   responses.each do |response|
+        #     puts response.status.description
+        #   end
         #
         def mutate_rows entries
-          RowsMutator.new(self, entries).apply_mutations
+          statuses = RowsMutator.new(self, entries).apply_mutations
+          statuses.map { |s| Response.from_grpc s }
         end
 
+        ##
         # Modifies a row atomically on the server. The method reads the latest
         # existing timestamp and value from the specified columns and writes a new
         # entry based on pre-defined read/modify/write rules. The new value for the
@@ -118,7 +121,8 @@ module Google
         #
         # @param key [String]
         #   The row key of the row to which the read/modify/write rules should be applied.
-        # @param rules [Google::Cloud::Bigtable::ReadModifyWriteRule, Array<Google::Cloud::Bigtable::ReadModifyWriteRule>]
+        # @param rules [Google::Cloud::Bigtable::ReadModifyWriteRule,
+        #   Array<Google::Cloud::Bigtable::ReadModifyWriteRule>]
         #   Rules specifying how the specified row's contents are to be transformed
         #   into writes. Entries are applied in order, meaning that earlier rules will
         #   affect the results of later ones.
@@ -152,13 +156,13 @@ module Google
         #   puts row.cells
         #
         def read_modify_write_row key, rules
-          res_row = client.read_modify_write_row(
+          res_row = service.read_modify_write_row(
             path,
             key,
             Array(rules).map(&:to_grpc),
             app_profile_id: @app_profile_id
           ).row
-          row = Row.new(res_row.key)
+          row = Row.new res_row.key
 
           res_row.families.each do |family|
             family.columns.each do |column|
@@ -177,6 +181,7 @@ module Google
           row
         end
 
+        ##
         # Mutates a row atomically based on the output of a predicate reader filter.
         #
         # NOTE: Condition predicate filter is not supported.
@@ -203,7 +208,8 @@ module Google
         #   Must contain at least one entry if +true_mutations+ is empty and at most
         #   100,000 entries.
         # @return [Boolean]
-        #   Predicate match or not status
+        #   Predicate match or not status.
+        #
         # @example
         #   require "google/cloud/bigtable"
         #
@@ -222,72 +228,35 @@ module Google
         #   otherwise_mutations = Google::Cloud::Bigtable::MutationEntry.new
         #   otherwise_mutations.delete_from_family("cf3")
         #
-        #   response = table.check_and_mutate_row(
+        #   predicate_matched = table.check_and_mutate_row(
         #     "user01",
         #     predicate_filter,
         #     on_match: on_match_mutations,
         #     otherwise: otherwise_mutations
         #   )
         #
-        #   if response
+        #   if predicate_matched
         #     puts "All predicates matched"
         #   end
         #
-        def check_and_mutate_row \
-            key,
-            predicate,
-            on_match: nil,
-            otherwise: nil
+        def check_and_mutate_row key, predicate, on_match: nil, otherwise: nil
           true_mutations = on_match.mutations if on_match
           false_mutations = otherwise.mutations if otherwise
-          response = client.check_and_mutate_row(
+          response = service.check_and_mutate_row(
             path,
             key,
             predicate_filter: predicate.to_grpc,
-            true_mutations: true_mutations,
-            false_mutations: false_mutations,
-            app_profile_id: @app_profile_id
+            true_mutations:   true_mutations,
+            false_mutations:  false_mutations,
+            app_profile_id:   @app_profile_id
           )
           response.predicate_matched
         end
 
-        # Read sample row keys.
-        #
-        # Returns a sample of row keys in the table. The returned row keys will
-        # delimit contiguous sections of the table of approximately equal size. The
-        # sections can be used to break up the data for distributed tasks like
-        # MapReduces.
-        #
-        # @yieldreturn [Google::Cloud::Bigtable::SampleRowKey]
-        # @return [:yields: sample_row_key]
-        #   Yield block for each processed SampleRowKey.
-        #
-        # @example
-        #   require "google/cloud"
-        #
-        #   bigtable = Google::Cloud::Bigtable.new
-        #   table = bigtable.table("my-instance", "my-table")
-        #
-        #   table.sample_row_keys.each do |sample_row_key|
-        #     p sample_row_key.key # user00116
-        #     p sample_row_key.offset # 805306368
-        #   end
-        #
-        def sample_row_keys
-          return enum_for(:sample_row_keys) unless block_given?
-
-          response = client.sample_row_keys(
-            path,
-            app_profile_id: @app_profile_id
-          )
-          response.each do |grpc|
-            yield SampleRowKey.from_grpc(grpc)
-          end
-        end
-
-        # Create an instance of mutation_entry
+        ##
+        # Creates a mutation entry instance.
         #
-        # @param row_key [String] Row key. Optional
+        # @param row_key [String] Row key. Optional.
         #   The row key of the row to which the mutation should be applied.
         # @return [Google::Cloud::Bigtable::MutationEntry]
         #
@@ -303,16 +272,17 @@ module Google
         #   entry = table.new_mutation_entry
         #
         def new_mutation_entry row_key = nil
-          Google::Cloud::Bigtable::MutationEntry.new(row_key)
+          Google::Cloud::Bigtable::MutationEntry.new row_key
         end
 
-        # Create an instance of ReadModifyWriteRule to append or increment the value
+        ##
+        # Create a read/modify/write rule to append or increment the value
         # of the cell qualifier.
         #
         # @param family [String]
-        #   The name of the column family to which the read/modify/write should be applied.
+        #   The name of the column family to which the read/modify/write rule should be applied.
         # @param qualifier [String]
-        #   The qualifier of the column to which the read/modify/write should be applied.
+        #   The qualifier of the column to which the read/modify/write rule should be applied.
         # @return [Google::Cloud::Bigtable::ReadModifyWriteRule]
         #
         # @example Create rule to append to qualifier value.
@@ -332,7 +302,54 @@ module Google
         #   rule.increment(100)
         #
         def new_read_modify_write_rule family, qualifier
-          Google::Cloud::Bigtable::ReadModifyWriteRule.new(family, qualifier)
+          Google::Cloud::Bigtable::ReadModifyWriteRule.new family, qualifier
+        end
+
+        ##
+        # # MutationEntry::Response
+        #
+        # Represents a response message from BigtableService.MutateRows.
+        #
+        # @attr [Integer] index The index into the original request's `entries`
+        #   list of the Entry for which a result is being reported.
+        # @attr [Google::Cloud::Bigtable::Status] The result of the request
+        #   Entry identified by `index`. Depending on how requests are batched
+        #   during execution, it is possible for one Entry to fail due to an
+        #   error with another Entry. In the event that this occurs, the same
+        #   error will be reported for both entries.
+        #
+        # @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 Response
+          attr_reader :index, :status
+
+          ##
+          # @private Creates a MutationEntry::Response object.
+          def initialize index, status
+            @index = index
+            @status = status
+          end
+
+          ##
+          # @private New MutationEntry::Response from a
+          # Google::Bigtable::V2::MutateRowsResponse::Entry object.
+          def self.from_grpc grpc
+            new grpc.index, Status.from_grpc(grpc.status)
+          end
         end
       end
     end

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

@@ -16,6 +16,7 @@
 module Google
   module Cloud
     module Bigtable
+      ##
       # # Policy
       #
       # Represents a Cloud IAM Policy for Bigtable instance resources.
@@ -63,6 +64,7 @@ module Google
           @roles = roles
         end
 
+        ##
         # Convenience method for adding a member to a binding on this policy.
         # See [Understanding
         # Roles](https://cloud.google.com/iam/docs/understanding-roles) for a
@@ -88,6 +90,7 @@ module Google
           role(role_name) << member
         end
 
+        ##
         # Convenience method for removing a member from a binding on this
         # policy. See [Understanding
         # Roles](https://cloud.google.com/iam/docs/understanding-roles) for a
@@ -101,7 +104,7 @@ module Google
         #   `"user:owner@example.com"`.
         #
         # @example
-        #   require "google/cloud/Bigtable"
+        #   require "google/cloud/bigtable"
         #
         #   bigtable = Google::Cloud::Bigtable.new
         #   instance = bigtable.instance "my-instance"
@@ -113,6 +116,7 @@ module Google
           role(role_name).delete member
         end
 
+        ##
         # Convenience method returning the array of members bound to a role in
         # this policy. Returns an empty array if no value is present for the role in
         # {#roles}. See [Understanding
@@ -124,7 +128,7 @@ module Google
         # @return [Array<String>] The members strings, or an empty array.
         #
         # @example
-        #   require "google/cloud/Bigtable"
+        #   require "google/cloud/bigtable"
         #
         #   bigtable = Google::Cloud::Bigtable.new
         #   instance = bigtable.instance "my-instance"
@@ -142,11 +146,11 @@ module Google
           bindings = roles.keys.map do |role_name|
             next if roles[role_name].empty?
             Google::Iam::V1::Binding.new(
-              role: role_name,
+              role:    role_name,
               members: roles[role_name]
             )
           end
-          Google::Iam::V1::Policy.new(etag: etag, bindings: bindings)
+          Google::Iam::V1::Policy.new etag: etag, bindings: bindings
         end
 
         # @private
@@ -155,7 +159,7 @@ module Google
           roles = grpc.bindings.each_with_object({}) do |binding, memo|
             memo[binding.role] = binding.members.to_a
           end
-          new(grpc.etag, roles)
+          new grpc.etag, roles
         end
       end
     end

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

@@ -26,23 +26,23 @@ require "google/cloud/bigtable/table"
 module Google
   module Cloud
     module Bigtable
+      ##
       # # Project
       #
       # Projects are top-level containers in Google Cloud Platform. They store
       # information about billing and authorized users, and they contain
       # Cloud Bigtable data. Each project has a friendly name and a unique ID.
       #
-      # Google::Cloud::Bigtable::Project is the main object for interacting with
+      # `Google::Cloud::Bigtable::Project` is the main object for interacting with
       # Cloud Bigtable.
       #
       # {Google::Cloud::Bigtable::Cluster} and {Google::Cloud::Bigtable::Instance}
       # objects are created, accessed, and managed by Google::Cloud::Bigtable::Project.
       #
-      # To create an instance, use {Google::Cloud::Bigtable.new} or
-      # {Google::Cloud#bigtable}.
+      # To create a `Project` instance, use {Google::Cloud::Bigtable.new}.
       #
       # @example Obtaining an instance and the clusters from a project.
-      #   require "google/cloud"
+      #   require "google/cloud/bigtable"
       #
       #   bigtable = Google::Cloud::Bigtable.new
       #
@@ -57,17 +57,17 @@ module Google
         # @private
         # Creates a new Bigtable Project instance.
         # @param service [Google::Cloud::Bigtable::Service]
-
         def initialize service
           @service = service
         end
 
+        ##
         # The identifier for the Cloud Bigtable project.
         #
         # @return [String] Project ID.
         #
         # @example
-        #   require "google/cloud"
+        #   require "google/cloud/bigtable"
         #
         #   bigtable = Google::Cloud::Bigtable.new(
         #     project_id: "my-project",
@@ -75,12 +75,13 @@ module Google
         #   )
         #
         #   bigtable.project_id #=> "my-project"
-
+        #
         def project_id
           ensure_service!
           service.project_id
         end
 
+        ##
         # Retrieves the list of Bigtable instances for the project.
         #
         # @param token [String] The `token` value returned by the last call to
@@ -98,16 +99,17 @@ module Google
         #   instances.all do |instance|
         #     puts instance.instance_id
         #   end
-
+        #
         def instances token: nil
           ensure_service!
-          grpc = service.list_instances(token: token)
-          Instance::List.from_grpc(grpc, service)
+          grpc = service.list_instances token: token
+          Instance::List.from_grpc grpc, service
         end
 
-        # Get an existing Bigtable instance.
+        ##
+        # Gets an existing Bigtable instance.
         #
-        # @param instance_id [String] Existing instance id.
+        # @param instance_id [String] Existing instance ID.
         # @return [Google::Cloud::Bigtable::Instance, nil]
         #
         # @example
@@ -120,16 +122,17 @@ module Google
         #   if instance
         #     puts instance.instance_id
         #   end
-
+        #
         def instance instance_id
           ensure_service!
-          grpc = service.get_instance(instance_id)
-          Instance.from_grpc(grpc, service)
+          grpc = service.get_instance instance_id
+          Instance.from_grpc grpc, service
         rescue Google::Cloud::NotFoundError
           nil
         end
 
-        # Create a Bigtable instance.
+        ##
+        # Creates a Bigtable instance.
         #
         # @see https://cloud.google.com/compute/docs/regions-zones Cluster zone locations
         #
@@ -140,9 +143,9 @@ module Google
         # @param display_name [String] The descriptive name for this instance as it
         #   appears in UIs. Must be unique per project and between 4 and 30
         #   characters.
-        # @param type [Symbol] The type of the instance.
-        #   Valid values are `:DEVELOPMENT` or `:PRODUCTION`.
-        #   Default `:PRODUCTION` instance will created if left blank.
+        # @param type [Symbol] The type of the instance. When creating a development instance,
+        #   `nodes` on the cluster must not be set.
+        #   Valid values are `:DEVELOPMENT` or `:PRODUCTION`. Default is `:PRODUCTION`.
         # @param labels [Hash{String=>String}] labels Cloud Labels are a flexible and lightweight
         #   mechanism for organizing cloud resources into groups that reflect a
         #   customer's organizational needs and deployment strategies. Cloud
@@ -169,7 +172,7 @@ module Google
         #   The job representing the long-running, asynchronous processing of
         #   an instance create operation.
         #
-        # @example Create development instance.
+        # @example Create a development instance.
         #   require "google/cloud/bigtable"
         #
         #   bigtable = Google::Cloud::Bigtable.new
@@ -180,13 +183,13 @@ module Google
         #     type: :DEVELOPMENT,
         #     labels: { "env" => "dev"}
         #   ) do |clusters|
-        #     clusters.add("test-cluster", "us-east1-b", nodes: 1)
+        #     clusters.add("test-cluster", "us-east1-b") # nodes not allowed
         #   end
         #
         #   job.done? #=> false
         #
         #   # Reload job until completion.
-        #   job.wait_until_done
+        #   job.wait_until_done!
         #   job.done? #=> true
         #
         #   if job.error?
@@ -195,7 +198,7 @@ module Google
         #     instance = job.instance
         #   end
         #
-        # @example Create production instance.
+        # @example Create a production instance.
         #   require "google/cloud/bigtable"
         #
         #   bigtable = Google::Cloud::Bigtable.new
@@ -211,7 +214,7 @@ module Google
         #   job.done? #=> false
         #
         #   # To block until the operation completes.
-        #   job.wait_until_done
+        #   job.wait_until_done!
         #   job.done? #=> true
         #
         #   if job.error?
@@ -219,39 +222,25 @@ module Google
         #   else
         #     instance = job.instance
         #   end
-
-        def create_instance \
-            instance_id,
-            display_name: nil,
-            type: nil,
-            labels: nil,
-            clusters: nil
+        #
+        def create_instance instance_id, display_name: nil, type: nil, labels: nil, clusters: nil
           labels = Hash[labels.map { |k, v| [String(k), String(v)] }] if labels
 
-          instance_attrs = {
-            display_name: display_name,
-            type: type,
-            labels: labels
-          }.delete_if { |_, v| v.nil? }
-          instance = Google::Bigtable::Admin::V2::Instance.new(instance_attrs)
+          instance_attrs = { display_name: display_name, type: type, labels: labels }.delete_if { |_, v| v.nil? }
+          instance = Google::Bigtable::Admin::V2::Instance.new instance_attrs
           clusters ||= Instance::ClusterMap.new
           yield clusters if block_given?
 
           clusters.each_value do |cluster|
-            unless cluster.location == "".freeze
-              cluster.location = service.location_path(cluster.location)
-            end
+            cluster.location = service.location_path cluster.location unless cluster.location == ""
           end
 
-          grpc = service.create_instance(
-            instance_id,
-            instance,
-            clusters.to_h
-          )
-          Instance::Job.from_grpc(grpc, service)
+          grpc = service.create_instance instance_id, instance, clusters.to_h
+          Instance::Job.from_grpc grpc, service
         end
 
-        # List all clusters in project.
+        ##
+        # Lists all clusters in the project.
         #
         # @param token [String] The `token` value returned by the last call to
         #   `clusters` indicates that this is a continuation of a call
@@ -267,20 +256,21 @@ module Google
         #     puts cluster.cluster_id
         #     puts cluster.ready?
         #   end
-
+        #
         def clusters token: nil
           ensure_service!
-          grpc = service.list_clusters("-", token: token)
-          Cluster::List.from_grpc(grpc, service, instance_id: "-")
+          grpc = service.list_clusters "-", token: token
+          Cluster::List.from_grpc grpc, service, instance_id: "-"
         end
 
-        # List all tables for given instance.
+        ##
+        # Lists all tables for the given instance.
         #
         # @param instance_id [String] Existing instance Id.
         # @return [Array<Google::Cloud::Bigtable::Table>]
         #   (See {Google::Cloud::Bigtable::Table::List})
         #
-        # @example Get tables
+        # @example
         #   require "google/cloud/bigtable"
         #
         #   bigtable = Google::Cloud::Bigtable.new
@@ -289,15 +279,16 @@ module Google
         #     puts table.name
         #     puts table.column_families
         #   end
-
+        #
         def tables instance_id
           ensure_service!
-          grpc = service.list_tables(instance_id)
-          Table::List.from_grpc(grpc, service)
+          grpc = service.list_tables instance_id
+          Table::List.from_grpc grpc, service
         end
 
-        # Get table information.
-        #
+        ##
+        # Returns a table representation. If `perform_lookup` is `false` (the default), a sparse representation will be
+        # returned without performing an RPC and without verifying that the table resource exists.
         #
         # @param instance_id [String] Existing instance Id.
         # @param table_id [String] Existing table Id.
@@ -318,79 +309,44 @@ module Google
         #   "default" application profile will be used.
         # @return [Google::Cloud::Bigtable::Table, nil]
         #
-        # @example Get table with schema only view
-        #   require "google/cloud/bigtable"
-        #
-        #   bigtable = Google::Cloud::Bigtable.new
-        #
-        #   table = bigtable.table("my-instance", "my-table", perform_lookup: true, view: :SCHEMA_VIEW)
-        #   if table
-        #     p table.name
-        #     p table.column_families
-        #   end
-        #
-        # @example Get table object without calling get table admin api.
+        # @example Get a sparse table representation without performing an RPC.
         #   require "google/cloud/bigtable"
         #
         #   bigtable = Google::Cloud::Bigtable.new
         #
         #   table = bigtable.table("my-instance", "my-table")
         #
-        # @example Get table with all fields, cluster states, and column families.
+        # @example Get a table with schema-only view.
         #   require "google/cloud/bigtable"
         #
         #   bigtable = Google::Cloud::Bigtable.new
         #
-        #   table = bigtable.table("my-instance", "my-table", view: :FULL, perform_lookup: true)
+        #   table = bigtable.table("my-instance", "my-table", perform_lookup: true, view: :SCHEMA_VIEW)
         #   if table
         #     puts table.name
-        #     p table.column_families
-        #     p table.cluster_states
+        #     puts table.column_families
         #   end
         #
-        # @example Mutate rows
+        # @example Get a table with all fields, cluster states, and column families.
         #   require "google/cloud/bigtable"
         #
         #   bigtable = Google::Cloud::Bigtable.new
         #
-        #   table = bigtable.table("my-instance", "my-table")
-        #
-        #   entry = table.new_mutation_entry("user-1")
-        #   entry.set_cell(
-        #     "cf-1",
-        #     "field-1",
-        #     "XYZ",
-        #     timestamp: (Time.now.to_f * 1000000).round(-3) # microseconds
-        #   ).delete_cells("cf2", "field02")
-        #
-        #   table.mutate_row(entry)
-        # @example Read rows using app profile routing
-        #   require "google/cloud/bigtable"
-        #
-        #   bigtable = Google::Cloud::Bigtable.new
-        #
-        #   table = bigtable.table("my-instance", "my-table", app_profile_id: "my-app-profile")
-        #
-        #   table.read_rows(limit: 5).each do |row|
-        #     p row
+        #   table = bigtable.table("my-instance", "my-table", view: :FULL, perform_lookup: true)
+        #   if table
+        #     puts table.name
+        #     puts table.column_families
+        #     puts table.cluster_states
         #   end
-
-        def table \
-            instance_id,
-            table_id,
-            view: nil,
-            perform_lookup: nil,
-            app_profile_id: nil
+        #
+        def table instance_id, table_id, view: nil, perform_lookup: nil, app_profile_id: nil
           ensure_service!
 
           table = if perform_lookup
-                    grpc = service.get_table(instance_id, table_id, view: view)
-                    Table.from_grpc(grpc, service, view: view)
+                    grpc = service.get_table instance_id, table_id, view: view
+                    Table.from_grpc grpc, service, view: view
                   else
-                    Table.from_path(
-                      service.table_path(instance_id, table_id),
-                      service
-                    )
+                    Table.from_path service.table_path(instance_id, table_id), service
                   end
 
           table.app_profile_id = app_profile_id
@@ -399,6 +355,7 @@ module Google
           nil
         end
 
+        ##
         # Creates a new table in the specified instance.
         # The table can be created with a full set of initial column families,
         # specified in the request.
@@ -408,9 +365,9 @@ module Google
         # @param table_id [String]
         #   The ID by which the new table should be referred to within the
         #   instance, e.g., `foobar`.
-        # @param column_families [Hash{String => Google::Cloud::Bigtable::ColumnFamily}]
-        #   (See {Google::Cloud::Bigtable::Table::ColumnFamilyMap})
-        #   If unspecified, you may use a code block to add column families.
+        # @param column_families [Google::Cloud::Bigtable::ColumnFamilyMap]
+        #   An object containing the column families for the table, mapped by
+        #   column family name.
         # @param granularity [Symbol]
         #   The granularity at which timestamps are stored in this table.
         #   Timestamps not matching the granularity will be rejected.
@@ -432,17 +389,14 @@ module Google
         #     * Tablet 3 : `[customer_1, customer_2) => {"customer_1"}`
         #     * Tablet 4 : `[customer_2, other)      => {"customer_2"}`
         #     * Tablet 5 : `[other, )                => {"other", "zz"}`
-        #   A hash in the form of `Google::Bigtable::Admin::V2::CreateTableRequest::Split`
-        #   can also be provided.
-        # @yield [column_families] A block for adding column_families.
-        # @yieldparam [Hash{String => Google::Cloud::Bigtable::ColumnFamily}]
-        #    Map of family name and column family object.
-        #   (See {Google::Cloud::Bigtable::Instance::ColumnFamilyMap})
-        #   (Read the GC Rules for column families at {Google::Cloud::Bigtable::GcRule})
+        # @yield [column_families] A block for adding column families.
+        # @yieldparam [Google::Cloud::Bigtable::ColumnFamilyMap] column_families
+        #   A mutable object containing the column families for the table,
+        #   mapped by column family name.
         #
         # @return [Google::Cloud::Bigtable::Table]
         #
-        # @example Create a table without a column family
+        # @example Create a table without column families.
         #   require "google/cloud/bigtable"
         #
         #   bigtable = Google::Cloud::Bigtable.new
@@ -450,53 +404,47 @@ module Google
         #   table = bigtable.create_table("my-instance", "my-table")
         #   puts table.name
         #
-        # @example Create table with column families and initial splits.
+        # @example Create a table with initial splits and column families.
         #   require "google/cloud/bigtable"
         #
         #   bigtable = Google::Cloud::Bigtable.new
         #
         #   initial_splits = ["user-00001", "user-100000", "others"]
-        #   table = bigtable.create_table("my-instance", "my-table", initial_splits: initial_splits) do |column_families|
-        #     column_families.add('cf1', Google::Cloud::Bigtable::GcRule.max_versions(5))
-        #     column_families.add('cf2', Google::Cloud::Bigtable::GcRule.max_age(600))
+        #   table = bigtable.create_table("my-instance", "my-table", initial_splits: initial_splits) do |cfm|
+        #     cfm.add('cf1', gc_rule: Google::Cloud::Bigtable::GcRule.max_versions(5))
+        #     cfm.add('cf2', gc_rule: Google::Cloud::Bigtable::GcRule.max_age(600))
         #
         #     gc_rule = Google::Cloud::Bigtable::GcRule.union(
         #       Google::Cloud::Bigtable::GcRule.max_age(1800),
         #       Google::Cloud::Bigtable::GcRule.max_versions(3)
         #     )
-        #     column_families.add('cf3', gc_rule)
+        #     cfm.add('cf3', gc_rule: gc_rule)
         #   end
         #
-        #   p table
-
-        def create_table \
-            instance_id,
-            table_id,
-            column_families: nil,
-            granularity: nil,
-            initial_splits: nil,
-            &block
+        #   puts table
+        #
+        def create_table instance_id, table_id, column_families: nil, granularity: nil, initial_splits: nil, &block
           ensure_service!
           Table.create(
             service,
             instance_id,
             table_id,
             column_families: column_families,
-            granularity: granularity,
-            initial_splits: initial_splits,
+            granularity:     granularity,
+            initial_splits:  initial_splits,
             &block
           )
         end
 
-        # Permanently deletes a specified table and all of its data.
+        ##
+        # Permanently deletes the specified table and all of its data.
         #
         # @param instance_id [String]
         #  The unique ID of the instance the table is in.
         # @param table_id [String]
-        #   The unique ID of the table to be deleted,
-        #   e.g., `foobar`
+        #   The unique ID of the table to be deleted.
         #
-        # @example Create table with column families and initial splits.
+        # @example
         #   require "google/cloud/bigtable"
         #
         #   bigtable = Google::Cloud::Bigtable.new
@@ -504,67 +452,10 @@ module Google
         #   bigtable.delete_table("my-instance", "my-table")
         #
         def delete_table instance_id, table_id
-          service.delete_table(instance_id, table_id)
+          service.delete_table instance_id, table_id
           true
         end
 
-        # 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 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.
-        #
-        # @example
-        #   require "google/cloud/bigtable"
-        #
-        #   bigtable = Google::Cloud::Bigtable.new
-        #
-        #   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("my-instance", "my-table", modifications)
-        #
-        #   p table.column_families
-
-        def modify_column_families instance_id, table_id, modifications
-          ensure_service!
-          Table.modify_column_families(
-            service,
-            instance_id,
-            table_id,
-            modifications
-          )
-        end
-
         protected
 
         # @private