feat: add field order_by in spanner.proto (googleapis#3064)

* feat: add field order_by in spanner.proto feat: add field lock_hint in spanner.proto PiperOrigin-RevId: 636759139 Source-Link: googleapis/googleapis@eeed69d Source-Link: googleapis/googleapis-gen@8b4c5da Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOGI0YzVkYWUyMTU3Y2Q2ODNhOTIyOWQ0MGRlOGM3MTY2NWMyMWEwYSJ9 feat: Add QueryCancellationAction message in executor protos PiperOrigin-RevId: 633451546 Source-Link: googleapis/googleapis@e3a34df Source-Link: googleapis/googleapis-gen@d4cd0f4 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZDRjZDBmNDhhNTc3MzE1MWZjNmVlZWJjODdhYTdlOWU5NTkwNTc1NSJ9 fix!: An existing method `UpdateVehicleLocation` is removed from service `VehicleService` fix!: An existing method `SearchFuzzedVehicles` is removed from service `VehicleService` fix!: An existing message `UpdateVehicleLocationRequest` is removed PiperOrigin-RevId: 631557549 Source-Link: googleapis/googleapis@3d50414 Source-Link: googleapis/googleapis-gen@5ce63d4 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNWNlNjNkNGU2MzZhOTc1MTc1YmRlMmQxNmMxNWU3MGRkNWE4MWZmNCJ9 feat: Add support for multi region encryption config docs: fix linting for several doc comments PiperOrigin-RevId: 630422337 Source-Link: googleapis/googleapis@65db386 Source-Link: googleapis/googleapis-gen@b798ca9 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYjc5OGNhOWY1NmUyYWQzZTBkMTQ5ODJiNjhiNjcyNGQxYzNkNjJiNSJ9 feat: add `RESOURCE_EXHAUSTED` to the list of retryable error codes PiperOrigin-RevId: 628281023 Source-Link: googleapis/googleapis@60536a2 Source-Link: googleapis/googleapis-gen@c5cfd5b Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYzVjZmQ1Yjk1NmY5ZWFkZmY1NDA5NmM5ZjFjOGE1N2FiMDFkYjI5NCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
surbhigarg92 · Jul 3, 2024 · 707639c · 707639c
1 parent 026655e
commit 707639c
Show file tree

Hide file tree

Showing 90 changed files with 8,243 additions and 2,312 deletions.
diff --git a/.../resources/META-INF/native-image/com.google.cloud.spanner.executor.v1/reflect-config.json b/.../resources/META-INF/native-image/com.google.cloud.spanner.executor.v1/reflect-config.json
@@ -4238,6 +4238,24 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.spanner.executor.v1.QueryCancellationAction",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.spanner.executor.v1.QueryCancellationAction$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.spanner.executor.v1.QueryResult",
     "queryAllDeclaredConstructors": true,
@@ -5363,6 +5381,24 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.spanner.v1.ReadRequest$LockHint",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.spanner.v1.ReadRequest$OrderBy",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.spanner.v1.RequestOptions",
     "queryAllDeclaredConstructors": true,

diff --git a/...spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClient.java b/...spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClient.java
@@ -86,8 +86,8 @@
  * Service Description: Cloud Spanner Database Admin API
  *
  * <p>The Cloud Spanner Database Admin API can be used to: &#42; create, drop, and list databases
- * &#42; update the schema of pre-existing databases &#42; create, delete and list backups for a
- * database &#42; restore a database from an existing backup
+ * &#42; update the schema of pre-existing databases &#42; create, delete, copy and list backups for
+ * a database &#42; restore a database from an existing backup
  *
  * <p>This class provides the ability to make remote calls to the backing service through method
  * calls that map to API methods. Sample code to get started:
@@ -199,7 +199,7 @@
  *    </tr>
  *    <tr>
  *      <td><p> UpdateDatabaseDdl</td>
- *      <td><p> Updates the schema of a Cloud Spanner database by creating/altering/dropping tables, columns, indexes, etc. The returned [long-running operation][google.longrunning.Operation] will have a name of the format `&lt;database_name&gt;/operations/&lt;operation_id&gt;` and can be used to track execution of the schema change(s). The [metadata][google.longrunning.Operation.metadata] field type is [UpdateDatabaseDdlMetadata][google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata].  The operation has no response.</td>
+ *      <td><p> Updates the schema of a Cloud Spanner database by creating/altering/dropping tables, columns, indexes, etc. The returned [long-running operation][google.longrunning.Operation] will have a name of the format `&lt;database_name&gt;/operations/&lt;operation_id&gt;` and can be used to track execution of the schema change(s). The [metadata][google.longrunning.Operation.metadata] field type is [UpdateDatabaseDdlMetadata][google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata]. The operation has no response.</td>
  *      <td>
  *      <p>Request object method variants only take one parameter, a request object, which must be constructed before the call.</p>
  *      <ul>
@@ -337,7 +337,7 @@
  *    </tr>
  *    <tr>
  *      <td><p> CopyBackup</td>
- *      <td><p> Starts copying a Cloud Spanner Backup. The returned backup [long-running operation][google.longrunning.Operation] will have a name of the format `projects/&lt;project&gt;/instances/&lt;instance&gt;/backups/&lt;backup&gt;/operations/&lt;operation_id&gt;` and can be used to track copying of the backup. The operation is associated with the destination backup. The [metadata][google.longrunning.Operation.metadata] field type is [CopyBackupMetadata][google.spanner.admin.database.v1.CopyBackupMetadata]. The [response][google.longrunning.Operation.response] field type is [Backup][google.spanner.admin.database.v1.Backup], if successful. Cancelling the returned operation will stop the copying and delete the backup. Concurrent CopyBackup requests can run on the same source backup.</td>
+ *      <td><p> Starts copying a Cloud Spanner Backup. The returned backup [long-running operation][google.longrunning.Operation] will have a name of the format `projects/&lt;project&gt;/instances/&lt;instance&gt;/backups/&lt;backup&gt;/operations/&lt;operation_id&gt;` and can be used to track copying of the backup. The operation is associated with the destination backup. The [metadata][google.longrunning.Operation.metadata] field type is [CopyBackupMetadata][google.spanner.admin.database.v1.CopyBackupMetadata]. The [response][google.longrunning.Operation.response] field type is [Backup][google.spanner.admin.database.v1.Backup], if successful. Cancelling the returned operation will stop the copying and delete the destination backup. Concurrent CopyBackup requests can run on the same source backup.</td>
  *      <td>
  *      <p>Request object method variants only take one parameter, a request object, which must be constructed before the call.</p>
  *      <ul>
@@ -2459,8 +2459,8 @@ public final UnaryCallable<CreateBackupRequest, Operation> createBackupCallable(
    * [CopyBackupMetadata][google.spanner.admin.database.v1.CopyBackupMetadata]. The
    * [response][google.longrunning.Operation.response] field type is
    * [Backup][google.spanner.admin.database.v1.Backup], if successful. Cancelling the returned
-   * operation will stop the copying and delete the backup. Concurrent CopyBackup requests can run
-   * on the same source backup.
+   * operation will stop the copying and delete the destination backup. Concurrent CopyBackup
+   * requests can run on the same source backup.
    *
    * <p>Sample code:
    *
@@ -2517,8 +2517,8 @@ public final OperationFuture<Backup, CopyBackupMetadata> copyBackupAsync(
    * [CopyBackupMetadata][google.spanner.admin.database.v1.CopyBackupMetadata]. The
    * [response][google.longrunning.Operation.response] field type is
    * [Backup][google.spanner.admin.database.v1.Backup], if successful. Cancelling the returned
-   * operation will stop the copying and delete the backup. Concurrent CopyBackup requests can run
-   * on the same source backup.
+   * operation will stop the copying and delete the destination backup. Concurrent CopyBackup
+   * requests can run on the same source backup.
    *
    * <p>Sample code:
    *
@@ -2575,8 +2575,8 @@ public final OperationFuture<Backup, CopyBackupMetadata> copyBackupAsync(
    * [CopyBackupMetadata][google.spanner.admin.database.v1.CopyBackupMetadata]. The
    * [response][google.longrunning.Operation.response] field type is
    * [Backup][google.spanner.admin.database.v1.Backup], if successful. Cancelling the returned
-   * operation will stop the copying and delete the backup. Concurrent CopyBackup requests can run
-   * on the same source backup.
+   * operation will stop the copying and delete the destination backup. Concurrent CopyBackup
+   * requests can run on the same source backup.
    *
    * <p>Sample code:
    *
@@ -2633,8 +2633,8 @@ public final OperationFuture<Backup, CopyBackupMetadata> copyBackupAsync(
    * [CopyBackupMetadata][google.spanner.admin.database.v1.CopyBackupMetadata]. The
    * [response][google.longrunning.Operation.response] field type is
    * [Backup][google.spanner.admin.database.v1.Backup], if successful. Cancelling the returned
-   * operation will stop the copying and delete the backup. Concurrent CopyBackup requests can run
-   * on the same source backup.
+   * operation will stop the copying and delete the destination backup. Concurrent CopyBackup
+   * requests can run on the same source backup.
    *
    * <p>Sample code:
    *
@@ -2691,8 +2691,8 @@ public final OperationFuture<Backup, CopyBackupMetadata> copyBackupAsync(
    * [CopyBackupMetadata][google.spanner.admin.database.v1.CopyBackupMetadata]. The
    * [response][google.longrunning.Operation.response] field type is
    * [Backup][google.spanner.admin.database.v1.Backup], if successful. Cancelling the returned
-   * operation will stop the copying and delete the backup. Concurrent CopyBackup requests can run
-   * on the same source backup.
+   * operation will stop the copying and delete the destination backup. Concurrent CopyBackup
+   * requests can run on the same source backup.
    *
    * <p>Sample code:
    *
@@ -2733,8 +2733,8 @@ public final OperationFuture<Backup, CopyBackupMetadata> copyBackupAsync(
    * [CopyBackupMetadata][google.spanner.admin.database.v1.CopyBackupMetadata]. The
    * [response][google.longrunning.Operation.response] field type is
    * [Backup][google.spanner.admin.database.v1.Backup], if successful. Cancelling the returned
-   * operation will stop the copying and delete the backup. Concurrent CopyBackup requests can run
-   * on the same source backup.
+   * operation will stop the copying and delete the destination backup. Concurrent CopyBackup
+   * requests can run on the same source backup.
    *
    * <p>Sample code:
    *
@@ -2775,8 +2775,8 @@ public final OperationFuture<Backup, CopyBackupMetadata> copyBackupAsync(
    * [CopyBackupMetadata][google.spanner.admin.database.v1.CopyBackupMetadata]. The
    * [response][google.longrunning.Operation.response] field type is
    * [Backup][google.spanner.admin.database.v1.Backup], if successful. Cancelling the returned
-   * operation will stop the copying and delete the backup. Concurrent CopyBackup requests can run
-   * on the same source backup.
+   * operation will stop the copying and delete the destination backup. Concurrent CopyBackup
+   * requests can run on the same source backup.
    *
    * <p>Sample code:
    *
@@ -4069,7 +4069,7 @@ public final ListBackupOperationsPagedResponse listBackupOperations(
    * }</pre>
    *
    * @param parent Required. The database whose roles should be listed. Values are of the form
-   *     `projects/&lt;project&gt;/instances/&lt;instance&gt;/databases/&lt;database&gt;/databaseRoles`.
+   *     `projects/&lt;project&gt;/instances/&lt;instance&gt;/databases/&lt;database&gt;`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final ListDatabaseRolesPagedResponse listDatabaseRoles(DatabaseName parent) {
@@ -4101,7 +4101,7 @@ public final ListDatabaseRolesPagedResponse listDatabaseRoles(DatabaseName paren
    * }</pre>
    *
    * @param parent Required. The database whose roles should be listed. Values are of the form
-   *     `projects/&lt;project&gt;/instances/&lt;instance&gt;/databases/&lt;database&gt;/databaseRoles`.
+   *     `projects/&lt;project&gt;/instances/&lt;instance&gt;/databases/&lt;database&gt;`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final ListDatabaseRolesPagedResponse listDatabaseRoles(String parent) {

diff --git a/...-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/package-info.java b/...-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/package-info.java
@@ -24,8 +24,8 @@
  * <p>Service Description: Cloud Spanner Database Admin API
  *
  * <p>The Cloud Spanner Database Admin API can be used to: &#42; create, drop, and list databases
- * &#42; update the schema of pre-existing databases &#42; create, delete and list backups for a
- * database &#42; restore a database from an existing backup
+ * &#42; update the schema of pre-existing databases &#42; create, delete, copy and list backups for
+ * a database &#42; restore a database from an existing backup
  *
  * <p>Sample for DatabaseAdminClient:
  *

diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStubSettings.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStubSettings.java
@@ -446,13 +446,19 @@ public static class Builder extends StubSettings.Builder<SpannerStubSettings, Bu
           ImmutableMap.builder();
       definitions.put(
           "retry_policy_3_codes",
-          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+          ImmutableSet.copyOf(
+              Lists.<StatusCode.Code>newArrayList(
+                  StatusCode.Code.UNAVAILABLE, StatusCode.Code.RESOURCE_EXHAUSTED)));
       definitions.put(
           "retry_policy_2_codes",
-          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+          ImmutableSet.copyOf(
+              Lists.<StatusCode.Code>newArrayList(
+                  StatusCode.Code.UNAVAILABLE, StatusCode.Code.RESOURCE_EXHAUSTED)));
       definitions.put(
           "retry_policy_1_codes",
-          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+          ImmutableSet.copyOf(
+              Lists.<StatusCode.Code>newArrayList(
+                  StatusCode.Code.UNAVAILABLE, StatusCode.Code.RESOURCE_EXHAUSTED)));
       definitions.put(
           "no_retry_0_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();

diff --git a/.../src/main/resources/META-INF/native-image/com.google.cloud.spanner.v1/reflect-config.json b/.../src/main/resources/META-INF/native-image/com.google.cloud.spanner.v1/reflect-config.json
@@ -1988,6 +1988,24 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.spanner.v1.ReadRequest$LockHint",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.spanner.v1.ReadRequest$OrderBy",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.spanner.v1.RequestOptions",
     "queryAllDeclaredConstructors": true,

diff --git a/...test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientHttpJsonTest.java b/...test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientHttpJsonTest.java
@@ -1081,6 +1081,7 @@ public void createBackupTest() throws Exception {
             .setSizeBytes(-1796325715)
             .addAllReferencingDatabases(new ArrayList<String>())
             .setEncryptionInfo(EncryptionInfo.newBuilder().build())
+            .addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
             .setDatabaseDialect(DatabaseDialect.forNumber(0))
             .addAllReferencingBackups(new ArrayList<String>())
             .setMaxExpireTime(Timestamp.newBuilder().build())
@@ -1144,6 +1145,7 @@ public void createBackupTest2() throws Exception {
             .setSizeBytes(-1796325715)
             .addAllReferencingDatabases(new ArrayList<String>())
             .setEncryptionInfo(EncryptionInfo.newBuilder().build())
+            .addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
             .setDatabaseDialect(DatabaseDialect.forNumber(0))
             .addAllReferencingBackups(new ArrayList<String>())
             .setMaxExpireTime(Timestamp.newBuilder().build())
@@ -1207,6 +1209,7 @@ public void copyBackupTest() throws Exception {
             .setSizeBytes(-1796325715)
             .addAllReferencingDatabases(new ArrayList<String>())
             .setEncryptionInfo(EncryptionInfo.newBuilder().build())
+            .addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
             .setDatabaseDialect(DatabaseDialect.forNumber(0))
             .addAllReferencingBackups(new ArrayList<String>())
             .setMaxExpireTime(Timestamp.newBuilder().build())
@@ -1273,6 +1276,7 @@ public void copyBackupTest2() throws Exception {
             .setSizeBytes(-1796325715)
             .addAllReferencingDatabases(new ArrayList<String>())
             .setEncryptionInfo(EncryptionInfo.newBuilder().build())
+            .addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
             .setDatabaseDialect(DatabaseDialect.forNumber(0))
             .addAllReferencingBackups(new ArrayList<String>())
             .setMaxExpireTime(Timestamp.newBuilder().build())
@@ -1339,6 +1343,7 @@ public void copyBackupTest3() throws Exception {
             .setSizeBytes(-1796325715)
             .addAllReferencingDatabases(new ArrayList<String>())
             .setEncryptionInfo(EncryptionInfo.newBuilder().build())
+            .addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
             .setDatabaseDialect(DatabaseDialect.forNumber(0))
             .addAllReferencingBackups(new ArrayList<String>())
             .setMaxExpireTime(Timestamp.newBuilder().build())
@@ -1405,6 +1410,7 @@ public void copyBackupTest4() throws Exception {
             .setSizeBytes(-1796325715)
             .addAllReferencingDatabases(new ArrayList<String>())
             .setEncryptionInfo(EncryptionInfo.newBuilder().build())
+            .addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
             .setDatabaseDialect(DatabaseDialect.forNumber(0))
             .addAllReferencingBackups(new ArrayList<String>())
             .setMaxExpireTime(Timestamp.newBuilder().build())
@@ -1471,6 +1477,7 @@ public void getBackupTest() throws Exception {
             .setSizeBytes(-1796325715)
             .addAllReferencingDatabases(new ArrayList<String>())
             .setEncryptionInfo(EncryptionInfo.newBuilder().build())
+            .addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
             .setDatabaseDialect(DatabaseDialect.forNumber(0))
             .addAllReferencingBackups(new ArrayList<String>())
             .setMaxExpireTime(Timestamp.newBuilder().build())
@@ -1525,6 +1532,7 @@ public void getBackupTest2() throws Exception {
             .setSizeBytes(-1796325715)
             .addAllReferencingDatabases(new ArrayList<String>())
             .setEncryptionInfo(EncryptionInfo.newBuilder().build())
+            .addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
             .setDatabaseDialect(DatabaseDialect.forNumber(0))
             .addAllReferencingBackups(new ArrayList<String>())
             .setMaxExpireTime(Timestamp.newBuilder().build())
@@ -1579,6 +1587,7 @@ public void updateBackupTest() throws Exception {
             .setSizeBytes(-1796325715)
             .addAllReferencingDatabases(new ArrayList<String>())
             .setEncryptionInfo(EncryptionInfo.newBuilder().build())
+            .addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
             .setDatabaseDialect(DatabaseDialect.forNumber(0))
             .addAllReferencingBackups(new ArrayList<String>())
             .setMaxExpireTime(Timestamp.newBuilder().build())
@@ -1595,6 +1604,7 @@ public void updateBackupTest() throws Exception {
             .setSizeBytes(-1796325715)
             .addAllReferencingDatabases(new ArrayList<String>())
             .setEncryptionInfo(EncryptionInfo.newBuilder().build())
+            .addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
             .setDatabaseDialect(DatabaseDialect.forNumber(0))
             .addAllReferencingBackups(new ArrayList<String>())
             .setMaxExpireTime(Timestamp.newBuilder().build())
@@ -1637,6 +1647,7 @@ public void updateBackupExceptionTest() throws Exception {
               .setSizeBytes(-1796325715)
               .addAllReferencingDatabases(new ArrayList<String>())
               .setEncryptionInfo(EncryptionInfo.newBuilder().build())
+              .addAllEncryptionInformation(new ArrayList<EncryptionInfo>())
               .setDatabaseDialect(DatabaseDialect.forNumber(0))
               .addAllReferencingBackups(new ArrayList<String>())
               .setMaxExpireTime(Timestamp.newBuilder().build())