google-cloud-datastore-v1 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f962ec2a012f1641a30531eb6c21ddf87f43fccf77ceef9fd2764966da9e193
-  data.tar.gz: 3e6e83c7aeff0e1edf09c4ec7d7677664c737bb2062331acaa0fd0bb3ff1dbb5
+  metadata.gz: 6c156a32d0ffb45fb9770ca7b20c0f8877751b879f9a8cfc89bb1f461630082d
+  data.tar.gz: 5e798946fc58617097f571ddadbe891957e0429cf4a5452aa60a8066b297a5fd
 SHA512:
-  metadata.gz: 0de86bb94cb961b6c56864e31dd2315dbf0ae4d54334737ea2acd9ab68b29e303a08c833fa70b39fdeaf2887f90285b74e1e258de68748948957f49c0b1dee01
-  data.tar.gz: 52585e36ae91af41c1c578a40ab8339fd3e0578ec3d61ad8e1add73565d0dcbe419b5c2c40cf832662ef208ed3f5f50dce5513211fbf9abd7105580ff24227b6
+  metadata.gz: d3b5568ee925154df2021e3103065e885181afab94eb783104e89b526d25be4c119208b84b943c21b43cdb69fa5a319c7796e021b24f7f2e45a54f22e9569837
+  data.tar.gz: 123ca94afcbf4391a1d023a7ee945e87a23993ade8aeb44064da107c5471b82e94f8f48c9e418c75bffccd429f384b1b92678b1457f87addd8f185b7b37701ed

data/README.md

