From 9002168bbd3ca49c37c9a17f9343b9e737aac532 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Tue, 16 Aug 2016 14:52:40 -0700 Subject: [PATCH 1/3] Updating datastore Makefile to use v1. --- Makefile.bigtable_v2 | 2 +- Makefile.datastore | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile.bigtable_v2 b/Makefile.bigtable_v2 index 5e4f43bcb9bd..fa921203fb2d 100644 --- a/Makefile.bigtable_v2 +++ b/Makefile.bigtable_v2 @@ -16,7 +16,7 @@ generate: [ -d $(GRPCIO_VIRTUALENV) ] || python2.7 -m virtualenv $(GRPCIO_VIRTUALENV) $(GRPCIO_VIRTUALENV)/bin/pip install --upgrade grpcio grpcio-tools # Retrieve git repos that have our *.proto files. - [ -d googleapis-pb ] || git clone https://github.com/google/googleapis googleapis-pb --depth=1 + [ -d googleapis-pb ] || git clone https://github.com/googleapis/googleapis googleapis-pb --depth=1 cd googleapis-pb && git pull origin master # Make the directory where our *_pb2.py files will go. mkdir -p $(GENERATED_DIR) diff --git a/Makefile.datastore b/Makefile.datastore index 60772791ada7..d9af38948ccf 100644 --- a/Makefile.datastore +++ b/Makefile.datastore @@ -15,7 +15,7 @@ generate: [ -d $(GRPCIO_VIRTUALENV) ] || python2.7 -m virtualenv $(GRPCIO_VIRTUALENV) $(GRPCIO_VIRTUALENV)/bin/pip install --upgrade grpcio grpcio-tools # Retrieve git repos that have our *.proto files. - [ -d googleapis-pb ] || git clone https://github.com/google/googleapis googleapis-pb --depth=1 + [ -d googleapis-pb ] || git clone https://github.com/googleapis/googleapis googleapis-pb --depth=1 cd googleapis-pb && git pull origin master # Make the directory where our *_pb2.py files will go. mkdir -p $(GENERATED_DIR) @@ -23,15 +23,15 @@ generate: $(PROTOC_CMD) \ --proto_path=$(GOOGLEAPIS_PROTOS_DIR) \ --python_out=$(GENERATED_DIR) \ - $(GOOGLEAPIS_PROTOS_DIR)/google/datastore/v1beta3/datastore.proto \ - $(GOOGLEAPIS_PROTOS_DIR)/google/datastore/v1beta3/entity.proto \ - $(GOOGLEAPIS_PROTOS_DIR)/google/datastore/v1beta3/query.proto + $(GOOGLEAPIS_PROTOS_DIR)/google/datastore/v1/datastore.proto \ + $(GOOGLEAPIS_PROTOS_DIR)/google/datastore/v1/entity.proto \ + $(GOOGLEAPIS_PROTOS_DIR)/google/datastore/v1/query.proto # Move the newly generated *_pb2.py files into our library. - cp $(GENERATED_DIR)/google/datastore/v1beta3/* $(DATASTORE_DIR) + cp $(GENERATED_DIR)/google/datastore/v1/* $(DATASTORE_DIR) # Remove all existing *.proto files before we replace rm -f $(DATASTORE_DIR)/*.proto # Copy over the *.proto files into our library. - cp $(GOOGLEAPIS_PROTOS_DIR)/google/datastore/v1beta3/*.proto $(DATASTORE_DIR) + cp $(GOOGLEAPIS_PROTOS_DIR)/google/datastore/v1/*.proto $(DATASTORE_DIR) # Rename all *.proto files in our library with an # underscore and remove executable bit. cd $(DATASTORE_DIR) && \ From c52d3635c16b015a29cb29a39de7a1275270e15a Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Tue, 16 Aug 2016 14:58:35 -0700 Subject: [PATCH 2/3] Replacing v1beta3 with v1 in handwritten datastore references. --- README.rst | 2 +- gcloud/datastore/connection.py | 2 +- scripts/make_datastore_grpc.py | 6 +++--- scripts/rewrite_imports.py | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.rst b/README.rst index dca3ebf74d0a..9ac6a0c72c46 100644 --- a/README.rst +++ b/README.rst @@ -74,7 +74,7 @@ writes, strong consistency for reads and ancestor queries, and eventual consistency for all other queries. .. _Cloud Datastore: https://cloud.google.com/datastore/docs -.. _Datastore API docs: https://cloud.google.com/datastore/docs/apis/v1beta3/ +.. _Datastore API docs: https://cloud.google.com/datastore/docs/ See the ``gcloud-python`` API `datastore documentation`_ to learn how to interact with the Cloud Datastore using this Client Library. diff --git a/gcloud/datastore/connection.py b/gcloud/datastore/connection.py index de030bc04470..21fb77209fc7 100644 --- a/gcloud/datastore/connection.py +++ b/gcloud/datastore/connection.py @@ -43,7 +43,7 @@ class Connection(connection.Connection): API_BASE_URL = 'https://datastore.googleapis.com' """The base of the API call URL.""" - API_VERSION = 'v1beta3' + API_VERSION = 'v1' """The version of the API, used in building the API call's URL.""" API_URL_TEMPLATE = ('{api_base}/{api_version}/projects' diff --git a/scripts/make_datastore_grpc.py b/scripts/make_datastore_grpc.py index d1a50b009200..b128994d863e 100644 --- a/scripts/make_datastore_grpc.py +++ b/scripts/make_datastore_grpc.py @@ -25,7 +25,7 @@ os.path.join(os.path.dirname(__file__), '..')) PROTOS_DIR = os.path.join(ROOT_DIR, 'googleapis-pb') PROTO_PATH = os.path.join(PROTOS_DIR, 'google', 'datastore', - 'v1beta3', 'datastore.proto') + 'v1', 'datastore.proto') GRPC_ONLY_FILE = os.path.join(ROOT_DIR, 'gcloud', 'datastore', '_generated', 'datastore_grpc_pb2.py') GRPCIO_VIRTUALENV = os.environ.get('GRPCIO_VIRTUALENV', 'protoc') @@ -39,7 +39,7 @@ def get_pb2_contents_with_grpc(): """ temp_dir = tempfile.mkdtemp() generated_path = os.path.join(temp_dir, 'google', 'datastore', - 'v1beta3', 'datastore_pb2.py') + 'v1', 'datastore_pb2.py') try: return_code = subprocess.call([ '%s/bin/python' % GRPCIO_VIRTUALENV, @@ -69,7 +69,7 @@ def get_pb2_contents_without_grpc(): """ temp_dir = tempfile.mkdtemp() generated_path = os.path.join(temp_dir, 'google', 'datastore', - 'v1beta3', 'datastore_pb2.py') + 'v1', 'datastore_pb2.py') try: return_code = subprocess.call([ '%s/bin/python' % GRPCIO_VIRTUALENV, diff --git a/scripts/rewrite_imports.py b/scripts/rewrite_imports.py index 75606d776f26..d8c6c3b7de4d 100644 --- a/scripts/rewrite_imports.py +++ b/scripts/rewrite_imports.py @@ -27,8 +27,8 @@ # Bigtable v2 'google.bigtable.v2': 'gcloud.bigtable._generated', 'google.bigtable.admin.v2': 'gcloud.bigtable._generated', - # Datastore v1beta3 - 'google.datastore.v1beta3': 'gcloud.datastore._generated', + # Datastore v1 + 'google.datastore.v1': 'gcloud.datastore._generated', } From c03c21669b7fe51baafaaab030b356bd6d5689ec Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Tue, 16 Aug 2016 14:59:12 -0700 Subject: [PATCH 3/3] Updating datastore generated modules and protos. --- gcloud/datastore/_generated/_datastore.proto | 75 +++-- gcloud/datastore/_generated/_entity.proto | 6 +- gcloud/datastore/_generated/_query.proto | 54 ++- .../_generated/datastore_grpc_pb2.py | 80 +++-- gcloud/datastore/_generated/datastore_pb2.py | 311 ++++++++++-------- gcloud/datastore/_generated/entity_pb2.py | 134 ++++---- gcloud/datastore/_generated/query_pb2.py | 272 +++++++-------- 7 files changed, 507 insertions(+), 425 deletions(-) diff --git a/gcloud/datastore/_generated/_datastore.proto b/gcloud/datastore/_generated/_datastore.proto index e36cc256b02e..5881e9a14714 100644 --- a/gcloud/datastore/_generated/_datastore.proto +++ b/gcloud/datastore/_generated/_datastore.proto @@ -1,4 +1,4 @@ -// Copyright (c) 2015, Google Inc. +// Copyright 2016 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,15 +14,15 @@ syntax = "proto3"; -package google.datastore.v1beta3; +package google.datastore.v1; import "google/api/annotations.proto"; -import "google/datastore/v1beta3/entity.proto"; -import "google/datastore/v1beta3/query.proto"; +import "google/datastore/v1/entity.proto"; +import "google/datastore/v1/query.proto"; option java_multiple_files = true; option java_outer_classname = "DatastoreProto"; -option java_package = "com.google.datastore.v1beta3"; +option java_package = "com.google.datastore.v1"; // Each RPC normalizes the partition IDs of the keys in its input entities, @@ -32,42 +32,41 @@ option java_package = "com.google.datastore.v1beta3"; // input keys sets the project ID (if not already set) to the project ID from // the request. // -// service Datastore { // Looks up entities by key. rpc Lookup(LookupRequest) returns (LookupResponse) { - option (google.api.http) = { post: "/v1beta3/projects/{project_id}:lookup" body: "*" }; + option (google.api.http) = { post: "/v1/projects/{project_id}:lookup" body: "*" }; } // Queries for entities. rpc RunQuery(RunQueryRequest) returns (RunQueryResponse) { - option (google.api.http) = { post: "/v1beta3/projects/{project_id}:runQuery" body: "*" }; + option (google.api.http) = { post: "/v1/projects/{project_id}:runQuery" body: "*" }; } // Begins a new transaction. rpc BeginTransaction(BeginTransactionRequest) returns (BeginTransactionResponse) { - option (google.api.http) = { post: "/v1beta3/projects/{project_id}:beginTransaction" body: "*" }; + option (google.api.http) = { post: "/v1/projects/{project_id}:beginTransaction" body: "*" }; } // Commits a transaction, optionally creating, deleting or modifying some // entities. rpc Commit(CommitRequest) returns (CommitResponse) { - option (google.api.http) = { post: "/v1beta3/projects/{project_id}:commit" body: "*" }; + option (google.api.http) = { post: "/v1/projects/{project_id}:commit" body: "*" }; } // Rolls back a transaction. rpc Rollback(RollbackRequest) returns (RollbackResponse) { - option (google.api.http) = { post: "/v1beta3/projects/{project_id}:rollback" body: "*" }; + option (google.api.http) = { post: "/v1/projects/{project_id}:rollback" body: "*" }; } // Allocates IDs for the given keys, which is useful for referencing an entity // before it is inserted. rpc AllocateIds(AllocateIdsRequest) returns (AllocateIdsResponse) { - option (google.api.http) = { post: "/v1beta3/projects/{project_id}:allocateIds" body: "*" }; + option (google.api.http) = { post: "/v1/projects/{project_id}:allocateIds" body: "*" }; } } -// The request for [google.datastore.v1beta3.Datastore.Lookup][google.datastore.v1beta3.Datastore.Lookup]. +// The request for [Datastore.Lookup][google.datastore.v1.Datastore.Lookup]. message LookupRequest { // The ID of the project against which to make the request. string project_id = 8; @@ -79,7 +78,7 @@ message LookupRequest { repeated Key keys = 3; } -// The response for [google.datastore.v1beta3.Datastore.Lookup][google.datastore.v1beta3.Datastore.Lookup]. +// The response for [Datastore.Lookup][google.datastore.v1.Datastore.Lookup]. message LookupResponse { // Entities found as `ResultType.FULL` entities. The order of results in this // field is undefined and has no relation to the order of the keys in the @@ -97,7 +96,7 @@ message LookupResponse { repeated Key deferred = 3; } -// The request for [google.datastore.v1beta3.Datastore.RunQuery][google.datastore.v1beta3.Datastore.RunQuery]. +// The request for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery]. message RunQueryRequest { // The ID of the project against which to make the request. string project_id = 8; @@ -121,7 +120,7 @@ message RunQueryRequest { } } -// The response for [google.datastore.v1beta3.Datastore.RunQuery][google.datastore.v1beta3.Datastore.RunQuery]. +// The response for [Datastore.RunQuery][google.datastore.v1.Datastore.RunQuery]. message RunQueryResponse { // A batch of query results (always present). QueryResultBatch batch = 1; @@ -130,35 +129,35 @@ message RunQueryResponse { Query query = 2; } -// The request for [google.datastore.v1beta3.Datastore.BeginTransaction][google.datastore.v1beta3.Datastore.BeginTransaction]. +// The request for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction]. message BeginTransactionRequest { // The ID of the project against which to make the request. string project_id = 8; } -// The response for [google.datastore.v1beta3.Datastore.BeginTransaction][google.datastore.v1beta3.Datastore.BeginTransaction]. +// The response for [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction]. message BeginTransactionResponse { // The transaction identifier (always present). bytes transaction = 1; } -// The request for [google.datastore.v1beta3.Datastore.Rollback][google.datastore.v1beta3.Datastore.Rollback]. +// The request for [Datastore.Rollback][google.datastore.v1.Datastore.Rollback]. message RollbackRequest { // The ID of the project against which to make the request. string project_id = 8; // The transaction identifier, returned by a call to - // [google.datastore.v1beta3.Datastore.BeginTransaction][google.datastore.v1beta3.Datastore.BeginTransaction]. + // [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction]. bytes transaction = 1; } -// The response for [google.datastore.v1beta3.Datastore.Rollback][google.datastore.v1beta3.Datastore.Rollback] +// The response for [Datastore.Rollback][google.datastore.v1.Datastore.Rollback]. // (an empty message). message RollbackResponse { } -// The request for [google.datastore.v1beta3.Datastore.Commit][google.datastore.v1beta3.Datastore.Commit]. +// The request for [Datastore.Commit][google.datastore.v1.Datastore.Commit]. message CommitRequest { // The modes available for commits. enum Mode { @@ -183,7 +182,7 @@ message CommitRequest { oneof transaction_selector { // The identifier of the transaction associated with the commit. A // transaction identifier is returned by a call to - // [BeginTransaction][google.datastore.v1beta3.Datastore.BeginTransaction]. + // [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction]. bytes transaction = 1; } @@ -203,7 +202,7 @@ message CommitRequest { repeated Mutation mutations = 6; } -// The response for [google.datastore.v1beta3.Datastore.Commit][google.datastore.v1beta3.Datastore.Commit]. +// The response for [Datastore.Commit][google.datastore.v1.Datastore.Commit]. message CommitResponse { // The result of performing the mutations. // The i-th mutation result corresponds to the i-th mutation in the request. @@ -214,7 +213,7 @@ message CommitResponse { int32 index_updates = 4; } -// The request for [google.datastore.v1beta3.Datastore.AllocateIds][google.datastore.v1beta3.Datastore.AllocateIds]. +// The request for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds]. message AllocateIdsRequest { // The ID of the project against which to make the request. string project_id = 8; @@ -224,7 +223,7 @@ message AllocateIdsRequest { repeated Key keys = 1; } -// The response for [google.datastore.v1beta3.Datastore.AllocateIds][google.datastore.v1beta3.Datastore.AllocateIds]. +// The response for [Datastore.AllocateIds][google.datastore.v1.Datastore.AllocateIds]. message AllocateIdsResponse { // The keys specified in the request (in the same order), each with // its key path completed with a newly allocated ID. @@ -258,6 +257,15 @@ message Mutation { // Must have a complete key path and must not be reserved/read-only. Key delete = 7; } + + // When set, the server will detect whether or not this mutation conflicts + // with the current version of the entity on the server. Conflicting mutations + // are not applied, and are marked as such in MutationResult. + oneof conflict_detection_strategy { + // The version of the entity that this mutation is being applied to. If this + // does not match the current version on the server, the mutation conflicts. + int64 base_version = 8; + } } // The result of applying a mutation. @@ -265,6 +273,17 @@ message MutationResult { // The automatically allocated key. // Set only when the mutation allocated a key. Key key = 3; + + // The version of the entity on the server after processing the mutation. If + // the mutation doesn't change anything on the server, then the version will + // be the version of the current entity or, if no entity is present, a version + // that is strictly greater than the version of any previous entity and less + // than the version of any possible future entity. + int64 version = 4; + + // Whether a conflict was detected for this mutation. Always false when a + // conflict detection strategy field is not set in the mutation. + bool conflict_detected = 5; } // The options shared by read requests. @@ -289,7 +308,9 @@ message ReadOptions { // Cannot be set to `STRONG` for global queries. ReadConsistency read_consistency = 1; - // The transaction in which to read. + // The identifier of the transaction in which to read. A + // transaction identifier is returned by a call to + // [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction]. bytes transaction = 2; } } diff --git a/gcloud/datastore/_generated/_entity.proto b/gcloud/datastore/_generated/_entity.proto index 871c266609ae..a0e7d39138f2 100644 --- a/gcloud/datastore/_generated/_entity.proto +++ b/gcloud/datastore/_generated/_entity.proto @@ -1,4 +1,4 @@ -// Copyright (c) 2015, Google Inc. +// Copyright 2016 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ syntax = "proto3"; -package google.datastore.v1beta3; +package google.datastore.v1; import "google/api/annotations.proto"; import "google/protobuf/struct.proto"; @@ -23,7 +23,7 @@ import "google/type/latlng.proto"; option java_multiple_files = true; option java_outer_classname = "EntityProto"; -option java_package = "com.google.datastore.v1beta3"; +option java_package = "com.google.datastore.v1"; // A partition ID identifies a grouping of entities. The grouping is always diff --git a/gcloud/datastore/_generated/_query.proto b/gcloud/datastore/_generated/_query.proto index af1808eb9bfe..e6dba2b226f9 100644 --- a/gcloud/datastore/_generated/_query.proto +++ b/gcloud/datastore/_generated/_query.proto @@ -1,4 +1,4 @@ -// Copyright (c) 2015, Google Inc. +// Copyright 2016 Google Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,16 +14,16 @@ syntax = "proto3"; -package google.datastore.v1beta3; +package google.datastore.v1; import "google/api/annotations.proto"; -import "google/datastore/v1beta3/entity.proto"; +import "google/datastore/v1/entity.proto"; import "google/protobuf/wrappers.proto"; import "google/type/latlng.proto"; option java_multiple_files = true; option java_outer_classname = "QueryProto"; -option java_package = "com.google.datastore.v1beta3"; +option java_package = "com.google.datastore.v1"; // The result of fetching an entity from Datastore. @@ -50,6 +50,17 @@ message EntityResult { // The resulting entity. Entity entity = 1; + // The version of the entity, a strictly positive number that monotonically + // increases with changes to the entity. + // + // This field is set for [`FULL`][google.datastore.v1.EntityResult.ResultType.FULL] entity + // results. + // + // For [missing][google.datastore.v1.LookupResponse.missing] entities in `LookupResponse`, this + // is the version of the snapshot that was used to look up the entity, and it + // is always set except for eventually consistent reads. + int64 version = 4; + // A cursor that points to the position after the result entity. // Set only when the `EntityResult` is part of a `QueryResultBatch` message. bytes cursor = 3; @@ -76,11 +87,13 @@ message Query { repeated PropertyReference distinct_on = 6; // A starting point for the query results. Query cursors are - // returned in query result batches. + // returned in query result batches and + // [can only be used to continue the same query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets). bytes start_cursor = 7; // An ending point for the query results. Query cursors are - // returned in query result batches. + // returned in query result batches and + // [can only be used to limit the same query](https://cloud.google.com/datastore/docs/concepts/queries#cursors_limits_and_offsets). bytes end_cursor = 8; // The number of results to skip. Applies before limit, but after all other @@ -207,24 +220,24 @@ message GqlQuery { // [here](https://cloud.google.com/datastore/docs/apis/gql/gql_reference). string query_string = 1; - // When false, the query string must not contain any literals and instead - // must bind all values. For example, + // When false, the query string must not contain any literals and instead must + // bind all values. For example, // `SELECT * FROM Kind WHERE a = 'string literal'` is not allowed, while // `SELECT * FROM Kind WHERE a = @value` is. bool allow_literals = 2; - // For each non-reserved named binding site in the query string, - // there must be a named parameter with that name, - // but not necessarily the inverse. + // For each non-reserved named binding site in the query string, there must be + // a named parameter with that name, but not necessarily the inverse. + // // Key must match regex `[A-Za-z_$][A-Za-z_$0-9]*`, must not match regex // `__.*__`, and must not be `""`. map named_bindings = 5; // Numbered binding site @1 references the first numbered parameter, // effectively using 1-based indexing, rather than the usual 0. - // For each binding site numbered i in `query_string`, - // there must be an i-th numbered parameter. - // The inverse must also be true. + // + // For each binding site numbered i in `query_string`, there must be an i-th + // numbered parameter. The inverse must also be true. repeated GqlQueryParameter positional_bindings = 4; } @@ -254,7 +267,8 @@ message QueryResultBatch { // The query is finished, but there may be more results after the limit. MORE_RESULTS_AFTER_LIMIT = 2; - // The query is finished, but there may be more results after the end cursor. + // The query is finished, but there may be more results after the end + // cursor. MORE_RESULTS_AFTER_CURSOR = 4; // The query has been exhausted. @@ -279,4 +293,14 @@ message QueryResultBatch { // The state of the query after the current batch. MoreResultsType more_results = 5; + + // The version number of the snapshot this batch was returned from. + // This applies to the range of results from the query's `start_cursor` (or + // the beginning of the query if no cursor was given) to this batch's + // `end_cursor` (not the query's `end_cursor`). + // + // In a single transaction, subsequent query result batches for the same query + // can have a greater snapshot version number. Each batch's snapshot version + // is valid for all preceding batches. + int64 snapshot_version = 7; } diff --git a/gcloud/datastore/_generated/datastore_grpc_pb2.py b/gcloud/datastore/_generated/datastore_grpc_pb2.py index b66d8eb2f07f..9e753ad6745d 100644 --- a/gcloud/datastore/_generated/datastore_grpc_pb2.py +++ b/gcloud/datastore/_generated/datastore_grpc_pb2.py @@ -13,7 +13,6 @@ class DatastoreStub(object): input keys sets the project ID (if not already set) to the project ID from the request. - """ def __init__(self, channel): @@ -23,32 +22,32 @@ def __init__(self, channel): channel: A grpc.Channel. """ self.Lookup = channel.unary_unary( - '/google.datastore.v1beta3.Datastore/Lookup', + '/google.datastore.v1.Datastore/Lookup', request_serializer=LookupRequest.SerializeToString, response_deserializer=LookupResponse.FromString, ) self.RunQuery = channel.unary_unary( - '/google.datastore.v1beta3.Datastore/RunQuery', + '/google.datastore.v1.Datastore/RunQuery', request_serializer=RunQueryRequest.SerializeToString, response_deserializer=RunQueryResponse.FromString, ) self.BeginTransaction = channel.unary_unary( - '/google.datastore.v1beta3.Datastore/BeginTransaction', + '/google.datastore.v1.Datastore/BeginTransaction', request_serializer=BeginTransactionRequest.SerializeToString, response_deserializer=BeginTransactionResponse.FromString, ) self.Commit = channel.unary_unary( - '/google.datastore.v1beta3.Datastore/Commit', + '/google.datastore.v1.Datastore/Commit', request_serializer=CommitRequest.SerializeToString, response_deserializer=CommitResponse.FromString, ) self.Rollback = channel.unary_unary( - '/google.datastore.v1beta3.Datastore/Rollback', + '/google.datastore.v1.Datastore/Rollback', request_serializer=RollbackRequest.SerializeToString, response_deserializer=RollbackResponse.FromString, ) self.AllocateIds = channel.unary_unary( - '/google.datastore.v1beta3.Datastore/AllocateIds', + '/google.datastore.v1.Datastore/AllocateIds', request_serializer=AllocateIdsRequest.SerializeToString, response_deserializer=AllocateIdsResponse.FromString, ) @@ -62,7 +61,6 @@ class DatastoreServicer(object): input keys sets the project ID (if not already set) to the project ID from the request. - """ def Lookup(self, request, context): @@ -144,7 +142,7 @@ def add_DatastoreServicer_to_server(servicer, server): ), } generic_handler = grpc.method_handlers_generic_handler( - 'google.datastore.v1beta3.Datastore', rpc_method_handlers) + 'google.datastore.v1.Datastore', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) @@ -156,7 +154,6 @@ class BetaDatastoreServicer(object): input keys sets the project ID (if not already set) to the project ID from the request. - """ def Lookup(self, request, context): """Looks up entities by key. @@ -194,7 +191,6 @@ class BetaDatastoreStub(object): input keys sets the project ID (if not already set) to the project ID from the request. - """ def Lookup(self, request, timeout, metadata=None, with_call=False, protocol_options=None): """Looks up entities by key. @@ -232,28 +228,28 @@ def AllocateIds(self, request, timeout, metadata=None, with_call=False, protocol def beta_create_Datastore_server(servicer, pool=None, pool_size=None, default_timeout=None, maximum_timeout=None): request_deserializers = { - ('google.datastore.v1beta3.Datastore', 'AllocateIds'): AllocateIdsRequest.FromString, - ('google.datastore.v1beta3.Datastore', 'BeginTransaction'): BeginTransactionRequest.FromString, - ('google.datastore.v1beta3.Datastore', 'Commit'): CommitRequest.FromString, - ('google.datastore.v1beta3.Datastore', 'Lookup'): LookupRequest.FromString, - ('google.datastore.v1beta3.Datastore', 'Rollback'): RollbackRequest.FromString, - ('google.datastore.v1beta3.Datastore', 'RunQuery'): RunQueryRequest.FromString, + ('google.datastore.v1.Datastore', 'AllocateIds'): AllocateIdsRequest.FromString, + ('google.datastore.v1.Datastore', 'BeginTransaction'): BeginTransactionRequest.FromString, + ('google.datastore.v1.Datastore', 'Commit'): CommitRequest.FromString, + ('google.datastore.v1.Datastore', 'Lookup'): LookupRequest.FromString, + ('google.datastore.v1.Datastore', 'Rollback'): RollbackRequest.FromString, + ('google.datastore.v1.Datastore', 'RunQuery'): RunQueryRequest.FromString, } response_serializers = { - ('google.datastore.v1beta3.Datastore', 'AllocateIds'): AllocateIdsResponse.SerializeToString, - ('google.datastore.v1beta3.Datastore', 'BeginTransaction'): BeginTransactionResponse.SerializeToString, - ('google.datastore.v1beta3.Datastore', 'Commit'): CommitResponse.SerializeToString, - ('google.datastore.v1beta3.Datastore', 'Lookup'): LookupResponse.SerializeToString, - ('google.datastore.v1beta3.Datastore', 'Rollback'): RollbackResponse.SerializeToString, - ('google.datastore.v1beta3.Datastore', 'RunQuery'): RunQueryResponse.SerializeToString, + ('google.datastore.v1.Datastore', 'AllocateIds'): AllocateIdsResponse.SerializeToString, + ('google.datastore.v1.Datastore', 'BeginTransaction'): BeginTransactionResponse.SerializeToString, + ('google.datastore.v1.Datastore', 'Commit'): CommitResponse.SerializeToString, + ('google.datastore.v1.Datastore', 'Lookup'): LookupResponse.SerializeToString, + ('google.datastore.v1.Datastore', 'Rollback'): RollbackResponse.SerializeToString, + ('google.datastore.v1.Datastore', 'RunQuery'): RunQueryResponse.SerializeToString, } method_implementations = { - ('google.datastore.v1beta3.Datastore', 'AllocateIds'): face_utilities.unary_unary_inline(servicer.AllocateIds), - ('google.datastore.v1beta3.Datastore', 'BeginTransaction'): face_utilities.unary_unary_inline(servicer.BeginTransaction), - ('google.datastore.v1beta3.Datastore', 'Commit'): face_utilities.unary_unary_inline(servicer.Commit), - ('google.datastore.v1beta3.Datastore', 'Lookup'): face_utilities.unary_unary_inline(servicer.Lookup), - ('google.datastore.v1beta3.Datastore', 'Rollback'): face_utilities.unary_unary_inline(servicer.Rollback), - ('google.datastore.v1beta3.Datastore', 'RunQuery'): face_utilities.unary_unary_inline(servicer.RunQuery), + ('google.datastore.v1.Datastore', 'AllocateIds'): face_utilities.unary_unary_inline(servicer.AllocateIds), + ('google.datastore.v1.Datastore', 'BeginTransaction'): face_utilities.unary_unary_inline(servicer.BeginTransaction), + ('google.datastore.v1.Datastore', 'Commit'): face_utilities.unary_unary_inline(servicer.Commit), + ('google.datastore.v1.Datastore', 'Lookup'): face_utilities.unary_unary_inline(servicer.Lookup), + ('google.datastore.v1.Datastore', 'Rollback'): face_utilities.unary_unary_inline(servicer.Rollback), + ('google.datastore.v1.Datastore', 'RunQuery'): face_utilities.unary_unary_inline(servicer.RunQuery), } server_options = beta_implementations.server_options(request_deserializers=request_deserializers, response_serializers=response_serializers, thread_pool=pool, thread_pool_size=pool_size, default_timeout=default_timeout, maximum_timeout=maximum_timeout) return beta_implementations.server(method_implementations, options=server_options) @@ -261,20 +257,20 @@ def beta_create_Datastore_server(servicer, pool=None, pool_size=None, default_ti def beta_create_Datastore_stub(channel, host=None, metadata_transformer=None, pool=None, pool_size=None): request_serializers = { - ('google.datastore.v1beta3.Datastore', 'AllocateIds'): AllocateIdsRequest.SerializeToString, - ('google.datastore.v1beta3.Datastore', 'BeginTransaction'): BeginTransactionRequest.SerializeToString, - ('google.datastore.v1beta3.Datastore', 'Commit'): CommitRequest.SerializeToString, - ('google.datastore.v1beta3.Datastore', 'Lookup'): LookupRequest.SerializeToString, - ('google.datastore.v1beta3.Datastore', 'Rollback'): RollbackRequest.SerializeToString, - ('google.datastore.v1beta3.Datastore', 'RunQuery'): RunQueryRequest.SerializeToString, + ('google.datastore.v1.Datastore', 'AllocateIds'): AllocateIdsRequest.SerializeToString, + ('google.datastore.v1.Datastore', 'BeginTransaction'): BeginTransactionRequest.SerializeToString, + ('google.datastore.v1.Datastore', 'Commit'): CommitRequest.SerializeToString, + ('google.datastore.v1.Datastore', 'Lookup'): LookupRequest.SerializeToString, + ('google.datastore.v1.Datastore', 'Rollback'): RollbackRequest.SerializeToString, + ('google.datastore.v1.Datastore', 'RunQuery'): RunQueryRequest.SerializeToString, } response_deserializers = { - ('google.datastore.v1beta3.Datastore', 'AllocateIds'): AllocateIdsResponse.FromString, - ('google.datastore.v1beta3.Datastore', 'BeginTransaction'): BeginTransactionResponse.FromString, - ('google.datastore.v1beta3.Datastore', 'Commit'): CommitResponse.FromString, - ('google.datastore.v1beta3.Datastore', 'Lookup'): LookupResponse.FromString, - ('google.datastore.v1beta3.Datastore', 'Rollback'): RollbackResponse.FromString, - ('google.datastore.v1beta3.Datastore', 'RunQuery'): RunQueryResponse.FromString, + ('google.datastore.v1.Datastore', 'AllocateIds'): AllocateIdsResponse.FromString, + ('google.datastore.v1.Datastore', 'BeginTransaction'): BeginTransactionResponse.FromString, + ('google.datastore.v1.Datastore', 'Commit'): CommitResponse.FromString, + ('google.datastore.v1.Datastore', 'Lookup'): LookupResponse.FromString, + ('google.datastore.v1.Datastore', 'Rollback'): RollbackResponse.FromString, + ('google.datastore.v1.Datastore', 'RunQuery'): RunQueryResponse.FromString, } cardinalities = { 'AllocateIds': cardinality.Cardinality.UNARY_UNARY, @@ -285,4 +281,4 @@ def beta_create_Datastore_stub(channel, host=None, metadata_transformer=None, po 'RunQuery': cardinality.Cardinality.UNARY_UNARY, } stub_options = beta_implementations.stub_options(host=host, metadata_transformer=metadata_transformer, request_serializers=request_serializers, response_deserializers=response_deserializers, thread_pool=pool, thread_pool_size=pool_size) - return beta_implementations.dynamic_stub(channel, 'google.datastore.v1beta3.Datastore', cardinalities, options=stub_options) + return beta_implementations.dynamic_stub(channel, 'google.datastore.v1.Datastore', cardinalities, options=stub_options) diff --git a/gcloud/datastore/_generated/datastore_pb2.py b/gcloud/datastore/_generated/datastore_pb2.py index a07e5cc5801a..ff61f1995e6b 100644 --- a/gcloud/datastore/_generated/datastore_pb2.py +++ b/gcloud/datastore/_generated/datastore_pb2.py @@ -1,5 +1,5 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! -# source: google/datastore/v1beta3/datastore.proto +# source: google/datastore/v1/datastore.proto import sys _b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) @@ -14,24 +14,24 @@ from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2 -from gcloud.datastore._generated import entity_pb2 as google_dot_datastore_dot_v1beta3_dot_entity__pb2 -from gcloud.datastore._generated import query_pb2 as google_dot_datastore_dot_v1beta3_dot_query__pb2 +from gcloud.datastore._generated import entity_pb2 as google_dot_datastore_dot_v1_dot_entity__pb2 +from gcloud.datastore._generated import query_pb2 as google_dot_datastore_dot_v1_dot_query__pb2 DESCRIPTOR = _descriptor.FileDescriptor( - name='google/datastore/v1beta3/datastore.proto', - package='google.datastore.v1beta3', + name='google/datastore/v1/datastore.proto', + package='google.datastore.v1', syntax='proto3', - serialized_pb=_b('\n(google/datastore/v1beta3/datastore.proto\x12\x18google.datastore.v1beta3\x1a\x1cgoogle/api/annotations.proto\x1a%google/datastore/v1beta3/entity.proto\x1a$google/datastore/v1beta3/query.proto\"\x8d\x01\n\rLookupRequest\x12\x12\n\nproject_id\x18\x08 \x01(\t\x12;\n\x0cread_options\x18\x01 \x01(\x0b\x32%.google.datastore.v1beta3.ReadOptions\x12+\n\x04keys\x18\x03 \x03(\x0b\x32\x1d.google.datastore.v1beta3.Key\"\xb1\x01\n\x0eLookupResponse\x12\x35\n\x05\x66ound\x18\x01 \x03(\x0b\x32&.google.datastore.v1beta3.EntityResult\x12\x37\n\x07missing\x18\x02 \x03(\x0b\x32&.google.datastore.v1beta3.EntityResult\x12/\n\x08\x64\x65\x66\x65rred\x18\x03 \x03(\x0b\x32\x1d.google.datastore.v1beta3.Key\"\x98\x02\n\x0fRunQueryRequest\x12\x12\n\nproject_id\x18\x08 \x01(\t\x12;\n\x0cpartition_id\x18\x02 \x01(\x0b\x32%.google.datastore.v1beta3.PartitionId\x12;\n\x0cread_options\x18\x01 \x01(\x0b\x32%.google.datastore.v1beta3.ReadOptions\x12\x30\n\x05query\x18\x03 \x01(\x0b\x32\x1f.google.datastore.v1beta3.QueryH\x00\x12\x37\n\tgql_query\x18\x07 \x01(\x0b\x32\".google.datastore.v1beta3.GqlQueryH\x00\x42\x0c\n\nquery_type\"}\n\x10RunQueryResponse\x12\x39\n\x05\x62\x61tch\x18\x01 \x01(\x0b\x32*.google.datastore.v1beta3.QueryResultBatch\x12.\n\x05query\x18\x02 \x01(\x0b\x32\x1f.google.datastore.v1beta3.Query\"-\n\x17\x42\x65ginTransactionRequest\x12\x12\n\nproject_id\x18\x08 \x01(\t\"/\n\x18\x42\x65ginTransactionResponse\x12\x13\n\x0btransaction\x18\x01 \x01(\x0c\":\n\x0fRollbackRequest\x12\x12\n\nproject_id\x18\x08 \x01(\t\x12\x13\n\x0btransaction\x18\x01 \x01(\x0c\"\x12\n\x10RollbackResponse\"\x8d\x02\n\rCommitRequest\x12\x12\n\nproject_id\x18\x08 \x01(\t\x12:\n\x04mode\x18\x05 \x01(\x0e\x32,.google.datastore.v1beta3.CommitRequest.Mode\x12\x15\n\x0btransaction\x18\x01 \x01(\x0cH\x00\x12\x35\n\tmutations\x18\x06 \x03(\x0b\x32\".google.datastore.v1beta3.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\"k\n\x0e\x43ommitResponse\x12\x42\n\x10mutation_results\x18\x03 \x03(\x0b\x32(.google.datastore.v1beta3.MutationResult\x12\x15\n\rindex_updates\x18\x04 \x01(\x05\"U\n\x12\x41llocateIdsRequest\x12\x12\n\nproject_id\x18\x08 \x01(\t\x12+\n\x04keys\x18\x01 \x03(\x0b\x32\x1d.google.datastore.v1beta3.Key\"B\n\x13\x41llocateIdsResponse\x12+\n\x04keys\x18\x01 \x03(\x0b\x32\x1d.google.datastore.v1beta3.Key\"\xe4\x01\n\x08Mutation\x12\x32\n\x06insert\x18\x04 \x01(\x0b\x32 .google.datastore.v1beta3.EntityH\x00\x12\x32\n\x06update\x18\x05 \x01(\x0b\x32 .google.datastore.v1beta3.EntityH\x00\x12\x32\n\x06upsert\x18\x06 \x01(\x0b\x32 .google.datastore.v1beta3.EntityH\x00\x12/\n\x06\x64\x65lete\x18\x07 \x01(\x0b\x32\x1d.google.datastore.v1beta3.KeyH\x00\x42\x0b\n\toperation\"<\n\x0eMutationResult\x12*\n\x03key\x18\x03 \x01(\x0b\x32\x1d.google.datastore.v1beta3.Key\"\xda\x01\n\x0bReadOptions\x12Q\n\x10read_consistency\x18\x01 \x01(\x0e\x32\x35.google.datastore.v1beta3.ReadOptions.ReadConsistencyH\x00\x12\x15\n\x0btransaction\x18\x02 \x01(\x0cH\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_type2\xb7\x07\n\tDatastore\x12\x8d\x01\n\x06Lookup\x12\'.google.datastore.v1beta3.LookupRequest\x1a(.google.datastore.v1beta3.LookupResponse\"0\x82\xd3\xe4\x93\x02*\"%/v1beta3/projects/{project_id}:lookup:\x01*\x12\x95\x01\n\x08RunQuery\x12).google.datastore.v1beta3.RunQueryRequest\x1a*.google.datastore.v1beta3.RunQueryResponse\"2\x82\xd3\xe4\x93\x02,\"\'/v1beta3/projects/{project_id}:runQuery:\x01*\x12\xb5\x01\n\x10\x42\x65ginTransaction\x12\x31.google.datastore.v1beta3.BeginTransactionRequest\x1a\x32.google.datastore.v1beta3.BeginTransactionResponse\":\x82\xd3\xe4\x93\x02\x34\"//v1beta3/projects/{project_id}:beginTransaction:\x01*\x12\x8d\x01\n\x06\x43ommit\x12\'.google.datastore.v1beta3.CommitRequest\x1a(.google.datastore.v1beta3.CommitResponse\"0\x82\xd3\xe4\x93\x02*\"%/v1beta3/projects/{project_id}:commit:\x01*\x12\x95\x01\n\x08Rollback\x12).google.datastore.v1beta3.RollbackRequest\x1a*.google.datastore.v1beta3.RollbackResponse\"2\x82\xd3\xe4\x93\x02,\"\'/v1beta3/projects/{project_id}:rollback:\x01*\x12\xa1\x01\n\x0b\x41llocateIds\x12,.google.datastore.v1beta3.AllocateIdsRequest\x1a-.google.datastore.v1beta3.AllocateIdsResponse\"5\x82\xd3\xe4\x93\x02/\"*/v1beta3/projects/{project_id}:allocateIds:\x01*B0\n\x1c\x63om.google.datastore.v1beta3B\x0e\x44\x61tastoreProtoP\x01\x62\x06proto3') + serialized_pb=_b('\n#google/datastore/v1/datastore.proto\x12\x13google.datastore.v1\x1a\x1cgoogle/api/annotations.proto\x1a google/datastore/v1/entity.proto\x1a\x1fgoogle/datastore/v1/query.proto\"\x83\x01\n\rLookupRequest\x12\x12\n\nproject_id\x18\x08 \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.Key\"\xa2\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\"\x84\x02\n\x0fRunQueryRequest\x12\x12\n\nproject_id\x18\x08 \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\"s\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\"-\n\x17\x42\x65ginTransactionRequest\x12\x12\n\nproject_id\x18\x08 \x01(\t\"/\n\x18\x42\x65ginTransactionResponse\x12\x13\n\x0btransaction\x18\x01 \x01(\x0c\":\n\x0fRollbackRequest\x12\x12\n\nproject_id\x18\x08 \x01(\t\x12\x13\n\x0btransaction\x18\x01 \x01(\x0c\"\x12\n\x10RollbackResponse\"\x83\x02\n\rCommitRequest\x12\x12\n\nproject_id\x18\x08 \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\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\"f\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\"P\n\x12\x41llocateIdsRequest\x12\x12\n\nproject_id\x18\x08 \x01(\t\x12&\n\x04keys\x18\x01 \x03(\x0b\x32\x18.google.datastore.v1.Key\"=\n\x13\x41llocateIdsResponse\x12&\n\x04keys\x18\x01 \x03(\x0b\x32\x18.google.datastore.v1.Key\"\x87\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\x42\x0b\n\toperationB\x1d\n\x1b\x63onflict_detection_strategy\"c\n\x0eMutationResult\x12%\n\x03key\x18\x03 \x01(\x0b\x32\x18.google.datastore.v1.Key\x12\x0f\n\x07version\x18\x04 \x01(\x03\x12\x19\n\x11\x63onflict_detected\x18\x05 \x01(\x08\"\xd5\x01\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\"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_type2\xdb\x06\n\tDatastore\x12~\n\x06Lookup\x12\".google.datastore.v1.LookupRequest\x1a#.google.datastore.v1.LookupResponse\"+\x82\xd3\xe4\x93\x02%\" /v1/projects/{project_id}:lookup:\x01*\x12\x86\x01\n\x08RunQuery\x12$.google.datastore.v1.RunQueryRequest\x1a%.google.datastore.v1.RunQueryResponse\"-\x82\xd3\xe4\x93\x02\'\"\"/v1/projects/{project_id}:runQuery:\x01*\x12\xa6\x01\n\x10\x42\x65ginTransaction\x12,.google.datastore.v1.BeginTransactionRequest\x1a-.google.datastore.v1.BeginTransactionResponse\"5\x82\xd3\xe4\x93\x02/\"*/v1/projects/{project_id}:beginTransaction:\x01*\x12~\n\x06\x43ommit\x12\".google.datastore.v1.CommitRequest\x1a#.google.datastore.v1.CommitResponse\"+\x82\xd3\xe4\x93\x02%\" /v1/projects/{project_id}:commit:\x01*\x12\x86\x01\n\x08Rollback\x12$.google.datastore.v1.RollbackRequest\x1a%.google.datastore.v1.RollbackResponse\"-\x82\xd3\xe4\x93\x02\'\"\"/v1/projects/{project_id}:rollback:\x01*\x12\x92\x01\n\x0b\x41llocateIds\x12\'.google.datastore.v1.AllocateIdsRequest\x1a(.google.datastore.v1.AllocateIdsResponse\"0\x82\xd3\xe4\x93\x02*\"%/v1/projects/{project_id}:allocateIds:\x01*B+\n\x17\x63om.google.datastore.v1B\x0e\x44\x61tastoreProtoP\x01\x62\x06proto3') , - dependencies=[google_dot_api_dot_annotations__pb2.DESCRIPTOR,google_dot_datastore_dot_v1beta3_dot_entity__pb2.DESCRIPTOR,google_dot_datastore_dot_v1beta3_dot_query__pb2.DESCRIPTOR,]) + dependencies=[google_dot_api_dot_annotations__pb2.DESCRIPTOR,google_dot_datastore_dot_v1_dot_entity__pb2.DESCRIPTOR,google_dot_datastore_dot_v1_dot_query__pb2.DESCRIPTOR,]) _sym_db.RegisterFileDescriptor(DESCRIPTOR) _COMMITREQUEST_MODE = _descriptor.EnumDescriptor( name='Mode', - full_name='google.datastore.v1beta3.CommitRequest.Mode', + full_name='google.datastore.v1.CommitRequest.Mode', filename=None, file=DESCRIPTOR, values=[ @@ -50,14 +50,14 @@ ], containing_type=None, options=None, - serialized_start=1263, - serialized_end=1333, + serialized_start=1178, + serialized_end=1248, ) _sym_db.RegisterEnumDescriptor(_COMMITREQUEST_MODE) _READOPTIONS_READCONSISTENCY = _descriptor.EnumDescriptor( name='ReadConsistency', - full_name='google.datastore.v1beta3.ReadOptions.ReadConsistency', + full_name='google.datastore.v1.ReadOptions.ReadConsistency', filename=None, file=DESCRIPTOR, values=[ @@ -76,35 +76,35 @@ ], containing_type=None, options=None, - serialized_start=2038, - serialized_end=2115, + serialized_start=2007, + serialized_end=2084, ) _sym_db.RegisterEnumDescriptor(_READOPTIONS_READCONSISTENCY) _LOOKUPREQUEST = _descriptor.Descriptor( name='LookupRequest', - full_name='google.datastore.v1beta3.LookupRequest', + full_name='google.datastore.v1.LookupRequest', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='project_id', full_name='google.datastore.v1beta3.LookupRequest.project_id', index=0, + name='project_id', full_name='google.datastore.v1.LookupRequest.project_id', index=0, number=8, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='read_options', full_name='google.datastore.v1beta3.LookupRequest.read_options', index=1, + name='read_options', full_name='google.datastore.v1.LookupRequest.read_options', index=1, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='keys', full_name='google.datastore.v1beta3.LookupRequest.keys', index=2, + name='keys', full_name='google.datastore.v1.LookupRequest.keys', index=2, number=3, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, @@ -122,34 +122,34 @@ extension_ranges=[], oneofs=[ ], - serialized_start=178, - serialized_end=319, + serialized_start=158, + serialized_end=289, ) _LOOKUPRESPONSE = _descriptor.Descriptor( name='LookupResponse', - full_name='google.datastore.v1beta3.LookupResponse', + full_name='google.datastore.v1.LookupResponse', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='found', full_name='google.datastore.v1beta3.LookupResponse.found', index=0, + name='found', full_name='google.datastore.v1.LookupResponse.found', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='missing', full_name='google.datastore.v1beta3.LookupResponse.missing', index=1, + name='missing', full_name='google.datastore.v1.LookupResponse.missing', index=1, number=2, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='deferred', full_name='google.datastore.v1beta3.LookupResponse.deferred', index=2, + name='deferred', full_name='google.datastore.v1.LookupResponse.deferred', index=2, number=3, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, @@ -167,48 +167,48 @@ extension_ranges=[], oneofs=[ ], - serialized_start=322, - serialized_end=499, + serialized_start=292, + serialized_end=454, ) _RUNQUERYREQUEST = _descriptor.Descriptor( name='RunQueryRequest', - full_name='google.datastore.v1beta3.RunQueryRequest', + full_name='google.datastore.v1.RunQueryRequest', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='project_id', full_name='google.datastore.v1beta3.RunQueryRequest.project_id', index=0, + name='project_id', full_name='google.datastore.v1.RunQueryRequest.project_id', index=0, number=8, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='partition_id', full_name='google.datastore.v1beta3.RunQueryRequest.partition_id', index=1, + name='partition_id', full_name='google.datastore.v1.RunQueryRequest.partition_id', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='read_options', full_name='google.datastore.v1beta3.RunQueryRequest.read_options', index=2, + name='read_options', full_name='google.datastore.v1.RunQueryRequest.read_options', index=2, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='query', full_name='google.datastore.v1beta3.RunQueryRequest.query', index=3, + name='query', full_name='google.datastore.v1.RunQueryRequest.query', index=3, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='gql_query', full_name='google.datastore.v1beta3.RunQueryRequest.gql_query', index=4, + name='gql_query', full_name='google.datastore.v1.RunQueryRequest.gql_query', index=4, number=7, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -226,30 +226,30 @@ extension_ranges=[], oneofs=[ _descriptor.OneofDescriptor( - name='query_type', full_name='google.datastore.v1beta3.RunQueryRequest.query_type', + name='query_type', full_name='google.datastore.v1.RunQueryRequest.query_type', index=0, containing_type=None, fields=[]), ], - serialized_start=502, - serialized_end=782, + serialized_start=457, + serialized_end=717, ) _RUNQUERYRESPONSE = _descriptor.Descriptor( name='RunQueryResponse', - full_name='google.datastore.v1beta3.RunQueryResponse', + full_name='google.datastore.v1.RunQueryResponse', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='batch', full_name='google.datastore.v1beta3.RunQueryResponse.batch', index=0, + name='batch', full_name='google.datastore.v1.RunQueryResponse.batch', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='query', full_name='google.datastore.v1beta3.RunQueryResponse.query', index=1, + name='query', full_name='google.datastore.v1.RunQueryResponse.query', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -267,20 +267,20 @@ extension_ranges=[], oneofs=[ ], - serialized_start=784, - serialized_end=909, + serialized_start=719, + serialized_end=834, ) _BEGINTRANSACTIONREQUEST = _descriptor.Descriptor( name='BeginTransactionRequest', - full_name='google.datastore.v1beta3.BeginTransactionRequest', + full_name='google.datastore.v1.BeginTransactionRequest', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='project_id', full_name='google.datastore.v1beta3.BeginTransactionRequest.project_id', index=0, + name='project_id', full_name='google.datastore.v1.BeginTransactionRequest.project_id', index=0, number=8, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, @@ -298,20 +298,20 @@ extension_ranges=[], oneofs=[ ], - serialized_start=911, - serialized_end=956, + serialized_start=836, + serialized_end=881, ) _BEGINTRANSACTIONRESPONSE = _descriptor.Descriptor( name='BeginTransactionResponse', - full_name='google.datastore.v1beta3.BeginTransactionResponse', + full_name='google.datastore.v1.BeginTransactionResponse', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='transaction', full_name='google.datastore.v1beta3.BeginTransactionResponse.transaction', index=0, + name='transaction', full_name='google.datastore.v1.BeginTransactionResponse.transaction', index=0, number=1, type=12, cpp_type=9, label=1, has_default_value=False, default_value=_b(""), message_type=None, enum_type=None, containing_type=None, @@ -329,27 +329,27 @@ extension_ranges=[], oneofs=[ ], - serialized_start=958, - serialized_end=1005, + serialized_start=883, + serialized_end=930, ) _ROLLBACKREQUEST = _descriptor.Descriptor( name='RollbackRequest', - full_name='google.datastore.v1beta3.RollbackRequest', + full_name='google.datastore.v1.RollbackRequest', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='project_id', full_name='google.datastore.v1beta3.RollbackRequest.project_id', index=0, + name='project_id', full_name='google.datastore.v1.RollbackRequest.project_id', index=0, number=8, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='transaction', full_name='google.datastore.v1beta3.RollbackRequest.transaction', index=1, + name='transaction', full_name='google.datastore.v1.RollbackRequest.transaction', index=1, number=1, type=12, cpp_type=9, label=1, has_default_value=False, default_value=_b(""), message_type=None, enum_type=None, containing_type=None, @@ -367,14 +367,14 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1007, - serialized_end=1065, + serialized_start=932, + serialized_end=990, ) _ROLLBACKRESPONSE = _descriptor.Descriptor( name='RollbackResponse', - full_name='google.datastore.v1beta3.RollbackResponse', + full_name='google.datastore.v1.RollbackResponse', filename=None, file=DESCRIPTOR, containing_type=None, @@ -391,41 +391,41 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1067, - serialized_end=1085, + serialized_start=992, + serialized_end=1010, ) _COMMITREQUEST = _descriptor.Descriptor( name='CommitRequest', - full_name='google.datastore.v1beta3.CommitRequest', + full_name='google.datastore.v1.CommitRequest', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='project_id', full_name='google.datastore.v1beta3.CommitRequest.project_id', index=0, + name='project_id', full_name='google.datastore.v1.CommitRequest.project_id', index=0, number=8, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='mode', full_name='google.datastore.v1beta3.CommitRequest.mode', index=1, + name='mode', full_name='google.datastore.v1.CommitRequest.mode', index=1, number=5, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='transaction', full_name='google.datastore.v1beta3.CommitRequest.transaction', index=2, + name='transaction', full_name='google.datastore.v1.CommitRequest.transaction', index=2, number=1, type=12, cpp_type=9, label=1, has_default_value=False, default_value=_b(""), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='mutations', full_name='google.datastore.v1beta3.CommitRequest.mutations', index=3, + name='mutations', full_name='google.datastore.v1.CommitRequest.mutations', index=3, number=6, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, @@ -444,30 +444,30 @@ extension_ranges=[], oneofs=[ _descriptor.OneofDescriptor( - name='transaction_selector', full_name='google.datastore.v1beta3.CommitRequest.transaction_selector', + name='transaction_selector', full_name='google.datastore.v1.CommitRequest.transaction_selector', index=0, containing_type=None, fields=[]), ], - serialized_start=1088, - serialized_end=1357, + serialized_start=1013, + serialized_end=1272, ) _COMMITRESPONSE = _descriptor.Descriptor( name='CommitResponse', - full_name='google.datastore.v1beta3.CommitResponse', + full_name='google.datastore.v1.CommitResponse', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='mutation_results', full_name='google.datastore.v1beta3.CommitResponse.mutation_results', index=0, + name='mutation_results', full_name='google.datastore.v1.CommitResponse.mutation_results', index=0, number=3, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='index_updates', full_name='google.datastore.v1beta3.CommitResponse.index_updates', index=1, + name='index_updates', full_name='google.datastore.v1.CommitResponse.index_updates', index=1, number=4, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, @@ -485,27 +485,27 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1359, - serialized_end=1466, + serialized_start=1274, + serialized_end=1376, ) _ALLOCATEIDSREQUEST = _descriptor.Descriptor( name='AllocateIdsRequest', - full_name='google.datastore.v1beta3.AllocateIdsRequest', + full_name='google.datastore.v1.AllocateIdsRequest', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='project_id', full_name='google.datastore.v1beta3.AllocateIdsRequest.project_id', index=0, + name='project_id', full_name='google.datastore.v1.AllocateIdsRequest.project_id', index=0, number=8, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='keys', full_name='google.datastore.v1beta3.AllocateIdsRequest.keys', index=1, + name='keys', full_name='google.datastore.v1.AllocateIdsRequest.keys', index=1, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, @@ -523,20 +523,20 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1468, - serialized_end=1553, + serialized_start=1378, + serialized_end=1458, ) _ALLOCATEIDSRESPONSE = _descriptor.Descriptor( name='AllocateIdsResponse', - full_name='google.datastore.v1beta3.AllocateIdsResponse', + full_name='google.datastore.v1.AllocateIdsResponse', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='keys', full_name='google.datastore.v1beta3.AllocateIdsResponse.keys', index=0, + name='keys', full_name='google.datastore.v1.AllocateIdsResponse.keys', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, @@ -554,46 +554,53 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1555, - serialized_end=1621, + serialized_start=1460, + serialized_end=1521, ) _MUTATION = _descriptor.Descriptor( name='Mutation', - full_name='google.datastore.v1beta3.Mutation', + full_name='google.datastore.v1.Mutation', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='insert', full_name='google.datastore.v1beta3.Mutation.insert', index=0, + name='insert', full_name='google.datastore.v1.Mutation.insert', index=0, number=4, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='update', full_name='google.datastore.v1beta3.Mutation.update', index=1, + name='update', full_name='google.datastore.v1.Mutation.update', index=1, number=5, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='upsert', full_name='google.datastore.v1beta3.Mutation.upsert', index=2, + name='upsert', full_name='google.datastore.v1.Mutation.upsert', index=2, number=6, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='delete', full_name='google.datastore.v1beta3.Mutation.delete', index=3, + name='delete', full_name='google.datastore.v1.Mutation.delete', index=3, number=7, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), + _descriptor.FieldDescriptor( + name='base_version', full_name='google.datastore.v1.Mutation.base_version', index=4, + number=8, type=3, cpp_type=2, label=1, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), ], extensions=[ ], @@ -606,28 +613,45 @@ extension_ranges=[], oneofs=[ _descriptor.OneofDescriptor( - name='operation', full_name='google.datastore.v1beta3.Mutation.operation', + name='operation', full_name='google.datastore.v1.Mutation.operation', index=0, containing_type=None, fields=[]), + _descriptor.OneofDescriptor( + name='conflict_detection_strategy', full_name='google.datastore.v1.Mutation.conflict_detection_strategy', + index=1, containing_type=None, fields=[]), ], - serialized_start=1624, - serialized_end=1852, + serialized_start=1524, + serialized_end=1787, ) _MUTATIONRESULT = _descriptor.Descriptor( name='MutationResult', - full_name='google.datastore.v1beta3.MutationResult', + full_name='google.datastore.v1.MutationResult', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='key', full_name='google.datastore.v1beta3.MutationResult.key', index=0, + name='key', full_name='google.datastore.v1.MutationResult.key', index=0, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), + _descriptor.FieldDescriptor( + name='version', full_name='google.datastore.v1.MutationResult.version', index=1, + number=4, type=3, cpp_type=2, label=1, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='conflict_detected', full_name='google.datastore.v1.MutationResult.conflict_detected', index=2, + number=5, type=8, cpp_type=7, label=1, + has_default_value=False, default_value=False, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), ], extensions=[ ], @@ -640,27 +664,27 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1854, - serialized_end=1914, + serialized_start=1789, + serialized_end=1888, ) _READOPTIONS = _descriptor.Descriptor( name='ReadOptions', - full_name='google.datastore.v1beta3.ReadOptions', + full_name='google.datastore.v1.ReadOptions', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='read_consistency', full_name='google.datastore.v1beta3.ReadOptions.read_consistency', index=0, + name='read_consistency', full_name='google.datastore.v1.ReadOptions.read_consistency', index=0, number=1, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='transaction', full_name='google.datastore.v1beta3.ReadOptions.transaction', index=1, + name='transaction', full_name='google.datastore.v1.ReadOptions.transaction', index=1, number=2, type=12, cpp_type=9, label=1, has_default_value=False, default_value=_b(""), message_type=None, enum_type=None, containing_type=None, @@ -679,30 +703,30 @@ extension_ranges=[], oneofs=[ _descriptor.OneofDescriptor( - name='consistency_type', full_name='google.datastore.v1beta3.ReadOptions.consistency_type', + name='consistency_type', full_name='google.datastore.v1.ReadOptions.consistency_type', index=0, containing_type=None, fields=[]), ], - serialized_start=1917, - serialized_end=2135, + serialized_start=1891, + serialized_end=2104, ) _LOOKUPREQUEST.fields_by_name['read_options'].message_type = _READOPTIONS -_LOOKUPREQUEST.fields_by_name['keys'].message_type = google_dot_datastore_dot_v1beta3_dot_entity__pb2._KEY -_LOOKUPRESPONSE.fields_by_name['found'].message_type = google_dot_datastore_dot_v1beta3_dot_query__pb2._ENTITYRESULT -_LOOKUPRESPONSE.fields_by_name['missing'].message_type = google_dot_datastore_dot_v1beta3_dot_query__pb2._ENTITYRESULT -_LOOKUPRESPONSE.fields_by_name['deferred'].message_type = google_dot_datastore_dot_v1beta3_dot_entity__pb2._KEY -_RUNQUERYREQUEST.fields_by_name['partition_id'].message_type = google_dot_datastore_dot_v1beta3_dot_entity__pb2._PARTITIONID +_LOOKUPREQUEST.fields_by_name['keys'].message_type = google_dot_datastore_dot_v1_dot_entity__pb2._KEY +_LOOKUPRESPONSE.fields_by_name['found'].message_type = google_dot_datastore_dot_v1_dot_query__pb2._ENTITYRESULT +_LOOKUPRESPONSE.fields_by_name['missing'].message_type = google_dot_datastore_dot_v1_dot_query__pb2._ENTITYRESULT +_LOOKUPRESPONSE.fields_by_name['deferred'].message_type = google_dot_datastore_dot_v1_dot_entity__pb2._KEY +_RUNQUERYREQUEST.fields_by_name['partition_id'].message_type = google_dot_datastore_dot_v1_dot_entity__pb2._PARTITIONID _RUNQUERYREQUEST.fields_by_name['read_options'].message_type = _READOPTIONS -_RUNQUERYREQUEST.fields_by_name['query'].message_type = google_dot_datastore_dot_v1beta3_dot_query__pb2._QUERY -_RUNQUERYREQUEST.fields_by_name['gql_query'].message_type = google_dot_datastore_dot_v1beta3_dot_query__pb2._GQLQUERY +_RUNQUERYREQUEST.fields_by_name['query'].message_type = google_dot_datastore_dot_v1_dot_query__pb2._QUERY +_RUNQUERYREQUEST.fields_by_name['gql_query'].message_type = google_dot_datastore_dot_v1_dot_query__pb2._GQLQUERY _RUNQUERYREQUEST.oneofs_by_name['query_type'].fields.append( _RUNQUERYREQUEST.fields_by_name['query']) _RUNQUERYREQUEST.fields_by_name['query'].containing_oneof = _RUNQUERYREQUEST.oneofs_by_name['query_type'] _RUNQUERYREQUEST.oneofs_by_name['query_type'].fields.append( _RUNQUERYREQUEST.fields_by_name['gql_query']) _RUNQUERYREQUEST.fields_by_name['gql_query'].containing_oneof = _RUNQUERYREQUEST.oneofs_by_name['query_type'] -_RUNQUERYRESPONSE.fields_by_name['batch'].message_type = google_dot_datastore_dot_v1beta3_dot_query__pb2._QUERYRESULTBATCH -_RUNQUERYRESPONSE.fields_by_name['query'].message_type = google_dot_datastore_dot_v1beta3_dot_query__pb2._QUERY +_RUNQUERYRESPONSE.fields_by_name['batch'].message_type = google_dot_datastore_dot_v1_dot_query__pb2._QUERYRESULTBATCH +_RUNQUERYRESPONSE.fields_by_name['query'].message_type = google_dot_datastore_dot_v1_dot_query__pb2._QUERY _COMMITREQUEST.fields_by_name['mode'].enum_type = _COMMITREQUEST_MODE _COMMITREQUEST.fields_by_name['mutations'].message_type = _MUTATION _COMMITREQUEST_MODE.containing_type = _COMMITREQUEST @@ -710,12 +734,12 @@ _COMMITREQUEST.fields_by_name['transaction']) _COMMITREQUEST.fields_by_name['transaction'].containing_oneof = _COMMITREQUEST.oneofs_by_name['transaction_selector'] _COMMITRESPONSE.fields_by_name['mutation_results'].message_type = _MUTATIONRESULT -_ALLOCATEIDSREQUEST.fields_by_name['keys'].message_type = google_dot_datastore_dot_v1beta3_dot_entity__pb2._KEY -_ALLOCATEIDSRESPONSE.fields_by_name['keys'].message_type = google_dot_datastore_dot_v1beta3_dot_entity__pb2._KEY -_MUTATION.fields_by_name['insert'].message_type = google_dot_datastore_dot_v1beta3_dot_entity__pb2._ENTITY -_MUTATION.fields_by_name['update'].message_type = google_dot_datastore_dot_v1beta3_dot_entity__pb2._ENTITY -_MUTATION.fields_by_name['upsert'].message_type = google_dot_datastore_dot_v1beta3_dot_entity__pb2._ENTITY -_MUTATION.fields_by_name['delete'].message_type = google_dot_datastore_dot_v1beta3_dot_entity__pb2._KEY +_ALLOCATEIDSREQUEST.fields_by_name['keys'].message_type = google_dot_datastore_dot_v1_dot_entity__pb2._KEY +_ALLOCATEIDSRESPONSE.fields_by_name['keys'].message_type = google_dot_datastore_dot_v1_dot_entity__pb2._KEY +_MUTATION.fields_by_name['insert'].message_type = google_dot_datastore_dot_v1_dot_entity__pb2._ENTITY +_MUTATION.fields_by_name['update'].message_type = google_dot_datastore_dot_v1_dot_entity__pb2._ENTITY +_MUTATION.fields_by_name['upsert'].message_type = google_dot_datastore_dot_v1_dot_entity__pb2._ENTITY +_MUTATION.fields_by_name['delete'].message_type = google_dot_datastore_dot_v1_dot_entity__pb2._KEY _MUTATION.oneofs_by_name['operation'].fields.append( _MUTATION.fields_by_name['insert']) _MUTATION.fields_by_name['insert'].containing_oneof = _MUTATION.oneofs_by_name['operation'] @@ -728,7 +752,10 @@ _MUTATION.oneofs_by_name['operation'].fields.append( _MUTATION.fields_by_name['delete']) _MUTATION.fields_by_name['delete'].containing_oneof = _MUTATION.oneofs_by_name['operation'] -_MUTATIONRESULT.fields_by_name['key'].message_type = google_dot_datastore_dot_v1beta3_dot_entity__pb2._KEY +_MUTATION.oneofs_by_name['conflict_detection_strategy'].fields.append( + _MUTATION.fields_by_name['base_version']) +_MUTATION.fields_by_name['base_version'].containing_oneof = _MUTATION.oneofs_by_name['conflict_detection_strategy'] +_MUTATIONRESULT.fields_by_name['key'].message_type = google_dot_datastore_dot_v1_dot_entity__pb2._KEY _READOPTIONS.fields_by_name['read_consistency'].enum_type = _READOPTIONS_READCONSISTENCY _READOPTIONS_READCONSISTENCY.containing_type = _READOPTIONS _READOPTIONS.oneofs_by_name['consistency_type'].fields.append( @@ -755,110 +782,110 @@ LookupRequest = _reflection.GeneratedProtocolMessageType('LookupRequest', (_message.Message,), dict( DESCRIPTOR = _LOOKUPREQUEST, - __module__ = 'google.datastore.v1beta3.datastore_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.LookupRequest) + __module__ = 'google.datastore.v1.datastore_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.LookupRequest) )) _sym_db.RegisterMessage(LookupRequest) LookupResponse = _reflection.GeneratedProtocolMessageType('LookupResponse', (_message.Message,), dict( DESCRIPTOR = _LOOKUPRESPONSE, - __module__ = 'google.datastore.v1beta3.datastore_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.LookupResponse) + __module__ = 'google.datastore.v1.datastore_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.LookupResponse) )) _sym_db.RegisterMessage(LookupResponse) RunQueryRequest = _reflection.GeneratedProtocolMessageType('RunQueryRequest', (_message.Message,), dict( DESCRIPTOR = _RUNQUERYREQUEST, - __module__ = 'google.datastore.v1beta3.datastore_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.RunQueryRequest) + __module__ = 'google.datastore.v1.datastore_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.RunQueryRequest) )) _sym_db.RegisterMessage(RunQueryRequest) RunQueryResponse = _reflection.GeneratedProtocolMessageType('RunQueryResponse', (_message.Message,), dict( DESCRIPTOR = _RUNQUERYRESPONSE, - __module__ = 'google.datastore.v1beta3.datastore_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.RunQueryResponse) + __module__ = 'google.datastore.v1.datastore_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.RunQueryResponse) )) _sym_db.RegisterMessage(RunQueryResponse) BeginTransactionRequest = _reflection.GeneratedProtocolMessageType('BeginTransactionRequest', (_message.Message,), dict( DESCRIPTOR = _BEGINTRANSACTIONREQUEST, - __module__ = 'google.datastore.v1beta3.datastore_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.BeginTransactionRequest) + __module__ = 'google.datastore.v1.datastore_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.BeginTransactionRequest) )) _sym_db.RegisterMessage(BeginTransactionRequest) BeginTransactionResponse = _reflection.GeneratedProtocolMessageType('BeginTransactionResponse', (_message.Message,), dict( DESCRIPTOR = _BEGINTRANSACTIONRESPONSE, - __module__ = 'google.datastore.v1beta3.datastore_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.BeginTransactionResponse) + __module__ = 'google.datastore.v1.datastore_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.BeginTransactionResponse) )) _sym_db.RegisterMessage(BeginTransactionResponse) RollbackRequest = _reflection.GeneratedProtocolMessageType('RollbackRequest', (_message.Message,), dict( DESCRIPTOR = _ROLLBACKREQUEST, - __module__ = 'google.datastore.v1beta3.datastore_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.RollbackRequest) + __module__ = 'google.datastore.v1.datastore_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.RollbackRequest) )) _sym_db.RegisterMessage(RollbackRequest) RollbackResponse = _reflection.GeneratedProtocolMessageType('RollbackResponse', (_message.Message,), dict( DESCRIPTOR = _ROLLBACKRESPONSE, - __module__ = 'google.datastore.v1beta3.datastore_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.RollbackResponse) + __module__ = 'google.datastore.v1.datastore_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.RollbackResponse) )) _sym_db.RegisterMessage(RollbackResponse) CommitRequest = _reflection.GeneratedProtocolMessageType('CommitRequest', (_message.Message,), dict( DESCRIPTOR = _COMMITREQUEST, - __module__ = 'google.datastore.v1beta3.datastore_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.CommitRequest) + __module__ = 'google.datastore.v1.datastore_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.CommitRequest) )) _sym_db.RegisterMessage(CommitRequest) CommitResponse = _reflection.GeneratedProtocolMessageType('CommitResponse', (_message.Message,), dict( DESCRIPTOR = _COMMITRESPONSE, - __module__ = 'google.datastore.v1beta3.datastore_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.CommitResponse) + __module__ = 'google.datastore.v1.datastore_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.CommitResponse) )) _sym_db.RegisterMessage(CommitResponse) AllocateIdsRequest = _reflection.GeneratedProtocolMessageType('AllocateIdsRequest', (_message.Message,), dict( DESCRIPTOR = _ALLOCATEIDSREQUEST, - __module__ = 'google.datastore.v1beta3.datastore_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.AllocateIdsRequest) + __module__ = 'google.datastore.v1.datastore_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.AllocateIdsRequest) )) _sym_db.RegisterMessage(AllocateIdsRequest) AllocateIdsResponse = _reflection.GeneratedProtocolMessageType('AllocateIdsResponse', (_message.Message,), dict( DESCRIPTOR = _ALLOCATEIDSRESPONSE, - __module__ = 'google.datastore.v1beta3.datastore_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.AllocateIdsResponse) + __module__ = 'google.datastore.v1.datastore_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.AllocateIdsResponse) )) _sym_db.RegisterMessage(AllocateIdsResponse) Mutation = _reflection.GeneratedProtocolMessageType('Mutation', (_message.Message,), dict( DESCRIPTOR = _MUTATION, - __module__ = 'google.datastore.v1beta3.datastore_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.Mutation) + __module__ = 'google.datastore.v1.datastore_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.Mutation) )) _sym_db.RegisterMessage(Mutation) MutationResult = _reflection.GeneratedProtocolMessageType('MutationResult', (_message.Message,), dict( DESCRIPTOR = _MUTATIONRESULT, - __module__ = 'google.datastore.v1beta3.datastore_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.MutationResult) + __module__ = 'google.datastore.v1.datastore_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.MutationResult) )) _sym_db.RegisterMessage(MutationResult) ReadOptions = _reflection.GeneratedProtocolMessageType('ReadOptions', (_message.Message,), dict( DESCRIPTOR = _READOPTIONS, - __module__ = 'google.datastore.v1beta3.datastore_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.ReadOptions) + __module__ = 'google.datastore.v1.datastore_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.ReadOptions) )) _sym_db.RegisterMessage(ReadOptions) DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\034com.google.datastore.v1beta3B\016DatastoreProtoP\001')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\027com.google.datastore.v1B\016DatastoreProtoP\001')) # @@protoc_insertion_point(module_scope) diff --git a/gcloud/datastore/_generated/entity_pb2.py b/gcloud/datastore/_generated/entity_pb2.py index 7c63444060da..44d530bdb74a 100644 --- a/gcloud/datastore/_generated/entity_pb2.py +++ b/gcloud/datastore/_generated/entity_pb2.py @@ -1,5 +1,5 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! -# source: google/datastore/v1beta3/entity.proto +# source: google/datastore/v1/entity.proto import sys _b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) @@ -20,10 +20,10 @@ DESCRIPTOR = _descriptor.FileDescriptor( - name='google/datastore/v1beta3/entity.proto', - package='google.datastore.v1beta3', + name='google/datastore/v1/entity.proto', + package='google.datastore.v1', syntax='proto3', - serialized_pb=_b('\n%google/datastore/v1beta3/entity.proto\x12\x18google.datastore.v1beta3\x1a\x1cgoogle/api/annotations.proto\x1a\x1cgoogle/protobuf/struct.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x18google/type/latlng.proto\"7\n\x0bPartitionId\x12\x12\n\nproject_id\x18\x02 \x01(\t\x12\x14\n\x0cnamespace_id\x18\x04 \x01(\t\"\xc1\x01\n\x03Key\x12;\n\x0cpartition_id\x18\x01 \x01(\x0b\x32%.google.datastore.v1beta3.PartitionId\x12\x37\n\x04path\x18\x02 \x03(\x0b\x32).google.datastore.v1beta3.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\"=\n\nArrayValue\x12/\n\x06values\x18\x01 \x03(\x0b\x32\x1f.google.datastore.v1beta3.Value\"\x80\x04\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\x32\n\tkey_value\x18\x05 \x01(\x0b\x32\x1d.google.datastore.v1beta3.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\x38\n\x0c\x65ntity_value\x18\x06 \x01(\x0b\x32 .google.datastore.v1beta3.EntityH\x00\x12;\n\x0b\x61rray_value\x18\t \x01(\x0b\x32$.google.datastore.v1beta3.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\"\xce\x01\n\x06\x45ntity\x12*\n\x03key\x18\x01 \x01(\x0b\x32\x1d.google.datastore.v1beta3.Key\x12\x44\n\nproperties\x18\x03 \x03(\x0b\x32\x30.google.datastore.v1beta3.Entity.PropertiesEntry\x1aR\n\x0fPropertiesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12.\n\x05value\x18\x02 \x01(\x0b\x32\x1f.google.datastore.v1beta3.Value:\x02\x38\x01\x42-\n\x1c\x63om.google.datastore.v1beta3B\x0b\x45ntityProtoP\x01\x62\x06proto3') + serialized_pb=_b('\n google/datastore/v1/entity.proto\x12\x13google.datastore.v1\x1a\x1cgoogle/api/annotations.proto\x1a\x1cgoogle/protobuf/struct.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x18google/type/latlng.proto\"7\n\x0bPartitionId\x12\x12\n\nproject_id\x18\x02 \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(\n\x17\x63om.google.datastore.v1B\x0b\x45ntityProtoP\x01\x62\x06proto3') , dependencies=[google_dot_api_dot_annotations__pb2.DESCRIPTOR,google_dot_protobuf_dot_struct__pb2.DESCRIPTOR,google_dot_protobuf_dot_timestamp__pb2.DESCRIPTOR,google_dot_type_dot_latlng__pb2.DESCRIPTOR,]) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -33,20 +33,20 @@ _PARTITIONID = _descriptor.Descriptor( name='PartitionId', - full_name='google.datastore.v1beta3.PartitionId', + full_name='google.datastore.v1.PartitionId', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='project_id', full_name='google.datastore.v1beta3.PartitionId.project_id', index=0, + name='project_id', full_name='google.datastore.v1.PartitionId.project_id', index=0, number=2, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='namespace_id', full_name='google.datastore.v1beta3.PartitionId.namespace_id', index=1, + name='namespace_id', full_name='google.datastore.v1.PartitionId.namespace_id', index=1, number=4, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, @@ -64,34 +64,34 @@ extension_ranges=[], oneofs=[ ], - serialized_start=186, - serialized_end=241, + serialized_start=176, + serialized_end=231, ) _KEY_PATHELEMENT = _descriptor.Descriptor( name='PathElement', - full_name='google.datastore.v1beta3.Key.PathElement', + full_name='google.datastore.v1.Key.PathElement', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='kind', full_name='google.datastore.v1beta3.Key.PathElement.kind', index=0, + name='kind', full_name='google.datastore.v1.Key.PathElement.kind', index=0, number=1, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='id', full_name='google.datastore.v1beta3.Key.PathElement.id', index=1, + name='id', full_name='google.datastore.v1.Key.PathElement.id', index=1, number=2, type=3, cpp_type=2, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='name', full_name='google.datastore.v1beta3.Key.PathElement.name', index=2, + name='name', full_name='google.datastore.v1.Key.PathElement.name', index=2, number=3, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, @@ -109,29 +109,29 @@ extension_ranges=[], oneofs=[ _descriptor.OneofDescriptor( - name='id_type', full_name='google.datastore.v1beta3.Key.PathElement.id_type', + name='id_type', full_name='google.datastore.v1.Key.PathElement.id_type', index=0, containing_type=None, fields=[]), ], - serialized_start=369, - serialized_end=437, + serialized_start=349, + serialized_end=417, ) _KEY = _descriptor.Descriptor( name='Key', - full_name='google.datastore.v1beta3.Key', + full_name='google.datastore.v1.Key', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='partition_id', full_name='google.datastore.v1beta3.Key.partition_id', index=0, + name='partition_id', full_name='google.datastore.v1.Key.partition_id', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='path', full_name='google.datastore.v1beta3.Key.path', index=1, + name='path', full_name='google.datastore.v1.Key.path', index=1, number=2, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, @@ -149,20 +149,20 @@ extension_ranges=[], oneofs=[ ], - serialized_start=244, - serialized_end=437, + serialized_start=234, + serialized_end=417, ) _ARRAYVALUE = _descriptor.Descriptor( name='ArrayValue', - full_name='google.datastore.v1beta3.ArrayValue', + full_name='google.datastore.v1.ArrayValue', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='values', full_name='google.datastore.v1beta3.ArrayValue.values', index=0, + name='values', full_name='google.datastore.v1.ArrayValue.values', index=0, number=1, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, @@ -180,104 +180,104 @@ extension_ranges=[], oneofs=[ ], - serialized_start=439, - serialized_end=500, + serialized_start=419, + serialized_end=475, ) _VALUE = _descriptor.Descriptor( name='Value', - full_name='google.datastore.v1beta3.Value', + full_name='google.datastore.v1.Value', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='null_value', full_name='google.datastore.v1beta3.Value.null_value', index=0, + name='null_value', full_name='google.datastore.v1.Value.null_value', index=0, number=11, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='boolean_value', full_name='google.datastore.v1beta3.Value.boolean_value', index=1, + name='boolean_value', full_name='google.datastore.v1.Value.boolean_value', index=1, number=1, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='integer_value', full_name='google.datastore.v1beta3.Value.integer_value', index=2, + name='integer_value', full_name='google.datastore.v1.Value.integer_value', index=2, number=2, type=3, cpp_type=2, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='double_value', full_name='google.datastore.v1beta3.Value.double_value', index=3, + name='double_value', full_name='google.datastore.v1.Value.double_value', index=3, number=3, type=1, cpp_type=5, label=1, has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='timestamp_value', full_name='google.datastore.v1beta3.Value.timestamp_value', index=4, + name='timestamp_value', full_name='google.datastore.v1.Value.timestamp_value', index=4, number=10, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='key_value', full_name='google.datastore.v1beta3.Value.key_value', index=5, + name='key_value', full_name='google.datastore.v1.Value.key_value', index=5, number=5, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='string_value', full_name='google.datastore.v1beta3.Value.string_value', index=6, + name='string_value', full_name='google.datastore.v1.Value.string_value', index=6, number=17, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='blob_value', full_name='google.datastore.v1beta3.Value.blob_value', index=7, + name='blob_value', full_name='google.datastore.v1.Value.blob_value', index=7, number=18, type=12, cpp_type=9, label=1, has_default_value=False, default_value=_b(""), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='geo_point_value', full_name='google.datastore.v1beta3.Value.geo_point_value', index=8, + name='geo_point_value', full_name='google.datastore.v1.Value.geo_point_value', index=8, number=8, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='entity_value', full_name='google.datastore.v1beta3.Value.entity_value', index=9, + name='entity_value', full_name='google.datastore.v1.Value.entity_value', index=9, number=6, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='array_value', full_name='google.datastore.v1beta3.Value.array_value', index=10, + name='array_value', full_name='google.datastore.v1.Value.array_value', index=10, number=9, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='meaning', full_name='google.datastore.v1beta3.Value.meaning', index=11, + name='meaning', full_name='google.datastore.v1.Value.meaning', index=11, number=14, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='exclude_from_indexes', full_name='google.datastore.v1beta3.Value.exclude_from_indexes', index=12, + name='exclude_from_indexes', full_name='google.datastore.v1.Value.exclude_from_indexes', index=12, number=19, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, @@ -295,30 +295,30 @@ extension_ranges=[], oneofs=[ _descriptor.OneofDescriptor( - name='value_type', full_name='google.datastore.v1beta3.Value.value_type', + name='value_type', full_name='google.datastore.v1.Value.value_type', index=0, containing_type=None, fields=[]), ], - serialized_start=503, - serialized_end=1015, + serialized_start=478, + serialized_end=975, ) _ENTITY_PROPERTIESENTRY = _descriptor.Descriptor( name='PropertiesEntry', - full_name='google.datastore.v1beta3.Entity.PropertiesEntry', + full_name='google.datastore.v1.Entity.PropertiesEntry', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='key', full_name='google.datastore.v1beta3.Entity.PropertiesEntry.key', index=0, + name='key', full_name='google.datastore.v1.Entity.PropertiesEntry.key', index=0, number=1, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='value', full_name='google.datastore.v1beta3.Entity.PropertiesEntry.value', index=1, + name='value', full_name='google.datastore.v1.Entity.PropertiesEntry.value', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -336,26 +336,26 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1142, - serialized_end=1224, + serialized_start=1092, + serialized_end=1169, ) _ENTITY = _descriptor.Descriptor( name='Entity', - full_name='google.datastore.v1beta3.Entity', + full_name='google.datastore.v1.Entity', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='key', full_name='google.datastore.v1beta3.Entity.key', index=0, + name='key', full_name='google.datastore.v1.Entity.key', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='properties', full_name='google.datastore.v1beta3.Entity.properties', index=1, + name='properties', full_name='google.datastore.v1.Entity.properties', index=1, number=3, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, @@ -373,8 +373,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1018, - serialized_end=1224, + serialized_start=978, + serialized_end=1169, ) _KEY_PATHELEMENT.containing_type = _KEY @@ -438,8 +438,8 @@ PartitionId = _reflection.GeneratedProtocolMessageType('PartitionId', (_message.Message,), dict( DESCRIPTOR = _PARTITIONID, - __module__ = 'google.datastore.v1beta3.entity_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.PartitionId) + __module__ = 'google.datastore.v1.entity_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.PartitionId) )) _sym_db.RegisterMessage(PartitionId) @@ -447,28 +447,28 @@ PathElement = _reflection.GeneratedProtocolMessageType('PathElement', (_message.Message,), dict( DESCRIPTOR = _KEY_PATHELEMENT, - __module__ = 'google.datastore.v1beta3.entity_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.Key.PathElement) + __module__ = 'google.datastore.v1.entity_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.Key.PathElement) )) , DESCRIPTOR = _KEY, - __module__ = 'google.datastore.v1beta3.entity_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.Key) + __module__ = 'google.datastore.v1.entity_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.Key) )) _sym_db.RegisterMessage(Key) _sym_db.RegisterMessage(Key.PathElement) ArrayValue = _reflection.GeneratedProtocolMessageType('ArrayValue', (_message.Message,), dict( DESCRIPTOR = _ARRAYVALUE, - __module__ = 'google.datastore.v1beta3.entity_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.ArrayValue) + __module__ = 'google.datastore.v1.entity_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.ArrayValue) )) _sym_db.RegisterMessage(ArrayValue) Value = _reflection.GeneratedProtocolMessageType('Value', (_message.Message,), dict( DESCRIPTOR = _VALUE, - __module__ = 'google.datastore.v1beta3.entity_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.Value) + __module__ = 'google.datastore.v1.entity_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.Value) )) _sym_db.RegisterMessage(Value) @@ -476,20 +476,20 @@ PropertiesEntry = _reflection.GeneratedProtocolMessageType('PropertiesEntry', (_message.Message,), dict( DESCRIPTOR = _ENTITY_PROPERTIESENTRY, - __module__ = 'google.datastore.v1beta3.entity_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.Entity.PropertiesEntry) + __module__ = 'google.datastore.v1.entity_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.Entity.PropertiesEntry) )) , DESCRIPTOR = _ENTITY, - __module__ = 'google.datastore.v1beta3.entity_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.Entity) + __module__ = 'google.datastore.v1.entity_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.Entity) )) _sym_db.RegisterMessage(Entity) _sym_db.RegisterMessage(Entity.PropertiesEntry) DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\034com.google.datastore.v1beta3B\013EntityProtoP\001')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\027com.google.datastore.v1B\013EntityProtoP\001')) _ENTITY_PROPERTIESENTRY.has_options = True _ENTITY_PROPERTIESENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')) # @@protoc_insertion_point(module_scope) diff --git a/gcloud/datastore/_generated/query_pb2.py b/gcloud/datastore/_generated/query_pb2.py index 1e6189e3c32c..2c611c071327 100644 --- a/gcloud/datastore/_generated/query_pb2.py +++ b/gcloud/datastore/_generated/query_pb2.py @@ -1,5 +1,5 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! -# source: google/datastore/v1beta3/query.proto +# source: google/datastore/v1/query.proto import sys _b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) @@ -14,25 +14,25 @@ from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2 -from gcloud.datastore._generated import entity_pb2 as google_dot_datastore_dot_v1beta3_dot_entity__pb2 +from gcloud.datastore._generated import entity_pb2 as google_dot_datastore_dot_v1_dot_entity__pb2 from google.protobuf import wrappers_pb2 as google_dot_protobuf_dot_wrappers__pb2 from google.type import latlng_pb2 as google_dot_type_dot_latlng__pb2 DESCRIPTOR = _descriptor.FileDescriptor( - name='google/datastore/v1beta3/query.proto', - package='google.datastore.v1beta3', + name='google/datastore/v1/query.proto', + package='google.datastore.v1', syntax='proto3', - serialized_pb=_b('\n$google/datastore/v1beta3/query.proto\x12\x18google.datastore.v1beta3\x1a\x1cgoogle/api/annotations.proto\x1a%google/datastore/v1beta3/entity.proto\x1a\x1egoogle/protobuf/wrappers.proto\x1a\x18google/type/latlng.proto\"\xa3\x01\n\x0c\x45ntityResult\x12\x30\n\x06\x65ntity\x18\x01 \x01(\x0b\x32 .google.datastore.v1beta3.Entity\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\"\x8b\x03\n\x05Query\x12\x38\n\nprojection\x18\x02 \x03(\x0b\x32$.google.datastore.v1beta3.Projection\x12\x36\n\x04kind\x18\x03 \x03(\x0b\x32(.google.datastore.v1beta3.KindExpression\x12\x30\n\x06\x66ilter\x18\x04 \x01(\x0b\x32 .google.datastore.v1beta3.Filter\x12\x36\n\x05order\x18\x05 \x03(\x0b\x32\'.google.datastore.v1beta3.PropertyOrder\x12@\n\x0b\x64istinct_on\x18\x06 \x03(\x0b\x32+.google.datastore.v1beta3.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\"\x1e\n\x0eKindExpression\x12\x0c\n\x04name\x18\x01 \x01(\t\"!\n\x11PropertyReference\x12\x0c\n\x04name\x18\x02 \x01(\t\"K\n\nProjection\x12=\n\x08property\x18\x01 \x01(\x0b\x32+.google.datastore.v1beta3.PropertyReference\"\xdb\x01\n\rPropertyOrder\x12=\n\x08property\x18\x01 \x01(\x0b\x32+.google.datastore.v1beta3.PropertyReference\x12\x44\n\tdirection\x18\x02 \x01(\x0e\x32\x31.google.datastore.v1beta3.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\"\xa3\x01\n\x06\x46ilter\x12\x45\n\x10\x63omposite_filter\x18\x01 \x01(\x0b\x32).google.datastore.v1beta3.CompositeFilterH\x00\x12\x43\n\x0fproperty_filter\x18\x02 \x01(\x0b\x32(.google.datastore.v1beta3.PropertyFilterH\x00\x42\r\n\x0b\x66ilter_type\"\xb3\x01\n\x0f\x43ompositeFilter\x12>\n\x02op\x18\x01 \x01(\x0e\x32\x32.google.datastore.v1beta3.CompositeFilter.Operator\x12\x31\n\x07\x66ilters\x18\x02 \x03(\x0b\x32 .google.datastore.v1beta3.Filter\"-\n\x08Operator\x12\x18\n\x14OPERATOR_UNSPECIFIED\x10\x00\x12\x07\n\x03\x41ND\x10\x01\"\xd6\x02\n\x0ePropertyFilter\x12=\n\x08property\x18\x01 \x01(\x0b\x32+.google.datastore.v1beta3.PropertyReference\x12=\n\x02op\x18\x02 \x01(\x0e\x32\x31.google.datastore.v1beta3.PropertyFilter.Operator\x12.\n\x05value\x18\x03 \x01(\x0b\x32\x1f.google.datastore.v1beta3.Value\"\x95\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\x10\n\x0cHAS_ANCESTOR\x10\x0b\"\xb4\x02\n\x08GqlQuery\x12\x14\n\x0cquery_string\x18\x01 \x01(\t\x12\x16\n\x0e\x61llow_literals\x18\x02 \x01(\x08\x12M\n\x0enamed_bindings\x18\x05 \x03(\x0b\x32\x35.google.datastore.v1beta3.GqlQuery.NamedBindingsEntry\x12H\n\x13positional_bindings\x18\x04 \x03(\x0b\x32+.google.datastore.v1beta3.GqlQueryParameter\x1a\x61\n\x12NamedBindingsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12:\n\x05value\x18\x02 \x01(\x0b\x32+.google.datastore.v1beta3.GqlQueryParameter:\x02\x38\x01\"i\n\x11GqlQueryParameter\x12\x30\n\x05value\x18\x02 \x01(\x0b\x32\x1f.google.datastore.v1beta3.ValueH\x00\x12\x10\n\x06\x63ursor\x18\x03 \x01(\x0cH\x00\x42\x10\n\x0eparameter_type\"\xd3\x03\n\x10QueryResultBatch\x12\x17\n\x0fskipped_results\x18\x06 \x01(\x05\x12\x16\n\x0eskipped_cursor\x18\x03 \x01(\x0c\x12M\n\x12\x65ntity_result_type\x18\x01 \x01(\x0e\x32\x31.google.datastore.v1beta3.EntityResult.ResultType\x12>\n\x0e\x65ntity_results\x18\x02 \x03(\x0b\x32&.google.datastore.v1beta3.EntityResult\x12\x12\n\nend_cursor\x18\x04 \x01(\x0c\x12P\n\x0cmore_results\x18\x05 \x01(\x0e\x32:.google.datastore.v1beta3.QueryResultBatch.MoreResultsType\"\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,\n\x1c\x63om.google.datastore.v1beta3B\nQueryProtoP\x01\x62\x06proto3') + serialized_pb=_b('\n\x1fgoogle/datastore/v1/query.proto\x12\x13google.datastore.v1\x1a\x1cgoogle/api/annotations.proto\x1a google/datastore/v1/entity.proto\x1a\x1egoogle/protobuf/wrappers.proto\x1a\x18google/type/latlng.proto\"\xaf\x01\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\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\"\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\"\xa9\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\"-\n\x08Operator\x12\x18\n\x14OPERATOR_UNSPECIFIED\x10\x00\x12\x07\n\x03\x41ND\x10\x01\"\xc7\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\"\x95\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\x10\n\x0cHAS_ANCESTOR\x10\x0b\"\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\"\xde\x03\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\"\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\'\n\x17\x63om.google.datastore.v1B\nQueryProtoP\x01\x62\x06proto3') , - dependencies=[google_dot_api_dot_annotations__pb2.DESCRIPTOR,google_dot_datastore_dot_v1beta3_dot_entity__pb2.DESCRIPTOR,google_dot_protobuf_dot_wrappers__pb2.DESCRIPTOR,google_dot_type_dot_latlng__pb2.DESCRIPTOR,]) + dependencies=[google_dot_api_dot_annotations__pb2.DESCRIPTOR,google_dot_datastore_dot_v1_dot_entity__pb2.DESCRIPTOR,google_dot_protobuf_dot_wrappers__pb2.DESCRIPTOR,google_dot_type_dot_latlng__pb2.DESCRIPTOR,]) _sym_db.RegisterFileDescriptor(DESCRIPTOR) _ENTITYRESULT_RESULTTYPE = _descriptor.EnumDescriptor( name='ResultType', - full_name='google.datastore.v1beta3.EntityResult.ResultType', + full_name='google.datastore.v1.EntityResult.ResultType', filename=None, file=DESCRIPTOR, values=[ @@ -55,14 +55,14 @@ ], containing_type=None, options=None, - serialized_start=276, - serialized_end=357, + serialized_start=273, + serialized_end=354, ) _sym_db.RegisterEnumDescriptor(_ENTITYRESULT_RESULTTYPE) _PROPERTYORDER_DIRECTION = _descriptor.EnumDescriptor( name='Direction', - full_name='google.datastore.v1beta3.PropertyOrder.Direction', + full_name='google.datastore.v1.PropertyOrder.Direction', filename=None, file=DESCRIPTOR, values=[ @@ -81,14 +81,14 @@ ], containing_type=None, options=None, - serialized_start=1052, - serialized_end=1121, + serialized_start=1009, + serialized_end=1078, ) _sym_db.RegisterEnumDescriptor(_PROPERTYORDER_DIRECTION) _COMPOSITEFILTER_OPERATOR = _descriptor.EnumDescriptor( name='Operator', - full_name='google.datastore.v1beta3.CompositeFilter.Operator', + full_name='google.datastore.v1.CompositeFilter.Operator', filename=None, file=DESCRIPTOR, values=[ @@ -103,14 +103,14 @@ ], containing_type=None, options=None, - serialized_start=1424, - serialized_end=1469, + serialized_start=1361, + serialized_end=1406, ) _sym_db.RegisterEnumDescriptor(_COMPOSITEFILTER_OPERATOR) _PROPERTYFILTER_OPERATOR = _descriptor.EnumDescriptor( name='Operator', - full_name='google.datastore.v1beta3.PropertyFilter.Operator', + full_name='google.datastore.v1.PropertyFilter.Operator', filename=None, file=DESCRIPTOR, values=[ @@ -145,14 +145,14 @@ ], containing_type=None, options=None, - serialized_start=1665, - serialized_end=1814, + serialized_start=1587, + serialized_end=1736, ) _sym_db.RegisterEnumDescriptor(_PROPERTYFILTER_OPERATOR) _QUERYRESULTBATCH_MORERESULTSTYPE = _descriptor.EnumDescriptor( name='MoreResultsType', - full_name='google.datastore.v1beta3.QueryResultBatch.MoreResultsType', + full_name='google.datastore.v1.QueryResultBatch.MoreResultsType', filename=None, file=DESCRIPTOR, values=[ @@ -179,28 +179,35 @@ ], containing_type=None, options=None, - serialized_start=2550, - serialized_end=2702, + serialized_start=2463, + serialized_end=2615, ) _sym_db.RegisterEnumDescriptor(_QUERYRESULTBATCH_MORERESULTSTYPE) _ENTITYRESULT = _descriptor.Descriptor( name='EntityResult', - full_name='google.datastore.v1beta3.EntityResult', + full_name='google.datastore.v1.EntityResult', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='entity', full_name='google.datastore.v1beta3.EntityResult.entity', index=0, + name='entity', full_name='google.datastore.v1.EntityResult.entity', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='cursor', full_name='google.datastore.v1beta3.EntityResult.cursor', index=1, + name='version', full_name='google.datastore.v1.EntityResult.version', index=1, + number=4, type=3, cpp_type=2, label=1, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='cursor', full_name='google.datastore.v1.EntityResult.cursor', index=2, number=3, type=12, cpp_type=9, label=1, has_default_value=False, default_value=_b(""), message_type=None, enum_type=None, containing_type=None, @@ -219,76 +226,76 @@ extension_ranges=[], oneofs=[ ], - serialized_start=194, - serialized_end=357, + serialized_start=179, + serialized_end=354, ) _QUERY = _descriptor.Descriptor( name='Query', - full_name='google.datastore.v1beta3.Query', + full_name='google.datastore.v1.Query', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='projection', full_name='google.datastore.v1beta3.Query.projection', index=0, + name='projection', full_name='google.datastore.v1.Query.projection', index=0, number=2, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='kind', full_name='google.datastore.v1beta3.Query.kind', index=1, + name='kind', full_name='google.datastore.v1.Query.kind', index=1, number=3, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='filter', full_name='google.datastore.v1beta3.Query.filter', index=2, + name='filter', full_name='google.datastore.v1.Query.filter', index=2, number=4, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='order', full_name='google.datastore.v1beta3.Query.order', index=3, + name='order', full_name='google.datastore.v1.Query.order', index=3, number=5, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='distinct_on', full_name='google.datastore.v1beta3.Query.distinct_on', index=4, + name='distinct_on', full_name='google.datastore.v1.Query.distinct_on', index=4, number=6, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='start_cursor', full_name='google.datastore.v1beta3.Query.start_cursor', index=5, + name='start_cursor', full_name='google.datastore.v1.Query.start_cursor', index=5, number=7, type=12, cpp_type=9, label=1, has_default_value=False, default_value=_b(""), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='end_cursor', full_name='google.datastore.v1beta3.Query.end_cursor', index=6, + name='end_cursor', full_name='google.datastore.v1.Query.end_cursor', index=6, number=8, type=12, cpp_type=9, label=1, has_default_value=False, default_value=_b(""), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='offset', full_name='google.datastore.v1beta3.Query.offset', index=7, + name='offset', full_name='google.datastore.v1.Query.offset', index=7, number=10, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='limit', full_name='google.datastore.v1beta3.Query.limit', index=8, + name='limit', full_name='google.datastore.v1.Query.limit', index=8, number=12, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -306,20 +313,20 @@ extension_ranges=[], oneofs=[ ], - serialized_start=360, - serialized_end=755, + serialized_start=357, + serialized_end=727, ) _KINDEXPRESSION = _descriptor.Descriptor( name='KindExpression', - full_name='google.datastore.v1beta3.KindExpression', + full_name='google.datastore.v1.KindExpression', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='name', full_name='google.datastore.v1beta3.KindExpression.name', index=0, + name='name', full_name='google.datastore.v1.KindExpression.name', index=0, number=1, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, @@ -337,20 +344,20 @@ extension_ranges=[], oneofs=[ ], - serialized_start=757, - serialized_end=787, + serialized_start=729, + serialized_end=759, ) _PROPERTYREFERENCE = _descriptor.Descriptor( name='PropertyReference', - full_name='google.datastore.v1beta3.PropertyReference', + full_name='google.datastore.v1.PropertyReference', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='name', full_name='google.datastore.v1beta3.PropertyReference.name', index=0, + name='name', full_name='google.datastore.v1.PropertyReference.name', index=0, number=2, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, @@ -368,20 +375,20 @@ extension_ranges=[], oneofs=[ ], - serialized_start=789, - serialized_end=822, + serialized_start=761, + serialized_end=794, ) _PROJECTION = _descriptor.Descriptor( name='Projection', - full_name='google.datastore.v1beta3.Projection', + full_name='google.datastore.v1.Projection', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='property', full_name='google.datastore.v1beta3.Projection.property', index=0, + name='property', full_name='google.datastore.v1.Projection.property', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -399,27 +406,27 @@ extension_ranges=[], oneofs=[ ], - serialized_start=824, - serialized_end=899, + serialized_start=796, + serialized_end=866, ) _PROPERTYORDER = _descriptor.Descriptor( name='PropertyOrder', - full_name='google.datastore.v1beta3.PropertyOrder', + full_name='google.datastore.v1.PropertyOrder', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='property', full_name='google.datastore.v1beta3.PropertyOrder.property', index=0, + name='property', full_name='google.datastore.v1.PropertyOrder.property', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='direction', full_name='google.datastore.v1beta3.PropertyOrder.direction', index=1, + name='direction', full_name='google.datastore.v1.PropertyOrder.direction', index=1, number=2, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, @@ -438,27 +445,27 @@ extension_ranges=[], oneofs=[ ], - serialized_start=902, - serialized_end=1121, + serialized_start=869, + serialized_end=1078, ) _FILTER = _descriptor.Descriptor( name='Filter', - full_name='google.datastore.v1beta3.Filter', + full_name='google.datastore.v1.Filter', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='composite_filter', full_name='google.datastore.v1beta3.Filter.composite_filter', index=0, + name='composite_filter', full_name='google.datastore.v1.Filter.composite_filter', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='property_filter', full_name='google.datastore.v1beta3.Filter.property_filter', index=1, + name='property_filter', full_name='google.datastore.v1.Filter.property_filter', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -476,30 +483,30 @@ extension_ranges=[], oneofs=[ _descriptor.OneofDescriptor( - name='filter_type', full_name='google.datastore.v1beta3.Filter.filter_type', + name='filter_type', full_name='google.datastore.v1.Filter.filter_type', index=0, containing_type=None, fields=[]), ], - serialized_start=1124, - serialized_end=1287, + serialized_start=1081, + serialized_end=1234, ) _COMPOSITEFILTER = _descriptor.Descriptor( name='CompositeFilter', - full_name='google.datastore.v1beta3.CompositeFilter', + full_name='google.datastore.v1.CompositeFilter', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='op', full_name='google.datastore.v1beta3.CompositeFilter.op', index=0, + name='op', full_name='google.datastore.v1.CompositeFilter.op', index=0, number=1, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='filters', full_name='google.datastore.v1beta3.CompositeFilter.filters', index=1, + name='filters', full_name='google.datastore.v1.CompositeFilter.filters', index=1, number=2, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, @@ -518,34 +525,34 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1290, - serialized_end=1469, + serialized_start=1237, + serialized_end=1406, ) _PROPERTYFILTER = _descriptor.Descriptor( name='PropertyFilter', - full_name='google.datastore.v1beta3.PropertyFilter', + full_name='google.datastore.v1.PropertyFilter', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='property', full_name='google.datastore.v1beta3.PropertyFilter.property', index=0, + name='property', full_name='google.datastore.v1.PropertyFilter.property', index=0, number=1, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='op', full_name='google.datastore.v1beta3.PropertyFilter.op', index=1, + name='op', full_name='google.datastore.v1.PropertyFilter.op', index=1, number=2, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='value', full_name='google.datastore.v1beta3.PropertyFilter.value', index=2, + name='value', full_name='google.datastore.v1.PropertyFilter.value', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -564,27 +571,27 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1472, - serialized_end=1814, + serialized_start=1409, + serialized_end=1736, ) _GQLQUERY_NAMEDBINDINGSENTRY = _descriptor.Descriptor( name='NamedBindingsEntry', - full_name='google.datastore.v1beta3.GqlQuery.NamedBindingsEntry', + full_name='google.datastore.v1.GqlQuery.NamedBindingsEntry', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='key', full_name='google.datastore.v1beta3.GqlQuery.NamedBindingsEntry.key', index=0, + name='key', full_name='google.datastore.v1.GqlQuery.NamedBindingsEntry.key', index=0, number=1, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='value', full_name='google.datastore.v1beta3.GqlQuery.NamedBindingsEntry.value', index=1, + name='value', full_name='google.datastore.v1.GqlQuery.NamedBindingsEntry.value', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -602,40 +609,40 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2028, - serialized_end=2125, + serialized_start=1940, + serialized_end=2032, ) _GQLQUERY = _descriptor.Descriptor( name='GqlQuery', - full_name='google.datastore.v1beta3.GqlQuery', + full_name='google.datastore.v1.GqlQuery', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='query_string', full_name='google.datastore.v1beta3.GqlQuery.query_string', index=0, + name='query_string', full_name='google.datastore.v1.GqlQuery.query_string', index=0, number=1, type=9, cpp_type=9, label=1, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='allow_literals', full_name='google.datastore.v1beta3.GqlQuery.allow_literals', index=1, + name='allow_literals', full_name='google.datastore.v1.GqlQuery.allow_literals', index=1, number=2, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='named_bindings', full_name='google.datastore.v1beta3.GqlQuery.named_bindings', index=2, + name='named_bindings', full_name='google.datastore.v1.GqlQuery.named_bindings', index=2, number=5, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='positional_bindings', full_name='google.datastore.v1beta3.GqlQuery.positional_bindings', index=3, + name='positional_bindings', full_name='google.datastore.v1.GqlQuery.positional_bindings', index=3, number=4, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, @@ -653,27 +660,27 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1817, - serialized_end=2125, + serialized_start=1739, + serialized_end=2032, ) _GQLQUERYPARAMETER = _descriptor.Descriptor( name='GqlQueryParameter', - full_name='google.datastore.v1beta3.GqlQueryParameter', + full_name='google.datastore.v1.GqlQueryParameter', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='value', full_name='google.datastore.v1beta3.GqlQueryParameter.value', index=0, + name='value', full_name='google.datastore.v1.GqlQueryParameter.value', index=0, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='cursor', full_name='google.datastore.v1beta3.GqlQueryParameter.cursor', index=1, + name='cursor', full_name='google.datastore.v1.GqlQueryParameter.cursor', index=1, number=3, type=12, cpp_type=9, label=1, has_default_value=False, default_value=_b(""), message_type=None, enum_type=None, containing_type=None, @@ -691,63 +698,70 @@ extension_ranges=[], oneofs=[ _descriptor.OneofDescriptor( - name='parameter_type', full_name='google.datastore.v1beta3.GqlQueryParameter.parameter_type', + name='parameter_type', full_name='google.datastore.v1.GqlQueryParameter.parameter_type', index=0, containing_type=None, fields=[]), ], - serialized_start=2127, - serialized_end=2232, + serialized_start=2034, + serialized_end=2134, ) _QUERYRESULTBATCH = _descriptor.Descriptor( name='QueryResultBatch', - full_name='google.datastore.v1beta3.QueryResultBatch', + full_name='google.datastore.v1.QueryResultBatch', filename=None, file=DESCRIPTOR, containing_type=None, fields=[ _descriptor.FieldDescriptor( - name='skipped_results', full_name='google.datastore.v1beta3.QueryResultBatch.skipped_results', index=0, + name='skipped_results', full_name='google.datastore.v1.QueryResultBatch.skipped_results', index=0, number=6, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='skipped_cursor', full_name='google.datastore.v1beta3.QueryResultBatch.skipped_cursor', index=1, + name='skipped_cursor', full_name='google.datastore.v1.QueryResultBatch.skipped_cursor', index=1, number=3, type=12, cpp_type=9, label=1, has_default_value=False, default_value=_b(""), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='entity_result_type', full_name='google.datastore.v1beta3.QueryResultBatch.entity_result_type', index=2, + name='entity_result_type', full_name='google.datastore.v1.QueryResultBatch.entity_result_type', index=2, number=1, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='entity_results', full_name='google.datastore.v1beta3.QueryResultBatch.entity_results', index=3, + name='entity_results', full_name='google.datastore.v1.QueryResultBatch.entity_results', index=3, number=2, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='end_cursor', full_name='google.datastore.v1beta3.QueryResultBatch.end_cursor', index=4, + name='end_cursor', full_name='google.datastore.v1.QueryResultBatch.end_cursor', index=4, number=4, type=12, cpp_type=9, label=1, has_default_value=False, default_value=_b(""), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='more_results', full_name='google.datastore.v1beta3.QueryResultBatch.more_results', index=5, + name='more_results', full_name='google.datastore.v1.QueryResultBatch.more_results', index=5, number=5, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), + _descriptor.FieldDescriptor( + name='snapshot_version', full_name='google.datastore.v1.QueryResultBatch.snapshot_version', index=6, + number=7, type=3, cpp_type=2, label=1, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), ], extensions=[ ], @@ -761,11 +775,11 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2235, - serialized_end=2702, + serialized_start=2137, + serialized_end=2615, ) -_ENTITYRESULT.fields_by_name['entity'].message_type = google_dot_datastore_dot_v1beta3_dot_entity__pb2._ENTITY +_ENTITYRESULT.fields_by_name['entity'].message_type = google_dot_datastore_dot_v1_dot_entity__pb2._ENTITY _ENTITYRESULT_RESULTTYPE.containing_type = _ENTITYRESULT _QUERY.fields_by_name['projection'].message_type = _PROJECTION _QUERY.fields_by_name['kind'].message_type = _KINDEXPRESSION @@ -790,13 +804,13 @@ _COMPOSITEFILTER_OPERATOR.containing_type = _COMPOSITEFILTER _PROPERTYFILTER.fields_by_name['property'].message_type = _PROPERTYREFERENCE _PROPERTYFILTER.fields_by_name['op'].enum_type = _PROPERTYFILTER_OPERATOR -_PROPERTYFILTER.fields_by_name['value'].message_type = google_dot_datastore_dot_v1beta3_dot_entity__pb2._VALUE +_PROPERTYFILTER.fields_by_name['value'].message_type = google_dot_datastore_dot_v1_dot_entity__pb2._VALUE _PROPERTYFILTER_OPERATOR.containing_type = _PROPERTYFILTER _GQLQUERY_NAMEDBINDINGSENTRY.fields_by_name['value'].message_type = _GQLQUERYPARAMETER _GQLQUERY_NAMEDBINDINGSENTRY.containing_type = _GQLQUERY _GQLQUERY.fields_by_name['named_bindings'].message_type = _GQLQUERY_NAMEDBINDINGSENTRY _GQLQUERY.fields_by_name['positional_bindings'].message_type = _GQLQUERYPARAMETER -_GQLQUERYPARAMETER.fields_by_name['value'].message_type = google_dot_datastore_dot_v1beta3_dot_entity__pb2._VALUE +_GQLQUERYPARAMETER.fields_by_name['value'].message_type = google_dot_datastore_dot_v1_dot_entity__pb2._VALUE _GQLQUERYPARAMETER.oneofs_by_name['parameter_type'].fields.append( _GQLQUERYPARAMETER.fields_by_name['value']) _GQLQUERYPARAMETER.fields_by_name['value'].containing_oneof = _GQLQUERYPARAMETER.oneofs_by_name['parameter_type'] @@ -822,64 +836,64 @@ EntityResult = _reflection.GeneratedProtocolMessageType('EntityResult', (_message.Message,), dict( DESCRIPTOR = _ENTITYRESULT, - __module__ = 'google.datastore.v1beta3.query_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.EntityResult) + __module__ = 'google.datastore.v1.query_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.EntityResult) )) _sym_db.RegisterMessage(EntityResult) Query = _reflection.GeneratedProtocolMessageType('Query', (_message.Message,), dict( DESCRIPTOR = _QUERY, - __module__ = 'google.datastore.v1beta3.query_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.Query) + __module__ = 'google.datastore.v1.query_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.Query) )) _sym_db.RegisterMessage(Query) KindExpression = _reflection.GeneratedProtocolMessageType('KindExpression', (_message.Message,), dict( DESCRIPTOR = _KINDEXPRESSION, - __module__ = 'google.datastore.v1beta3.query_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.KindExpression) + __module__ = 'google.datastore.v1.query_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.KindExpression) )) _sym_db.RegisterMessage(KindExpression) PropertyReference = _reflection.GeneratedProtocolMessageType('PropertyReference', (_message.Message,), dict( DESCRIPTOR = _PROPERTYREFERENCE, - __module__ = 'google.datastore.v1beta3.query_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.PropertyReference) + __module__ = 'google.datastore.v1.query_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.PropertyReference) )) _sym_db.RegisterMessage(PropertyReference) Projection = _reflection.GeneratedProtocolMessageType('Projection', (_message.Message,), dict( DESCRIPTOR = _PROJECTION, - __module__ = 'google.datastore.v1beta3.query_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.Projection) + __module__ = 'google.datastore.v1.query_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.Projection) )) _sym_db.RegisterMessage(Projection) PropertyOrder = _reflection.GeneratedProtocolMessageType('PropertyOrder', (_message.Message,), dict( DESCRIPTOR = _PROPERTYORDER, - __module__ = 'google.datastore.v1beta3.query_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.PropertyOrder) + __module__ = 'google.datastore.v1.query_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.PropertyOrder) )) _sym_db.RegisterMessage(PropertyOrder) Filter = _reflection.GeneratedProtocolMessageType('Filter', (_message.Message,), dict( DESCRIPTOR = _FILTER, - __module__ = 'google.datastore.v1beta3.query_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.Filter) + __module__ = 'google.datastore.v1.query_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.Filter) )) _sym_db.RegisterMessage(Filter) CompositeFilter = _reflection.GeneratedProtocolMessageType('CompositeFilter', (_message.Message,), dict( DESCRIPTOR = _COMPOSITEFILTER, - __module__ = 'google.datastore.v1beta3.query_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.CompositeFilter) + __module__ = 'google.datastore.v1.query_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.CompositeFilter) )) _sym_db.RegisterMessage(CompositeFilter) PropertyFilter = _reflection.GeneratedProtocolMessageType('PropertyFilter', (_message.Message,), dict( DESCRIPTOR = _PROPERTYFILTER, - __module__ = 'google.datastore.v1beta3.query_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.PropertyFilter) + __module__ = 'google.datastore.v1.query_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.PropertyFilter) )) _sym_db.RegisterMessage(PropertyFilter) @@ -887,34 +901,34 @@ NamedBindingsEntry = _reflection.GeneratedProtocolMessageType('NamedBindingsEntry', (_message.Message,), dict( DESCRIPTOR = _GQLQUERY_NAMEDBINDINGSENTRY, - __module__ = 'google.datastore.v1beta3.query_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.GqlQuery.NamedBindingsEntry) + __module__ = 'google.datastore.v1.query_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.GqlQuery.NamedBindingsEntry) )) , DESCRIPTOR = _GQLQUERY, - __module__ = 'google.datastore.v1beta3.query_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.GqlQuery) + __module__ = 'google.datastore.v1.query_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.GqlQuery) )) _sym_db.RegisterMessage(GqlQuery) _sym_db.RegisterMessage(GqlQuery.NamedBindingsEntry) GqlQueryParameter = _reflection.GeneratedProtocolMessageType('GqlQueryParameter', (_message.Message,), dict( DESCRIPTOR = _GQLQUERYPARAMETER, - __module__ = 'google.datastore.v1beta3.query_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.GqlQueryParameter) + __module__ = 'google.datastore.v1.query_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.GqlQueryParameter) )) _sym_db.RegisterMessage(GqlQueryParameter) QueryResultBatch = _reflection.GeneratedProtocolMessageType('QueryResultBatch', (_message.Message,), dict( DESCRIPTOR = _QUERYRESULTBATCH, - __module__ = 'google.datastore.v1beta3.query_pb2' - # @@protoc_insertion_point(class_scope:google.datastore.v1beta3.QueryResultBatch) + __module__ = 'google.datastore.v1.query_pb2' + # @@protoc_insertion_point(class_scope:google.datastore.v1.QueryResultBatch) )) _sym_db.RegisterMessage(QueryResultBatch) DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\034com.google.datastore.v1beta3B\nQueryProtoP\001')) +DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\027com.google.datastore.v1B\nQueryProtoP\001')) _GQLQUERY_NAMEDBINDINGSENTRY.has_options = True _GQLQUERY_NAMEDBINDINGSENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')) # @@protoc_insertion_point(module_scope)