feat: add tagging request options

Google APIs · copybara-github · commit 6ce40ff8faf6 · 2021-03-28T20:54:56.000-07:00
PiperOrigin-RevId: 365498709
diff --git a/google/spanner/admin/database/v1/spanner_database_admin.proto b/google/spanner/admin/database/v1/spanner_database_admin.proto
@@ -736,7 +736,7 @@ message RestoreDatabaseRequest {
   // to. If this field is not specified, the restored database will use the same
   // encryption configuration as the backup by default, namely
   // [encryption_type][google.spanner.admin.database.v1.RestoreDatabaseEncryptionConfig.encryption_type]
-  // = `USE_CONFIG_DEFAULT_OR_DATABASE_ENCRYPTION`.
+  // = `USE_CONFIG_DEFAULT_OR_BACKUP_ENCRYPTION`.
   RestoreDatabaseEncryptionConfig encryption_config = 4
       [(google.api.field_behavior) = OPTIONAL];
 }
diff --git a/google/spanner/admin/instance/v1/spanner_instance_admin.proto b/google/spanner/admin/instance/v1/spanner_instance_admin.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -373,7 +373,7 @@ message Instance {
   // either omitted or set to `CREATING`. For
   // [UpdateInstance][google.spanner.admin.instance.v1.InstanceAdmin.UpdateInstance], the state must be
   // either omitted or set to `READY`.
-  State state = 6;
+  State state = 6 [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Cloud Labels are a flexible and lightweight mechanism for organizing cloud
   // resources into groups that reflect a customer's organizational needs and
diff --git a/google/spanner/v1/spanner.proto b/google/spanner/v1/spanner.proto
@@ -459,6 +459,27 @@ message RequestOptions {
 
   // Priority for the request.
   Priority priority = 1;
+
+  // A per-request tag which can be applied to queries or reads, used for
+  // statistics collection.
+  // Both request_tag and transaction_tag can be specified for a read or query
+  // that belongs to a transaction.
+  // This field is ignored for requests where it's not applicable (e.g.
+  // CommitRequest).
+  // `request_tag` must be a valid identifier of the form:
+  // `[a-zA-Z][a-zA-Z0-9_\-]` between 2 and 64 characters in length
+  string request_tag = 2;
+
+  // A tag used for statistics collection about this transaction.
+  // Both request_tag and transaction_tag can be specified for a read or query
+  // that belongs to a transaction.
+  // The value of transaction_tag should be the same for all requests belonging
+  // to the same transaction.
+  // If this request doesn’t belong to any transaction, transaction_tag will be
+  // ignored.
+  // `transaction_tag` must be a valid identifier of the format:
+  // `[a-zA-Z][a-zA-Z0-9_\-]{0,49}`
+  string transaction_tag = 3;
 }
 
 // The request for [ExecuteSql][google.spanner.v1.Spanner.ExecuteSql] and
@@ -490,15 +511,15 @@ message ExecuteSqlRequest {
     // The `optimizer_version` statement hint has precedence over this setting.
     string optimizer_version = 1;
 
-    // Query optimizer statistics package to use.
+    // An option to control the selection of optimizer statistics package.
     //
     // This parameter allows individual queries to use a different query
-    // optimizer statistics.
+    // optimizer statistics package.
     //
     // Specifying `latest` as a value instructs Cloud Spanner to use the latest
     // generated statistics package. If not specified, Cloud Spanner uses
-    // statistics package set at the database level options, or latest if
-    // the database option is not set.
+    // the statistics package set at the database level options, or the latest
+    // package if the database option is not set.
     //
     // The statistics package requested by the query has to be exempt from
     // garbage collection. This can be achieved with the following DDL
@@ -509,10 +530,10 @@ message ExecuteSqlRequest {
     // ```
     //
     // The list of available statistics packages can be queried from
-    // `SPANNER_SYS.OPTIMIZER_STATISTICS_PACKAGES`.
+    // `INFORMATION_SCHEMA.SPANNER_STATISTICS`.
     //
     // Executing a SQL statement with an invalid optimizer statistics package
-    // or with statistics package that allows garbage collection fails with
+    // or with a statistics package that allows garbage collection fails with
     // an `INVALID_ARGUMENT` error.
     string optimizer_statistics_package = 2;
   }

Original file line number	Diff line number	Diff line change
`@@ -736,7 +736,7 @@ message RestoreDatabaseRequest {`
`736`	`736`	`// to. If this field is not specified, the restored database will use the same`
`737`	`737`	`// encryption configuration as the backup by default, namely`
`738`	`738`	`// [encryption_type][google.spanner.admin.database.v1.RestoreDatabaseEncryptionConfig.encryption_type]`
`739`		- // = `USE_CONFIG_DEFAULT_OR_DATABASE_ENCRYPTION`.
	`739`	+ // = `USE_CONFIG_DEFAULT_OR_BACKUP_ENCRYPTION`.
`740`	`740`	`RestoreDatabaseEncryptionConfig encryption_config = 4`
`741`	`741`	`[(google.api.field_behavior) = OPTIONAL];`
`742`	`742`	`}`