From 7f797a0ffbc3c46cb0dcc146f48e4fab58f2fa50 Mon Sep 17 00:00:00 2001 From: Google APIs Date: Wed, 30 Aug 2017 11:03:14 -0700 Subject: [PATCH] Synchronize new proto changes. --- .../admin/v1beta1/datastore_admin.proto | 45 ++++++++++--------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/google/datastore/admin/v1beta1/datastore_admin.proto b/google/datastore/admin/v1beta1/datastore_admin.proto index 44ed564d..31ef5678 100644 --- a/google/datastore/admin/v1beta1/datastore_admin.proto +++ b/google/datastore/admin/v1beta1/datastore_admin.proto @@ -29,7 +29,7 @@ option java_package = "com.google.datastore.admin.v1beta1"; // Google Cloud Datastore Admin API // -// The Datastore Admin API provides several admin services for the Datastore. +// The Datastore Admin API provides several admin services for Cloud Datastore. // // ----------------------------------------------------------------------------- // ## Concepts @@ -39,9 +39,9 @@ option java_package = "com.google.datastore.admin.v1beta1"; // // Operation: An Operation represents work being performed in the background. // -// EntityFilter: Allows specifying a subset of entities in a project. This is -// specified as a combination of kind + namespace (either or both of which may -// be all). +// EntityFilter: Allows specifying a subset of entities in a project. This is +// specified as a combination of kinds and namespaces (either or both of which +// may be all). // // ----------------------------------------------------------------------------- // ## Services @@ -52,12 +52,10 @@ option java_package = "com.google.datastore.admin.v1beta1"; // entities to/from Google Cloud Storage. // // Exported data may be imported into Cloud Datastore for any Google Cloud -// Platform project. It is not restricted to the export source. A copy can be -// performed by exporting from one project and then importing into another -// project. +// Platform project. It is not restricted to the export source project. It is +// possible to export from one project and then import into another. // -// Exported data can also be provided to other services. For example, it can be -// loaded into Google BigQuery for analysis. +// Exported data can also be loaded into Google BigQuery for analysis. // // Exports and imports are performed asynchronously. An Operation resource is // created for each export/import. The state (including any errors encountered) @@ -76,6 +74,8 @@ option java_package = "com.google.datastore.admin.v1beta1"; // An operation that is done may be deleted so that it is no longer listed as // part of the Operation collection. // +// ListOperations returns all pending operations, but not completed operations. +// // Operations are created by service DatastoreAdmin, // but are accessed via service google.longrunning.Operations. service DatastoreAdmin { @@ -83,7 +83,7 @@ service DatastoreAdmin { // to another storage system, such as Google Cloud Storage. Recent updates to // entities may not be reflected in the export. The export occurs in the // background and its progress can be monitored and managed via the - // Operation resource that is created. The output of an export may only be + // Operation resource that is created. The output of an export may only be // used once the associated operation is done. If an export operation is // cancelled before completion it may leave partial data behind in Google // Cloud Storage. @@ -94,7 +94,7 @@ service DatastoreAdmin { // Imports entities into Google Cloud Datastore. Existing entities with the // same key are overwritten. The import occurs in the background and its // progress can be monitored and managed via the Operation resource that is - // created. If an ImportEntities operation is cancelled, it is possible + // created. If an ImportEntities operation is cancelled, it is possible // that a subset of the data has already been imported to Cloud Datastore. rpc ImportEntities(ImportEntitiesRequest) returns (google.longrunning.Operation) { option (google.api.http) = { post: "/v1beta1/projects/{project_id}:import" body: "*" }; @@ -115,7 +115,7 @@ message CommonMetadata { PROCESSING = 2; // Request is in the process of being cancelled after user called - // longrunning.Operations.CancelOperation on the operation. + // google.longrunning.Operations.CancelOperation on the operation. CANCELLING = 3; // Request has been processed and is in its finalization stage. @@ -128,7 +128,7 @@ message CommonMetadata { FAILED = 6; // Request has finished being cancelled after user called - // longrunning.Operations.CancelOperation. + // google.longrunning.Operations.CancelOperation. CANCELLED = 7; } @@ -138,12 +138,12 @@ message CommonMetadata { // The time the operation ended, either successfully or otherwise. google.protobuf.Timestamp end_time = 2; - // The type of the operation. Can be used as a filter in + // The type of the operation. Can be used as a filter in // ListOperationsRequest. OperationType operation_type = 3; // The client-assigned labels which were provided when the operation was - // created. May also include additional labels. + // created. May also include additional labels. map labels = 4; // The current state of the Operation. @@ -152,10 +152,11 @@ message CommonMetadata { // Measures the progress of a particular metric. message Progress { - // Note that this may be greater than work_estimated. + // The amount of work that has been completed. Note that this may be greater + // than work_estimated. int64 work_completed = 1; - // An estimate of how much work needs to be performed. May be zero if the + // An estimate of how much work needs to be performed. May be zero if the // work estimate is unavailable. int64 work_estimated = 2; } @@ -202,7 +203,7 @@ message ImportEntitiesRequest { // Client-assigned labels. map labels = 2; - // The full resource URL of the external storage location. Currently, only + // The full resource URL of the external storage location. Currently, only // Google Cloud Storage is supported. So input_url should be of the form: // `gs://BUCKET_NAME[/NAMESPACE_PATH]/OVERALL_EXPORT_METADATA_FILE`, where // `BUCKET_NAME` is the name of the Cloud Storage bucket, `NAMESPACE_PATH` is @@ -276,8 +277,8 @@ message ImportEntitiesMetadata { string input_url = 5; } -// Identifies a subset of entities in a project. This is specified as -// combinations of kind + namespace (either or both of which may be all, as +// Identifies a subset of entities in a project. This is specified as +// combinations of kinds and namespaces (either or both of which may be all, as // described in the following examples). // Example usage: // @@ -299,10 +300,10 @@ message EntityFilter { // If empty, then this represents all kinds. repeated string kinds = 1; - // An empty list represents all namespaces. This is the preferred + // An empty list represents all namespaces. This is the preferred // usage for projects that don't use namespaces. // - // An empty string element represents the default namespace. This should be + // An empty string element represents the default namespace. This should be // used if the project has data in non-default namespaces, but doesn't want to // include them. // Each namespace in this list must be unique.