@@ -47,7 +47,7 @@ for general usage information.
 
 To enable logging for this library, set the logger for the underlying [gRPC](https://github.com/grpc/grpc/tree/master/src/ruby) library.
 The logger that you set may be a Ruby stdlib [`Logger`](https://ruby-doc.org/current/stdlibs/logger/Logger.html) as shown below,
-or a [`Google::Cloud::Logging::Logger`](https://googleapis.dev/ruby/google-cloud-logging/latest)
+or a [`Google::Cloud::Logging::Logger`](https://cloud.google.com/ruby/docs/reference/google-cloud-logging/latest)
 that will write logs to [Cloud Logging](https://cloud.google.com/logging/). See [grpc/logconfig.rb](https://github.com/grpc/grpc/blob/master/src/ruby/lib/grpc/logconfig.rb)
 and the gRPC [spec_helper.rb](https://github.com/grpc/grpc/blob/master/src/ruby/spec/spec_helper.rb) for additional information.
 

data/lib/google/cloud/datastore/v1/datastore/client.rb

@@ -154,7 +154,7 @@ module Google
               credentials = @config.credentials
               # Use self-signed JWT if the endpoint is unchanged from default,
               # but only if the default endpoint does not have a region prefix.
-              enable_self_signed_jwt = @config.endpoint == Client.configure.endpoint &&
+              enable_self_signed_jwt = @config.endpoint == Configuration::DEFAULT_ENDPOINT &&
                                        !@config.endpoint.split(".").first.include?("-")
               credentials ||= Credentials.default scope: @config.scope,
                                                   enable_self_signed_jwt: enable_self_signed_jwt
@@ -1022,9 +1022,9 @@ module Google
             #    *  (`String`) The path to a service account key file in JSON format
             #    *  (`Hash`) A service account key as a Hash
             #    *  (`Google::Auth::Credentials`) A googleauth credentials object
-            #       (see the [googleauth docs](https://googleapis.dev/ruby/googleauth/latest/index.html))
+            #       (see the [googleauth docs](https://rubydoc.info/gems/googleauth/Google/Auth/Credentials))
             #    *  (`Signet::OAuth2::Client`) A signet oauth2 client object
-            #       (see the [signet docs](https://googleapis.dev/ruby/signet/latest/Signet/OAuth2/Client.html))
+            #       (see the [signet docs](https://rubydoc.info/gems/signet/Signet/OAuth2/Client))
             #    *  (`GRPC::Core::Channel`) a gRPC channel with included credentials
             #    *  (`GRPC::Core::ChannelCredentials`) a gRPC credentails object
             #    *  (`nil`) indicating no credentials
@@ -1066,7 +1066,9 @@ module Google
             class Configuration
               extend ::Gapic::Config
 
-              config_attr :endpoint,      "datastore.googleapis.com", ::String
+              DEFAULT_ENDPOINT = "datastore.googleapis.com"
+
+              config_attr :endpoint,      DEFAULT_ENDPOINT, ::String
               config_attr :credentials,   nil do |value|
                 allowed = [::String, ::Hash, ::Proc, ::Symbol, ::Google::Auth::Credentials, ::Signet::OAuth2::Client, nil]
                 allowed += [::GRPC::Core::Channel, ::GRPC::Core::ChannelCredentials] if defined? ::GRPC

data/lib/google/cloud/datastore/v1/datastore/rest/client.rb

@@ -150,7 +150,7 @@ module Google
                 credentials = @config.credentials
                 # Use self-signed JWT if the endpoint is unchanged from default,
                 # but only if the default endpoint does not have a region prefix.
-                enable_self_signed_jwt = @config.endpoint == Client.configure.endpoint &&
+                enable_self_signed_jwt = @config.endpoint == Configuration::DEFAULT_ENDPOINT &&
                                          !@config.endpoint.split(".").first.include?("-")
                 credentials ||= Credentials.default scope: @config.scope,
                                                     enable_self_signed_jwt: enable_self_signed_jwt
@@ -805,9 +805,9 @@ module Google
               #    *  (`String`) The path to a service account key file in JSON format
               #    *  (`Hash`) A service account key as a Hash
               #    *  (`Google::Auth::Credentials`) A googleauth credentials object
-              #       (see the [googleauth docs](https://googleapis.dev/ruby/googleauth/latest/index.html))
+              #       (see the [googleauth docs](https://rubydoc.info/gems/googleauth/Google/Auth/Credentials))
               #    *  (`Signet::OAuth2::Client`) A signet oauth2 client object
-              #       (see the [signet docs](https://googleapis.dev/ruby/signet/latest/Signet/OAuth2/Client.html))
+              #       (see the [signet docs](https://rubydoc.info/gems/signet/Signet/OAuth2/Client))
               #    *  (`nil`) indicating no credentials
               #   @return [::Object]
               # @!attribute [rw] scope
@@ -840,7 +840,9 @@ module Google
               class Configuration
                 extend ::Gapic::Config
 
-                config_attr :endpoint,      "datastore.googleapis.com", ::String
+                DEFAULT_ENDPOINT = "datastore.googleapis.com"
+
+                config_attr :endpoint,      DEFAULT_ENDPOINT, ::String
                 config_attr :credentials,   nil do |value|
                   allowed = [::String, ::Hash, ::Proc, ::Symbol, ::Google::Auth::Credentials, ::Signet::OAuth2::Client, nil]
                   allowed.any? { |klass| klass === value }

data/lib/google/cloud/datastore/v1/datastore/rest/service_stub.rb

@@ -59,7 +59,7 @@ module Google
 
                 verb, uri, query_string_params, body = ServiceStub.transcode_lookup_request request_pb
                 query_string_params = if query_string_params.any?
-                                        query_string_params.to_h { |p| p.split("=", 2) }
+                                        query_string_params.to_h { |p| p.split "=", 2 }
                                       else
                                         {}
                                       end
@@ -97,7 +97,7 @@ module Google
 
                 verb, uri, query_string_params, body = ServiceStub.transcode_run_query_request request_pb
                 query_string_params = if query_string_params.any?
-                                        query_string_params.to_h { |p| p.split("=", 2) }
+                                        query_string_params.to_h { |p| p.split "=", 2 }
                                       else
                                         {}
                                       end
@@ -135,7 +135,7 @@ module Google
 
                 verb, uri, query_string_params, body = ServiceStub.transcode_run_aggregation_query_request request_pb
                 query_string_params = if query_string_params.any?
-                                        query_string_params.to_h { |p| p.split("=", 2) }
+                                        query_string_params.to_h { |p| p.split "=", 2 }
                                       else
                                         {}
                                       end
@@ -173,7 +173,7 @@ module Google
 
                 verb, uri, query_string_params, body = ServiceStub.transcode_begin_transaction_request request_pb
                 query_string_params = if query_string_params.any?
-                                        query_string_params.to_h { |p| p.split("=", 2) }
+                                        query_string_params.to_h { |p| p.split "=", 2 }
                                       else
                                         {}
                                       end
@@ -211,7 +211,7 @@ module Google
 
                 verb, uri, query_string_params, body = ServiceStub.transcode_commit_request request_pb
                 query_string_params = if query_string_params.any?
-                                        query_string_params.to_h { |p| p.split("=", 2) }
+                                        query_string_params.to_h { |p| p.split "=", 2 }
                                       else
                                         {}
                                       end
@@ -249,7 +249,7 @@ module Google
 
                 verb, uri, query_string_params, body = ServiceStub.transcode_rollback_request request_pb
                 query_string_params = if query_string_params.any?
-                                        query_string_params.to_h { |p| p.split("=", 2) }
+                                        query_string_params.to_h { |p| p.split "=", 2 }
                                       else
                                         {}
                                       end
@@ -287,7 +287,7 @@ module Google
 
                 verb, uri, query_string_params, body = ServiceStub.transcode_allocate_ids_request request_pb
                 query_string_params = if query_string_params.any?
-                                        query_string_params.to_h { |p| p.split("=", 2) }
+                                        query_string_params.to_h { |p| p.split "=", 2 }
                                       else
                                         {}
                                       end
@@ -325,7 +325,7 @@ module Google
 
                 verb, uri, query_string_params, body = ServiceStub.transcode_reserve_ids_request request_pb
                 query_string_params = if query_string_params.any?
-                                        query_string_params.to_h { |p| p.split("=", 2) }
+                                        query_string_params.to_h { |p| p.split "=", 2 }
                                       else
                                         {}
                                       end

data/lib/google/cloud/datastore/v1/version.rb

@@ -21,7 +21,7 @@ module Google
   module Cloud
     module Datastore
       module V1
-        VERSION = "0.11.0"
+        VERSION = "0.12.0"
       end
     end
   end

data/lib/google/datastore/v1/aggregation_result_pb.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: google/datastore/v1/aggregation_result.proto
 
@@ -7,17 +8,33 @@ require 'google/datastore/v1/entity_pb'
 require 'google/datastore/v1/query_pb'
 require 'google/protobuf/timestamp_pb'
 
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_file("google/datastore/v1/aggregation_result.proto", :syntax => :proto3) do
-    add_message "google.datastore.v1.AggregationResult" do
-      map :aggregate_properties, :string, :message, 2, "google.datastore.v1.Value"
-    end
-    add_message "google.datastore.v1.AggregationResultBatch" do
-      repeated :aggregation_results, :message, 1, "google.datastore.v1.AggregationResult"
-      optional :more_results, :enum, 2, "google.datastore.v1.QueryResultBatch.MoreResultsType"
-      optional :read_time, :message, 3, "google.protobuf.Timestamp"
+
+descriptor_data = "\n,google/datastore/v1/aggregation_result.proto\x12\x13google.datastore.v1\x1a google/datastore/v1/entity.proto\x1a\x1fgoogle/datastore/v1/query.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xca\x01\n\x11\x41ggregationResult\x12]\n\x14\x61ggregate_properties\x18\x02 \x03(\x0b\x32?.google.datastore.v1.AggregationResult.AggregatePropertiesEntry\x1aV\n\x18\x41ggregatePropertiesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12)\n\x05value\x18\x02 \x01(\x0b\x32\x1a.google.datastore.v1.Value:\x02\x38\x01\"\xd9\x01\n\x16\x41ggregationResultBatch\x12\x43\n\x13\x61ggregation_results\x18\x01 \x03(\x0b\x32&.google.datastore.v1.AggregationResult\x12K\n\x0cmore_results\x18\x02 \x01(\x0e\x32\x35.google.datastore.v1.QueryResultBatch.MoreResultsType\x12-\n\tread_time\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.TimestampB\xc8\x01\n\x17\x63om.google.datastore.v1B\x16\x41ggregationResultProtoP\x01Z<google.golang.org/genproto/googleapis/datastore/v1;datastore\xaa\x02\x19Google.Cloud.Datastore.V1\xca\x02\x19Google\\Cloud\\Datastore\\V1\xea\x02\x1cGoogle::Cloud::Datastore::V1b\x06proto3"
+
+pool = Google::Protobuf::DescriptorPool.generated_pool
+
+begin
+  pool.add_serialized_file(descriptor_data)
+rescue TypeError => e
+  # Compatibility code: will be removed in the next major version.
+  require 'google/protobuf/descriptor_pb'
+  parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)
+  parsed.clear_dependency
+  serialized = parsed.class.encode(parsed)
+  file = pool.add_serialized_file(serialized)
+  warn "Warning: Protobuf detected an import path issue while loading generated file #{__FILE__}"
+  imports = [
+    ["google.datastore.v1.Value", "google/datastore/v1/entity.proto"],
+    ["google.protobuf.Timestamp", "google/protobuf/timestamp.proto"],
+  ]
+  imports.each do |type_name, expected_filename|
+    import_file = pool.lookup(type_name).file_descriptor
+    if import_file.name != expected_filename
+      warn "- #{file.name} imports #{expected_filename}, but that import was loaded as #{import_file.name}"
     end
   end
+  warn "Each proto file must use a consistent fully-qualified name."
+  warn "This will become an error in the next major version."
 end
 
 module Google

data/lib/google/datastore/v1/datastore_pb.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: google/datastore/v1/datastore.proto
 
@@ -12,146 +13,35 @@ require 'google/datastore/v1/entity_pb'
 require 'google/datastore/v1/query_pb'
 require 'google/protobuf/timestamp_pb'
 
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_file("google/datastore/v1/datastore.proto", :syntax => :proto3) do
-    add_message "google.datastore.v1.LookupRequest" do
-      optional :project_id, :string, 8
-      optional :database_id, :string, 9
-      optional :read_options, :message, 1, "google.datastore.v1.ReadOptions"
-      repeated :keys, :message, 3, "google.datastore.v1.Key"
-    end
-    add_message "google.datastore.v1.LookupResponse" do
-      repeated :found, :message, 1, "google.datastore.v1.EntityResult"
-      repeated :missing, :message, 2, "google.datastore.v1.EntityResult"
-      repeated :deferred, :message, 3, "google.datastore.v1.Key"
-      optional :transaction, :bytes, 5
-      optional :read_time, :message, 7, "google.protobuf.Timestamp"
-    end
-    add_message "google.datastore.v1.RunQueryRequest" do
-      optional :project_id, :string, 8
-      optional :database_id, :string, 9
-      optional :partition_id, :message, 2, "google.datastore.v1.PartitionId"
-      optional :read_options, :message, 1, "google.datastore.v1.ReadOptions"
-      oneof :query_type do
-        optional :query, :message, 3, "google.datastore.v1.Query"
-        optional :gql_query, :message, 7, "google.datastore.v1.GqlQuery"
-      end
-    end
-    add_message "google.datastore.v1.RunQueryResponse" do
-      optional :batch, :message, 1, "google.datastore.v1.QueryResultBatch"
-      optional :query, :message, 2, "google.datastore.v1.Query"
-      optional :transaction, :bytes, 5
-    end
-    add_message "google.datastore.v1.RunAggregationQueryRequest" do
-      optional :project_id, :string, 8
-      optional :database_id, :string, 9
-      optional :partition_id, :message, 2, "google.datastore.v1.PartitionId"
-      optional :read_options, :message, 1, "google.datastore.v1.ReadOptions"
-      oneof :query_type do
-        optional :aggregation_query, :message, 3, "google.datastore.v1.AggregationQuery"
-        optional :gql_query, :message, 7, "google.datastore.v1.GqlQuery"
-      end
-    end
-    add_message "google.datastore.v1.RunAggregationQueryResponse" do
-      optional :batch, :message, 1, "google.datastore.v1.AggregationResultBatch"
-      optional :query, :message, 2, "google.datastore.v1.AggregationQuery"
-      optional :transaction, :bytes, 5
-    end
-    add_message "google.datastore.v1.BeginTransactionRequest" do
-      optional :project_id, :string, 8
-      optional :database_id, :string, 9
-      optional :transaction_options, :message, 10, "google.datastore.v1.TransactionOptions"
-    end
-    add_message "google.datastore.v1.BeginTransactionResponse" do
-      optional :transaction, :bytes, 1
-    end
-    add_message "google.datastore.v1.RollbackRequest" do
-      optional :project_id, :string, 8
-      optional :database_id, :string, 9
-      optional :transaction, :bytes, 1
-    end
-    add_message "google.datastore.v1.RollbackResponse" do
-    end
-    add_message "google.datastore.v1.CommitRequest" do
-      optional :project_id, :string, 8
-      optional :database_id, :string, 9
-      optional :mode, :enum, 5, "google.datastore.v1.CommitRequest.Mode"
-      repeated :mutations, :message, 6, "google.datastore.v1.Mutation"
-      oneof :transaction_selector do
-        optional :transaction, :bytes, 1
-        optional :single_use_transaction, :message, 10, "google.datastore.v1.TransactionOptions"
-      end
-    end
-    add_enum "google.datastore.v1.CommitRequest.Mode" do
-      value :MODE_UNSPECIFIED, 0
-      value :TRANSACTIONAL, 1
-      value :NON_TRANSACTIONAL, 2
-    end
-    add_message "google.datastore.v1.CommitResponse" do
-      repeated :mutation_results, :message, 3, "google.datastore.v1.MutationResult"
-      optional :index_updates, :int32, 4
-      optional :commit_time, :message, 8, "google.protobuf.Timestamp"
-    end
-    add_message "google.datastore.v1.AllocateIdsRequest" do
-      optional :project_id, :string, 8
-      optional :database_id, :string, 9
-      repeated :keys, :message, 1, "google.datastore.v1.Key"
-    end
-    add_message "google.datastore.v1.AllocateIdsResponse" do
-      repeated :keys, :message, 1, "google.datastore.v1.Key"
-    end
-    add_message "google.datastore.v1.ReserveIdsRequest" do
-      optional :project_id, :string, 8
-      optional :database_id, :string, 9
-      repeated :keys, :message, 1, "google.datastore.v1.Key"
-    end
-    add_message "google.datastore.v1.ReserveIdsResponse" do
-    end
-    add_message "google.datastore.v1.Mutation" do
-      oneof :operation do
-        optional :insert, :message, 4, "google.datastore.v1.Entity"
-        optional :update, :message, 5, "google.datastore.v1.Entity"
-        optional :upsert, :message, 6, "google.datastore.v1.Entity"
-        optional :delete, :message, 7, "google.datastore.v1.Key"
-      end
-      oneof :conflict_detection_strategy do
-        optional :base_version, :int64, 8
-        optional :update_time, :message, 11, "google.protobuf.Timestamp"
-      end
-    end
-    add_message "google.datastore.v1.MutationResult" do
-      optional :key, :message, 3, "google.datastore.v1.Key"
-      optional :version, :int64, 4
-      optional :create_time, :message, 7, "google.protobuf.Timestamp"
-      optional :update_time, :message, 6, "google.protobuf.Timestamp"
-      optional :conflict_detected, :bool, 5
-    end
-    add_message "google.datastore.v1.ReadOptions" do
-      oneof :consistency_type do
-        optional :read_consistency, :enum, 1, "google.datastore.v1.ReadOptions.ReadConsistency"
-        optional :transaction, :bytes, 2
-        optional :new_transaction, :message, 3, "google.datastore.v1.TransactionOptions"
-        optional :read_time, :message, 4, "google.protobuf.Timestamp"
-      end
-    end
-    add_enum "google.datastore.v1.ReadOptions.ReadConsistency" do
-      value :READ_CONSISTENCY_UNSPECIFIED, 0
-      value :STRONG, 1
-      value :EVENTUAL, 2
-    end
-    add_message "google.datastore.v1.TransactionOptions" do
-      oneof :mode do
-        optional :read_write, :message, 1, "google.datastore.v1.TransactionOptions.ReadWrite"
-        optional :read_only, :message, 2, "google.datastore.v1.TransactionOptions.ReadOnly"
-      end
-    end
-    add_message "google.datastore.v1.TransactionOptions.ReadWrite" do
-      optional :previous_transaction, :bytes, 1
-    end
-    add_message "google.datastore.v1.TransactionOptions.ReadOnly" do
-      optional :read_time, :message, 1, "google.protobuf.Timestamp"
+
+descriptor_data = "\n#google/datastore/v1/datastore.proto\x12\x13google.datastore.v1\x1a\x1cgoogle/api/annotations.proto\x1a\x17google/api/client.proto\x1a\x1fgoogle/api/field_behavior.proto\x1a\x18google/api/routing.proto\x1a,google/datastore/v1/aggregation_result.proto\x1a google/datastore/v1/entity.proto\x1a\x1fgoogle/datastore/v1/query.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xa2\x01\n\rLookupRequest\x12\x17\n\nproject_id\x18\x08 \x01(\tB\x03\xe0\x41\x02\x12\x13\n\x0b\x64\x61tabase_id\x18\t \x01(\t\x12\x36\n\x0cread_options\x18\x01 \x01(\x0b\x32 .google.datastore.v1.ReadOptions\x12+\n\x04keys\x18\x03 \x03(\x0b\x32\x18.google.datastore.v1.KeyB\x03\xe0\x41\x02\"\xe6\x01\n\x0eLookupResponse\x12\x30\n\x05\x66ound\x18\x01 \x03(\x0b\x32!.google.datastore.v1.EntityResult\x12\x32\n\x07missing\x18\x02 \x03(\x0b\x32!.google.datastore.v1.EntityResult\x12*\n\x08\x64\x65\x66\x65rred\x18\x03 \x03(\x0b\x32\x18.google.datastore.v1.Key\x12\x13\n\x0btransaction\x18\x05 \x01(\x0c\x12-\n\tread_time\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\"\x9e\x02\n\x0fRunQueryRequest\x12\x17\n\nproject_id\x18\x08 \x01(\tB\x03\xe0\x41\x02\x12\x13\n\x0b\x64\x61tabase_id\x18\t \x01(\t\x12\x36\n\x0cpartition_id\x18\x02 \x01(\x0b\x32 .google.datastore.v1.PartitionId\x12\x36\n\x0cread_options\x18\x01 \x01(\x0b\x32 .google.datastore.v1.ReadOptions\x12+\n\x05query\x18\x03 \x01(\x0b\x32\x1a.google.datastore.v1.QueryH\x00\x12\x32\n\tgql_query\x18\x07 \x01(\x0b\x32\x1d.google.datastore.v1.GqlQueryH\x00\x42\x0c\n\nquery_type\"\x88\x01\n\x10RunQueryResponse\x12\x34\n\x05\x62\x61tch\x18\x01 \x01(\x0b\x32%.google.datastore.v1.QueryResultBatch\x12)\n\x05query\x18\x02 \x01(\x0b\x32\x1a.google.datastore.v1.Query\x12\x13\n\x0btransaction\x18\x05 \x01(\x0c\"\xc0\x02\n\x1aRunAggregationQueryRequest\x12\x17\n\nproject_id\x18\x08 \x01(\tB\x03\xe0\x41\x02\x12\x13\n\x0b\x64\x61tabase_id\x18\t \x01(\t\x12\x36\n\x0cpartition_id\x18\x02 \x01(\x0b\x32 .google.datastore.v1.PartitionId\x12\x36\n\x0cread_options\x18\x01 \x01(\x0b\x32 .google.datastore.v1.ReadOptions\x12\x42\n\x11\x61ggregation_query\x18\x03 \x01(\x0b\x32%.google.datastore.v1.AggregationQueryH\x00\x12\x32\n\tgql_query\x18\x07 \x01(\x0b\x32\x1d.google.datastore.v1.GqlQueryH\x00\x42\x0c\n\nquery_type\"\xa4\x01\n\x1bRunAggregationQueryResponse\x12:\n\x05\x62\x61tch\x18\x01 \x01(\x0b\x32+.google.datastore.v1.AggregationResultBatch\x12\x34\n\x05query\x18\x02 \x01(\x0b\x32%.google.datastore.v1.AggregationQuery\x12\x13\n\x0btransaction\x18\x05 \x01(\x0c\"\x8d\x01\n\x17\x42\x65ginTransactionRequest\x12\x17\n\nproject_id\x18\x08 \x01(\tB\x03\xe0\x41\x02\x12\x13\n\x0b\x64\x61tabase_id\x18\t \x01(\t\x12\x44\n\x13transaction_options\x18\n \x01(\x0b\x32\'.google.datastore.v1.TransactionOptions\"/\n\x18\x42\x65ginTransactionResponse\x12\x13\n\x0btransaction\x18\x01 \x01(\x0c\"Y\n\x0fRollbackRequest\x12\x17\n\nproject_id\x18\x08 \x01(\tB\x03\xe0\x41\x02\x12\x13\n\x0b\x64\x61tabase_id\x18\t \x01(\t\x12\x18\n\x0btransaction\x18\x01 \x01(\x0c\x42\x03\xe0\x41\x02\"\x12\n\x10RollbackResponse\"\xe8\x02\n\rCommitRequest\x12\x17\n\nproject_id\x18\x08 \x01(\tB\x03\xe0\x41\x02\x12\x13\n\x0b\x64\x61tabase_id\x18\t \x01(\t\x12\x35\n\x04mode\x18\x05 \x01(\x0e\x32\'.google.datastore.v1.CommitRequest.Mode\x12\x15\n\x0btransaction\x18\x01 \x01(\x0cH\x00\x12I\n\x16single_use_transaction\x18\n \x01(\x0b\x32\'.google.datastore.v1.TransactionOptionsH\x00\x12\x30\n\tmutations\x18\x06 \x03(\x0b\x32\x1d.google.datastore.v1.Mutation\"F\n\x04Mode\x12\x14\n\x10MODE_UNSPECIFIED\x10\x00\x12\x11\n\rTRANSACTIONAL\x10\x01\x12\x15\n\x11NON_TRANSACTIONAL\x10\x02\x42\x16\n\x14transaction_selector\"\x97\x01\n\x0e\x43ommitResponse\x12=\n\x10mutation_results\x18\x03 \x03(\x0b\x32#.google.datastore.v1.MutationResult\x12\x15\n\rindex_updates\x18\x04 \x01(\x05\x12/\n\x0b\x63ommit_time\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\"o\n\x12\x41llocateIdsRequest\x12\x17\n\nproject_id\x18\x08 \x01(\tB\x03\xe0\x41\x02\x12\x13\n\x0b\x64\x61tabase_id\x18\t \x01(\t\x12+\n\x04keys\x18\x01 \x03(\x0b\x32\x18.google.datastore.v1.KeyB\x03\xe0\x41\x02\"=\n\x13\x41llocateIdsResponse\x12&\n\x04keys\x18\x01 \x03(\x0b\x32\x18.google.datastore.v1.Key\"n\n\x11ReserveIdsRequest\x12\x17\n\nproject_id\x18\x08 \x01(\tB\x03\xe0\x41\x02\x12\x13\n\x0b\x64\x61tabase_id\x18\t \x01(\t\x12+\n\x04keys\x18\x01 \x03(\x0b\x32\x18.google.datastore.v1.KeyB\x03\xe0\x41\x02\"\x14\n\x12ReserveIdsResponse\"\xba\x02\n\x08Mutation\x12-\n\x06insert\x18\x04 \x01(\x0b\x32\x1b.google.datastore.v1.EntityH\x00\x12-\n\x06update\x18\x05 \x01(\x0b\x32\x1b.google.datastore.v1.EntityH\x00\x12-\n\x06upsert\x18\x06 \x01(\x0b\x32\x1b.google.datastore.v1.EntityH\x00\x12*\n\x06\x64\x65lete\x18\x07 \x01(\x0b\x32\x18.google.datastore.v1.KeyH\x00\x12\x16\n\x0c\x62\x61se_version\x18\x08 \x01(\x03H\x01\x12\x31\n\x0bupdate_time\x18\x0b \x01(\x0b\x32\x1a.google.protobuf.TimestampH\x01\x42\x0b\n\toperationB\x1d\n\x1b\x63onflict_detection_strategy\"\xc5\x01\n\x0eMutationResult\x12%\n\x03key\x18\x03 \x01(\x0b\x32\x18.google.datastore.v1.Key\x12\x0f\n\x07version\x18\x04 \x01(\x03\x12/\n\x0b\x63reate_time\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12/\n\x0bupdate_time\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x19\n\x11\x63onflict_detected\x18\x05 \x01(\x08\"\xca\x02\n\x0bReadOptions\x12L\n\x10read_consistency\x18\x01 \x01(\x0e\x32\x30.google.datastore.v1.ReadOptions.ReadConsistencyH\x00\x12\x15\n\x0btransaction\x18\x02 \x01(\x0cH\x00\x12\x42\n\x0fnew_transaction\x18\x03 \x01(\x0b\x32\'.google.datastore.v1.TransactionOptionsH\x00\x12/\n\tread_time\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.TimestampH\x00\"M\n\x0fReadConsistency\x12 \n\x1cREAD_CONSISTENCY_UNSPECIFIED\x10\x00\x12\n\n\x06STRONG\x10\x01\x12\x0c\n\x08\x45VENTUAL\x10\x02\x42\x12\n\x10\x63onsistency_type\"\x92\x02\n\x12TransactionOptions\x12G\n\nread_write\x18\x01 \x01(\x0b\x32\x31.google.datastore.v1.TransactionOptions.ReadWriteH\x00\x12\x45\n\tread_only\x18\x02 \x01(\x0b\x32\x30.google.datastore.v1.TransactionOptions.ReadOnlyH\x00\x1a)\n\tReadWrite\x12\x1c\n\x14previous_transaction\x18\x01 \x01(\x0c\x1a\x39\n\x08ReadOnly\x12-\n\tread_time\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.TimestampB\x06\n\x04mode2\xe1\r\n\tDatastore\x12\xc0\x01\n\x06Lookup\x12\".google.datastore.v1.LookupRequest\x1a#.google.datastore.v1.LookupResponse\"m\x82\xd3\xe4\x93\x02%\" /v1/projects/{project_id}:lookup:\x01*\x8a\xd3\xe4\x93\x02\x1d\x12\x0c\n\nproject_id\x12\r\n\x0b\x64\x61tabase_id\xda\x41\x1cproject_id,read_options,keys\x12\xa9\x01\n\x08RunQuery\x12$.google.datastore.v1.RunQueryRequest\x1a%.google.datastore.v1.RunQueryResponse\"P\x82\xd3\xe4\x93\x02\'\"\"/v1/projects/{project_id}:runQuery:\x01*\x8a\xd3\xe4\x93\x02\x1d\x12\x0c\n\nproject_id\x12\r\n\x0b\x64\x61tabase_id\x12\xd5\x01\n\x13RunAggregationQuery\x12/.google.datastore.v1.RunAggregationQueryRequest\x1a\x30.google.datastore.v1.RunAggregationQueryResponse\"[\x82\xd3\xe4\x93\x02\x32\"-/v1/projects/{project_id}:runAggregationQuery:\x01*\x8a\xd3\xe4\x93\x02\x1d\x12\x0c\n\nproject_id\x12\r\n\x0b\x64\x61tabase_id\x12\xd6\x01\n\x10\x42\x65ginTransaction\x12,.google.datastore.v1.BeginTransactionRequest\x1a-.google.datastore.v1.BeginTransactionResponse\"e\x82\xd3\xe4\x93\x02/\"*/v1/projects/{project_id}:beginTransaction:\x01*\x8a\xd3\xe4\x93\x02\x1d\x12\x0c\n\nproject_id\x12\r\n\x0b\x64\x61tabase_id\xda\x41\nproject_id\x12\xe6\x01\n\x06\x43ommit\x12\".google.datastore.v1.CommitRequest\x1a#.google.datastore.v1.CommitResponse\"\x92\x01\x82\xd3\xe4\x93\x02%\" /v1/projects/{project_id}:commit:\x01*\x8a\xd3\xe4\x93\x02\x1d\x12\x0c\n\nproject_id\x12\r\n\x0b\x64\x61tabase_id\xda\x41%project_id,mode,transaction,mutations\xda\x41\x19project_id,mode,mutations\x12\xc2\x01\n\x08Rollback\x12$.google.datastore.v1.RollbackRequest\x1a%.google.datastore.v1.RollbackResponse\"i\x82\xd3\xe4\x93\x02\'\"\"/v1/projects/{project_id}:rollback:\x01*\x8a\xd3\xe4\x93\x02\x1d\x12\x0c\n\nproject_id\x12\r\n\x0b\x64\x61tabase_id\xda\x41\x16project_id,transaction\x12\xc7\x01\n\x0b\x41llocateIds\x12\'.google.datastore.v1.AllocateIdsRequest\x1a(.google.datastore.v1.AllocateIdsResponse\"e\x82\xd3\xe4\x93\x02*\"%/v1/projects/{project_id}:allocateIds:\x01*\x8a\xd3\xe4\x93\x02\x1d\x12\x0c\n\nproject_id\x12\r\n\x0b\x64\x61tabase_id\xda\x41\x0fproject_id,keys\x12\xc3\x01\n\nReserveIds\x12&.google.datastore.v1.ReserveIdsRequest\x1a\'.google.datastore.v1.ReserveIdsResponse\"d\x82\xd3\xe4\x93\x02)\"$/v1/projects/{project_id}:reserveIds:\x01*\x8a\xd3\xe4\x93\x02\x1d\x12\x0c\n\nproject_id\x12\r\n\x0b\x64\x61tabase_id\xda\x41\x0fproject_id,keys\x1av\xca\x41\x18\x64\x61tastore.googleapis.com\xd2\x41Xhttps://www.googleapis.com/auth/cloud-platform,https://www.googleapis.com/auth/datastoreB\xc0\x01\n\x17\x63om.google.datastore.v1B\x0e\x44\x61tastoreProtoP\x01Z<google.golang.org/genproto/googleapis/datastore/v1;datastore\xaa\x02\x19Google.Cloud.Datastore.V1\xca\x02\x19Google\\Cloud\\Datastore\\V1\xea\x02\x1cGoogle::Cloud::Datastore::V1b\x06proto3"
+
+pool = Google::Protobuf::DescriptorPool.generated_pool
+
+begin
+  pool.add_serialized_file(descriptor_data)
+rescue TypeError => e
+  # Compatibility code: will be removed in the next major version.
+  require 'google/protobuf/descriptor_pb'
+  parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)
+  parsed.clear_dependency
+  serialized = parsed.class.encode(parsed)
+  file = pool.add_serialized_file(serialized)
+  warn "Warning: Protobuf detected an import path issue while loading generated file #{__FILE__}"
+  imports = [
+    ["google.datastore.v1.Key", "google/datastore/v1/entity.proto"],
+    ["google.datastore.v1.EntityResult", "google/datastore/v1/query.proto"],
+    ["google.protobuf.Timestamp", "google/protobuf/timestamp.proto"],
+    ["google.datastore.v1.AggregationResultBatch", "google/datastore/v1/aggregation_result.proto"],
+  ]
+  imports.each do |type_name, expected_filename|
+    import_file = pool.lookup(type_name).file_descriptor
+    if import_file.name != expected_filename
+      warn "- #{file.name} imports #{expected_filename}, but that import was loaded as #{import_file.name}"
     end
   end
+  warn "Each proto file must use a consistent fully-qualified name."
+  warn "This will become an error in the next major version."
 end
 
 module Google

data/lib/google/datastore/v1/entity_pb.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: google/datastore/v1/entity.proto
 
@@ -7,49 +8,33 @@ require 'google/protobuf/struct_pb'
 require 'google/protobuf/timestamp_pb'
 require 'google/type/latlng_pb'
 
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_file("google/datastore/v1/entity.proto", :syntax => :proto3) do
-    add_message "google.datastore.v1.PartitionId" do
-      optional :project_id, :string, 2
-      optional :database_id, :string, 3
-      optional :namespace_id, :string, 4
-    end
-    add_message "google.datastore.v1.Key" do
-      optional :partition_id, :message, 1, "google.datastore.v1.PartitionId"
-      repeated :path, :message, 2, "google.datastore.v1.Key.PathElement"
-    end
-    add_message "google.datastore.v1.Key.PathElement" do
-      optional :kind, :string, 1
-      oneof :id_type do
-        optional :id, :int64, 2
-        optional :name, :string, 3
-      end
-    end
-    add_message "google.datastore.v1.ArrayValue" do
-      repeated :values, :message, 1, "google.datastore.v1.Value"
-    end
-    add_message "google.datastore.v1.Value" do
-      optional :meaning, :int32, 14
-      optional :exclude_from_indexes, :bool, 19
-      oneof :value_type do
-        optional :null_value, :enum, 11, "google.protobuf.NullValue"
-        optional :boolean_value, :bool, 1
-        optional :integer_value, :int64, 2
-        optional :double_value, :double, 3
-        optional :timestamp_value, :message, 10, "google.protobuf.Timestamp"
-        optional :key_value, :message, 5, "google.datastore.v1.Key"
-        optional :string_value, :string, 17
-        optional :blob_value, :bytes, 18
-        optional :geo_point_value, :message, 8, "google.type.LatLng"
-        optional :entity_value, :message, 6, "google.datastore.v1.Entity"
-        optional :array_value, :message, 9, "google.datastore.v1.ArrayValue"
-      end
-    end
-    add_message "google.datastore.v1.Entity" do
-      optional :key, :message, 1, "google.datastore.v1.Key"
-      map :properties, :string, :message, 3, "google.datastore.v1.Value"
+
+descriptor_data = "\n google/datastore/v1/entity.proto\x12\x13google.datastore.v1\x1a\x1cgoogle/protobuf/struct.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x18google/type/latlng.proto\"L\n\x0bPartitionId\x12\x12\n\nproject_id\x18\x02 \x01(\t\x12\x13\n\x0b\x64\x61tabase_id\x18\x03 \x01(\t\x12\x14\n\x0cnamespace_id\x18\x04 \x01(\t\"\xb7\x01\n\x03Key\x12\x36\n\x0cpartition_id\x18\x01 \x01(\x0b\x32 .google.datastore.v1.PartitionId\x12\x32\n\x04path\x18\x02 \x03(\x0b\x32$.google.datastore.v1.Key.PathElement\x1a\x44\n\x0bPathElement\x12\x0c\n\x04kind\x18\x01 \x01(\t\x12\x0c\n\x02id\x18\x02 \x01(\x03H\x00\x12\x0e\n\x04name\x18\x03 \x01(\tH\x00\x42\t\n\x07id_type\"8\n\nArrayValue\x12*\n\x06values\x18\x01 \x03(\x0b\x32\x1a.google.datastore.v1.Value\"\xf1\x03\n\x05Value\x12\x30\n\nnull_value\x18\x0b \x01(\x0e\x32\x1a.google.protobuf.NullValueH\x00\x12\x17\n\rboolean_value\x18\x01 \x01(\x08H\x00\x12\x17\n\rinteger_value\x18\x02 \x01(\x03H\x00\x12\x16\n\x0c\x64ouble_value\x18\x03 \x01(\x01H\x00\x12\x35\n\x0ftimestamp_value\x18\n \x01(\x0b\x32\x1a.google.protobuf.TimestampH\x00\x12-\n\tkey_value\x18\x05 \x01(\x0b\x32\x18.google.datastore.v1.KeyH\x00\x12\x16\n\x0cstring_value\x18\x11 \x01(\tH\x00\x12\x14\n\nblob_value\x18\x12 \x01(\x0cH\x00\x12.\n\x0fgeo_point_value\x18\x08 \x01(\x0b\x32\x13.google.type.LatLngH\x00\x12\x33\n\x0c\x65ntity_value\x18\x06 \x01(\x0b\x32\x1b.google.datastore.v1.EntityH\x00\x12\x36\n\x0b\x61rray_value\x18\t \x01(\x0b\x32\x1f.google.datastore.v1.ArrayValueH\x00\x12\x0f\n\x07meaning\x18\x0e \x01(\x05\x12\x1c\n\x14\x65xclude_from_indexes\x18\x13 \x01(\x08\x42\x0c\n\nvalue_type\"\xbf\x01\n\x06\x45ntity\x12%\n\x03key\x18\x01 \x01(\x0b\x32\x18.google.datastore.v1.Key\x12?\n\nproperties\x18\x03 \x03(\x0b\x32+.google.datastore.v1.Entity.PropertiesEntry\x1aM\n\x0fPropertiesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12)\n\x05value\x18\x02 \x01(\x0b\x32\x1a.google.datastore.v1.Value:\x02\x38\x01\x42\xbd\x01\n\x17\x63om.google.datastore.v1B\x0b\x45ntityProtoP\x01Z<google.golang.org/genproto/googleapis/datastore/v1;datastore\xaa\x02\x19Google.Cloud.Datastore.V1\xca\x02\x19Google\\Cloud\\Datastore\\V1\xea\x02\x1cGoogle::Cloud::Datastore::V1b\x06proto3"
+
+pool = Google::Protobuf::DescriptorPool.generated_pool
+
+begin
+  pool.add_serialized_file(descriptor_data)
+rescue TypeError => e
+  # Compatibility code: will be removed in the next major version.
+  require 'google/protobuf/descriptor_pb'
+  parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)
+  parsed.clear_dependency
+  serialized = parsed.class.encode(parsed)
+  file = pool.add_serialized_file(serialized)
+  warn "Warning: Protobuf detected an import path issue while loading generated file #{__FILE__}"
+  imports = [
+    ["google.protobuf.Timestamp", "google/protobuf/timestamp.proto"],
+    ["google.type.LatLng", "google/type/latlng.proto"],
+  ]
+  imports.each do |type_name, expected_filename|
+    import_file = pool.lookup(type_name).file_descriptor
+    if import_file.name != expected_filename
+      warn "- #{file.name} imports #{expected_filename}, but that import was loaded as #{import_file.name}"
     end
   end
+  warn "Each proto file must use a consistent fully-qualified name."
+  warn "This will become an error in the next major version."
 end
 
 module Google

data/lib/google/datastore/v1/query_pb.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: google/datastore/v1/query.proto
 
@@ -8,127 +9,34 @@ require 'google/datastore/v1/entity_pb'
 require 'google/protobuf/timestamp_pb'
 require 'google/protobuf/wrappers_pb'
 
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_file("google/datastore/v1/query.proto", :syntax => :proto3) do
-    add_message "google.datastore.v1.EntityResult" do
-      optional :entity, :message, 1, "google.datastore.v1.Entity"
-      optional :version, :int64, 4
-      optional :create_time, :message, 6, "google.protobuf.Timestamp"
-      optional :update_time, :message, 5, "google.protobuf.Timestamp"
-      optional :cursor, :bytes, 3
-    end
-    add_enum "google.datastore.v1.EntityResult.ResultType" do
-      value :RESULT_TYPE_UNSPECIFIED, 0
-      value :FULL, 1
-      value :PROJECTION, 2
-      value :KEY_ONLY, 3
-    end
-    add_message "google.datastore.v1.Query" do
-      repeated :projection, :message, 2, "google.datastore.v1.Projection"
-      repeated :kind, :message, 3, "google.datastore.v1.KindExpression"
-      optional :filter, :message, 4, "google.datastore.v1.Filter"
-      repeated :order, :message, 5, "google.datastore.v1.PropertyOrder"
-      repeated :distinct_on, :message, 6, "google.datastore.v1.PropertyReference"
-      optional :start_cursor, :bytes, 7
-      optional :end_cursor, :bytes, 8
-      optional :offset, :int32, 10
-      optional :limit, :message, 12, "google.protobuf.Int32Value"
-    end
-    add_message "google.datastore.v1.AggregationQuery" do
-      repeated :aggregations, :message, 3, "google.datastore.v1.AggregationQuery.Aggregation"
-      oneof :query_type do
-        optional :nested_query, :message, 1, "google.datastore.v1.Query"
-      end
-    end
-    add_message "google.datastore.v1.AggregationQuery.Aggregation" do
-      optional :alias, :string, 7
-      oneof :operator do
-        optional :count, :message, 1, "google.datastore.v1.AggregationQuery.Aggregation.Count"
-      end
-    end
-    add_message "google.datastore.v1.AggregationQuery.Aggregation.Count" do
-      optional :up_to, :message, 1, "google.protobuf.Int64Value"
-    end
-    add_message "google.datastore.v1.KindExpression" do
-      optional :name, :string, 1
-    end
-    add_message "google.datastore.v1.PropertyReference" do
-      optional :name, :string, 2
-    end
-    add_message "google.datastore.v1.Projection" do
-      optional :property, :message, 1, "google.datastore.v1.PropertyReference"
-    end
-    add_message "google.datastore.v1.PropertyOrder" do
-      optional :property, :message, 1, "google.datastore.v1.PropertyReference"
-      optional :direction, :enum, 2, "google.datastore.v1.PropertyOrder.Direction"
-    end
-    add_enum "google.datastore.v1.PropertyOrder.Direction" do
-      value :DIRECTION_UNSPECIFIED, 0
-      value :ASCENDING, 1
-      value :DESCENDING, 2
-    end
-    add_message "google.datastore.v1.Filter" do
-      oneof :filter_type do
-        optional :composite_filter, :message, 1, "google.datastore.v1.CompositeFilter"
-        optional :property_filter, :message, 2, "google.datastore.v1.PropertyFilter"
-      end
-    end
-    add_message "google.datastore.v1.CompositeFilter" do
-      optional :op, :enum, 1, "google.datastore.v1.CompositeFilter.Operator"
-      repeated :filters, :message, 2, "google.datastore.v1.Filter"
-    end
-    add_enum "google.datastore.v1.CompositeFilter.Operator" do
-      value :OPERATOR_UNSPECIFIED, 0
-      value :AND, 1
-      value :OR, 2
-    end
-    add_message "google.datastore.v1.PropertyFilter" do
-      optional :property, :message, 1, "google.datastore.v1.PropertyReference"
-      optional :op, :enum, 2, "google.datastore.v1.PropertyFilter.Operator"
-      optional :value, :message, 3, "google.datastore.v1.Value"
-    end
-    add_enum "google.datastore.v1.PropertyFilter.Operator" do
-      value :OPERATOR_UNSPECIFIED, 0
-      value :LESS_THAN, 1
-      value :LESS_THAN_OR_EQUAL, 2
-      value :GREATER_THAN, 3
-      value :GREATER_THAN_OR_EQUAL, 4
-      value :EQUAL, 5
-      value :IN, 6
-      value :NOT_EQUAL, 9
-      value :HAS_ANCESTOR, 11
-      value :NOT_IN, 13
-    end
-    add_message "google.datastore.v1.GqlQuery" do
-      optional :query_string, :string, 1
-      optional :allow_literals, :bool, 2
-      map :named_bindings, :string, :message, 5, "google.datastore.v1.GqlQueryParameter"
-      repeated :positional_bindings, :message, 4, "google.datastore.v1.GqlQueryParameter"
-    end
-    add_message "google.datastore.v1.GqlQueryParameter" do
-      oneof :parameter_type do
-        optional :value, :message, 2, "google.datastore.v1.Value"
-        optional :cursor, :bytes, 3
-      end
-    end
-    add_message "google.datastore.v1.QueryResultBatch" do
-      optional :skipped_results, :int32, 6
-      optional :skipped_cursor, :bytes, 3
-      optional :entity_result_type, :enum, 1, "google.datastore.v1.EntityResult.ResultType"
-      repeated :entity_results, :message, 2, "google.datastore.v1.EntityResult"
-      optional :end_cursor, :bytes, 4
-      optional :more_results, :enum, 5, "google.datastore.v1.QueryResultBatch.MoreResultsType"
-      optional :snapshot_version, :int64, 7
-      optional :read_time, :message, 8, "google.protobuf.Timestamp"
-    end
-    add_enum "google.datastore.v1.QueryResultBatch.MoreResultsType" do
-      value :MORE_RESULTS_TYPE_UNSPECIFIED, 0
-      value :NOT_FINISHED, 1
-      value :MORE_RESULTS_AFTER_LIMIT, 2
-      value :MORE_RESULTS_AFTER_CURSOR, 4
-      value :NO_MORE_RESULTS, 3
+
+descriptor_data = "\n\x1fgoogle/datastore/v1/query.proto\x12\x13google.datastore.v1\x1a\x1fgoogle/api/field_behavior.proto\x1a google/datastore/v1/entity.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1egoogle/protobuf/wrappers.proto\"\x91\x02\n\x0c\x45ntityResult\x12+\n\x06\x65ntity\x18\x01 \x01(\x0b\x32\x1b.google.datastore.v1.Entity\x12\x0f\n\x07version\x18\x04 \x01(\x03\x12/\n\x0b\x63reate_time\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12/\n\x0bupdate_time\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x0e\n\x06\x63ursor\x18\x03 \x01(\x0c\"Q\n\nResultType\x12\x1b\n\x17RESULT_TYPE_UNSPECIFIED\x10\x00\x12\x08\n\x04\x46ULL\x10\x01\x12\x0e\n\nPROJECTION\x10\x02\x12\x0c\n\x08KEY_ONLY\x10\x03\"\xf2\x02\n\x05Query\x12\x33\n\nprojection\x18\x02 \x03(\x0b\x32\x1f.google.datastore.v1.Projection\x12\x31\n\x04kind\x18\x03 \x03(\x0b\x32#.google.datastore.v1.KindExpression\x12+\n\x06\x66ilter\x18\x04 \x01(\x0b\x32\x1b.google.datastore.v1.Filter\x12\x31\n\x05order\x18\x05 \x03(\x0b\x32\".google.datastore.v1.PropertyOrder\x12;\n\x0b\x64istinct_on\x18\x06 \x03(\x0b\x32&.google.datastore.v1.PropertyReference\x12\x14\n\x0cstart_cursor\x18\x07 \x01(\x0c\x12\x12\n\nend_cursor\x18\x08 \x01(\x0c\x12\x0e\n\x06offset\x18\n \x01(\x05\x12*\n\x05limit\x18\x0c \x01(\x0b\x32\x1b.google.protobuf.Int32Value\"\xd6\x02\n\x10\x41ggregationQuery\x12\x32\n\x0cnested_query\x18\x01 \x01(\x0b\x32\x1a.google.datastore.v1.QueryH\x00\x12L\n\x0c\x61ggregations\x18\x03 \x03(\x0b\x32\x31.google.datastore.v1.AggregationQuery.AggregationB\x03\xe0\x41\x01\x1a\xb1\x01\n\x0b\x41ggregation\x12H\n\x05\x63ount\x18\x01 \x01(\x0b\x32\x37.google.datastore.v1.AggregationQuery.Aggregation.CountH\x00\x12\x12\n\x05\x61lias\x18\x07 \x01(\tB\x03\xe0\x41\x01\x1a\x38\n\x05\x43ount\x12/\n\x05up_to\x18\x01 \x01(\x0b\x32\x1b.google.protobuf.Int64ValueB\x03\xe0\x41\x01\x42\n\n\x08operatorB\x0c\n\nquery_type\"\x1e\n\x0eKindExpression\x12\x0c\n\x04name\x18\x01 \x01(\t\"!\n\x11PropertyReference\x12\x0c\n\x04name\x18\x02 \x01(\t\"F\n\nProjection\x12\x38\n\x08property\x18\x01 \x01(\x0b\x32&.google.datastore.v1.PropertyReference\"\xd1\x01\n\rPropertyOrder\x12\x38\n\x08property\x18\x01 \x01(\x0b\x32&.google.datastore.v1.PropertyReference\x12?\n\tdirection\x18\x02 \x01(\x0e\x32,.google.datastore.v1.PropertyOrder.Direction\"E\n\tDirection\x12\x19\n\x15\x44IRECTION_UNSPECIFIED\x10\x00\x12\r\n\tASCENDING\x10\x01\x12\x0e\n\nDESCENDING\x10\x02\"\x99\x01\n\x06\x46ilter\x12@\n\x10\x63omposite_filter\x18\x01 \x01(\x0b\x32$.google.datastore.v1.CompositeFilterH\x00\x12>\n\x0fproperty_filter\x18\x02 \x01(\x0b\x32#.google.datastore.v1.PropertyFilterH\x00\x42\r\n\x0b\x66ilter_type\"\xb1\x01\n\x0f\x43ompositeFilter\x12\x39\n\x02op\x18\x01 \x01(\x0e\x32-.google.datastore.v1.CompositeFilter.Operator\x12,\n\x07\x66ilters\x18\x02 \x03(\x0b\x32\x1b.google.datastore.v1.Filter\"5\n\x08Operator\x12\x18\n\x14OPERATOR_UNSPECIFIED\x10\x00\x12\x07\n\x03\x41ND\x10\x01\x12\x06\n\x02OR\x10\x02\"\xea\x02\n\x0ePropertyFilter\x12\x38\n\x08property\x18\x01 \x01(\x0b\x32&.google.datastore.v1.PropertyReference\x12\x38\n\x02op\x18\x02 \x01(\x0e\x32,.google.datastore.v1.PropertyFilter.Operator\x12)\n\x05value\x18\x03 \x01(\x0b\x32\x1a.google.datastore.v1.Value\"\xb8\x01\n\x08Operator\x12\x18\n\x14OPERATOR_UNSPECIFIED\x10\x00\x12\r\n\tLESS_THAN\x10\x01\x12\x16\n\x12LESS_THAN_OR_EQUAL\x10\x02\x12\x10\n\x0cGREATER_THAN\x10\x03\x12\x19\n\x15GREATER_THAN_OR_EQUAL\x10\x04\x12\t\n\x05\x45QUAL\x10\x05\x12\x06\n\x02IN\x10\x06\x12\r\n\tNOT_EQUAL\x10\t\x12\x10\n\x0cHAS_ANCESTOR\x10\x0b\x12\n\n\x06NOT_IN\x10\r\"\xa5\x02\n\x08GqlQuery\x12\x14\n\x0cquery_string\x18\x01 \x01(\t\x12\x16\n\x0e\x61llow_literals\x18\x02 \x01(\x08\x12H\n\x0enamed_bindings\x18\x05 \x03(\x0b\x32\x30.google.datastore.v1.GqlQuery.NamedBindingsEntry\x12\x43\n\x13positional_bindings\x18\x04 \x03(\x0b\x32&.google.datastore.v1.GqlQueryParameter\x1a\\\n\x12NamedBindingsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x35\n\x05value\x18\x02 \x01(\x0b\x32&.google.datastore.v1.GqlQueryParameter:\x02\x38\x01\"d\n\x11GqlQueryParameter\x12+\n\x05value\x18\x02 \x01(\x0b\x32\x1a.google.datastore.v1.ValueH\x00\x12\x10\n\x06\x63ursor\x18\x03 \x01(\x0cH\x00\x42\x10\n\x0eparameter_type\"\x8d\x04\n\x10QueryResultBatch\x12\x17\n\x0fskipped_results\x18\x06 \x01(\x05\x12\x16\n\x0eskipped_cursor\x18\x03 \x01(\x0c\x12H\n\x12\x65ntity_result_type\x18\x01 \x01(\x0e\x32,.google.datastore.v1.EntityResult.ResultType\x12\x39\n\x0e\x65ntity_results\x18\x02 \x03(\x0b\x32!.google.datastore.v1.EntityResult\x12\x12\n\nend_cursor\x18\x04 \x01(\x0c\x12K\n\x0cmore_results\x18\x05 \x01(\x0e\x32\x35.google.datastore.v1.QueryResultBatch.MoreResultsType\x12\x18\n\x10snapshot_version\x18\x07 \x01(\x03\x12-\n\tread_time\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\"\x98\x01\n\x0fMoreResultsType\x12!\n\x1dMORE_RESULTS_TYPE_UNSPECIFIED\x10\x00\x12\x10\n\x0cNOT_FINISHED\x10\x01\x12\x1c\n\x18MORE_RESULTS_AFTER_LIMIT\x10\x02\x12\x1d\n\x19MORE_RESULTS_AFTER_CURSOR\x10\x04\x12\x13\n\x0fNO_MORE_RESULTS\x10\x03\x42\xbc\x01\n\x17\x63om.google.datastore.v1B\nQueryProtoP\x01Z<google.golang.org/genproto/googleapis/datastore/v1;datastore\xaa\x02\x19Google.Cloud.Datastore.V1\xca\x02\x19Google\\Cloud\\Datastore\\V1\xea\x02\x1cGoogle::Cloud::Datastore::V1b\x06proto3"
+
+pool = Google::Protobuf::DescriptorPool.generated_pool
+
+begin
+  pool.add_serialized_file(descriptor_data)
+rescue TypeError => e
+  # Compatibility code: will be removed in the next major version.
+  require 'google/protobuf/descriptor_pb'
+  parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)
+  parsed.clear_dependency
+  serialized = parsed.class.encode(parsed)
+  file = pool.add_serialized_file(serialized)
+  warn "Warning: Protobuf detected an import path issue while loading generated file #{__FILE__}"
+  imports = [
+    ["google.datastore.v1.Entity", "google/datastore/v1/entity.proto"],
+    ["google.protobuf.Timestamp", "google/protobuf/timestamp.proto"],
+    ["google.protobuf.Int32Value", "google/protobuf/wrappers.proto"],
+  ]
+  imports.each do |type_name, expected_filename|
+    import_file = pool.lookup(type_name).file_descriptor
+    if import_file.name != expected_filename
+      warn "- #{file.name} imports #{expected_filename}, but that import was loaded as #{import_file.name}"
     end
   end
+  warn "Each proto file must use a consistent fully-qualified name."
+  warn "This will become an error in the next major version."
 end
 
 module Google

data/proto_docs/google/api/client.rb

@@ -35,7 +35,9 @@ module Google
     # Details about how and where to publish client libraries.
     # @!attribute [rw] version
     #   @return [::String]
-    #     Version of the API to apply these settings to.
+    #     Version of the API to apply these settings to. This is the full protobuf
+    #     package for the API, ending in the version element.
+    #     Examples: "google.cloud.speech.v1" and "google.spanner.admin.database.v1".
     # @!attribute [rw] launch_stage
     #   @return [::Google::Api::LaunchStage]
     #     Launch stage of this version of the API.
@@ -81,7 +83,7 @@ module Google
     #     long-running operation pattern.
     # @!attribute [rw] new_issue_uri
     #   @return [::String]
-    #     Link to a place that API users can report issues.  Example:
+    #     Link to a *public* URI where users can report issues.  Example:
     #     https://issuetracker.google.com/issues/new?component=190865&template=1161103
     # @!attribute [rw] documentation_uri
     #   @return [::String]
@@ -111,6 +113,10 @@ module Google
     #     Client library settings.  If the same version string appears multiple
     #     times in this list, then the last one wins.  Settings from earlier
     #     settings with the same version string are discarded.
+    # @!attribute [rw] proto_reference_documentation_uri
+    #   @return [::String]
+    #     Optional link to proto reference documentation.  Example:
+    #     https://cloud.google.com/pubsub/lite/docs/reference/rpc
     class Publishing
       include ::Google::Protobuf::MessageExts
       extend ::Google::Protobuf::MessageExts::ClassMethods
@@ -203,9 +209,57 @@ module Google
     # @!attribute [rw] common
     #   @return [::Google::Api::CommonLanguageSettings]
     #     Some settings.
+    # @!attribute [rw] renamed_services
+    #   @return [::Google::Protobuf::Map{::String => ::String}]
+    #     Map from original service names to renamed versions.
+    #     This is used when the default generated types
+    #     would cause a naming conflict. (Neither name is
+    #     fully-qualified.)
+    #     Example: Subscriber to SubscriberServiceApi.
+    # @!attribute [rw] renamed_resources
+    #   @return [::Google::Protobuf::Map{::String => ::String}]
+    #     Map from full resource types to the effective short name
+    #     for the resource. This is used when otherwise resource
+    #     named from different services would cause naming collisions.
+    #     Example entry:
+    #     "datalabeling.googleapis.com/Dataset": "DataLabelingDataset"
+    # @!attribute [rw] ignored_resources
+    #   @return [::Array<::String>]
+    #     List of full resource types to ignore during generation.
+    #     This is typically used for API-specific Location resources,
+    #     which should be handled by the generator as if they were actually
+    #     the common Location resources.
+    #     Example entry: "documentai.googleapis.com/Location"
+    # @!attribute [rw] forced_namespace_aliases
+    #   @return [::Array<::String>]
+    #     Namespaces which must be aliased in snippets due to
+    #     a known (but non-generator-predictable) naming collision
+    # @!attribute [rw] handwritten_signatures
+    #   @return [::Array<::String>]
+    #     Method signatures (in the form "service.method(signature)")
+    #     which are provided separately, so shouldn't be generated.
+    #     Snippets *calling* these methods are still generated, however.
     class DotnetSettings
       include ::Google::Protobuf::MessageExts
       extend ::Google::Protobuf::MessageExts::ClassMethods
+
+      # @!attribute [rw] key
+      #   @return [::String]
+      # @!attribute [rw] value
+      #   @return [::String]
+      class RenamedServicesEntry
+        include ::Google::Protobuf::MessageExts
+        extend ::Google::Protobuf::MessageExts::ClassMethods
+      end
+
+      # @!attribute [rw] key
+      #   @return [::String]
+      # @!attribute [rw] value
+      #   @return [::String]
+      class RenamedResourcesEntry
+        include ::Google::Protobuf::MessageExts
+        extend ::Google::Protobuf::MessageExts::ClassMethods
+      end
     end
 
     # Settings for Ruby client libraries.
@@ -240,8 +294,8 @@ module Google
     #     Example of a YAML configuration::
     #
     #      publishing:
-    #        method_behavior:
-    #          - selector: CreateAdDomain
+    #        method_settings:
+    #          - selector: google.cloud.speech.v2.Speech.BatchRecognize
     #            long_running:
     #              initial_poll_delay:
     #                seconds: 60 # 1 minute
@@ -299,6 +353,15 @@ module Google
 
       # Street View Org.
       STREET_VIEW = 4
+
+      # Shopping Org.
+      SHOPPING = 5
+
+      # Geo Org.
+      GEO = 6
+
+      # Generative AI - https://developers.generativeai.google
+      GENERATIVE_AI = 7
     end
 
     # To where should client libraries be published?

data/proto_docs/google/datastore/v1/entity.rb

@@ -199,9 +199,7 @@ module Google
 
         # A Datastore data object.
         #
-        # An entity is limited to 1 megabyte when stored. That _roughly_
-        # corresponds to a limit of 1 megabyte for the serialized form of this
-        # message.
+        # Must not exceed 1 MiB - 4 bytes.
         # @!attribute [rw] key
         #   @return [::Google::Cloud::Datastore::V1::Key]
         #     The entity's key.
@@ -216,8 +214,8 @@ module Google
         #     The map's keys are property names.
         #     A property name matching regex `__.*__` is reserved.
         #     A reserved property name is forbidden in certain documented contexts.
-        #     The name must not contain more than 500 characters.
-        #     The name cannot be `""`.
+        #     The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+        #     be empty.
         class Entity
           include ::Google::Protobuf::MessageExts
           extend ::Google::Protobuf::MessageExts::ClassMethods

data/proto_docs/google/datastore/v1/query.rb

@@ -95,6 +95,11 @@ module Google
         #     The properties to make distinct. The query results will contain the first
         #     result for each distinct combination of values for the given properties
         #     (if empty, all results are returned).
+        #
+        #     Requires:
+        #
+        #     * If `order` is specified, the set of distinct on properties must appear
+        #     before the non-distinct on properties in `order`.
         # @!attribute [rw] start_cursor
         #   @return [::String]
         #     A starting point for the query results. Query cursors are
@@ -139,7 +144,7 @@ module Google
           include ::Google::Protobuf::MessageExts
           extend ::Google::Protobuf::MessageExts::ClassMethods
 
-          # Defines a aggregation that produces a single result.
+          # Defines an aggregation that produces a single result.
           # @!attribute [rw] count
           #   @return [::Google::Cloud::Datastore::V1::AggregationQuery::Aggregation::Count]
           #     Count aggregator.
@@ -156,7 +161,7 @@ module Google
           #       COUNT_UP_TO(1) AS count_up_to_1,
           #       COUNT_UP_TO(2),
           #       COUNT_UP_TO(3) AS count_up_to_3,
-          #       COUNT_UP_TO(4)
+          #       COUNT(*)
           #     OVER (
           #       ...
           #     );
@@ -169,7 +174,7 @@ module Google
           #       COUNT_UP_TO(1) AS count_up_to_1,
           #       COUNT_UP_TO(2) AS property_1,
           #       COUNT_UP_TO(3) AS count_up_to_3,
-          #       COUNT_UP_TO(4) AS property_2
+          #       COUNT(*) AS property_2
           #     OVER (
           #       ...
           #     );
@@ -194,7 +199,7 @@ module Google
             #     count.
             #
             #     This provides a way to set an upper bound on the number of entities
-            #     to scan, limiting latency and cost.
+            #     to scan, limiting latency, and cost.
             #
             #     Unspecified is interpreted as no bound.
             #

data/proto_docs/google/protobuf/struct.rb

@@ -87,7 +87,7 @@ module Google
     # `NullValue` is a singleton enumeration to represent the null value for the
     # `Value` type union.
     #
-    #  The JSON representation for `NullValue` is JSON `null`.
+    # The JSON representation for `NullValue` is JSON `null`.
     module NullValue
       # Null value.
       NULL_VALUE = 0

data/proto_docs/google/protobuf/timestamp.rb

@@ -69,7 +69,6 @@ module Google
     #     Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000)
     #         .setNanos((int) ((millis % 1000) * 1000000)).build();
     #
-    #
     # Example 5: Compute Timestamp from Java `Instant.now()`.
     #
     #     Instant now = Instant.now();
@@ -78,7 +77,6 @@ module Google
     #         Timestamp.newBuilder().setSeconds(now.getEpochSecond())
     #             .setNanos(now.getNano()).build();
     #
-    #
     # Example 6: Compute Timestamp from current time in Python.
     #
     #     timestamp = Timestamp()
@@ -108,7 +106,7 @@ module Google
     # [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with
     # the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use
     # the Joda Time's [`ISODateTimeFormat.dateTime()`](
-    # http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D
+    # http://joda-time.sourceforge.net/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime()
     # ) to obtain a formatter capable of generating timestamps in this format.
     # @!attribute [rw] seconds
     #   @return [::Integer]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-datastore-v1
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Google LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-08 00:00:00.000000000 Z
+date: 2023-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gapic-common
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.19.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.a
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.19.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.a