google-cloud-bigtable 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1f99712143906255ee1d2632c445d1c1bdacb1a407c5a63a3e26bbf4446212e
-  data.tar.gz: 8371b2372d45334f65a625271d78fe8ea5bf3dc8448cdbd0827908925b2a7d2d
+  metadata.gz: 1d2ceaa917a67e31cae160f8cfb03ecb1617aebf24c634d89a3f5805589d3f46
+  data.tar.gz: c2c614ffbd788256c15037c22ff9f7fd09208399a49ee85149e9515e0976f0f9
 SHA512:
-  metadata.gz: 0a3aa85a0322a4182e01152ded9445f0b5442a69a63a47c338a7137a2e170f2ad62a37badf7e2079e3e8ee75080a6ff0a0022314ae73021a01439833d585f3d5
-  data.tar.gz: 13e017d3992738213ca3ac3d50cdc91ce954c5326956f7b814f441f69fee876c8d97e922a2d85c931e7c620d0f51b37ed2c0b5b0ada8afeaf26e229751adec36
+  metadata.gz: 6e019a7ad97017938d2960b52951dda90911d5f84c6d3c95cd09abd0086d35b68f8f4139d5626c92065928eec8493758aa0fb6d6185cf89a149eadde53c54675
+  data.tar.gz: f3eeec0098bd030dad2a8cd07b08dae4d58d02753ead572d552eaf7543a93776ca48576bb7c37199a7cd181f6f23e98f989778a0f7ee8e9e614522f97fbf23e8

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release History
 
+### 2.4.1 / 2021-04-01
+
+#### Bug Fixes
+
+* Update internal management of view states in Table
+
 ### 2.4.0 / 2021-03-10
 
 #### Features

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

@@ -520,6 +520,7 @@ module Google
         def table table_id, view: nil, perform_lookup: nil, app_profile_id: nil
           ensure_service!
 
+          view ||= :SCHEMA_VIEW
           table = if perform_lookup
                     grpc = service.get_table instance_id, table_id, view: view
                     Table.from_grpc grpc, service, view: view

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

@@ -316,18 +316,18 @@ module Google
         #
         #   table = bigtable.table("my-instance", "my-table")
         #
-        # @example Get a table with schema-only view.
+        # @example Retrieve a table with a 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)
+        #   table = bigtable.table("my-instance", "my-table", perform_lookup: true)
         #   if table
         #     puts table.name
         #     puts table.column_families
         #   end
         #
-        # @example Get a table with all fields, cluster states, and column families.
+        # @example Retrieve a table with all fields, cluster states, and column families.
         #   require "google/cloud/bigtable"
         #
         #   bigtable = Google::Cloud::Bigtable.new
@@ -342,6 +342,7 @@ module Google
         def table instance_id, table_id, view: nil, perform_lookup: nil, app_profile_id: nil
           ensure_service!
 
+          view ||= :SCHEMA_VIEW
           table = if perform_lookup
                     grpc = service.get_table instance_id, table_id, view: view
                     Table.from_grpc grpc, service, view: view

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

@@ -56,6 +56,14 @@ module Google
         # The gRPC Service object.
         attr_accessor :service
 
+        # @private
+        # The current gRPC resource, for testing only.
+        attr_accessor :grpc
+
+        # @private
+        # The current loaded_views, for testing only. See #check_view_and_load, below.
+        attr_reader :loaded_views
+
         ##
         # @return [String] App profile ID for request routing.
         #
@@ -64,10 +72,11 @@ module Google
         # @private
         #
         # Creates a new Table instance.
-        def initialize grpc, service, view: nil
+        def initialize grpc, service, view:
           @grpc = grpc
           @service = service
-          @view = view || :SCHEMA_VIEW
+          raise ArgumentError, "view must not be nil" if view.nil?
+          @loaded_views = Set[view]
         end
 
         ##
@@ -109,7 +118,8 @@ module Google
         end
 
         ##
-        # Reloads table data.
+        # Reloads table data with the provided `view`, or with `SCHEMA_VIEW`
+        # if none is provided. Previously loaded data is not retained.
         #
         # @param view [Symbol] Table view type.
         #   Default view type is `:SCHEMA_VIEW`.
@@ -123,8 +133,9 @@ module Google
         # @return [Google::Cloud::Bigtable::Table]
         #
         def reload! view: nil
-          @view = view || :SCHEMA_VIEW
+          view ||= :SCHEMA_VIEW
           @grpc = service.get_table instance_id, name, view: view
+          @loaded_views = Set[view]
           self
         end
 
@@ -133,7 +144,10 @@ module Google
         # 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
         # there will be an entry for the cluster with UNKNOWN `replication_status`.
-        # Views: `FULL`.
+        #
+        # Reloads the table if necessary to retrieve the cluster states data,
+        # since it is only available in a table with view type `REPLICATION_VIEW`
+        # or `FULL`. Previously loaded data is retained.
         #
         # @return [Array<Google::Cloud::Bigtable::Table::ClusterState>]
         #
@@ -146,9 +160,11 @@ module Google
 
         ##
         # 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`.
+        # 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`. Previously loaded data is retained.
         #
         # Also accepts a block for making modifications to the table's column
         # families. After the modifications are completed, the table will be
@@ -224,7 +240,10 @@ module Google
         # 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`.
-        # Views: `SCHEMA_VIEW`, `FULL`.
+        #
+        # 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`. Previously loaded data is retained.
         #
         # @return [Symbol]
         #
@@ -439,7 +458,7 @@ module Google
           }.delete_if { |_, v| v.nil? })
 
           grpc = service.create_table instance_id, table_id, table, initial_splits: initial_splits
-          from_grpc grpc, service
+          from_grpc grpc, service, view: :SCHEMA_VIEW
         end
 
         ##
@@ -625,7 +644,7 @@ module Google
         # @param view [Symbol] View type.
         # @return [Google::Cloud::Bigtable::Table]
         #
-        def self.from_grpc grpc, service, view: nil
+        def self.from_grpc grpc, service, view:
           new grpc, service, view: view
         end
 
@@ -666,7 +685,6 @@ module Google
         #
         def check_view_and_load view
           ensure_service!
-          @loaded_views ||= Set.new [@view]
 
           return if @loaded_views.include?(view) || @loaded_views.include?(:FULL)
 

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

@@ -108,7 +108,7 @@ module Google
           #   end
           #
           def table
-            Table.from_grpc results, service if results
+            Table.from_grpc results, service, view: :NAME_ONLY if results
           end
         end
       end

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

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Bigtable
-      VERSION = "2.4.0".freeze
+      VERSION = "2.4.1".freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-bigtable
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Google LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-bigtable-admin-v2