From 21af00c57b722640d08b730503a316faba8da9ed Mon Sep 17 00:00:00 2001 From: surbhigarg92 Date: Wed, 22 Feb 2023 15:42:17 +0530 Subject: [PATCH 01/10] test: fixed failed system test cases (#1810) Fixes #1809 --- system-test/spanner.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/system-test/spanner.ts b/system-test/spanner.ts index 39f5d01d1..7b6bc90ca 100644 --- a/system-test/spanner.ts +++ b/system-test/spanner.ts @@ -3759,10 +3759,11 @@ describe('Spanner', () => { const GOOGLE_SQL_EXPECTED_ROW = extend(true, {}, GOOGLE_SQL_INSERT_ROW); const POSTGRESQL_EXPECTED_ROW = extend(true, {}, POSTGRESQL_INSERT_ROW); - before(() => { - return googleSqlTable.insert(GOOGLE_SQL_INSERT_ROW).then(() => { - postgreSqlTable.insert(POSTGRESQL_INSERT_ROW); - }); + before(async () => { + await googleSqlTable.insert(GOOGLE_SQL_INSERT_ROW); + if (!IS_EMULATOR_ENABLED) { + await postgreSqlTable.insert(POSTGRESQL_INSERT_ROW); + } }); const queryCallbackMode = (done, database, query, EXPECTED_ROW) => { From 2a6ca6f09215752f9451d625ac02837e9d70b66a Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 6 Mar 2023 15:49:52 -0500 Subject: [PATCH 02/10] feat: Adding new fields for Serverless analytics (#1816) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: Adding new fields for Serverless analytics PiperOrigin-RevId: 513499163 Source-Link: https://github.com/googleapis/googleapis/commit/c3ffffa624534dd6431db695245f374d552e973d Source-Link: https://github.com/googleapis/googleapis-gen/commit/3e262dc86a9e73ea0b6cfd7d19ac7685ac34a0e5 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiM2UyNjJkYzg2YTllNzNlYTBiNmNmZDdkMTlhYzc2ODVhYzM0YTBlNSJ9 * 🦉 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 --- protos/google/spanner/v1/spanner.proto | 14 ++++++++ protos/protos.d.ts | 12 +++++++ protos/protos.js | 46 ++++++++++++++++++++++++++ protos/protos.json | 8 +++++ src/v1/spanner_client.ts | 24 ++++++++++++++ 5 files changed, 104 insertions(+) diff --git a/protos/google/spanner/v1/spanner.proto b/protos/google/spanner/v1/spanner.proto index ef772170b..77a1f0e47 100644 --- a/protos/google/spanner/v1/spanner.proto +++ b/protos/google/spanner/v1/spanner.proto @@ -643,6 +643,13 @@ message ExecuteSqlRequest { // Common options for this request. RequestOptions request_options = 11; + + // If this is for a partitioned read and this field is set to `true`, the + // request will be executed via Spanner independent compute resources. + // + // If the field is set to `true` but the request does not set + // `partition_token`, the API will return an `INVALID_ARGUMENT` error. + bool data_boost_enabled = 15; } // The request for [ExecuteBatchDml][google.spanner.v1.Spanner.ExecuteBatchDml]. @@ -949,6 +956,13 @@ message ReadRequest { // Common options for this request. RequestOptions request_options = 11; + + // If this is for a partitioned query and this field is set to `true`, the + // request will be executed via Spanner independent compute resources. + // + // If the field is set to `true` but the request does not set + // `partition_token`, the API will return an `INVALID_ARGUMENT` error. + bool data_boost_enabled = 16; } // The request for [BeginTransaction][google.spanner.v1.Spanner.BeginTransaction]. diff --git a/protos/protos.d.ts b/protos/protos.d.ts index 91552afe3..b7fd19956 100644 --- a/protos/protos.d.ts +++ b/protos/protos.d.ts @@ -17400,6 +17400,9 @@ export namespace google { /** ExecuteSqlRequest requestOptions */ requestOptions?: (google.spanner.v1.IRequestOptions|null); + + /** ExecuteSqlRequest dataBoostEnabled */ + dataBoostEnabled?: (boolean|null); } /** Represents an ExecuteSqlRequest. */ @@ -17444,6 +17447,9 @@ export namespace google { /** ExecuteSqlRequest requestOptions. */ public requestOptions?: (google.spanner.v1.IRequestOptions|null); + /** ExecuteSqlRequest dataBoostEnabled. */ + public dataBoostEnabled: boolean; + /** * Creates a new ExecuteSqlRequest instance using the specified properties. * @param [properties] Properties to set @@ -18566,6 +18572,9 @@ export namespace google { /** ReadRequest requestOptions */ requestOptions?: (google.spanner.v1.IRequestOptions|null); + + /** ReadRequest dataBoostEnabled */ + dataBoostEnabled?: (boolean|null); } /** Represents a ReadRequest. */ @@ -18607,6 +18616,9 @@ export namespace google { /** ReadRequest requestOptions. */ public requestOptions?: (google.spanner.v1.IRequestOptions|null); + /** ReadRequest dataBoostEnabled. */ + public dataBoostEnabled: boolean; + /** * Creates a new ReadRequest instance using the specified properties. * @param [properties] Properties to set diff --git a/protos/protos.js b/protos/protos.js index ad74f311f..1bfa52a63 100644 --- a/protos/protos.js +++ b/protos/protos.js @@ -42925,6 +42925,7 @@ * @property {number|Long|null} [seqno] ExecuteSqlRequest seqno * @property {google.spanner.v1.ExecuteSqlRequest.IQueryOptions|null} [queryOptions] ExecuteSqlRequest queryOptions * @property {google.spanner.v1.IRequestOptions|null} [requestOptions] ExecuteSqlRequest requestOptions + * @property {boolean|null} [dataBoostEnabled] ExecuteSqlRequest dataBoostEnabled */ /** @@ -43031,6 +43032,14 @@ */ ExecuteSqlRequest.prototype.requestOptions = null; + /** + * ExecuteSqlRequest dataBoostEnabled. + * @member {boolean} dataBoostEnabled + * @memberof google.spanner.v1.ExecuteSqlRequest + * @instance + */ + ExecuteSqlRequest.prototype.dataBoostEnabled = false; + /** * Creates a new ExecuteSqlRequest instance using the specified properties. * @function create @@ -43080,6 +43089,8 @@ $root.google.spanner.v1.ExecuteSqlRequest.QueryOptions.encode(message.queryOptions, writer.uint32(/* id 10, wireType 2 =*/82).fork()).ldelim(); if (message.requestOptions != null && Object.hasOwnProperty.call(message, "requestOptions")) $root.google.spanner.v1.RequestOptions.encode(message.requestOptions, writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim(); + if (message.dataBoostEnabled != null && Object.hasOwnProperty.call(message, "dataBoostEnabled")) + writer.uint32(/* id 15, wireType 0 =*/120).bool(message.dataBoostEnabled); return writer; }; @@ -43177,6 +43188,10 @@ message.requestOptions = $root.google.spanner.v1.RequestOptions.decode(reader, reader.uint32()); break; } + case 15: { + message.dataBoostEnabled = reader.bool(); + break; + } default: reader.skipType(tag & 7); break; @@ -43266,6 +43281,9 @@ if (error) return "requestOptions." + error; } + if (message.dataBoostEnabled != null && message.hasOwnProperty("dataBoostEnabled")) + if (typeof message.dataBoostEnabled !== "boolean") + return "dataBoostEnabled: boolean expected"; return null; }; @@ -43354,6 +43372,8 @@ throw TypeError(".google.spanner.v1.ExecuteSqlRequest.requestOptions: object expected"); message.requestOptions = $root.google.spanner.v1.RequestOptions.fromObject(object.requestOptions); } + if (object.dataBoostEnabled != null) + message.dataBoostEnabled = Boolean(object.dataBoostEnabled); return message; }; @@ -43399,6 +43419,7 @@ object.seqno = options.longs === String ? "0" : 0; object.queryOptions = null; object.requestOptions = null; + object.dataBoostEnabled = false; } if (message.session != null && message.hasOwnProperty("session")) object.session = message.session; @@ -43429,6 +43450,8 @@ object.queryOptions = $root.google.spanner.v1.ExecuteSqlRequest.QueryOptions.toObject(message.queryOptions, options); if (message.requestOptions != null && message.hasOwnProperty("requestOptions")) object.requestOptions = $root.google.spanner.v1.RequestOptions.toObject(message.requestOptions, options); + if (message.dataBoostEnabled != null && message.hasOwnProperty("dataBoostEnabled")) + object.dataBoostEnabled = message.dataBoostEnabled; return object; }; @@ -46084,6 +46107,7 @@ * @property {Uint8Array|null} [resumeToken] ReadRequest resumeToken * @property {Uint8Array|null} [partitionToken] ReadRequest partitionToken * @property {google.spanner.v1.IRequestOptions|null} [requestOptions] ReadRequest requestOptions + * @property {boolean|null} [dataBoostEnabled] ReadRequest dataBoostEnabled */ /** @@ -46182,6 +46206,14 @@ */ ReadRequest.prototype.requestOptions = null; + /** + * ReadRequest dataBoostEnabled. + * @member {boolean} dataBoostEnabled + * @memberof google.spanner.v1.ReadRequest + * @instance + */ + ReadRequest.prototype.dataBoostEnabled = false; + /** * Creates a new ReadRequest instance using the specified properties. * @function create @@ -46227,6 +46259,8 @@ writer.uint32(/* id 10, wireType 2 =*/82).bytes(message.partitionToken); if (message.requestOptions != null && Object.hasOwnProperty.call(message, "requestOptions")) $root.google.spanner.v1.RequestOptions.encode(message.requestOptions, writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim(); + if (message.dataBoostEnabled != null && Object.hasOwnProperty.call(message, "dataBoostEnabled")) + writer.uint32(/* id 16, wireType 0 =*/128).bool(message.dataBoostEnabled); return writer; }; @@ -46303,6 +46337,10 @@ message.requestOptions = $root.google.spanner.v1.RequestOptions.decode(reader, reader.uint32()); break; } + case 16: { + message.dataBoostEnabled = reader.bool(); + break; + } default: reader.skipType(tag & 7); break; @@ -46378,6 +46416,9 @@ if (error) return "requestOptions." + error; } + if (message.dataBoostEnabled != null && message.hasOwnProperty("dataBoostEnabled")) + if (typeof message.dataBoostEnabled !== "boolean") + return "dataBoostEnabled: boolean expected"; return null; }; @@ -46440,6 +46481,8 @@ throw TypeError(".google.spanner.v1.ReadRequest.requestOptions: object expected"); message.requestOptions = $root.google.spanner.v1.RequestOptions.fromObject(object.requestOptions); } + if (object.dataBoostEnabled != null) + message.dataBoostEnabled = Boolean(object.dataBoostEnabled); return message; }; @@ -46484,6 +46527,7 @@ object.partitionToken = $util.newBuffer(object.partitionToken); } object.requestOptions = null; + object.dataBoostEnabled = false; } if (message.session != null && message.hasOwnProperty("session")) object.session = message.session; @@ -46511,6 +46555,8 @@ object.partitionToken = options.bytes === String ? $util.base64.encode(message.partitionToken, 0, message.partitionToken.length) : options.bytes === Array ? Array.prototype.slice.call(message.partitionToken) : message.partitionToken; if (message.requestOptions != null && message.hasOwnProperty("requestOptions")) object.requestOptions = $root.google.spanner.v1.RequestOptions.toObject(message.requestOptions, options); + if (message.dataBoostEnabled != null && message.hasOwnProperty("dataBoostEnabled")) + object.dataBoostEnabled = message.dataBoostEnabled; return object; }; diff --git a/protos/protos.json b/protos/protos.json index 9fc57be4b..667d6ecd9 100644 --- a/protos/protos.json +++ b/protos/protos.json @@ -4604,6 +4604,10 @@ "requestOptions": { "type": "RequestOptions", "id": 11 + }, + "dataBoostEnabled": { + "type": "bool", + "id": 15 } }, "nested": { @@ -4868,6 +4872,10 @@ "requestOptions": { "type": "RequestOptions", "id": 11 + }, + "dataBoostEnabled": { + "type": "bool", + "id": 16 } } }, diff --git a/src/v1/spanner_client.ts b/src/v1/spanner_client.ts index 3b47a41e6..4f13e606b 100644 --- a/src/v1/spanner_client.ts +++ b/src/v1/spanner_client.ts @@ -824,6 +824,12 @@ export class SpannerClient { * Query optimizer configuration to use for the given query. * @param {google.spanner.v1.RequestOptions} request.requestOptions * Common options for this request. + * @param {boolean} request.dataBoostEnabled + * If this is for a partitioned read and this field is set to `true`, the + * request will be executed via Spanner independent compute resources. + * + * If the field is set to `true` but the request does not set + * `partition_token`, the API will return an `INVALID_ARGUMENT` error. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. @@ -1075,6 +1081,12 @@ export class SpannerClient { * PartitionReadRequest message used to create this partition_token. * @param {google.spanner.v1.RequestOptions} request.requestOptions * Common options for this request. + * @param {boolean} request.dataBoostEnabled + * If this is for a partitioned query and this field is set to `true`, the + * request will be executed via Spanner independent compute resources. + * + * If the field is set to `true` but the request does not set + * `partition_token`, the API will return an `INVALID_ARGUMENT` error. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. @@ -1770,6 +1782,12 @@ export class SpannerClient { * Query optimizer configuration to use for the given query. * @param {google.spanner.v1.RequestOptions} request.requestOptions * Common options for this request. + * @param {boolean} request.dataBoostEnabled + * If this is for a partitioned read and this field is set to `true`, the + * request will be executed via Spanner independent compute resources. + * + * If the field is set to `true` but the request does not set + * `partition_token`, the API will return an `INVALID_ARGUMENT` error. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} @@ -1848,6 +1866,12 @@ export class SpannerClient { * PartitionReadRequest message used to create this partition_token. * @param {google.spanner.v1.RequestOptions} request.requestOptions * Common options for this request. + * @param {boolean} request.dataBoostEnabled + * If this is for a partitioned query and this field is set to `true`, the + * request will be executed via Spanner independent compute resources. + * + * If the field is set to `true` but the request does not set + * `partition_token`, the API will return an `INVALID_ARGUMENT` error. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} From a1603ef7fb1f34a3e65ea885ba694b303753a52b Mon Sep 17 00:00:00 2001 From: dansaadati Date: Wed, 8 Mar 2023 01:50:27 -0800 Subject: [PATCH 03/10] docs: remove unused references to generated samples (#1815) This does not render correctly in documentation, so it should be removed. Co-authored-by: surbhigarg92 --- src/v1/database_admin_client.ts | 48 --------------------------------- src/v1/instance_admin_client.ts | 36 ------------------------- 2 files changed, 84 deletions(-) diff --git a/src/v1/database_admin_client.ts b/src/v1/database_admin_client.ts index d3a829724..5156f30c6 100644 --- a/src/v1/database_admin_client.ts +++ b/src/v1/database_admin_client.ts @@ -526,8 +526,6 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/database_admin.get_database.js - * region_tag:spanner_v1_generated_DatabaseAdmin_GetDatabase_async */ getDatabase( request?: protos.google.spanner.admin.database.v1.IGetDatabaseRequest, @@ -621,8 +619,6 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/database_admin.drop_database.js - * region_tag:spanner_v1_generated_DatabaseAdmin_DropDatabase_async */ dropDatabase( request?: protos.google.spanner.admin.database.v1.IDropDatabaseRequest, @@ -716,8 +712,6 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/database_admin.get_database_ddl.js - * region_tag:spanner_v1_generated_DatabaseAdmin_GetDatabaseDdl_async */ getDatabaseDdl( request?: protos.google.spanner.admin.database.v1.IGetDatabaseDdlRequest, @@ -831,8 +825,6 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/database_admin.set_iam_policy.js - * region_tag:spanner_v1_generated_DatabaseAdmin_SetIamPolicy_async */ setIamPolicy( request?: protos.google.iam.v1.ISetIamPolicyRequest, @@ -925,8 +917,6 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/database_admin.get_iam_policy.js - * region_tag:spanner_v1_generated_DatabaseAdmin_GetIamPolicy_async */ getIamPolicy( request?: protos.google.iam.v1.IGetIamPolicyRequest, @@ -1023,8 +1013,6 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/database_admin.test_iam_permissions.js - * region_tag:spanner_v1_generated_DatabaseAdmin_TestIamPermissions_async */ testIamPermissions( request?: protos.google.iam.v1.ITestIamPermissionsRequest, @@ -1108,8 +1096,6 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/database_admin.get_backup.js - * region_tag:spanner_v1_generated_DatabaseAdmin_GetBackup_async */ getBackup( request?: protos.google.spanner.admin.database.v1.IGetBackupRequest, @@ -1208,8 +1194,6 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/database_admin.update_backup.js - * region_tag:spanner_v1_generated_DatabaseAdmin_UpdateBackup_async */ updateBackup( request?: protos.google.spanner.admin.database.v1.IUpdateBackupRequest, @@ -1301,8 +1285,6 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/database_admin.delete_backup.js - * region_tag:spanner_v1_generated_DatabaseAdmin_DeleteBackup_async */ deleteBackup( request?: protos.google.spanner.admin.database.v1.IDeleteBackupRequest, @@ -1420,8 +1402,6 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. - * @example include:samples/generated/v1/database_admin.create_database.js - * region_tag:spanner_v1_generated_DatabaseAdmin_CreateDatabase_async */ createDatabase( request?: protos.google.spanner.admin.database.v1.ICreateDatabaseRequest, @@ -1516,8 +1496,6 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. - * @example include:samples/generated/v1/database_admin.create_database.js - * region_tag:spanner_v1_generated_DatabaseAdmin_CreateDatabase_async */ async checkCreateDatabaseProgress( name: string @@ -1586,8 +1564,6 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. - * @example include:samples/generated/v1/database_admin.update_database_ddl.js - * region_tag:spanner_v1_generated_DatabaseAdmin_UpdateDatabaseDdl_async */ updateDatabaseDdl( request?: protos.google.spanner.admin.database.v1.IUpdateDatabaseDdlRequest, @@ -1682,8 +1658,6 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. - * @example include:samples/generated/v1/database_admin.update_database_ddl.js - * region_tag:spanner_v1_generated_DatabaseAdmin_UpdateDatabaseDdl_async */ async checkUpdateDatabaseDdlProgress( name: string @@ -1752,8 +1726,6 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. - * @example include:samples/generated/v1/database_admin.create_backup.js - * region_tag:spanner_v1_generated_DatabaseAdmin_CreateBackup_async */ createBackup( request?: protos.google.spanner.admin.database.v1.ICreateBackupRequest, @@ -1848,8 +1820,6 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. - * @example include:samples/generated/v1/database_admin.create_backup.js - * region_tag:spanner_v1_generated_DatabaseAdmin_CreateBackup_async */ async checkCreateBackupProgress( name: string @@ -1925,8 +1895,6 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. - * @example include:samples/generated/v1/database_admin.copy_backup.js - * region_tag:spanner_v1_generated_DatabaseAdmin_CopyBackup_async */ copyBackup( request?: protos.google.spanner.admin.database.v1.ICopyBackupRequest, @@ -2021,8 +1989,6 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. - * @example include:samples/generated/v1/database_admin.copy_backup.js - * region_tag:spanner_v1_generated_DatabaseAdmin_CopyBackup_async */ async checkCopyBackupProgress( name: string @@ -2098,8 +2064,6 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. - * @example include:samples/generated/v1/database_admin.restore_database.js - * region_tag:spanner_v1_generated_DatabaseAdmin_RestoreDatabase_async */ restoreDatabase( request?: protos.google.spanner.admin.database.v1.IRestoreDatabaseRequest, @@ -2194,8 +2158,6 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. - * @example include:samples/generated/v1/database_admin.restore_database.js - * region_tag:spanner_v1_generated_DatabaseAdmin_RestoreDatabase_async */ async checkRestoreDatabaseProgress( name: string @@ -2397,8 +2359,6 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. - * @example include:samples/generated/v1/database_admin.list_databases.js - * region_tag:spanner_v1_generated_DatabaseAdmin_ListDatabases_async */ listDatabasesAsync( request?: protos.google.spanner.admin.database.v1.IListDatabasesRequest, @@ -2711,8 +2671,6 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. - * @example include:samples/generated/v1/database_admin.list_backups.js - * region_tag:spanner_v1_generated_DatabaseAdmin_ListBackups_async */ listBackupsAsync( request?: protos.google.spanner.admin.database.v1.IListBackupsRequest, @@ -3055,8 +3013,6 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. - * @example include:samples/generated/v1/database_admin.list_database_operations.js - * region_tag:spanner_v1_generated_DatabaseAdmin_ListDatabaseOperations_async */ listDatabaseOperationsAsync( request?: protos.google.spanner.admin.database.v1.IListDatabaseOperationsRequest, @@ -3469,8 +3425,6 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. - * @example include:samples/generated/v1/database_admin.list_backup_operations.js - * region_tag:spanner_v1_generated_DatabaseAdmin_ListBackupOperations_async */ listBackupOperationsAsync( request?: protos.google.spanner.admin.database.v1.IListBackupOperationsRequest, @@ -3673,8 +3627,6 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. - * @example include:samples/generated/v1/database_admin.list_database_roles.js - * region_tag:spanner_v1_generated_DatabaseAdmin_ListDatabaseRoles_async */ listDatabaseRolesAsync( request?: protos.google.spanner.admin.database.v1.IListDatabaseRolesRequest, diff --git a/src/v1/instance_admin_client.ts b/src/v1/instance_admin_client.ts index 7fece782b..46f69c394 100644 --- a/src/v1/instance_admin_client.ts +++ b/src/v1/instance_admin_client.ts @@ -493,8 +493,6 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/instance_admin.get_instance_config.js - * region_tag:spanner_v1_generated_InstanceAdmin_GetInstanceConfig_async */ getInstanceConfig( request?: protos.google.spanner.admin.instance.v1.IGetInstanceConfigRequest, @@ -610,8 +608,6 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/instance_admin.delete_instance_config.js - * region_tag:spanner_v1_generated_InstanceAdmin_DeleteInstanceConfig_async */ deleteInstanceConfig( request?: protos.google.spanner.admin.instance.v1.IDeleteInstanceConfigRequest, @@ -713,8 +709,6 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/instance_admin.get_instance.js - * region_tag:spanner_v1_generated_InstanceAdmin_GetInstance_async */ getInstance( request?: protos.google.spanner.admin.instance.v1.IGetInstanceRequest, @@ -815,8 +809,6 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/instance_admin.delete_instance.js - * region_tag:spanner_v1_generated_InstanceAdmin_DeleteInstance_async */ deleteInstance( request?: protos.google.spanner.admin.instance.v1.IDeleteInstanceRequest, @@ -928,8 +920,6 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/instance_admin.set_iam_policy.js - * region_tag:spanner_v1_generated_InstanceAdmin_SetIamPolicy_async */ setIamPolicy( request?: protos.google.iam.v1.ISetIamPolicyRequest, @@ -1019,8 +1009,6 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/instance_admin.get_iam_policy.js - * region_tag:spanner_v1_generated_InstanceAdmin_GetIamPolicy_async */ getIamPolicy( request?: protos.google.iam.v1.IGetIamPolicyRequest, @@ -1113,8 +1101,6 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. - * @example include:samples/generated/v1/instance_admin.test_iam_permissions.js - * region_tag:spanner_v1_generated_InstanceAdmin_TestIamPermissions_async */ testIamPermissions( request?: protos.google.iam.v1.ITestIamPermissionsRequest, @@ -1254,8 +1240,6 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. - * @example include:samples/generated/v1/instance_admin.create_instance_config.js - * region_tag:spanner_v1_generated_InstanceAdmin_CreateInstanceConfig_async */ createInstanceConfig( request?: protos.google.spanner.admin.instance.v1.ICreateInstanceConfigRequest, @@ -1350,8 +1334,6 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. - * @example include:samples/generated/v1/instance_admin.create_instance_config.js - * region_tag:spanner_v1_generated_InstanceAdmin_CreateInstanceConfig_async */ async checkCreateInstanceConfigProgress( name: string @@ -1450,8 +1432,6 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. - * @example include:samples/generated/v1/instance_admin.update_instance_config.js - * region_tag:spanner_v1_generated_InstanceAdmin_UpdateInstanceConfig_async */ updateInstanceConfig( request?: protos.google.spanner.admin.instance.v1.IUpdateInstanceConfigRequest, @@ -1546,8 +1526,6 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. - * @example include:samples/generated/v1/instance_admin.update_instance_config.js - * region_tag:spanner_v1_generated_InstanceAdmin_UpdateInstanceConfig_async */ async checkUpdateInstanceConfigProgress( name: string @@ -1629,8 +1607,6 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. - * @example include:samples/generated/v1/instance_admin.create_instance.js - * region_tag:spanner_v1_generated_InstanceAdmin_CreateInstance_async */ createInstance( request?: protos.google.spanner.admin.instance.v1.ICreateInstanceRequest, @@ -1725,8 +1701,6 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. - * @example include:samples/generated/v1/instance_admin.create_instance.js - * region_tag:spanner_v1_generated_InstanceAdmin_CreateInstance_async */ async checkCreateInstanceProgress( name: string @@ -1815,8 +1789,6 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. - * @example include:samples/generated/v1/instance_admin.update_instance.js - * region_tag:spanner_v1_generated_InstanceAdmin_UpdateInstance_async */ updateInstance( request?: protos.google.spanner.admin.instance.v1.IUpdateInstanceRequest, @@ -1911,8 +1883,6 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. - * @example include:samples/generated/v1/instance_admin.update_instance.js - * region_tag:spanner_v1_generated_InstanceAdmin_UpdateInstance_async */ async checkUpdateInstanceProgress( name: string @@ -2120,8 +2090,6 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. - * @example include:samples/generated/v1/instance_admin.list_instance_configs.js - * region_tag:spanner_v1_generated_InstanceAdmin_ListInstanceConfigs_async */ listInstanceConfigsAsync( request?: protos.google.spanner.admin.instance.v1.IListInstanceConfigsRequest, @@ -2473,8 +2441,6 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. - * @example include:samples/generated/v1/instance_admin.list_instance_config_operations.js - * region_tag:spanner_v1_generated_InstanceAdmin_ListInstanceConfigOperations_async */ listInstanceConfigOperationsAsync( request?: protos.google.spanner.admin.instance.v1.IListInstanceConfigOperationsRequest, @@ -2737,8 +2703,6 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. - * @example include:samples/generated/v1/instance_admin.list_instances.js - * region_tag:spanner_v1_generated_InstanceAdmin_ListInstances_async */ listInstancesAsync( request?: protos.google.spanner.admin.instance.v1.IListInstancesRequest, From 9271c0d6201f7abe3e4f4fa3699a8143ad588bd9 Mon Sep 17 00:00:00 2001 From: surbhigarg92 Date: Mon, 13 Mar 2023 18:19:08 +0530 Subject: [PATCH 04/10] Revert "feat: Adding new fields for Serverless analytics (#1816)" (#1820) This reverts commit 2a6ca6f09215752f9451d625ac02837e9d70b66a. --- protos/google/spanner/v1/spanner.proto | 14 -------- protos/protos.d.ts | 12 ------- protos/protos.js | 46 -------------------------- protos/protos.json | 8 ----- src/v1/spanner_client.ts | 24 -------------- 5 files changed, 104 deletions(-) diff --git a/protos/google/spanner/v1/spanner.proto b/protos/google/spanner/v1/spanner.proto index 77a1f0e47..ef772170b 100644 --- a/protos/google/spanner/v1/spanner.proto +++ b/protos/google/spanner/v1/spanner.proto @@ -643,13 +643,6 @@ message ExecuteSqlRequest { // Common options for this request. RequestOptions request_options = 11; - - // If this is for a partitioned read and this field is set to `true`, the - // request will be executed via Spanner independent compute resources. - // - // If the field is set to `true` but the request does not set - // `partition_token`, the API will return an `INVALID_ARGUMENT` error. - bool data_boost_enabled = 15; } // The request for [ExecuteBatchDml][google.spanner.v1.Spanner.ExecuteBatchDml]. @@ -956,13 +949,6 @@ message ReadRequest { // Common options for this request. RequestOptions request_options = 11; - - // If this is for a partitioned query and this field is set to `true`, the - // request will be executed via Spanner independent compute resources. - // - // If the field is set to `true` but the request does not set - // `partition_token`, the API will return an `INVALID_ARGUMENT` error. - bool data_boost_enabled = 16; } // The request for [BeginTransaction][google.spanner.v1.Spanner.BeginTransaction]. diff --git a/protos/protos.d.ts b/protos/protos.d.ts index b7fd19956..91552afe3 100644 --- a/protos/protos.d.ts +++ b/protos/protos.d.ts @@ -17400,9 +17400,6 @@ export namespace google { /** ExecuteSqlRequest requestOptions */ requestOptions?: (google.spanner.v1.IRequestOptions|null); - - /** ExecuteSqlRequest dataBoostEnabled */ - dataBoostEnabled?: (boolean|null); } /** Represents an ExecuteSqlRequest. */ @@ -17447,9 +17444,6 @@ export namespace google { /** ExecuteSqlRequest requestOptions. */ public requestOptions?: (google.spanner.v1.IRequestOptions|null); - /** ExecuteSqlRequest dataBoostEnabled. */ - public dataBoostEnabled: boolean; - /** * Creates a new ExecuteSqlRequest instance using the specified properties. * @param [properties] Properties to set @@ -18572,9 +18566,6 @@ export namespace google { /** ReadRequest requestOptions */ requestOptions?: (google.spanner.v1.IRequestOptions|null); - - /** ReadRequest dataBoostEnabled */ - dataBoostEnabled?: (boolean|null); } /** Represents a ReadRequest. */ @@ -18616,9 +18607,6 @@ export namespace google { /** ReadRequest requestOptions. */ public requestOptions?: (google.spanner.v1.IRequestOptions|null); - /** ReadRequest dataBoostEnabled. */ - public dataBoostEnabled: boolean; - /** * Creates a new ReadRequest instance using the specified properties. * @param [properties] Properties to set diff --git a/protos/protos.js b/protos/protos.js index 1bfa52a63..ad74f311f 100644 --- a/protos/protos.js +++ b/protos/protos.js @@ -42925,7 +42925,6 @@ * @property {number|Long|null} [seqno] ExecuteSqlRequest seqno * @property {google.spanner.v1.ExecuteSqlRequest.IQueryOptions|null} [queryOptions] ExecuteSqlRequest queryOptions * @property {google.spanner.v1.IRequestOptions|null} [requestOptions] ExecuteSqlRequest requestOptions - * @property {boolean|null} [dataBoostEnabled] ExecuteSqlRequest dataBoostEnabled */ /** @@ -43032,14 +43031,6 @@ */ ExecuteSqlRequest.prototype.requestOptions = null; - /** - * ExecuteSqlRequest dataBoostEnabled. - * @member {boolean} dataBoostEnabled - * @memberof google.spanner.v1.ExecuteSqlRequest - * @instance - */ - ExecuteSqlRequest.prototype.dataBoostEnabled = false; - /** * Creates a new ExecuteSqlRequest instance using the specified properties. * @function create @@ -43089,8 +43080,6 @@ $root.google.spanner.v1.ExecuteSqlRequest.QueryOptions.encode(message.queryOptions, writer.uint32(/* id 10, wireType 2 =*/82).fork()).ldelim(); if (message.requestOptions != null && Object.hasOwnProperty.call(message, "requestOptions")) $root.google.spanner.v1.RequestOptions.encode(message.requestOptions, writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim(); - if (message.dataBoostEnabled != null && Object.hasOwnProperty.call(message, "dataBoostEnabled")) - writer.uint32(/* id 15, wireType 0 =*/120).bool(message.dataBoostEnabled); return writer; }; @@ -43188,10 +43177,6 @@ message.requestOptions = $root.google.spanner.v1.RequestOptions.decode(reader, reader.uint32()); break; } - case 15: { - message.dataBoostEnabled = reader.bool(); - break; - } default: reader.skipType(tag & 7); break; @@ -43281,9 +43266,6 @@ if (error) return "requestOptions." + error; } - if (message.dataBoostEnabled != null && message.hasOwnProperty("dataBoostEnabled")) - if (typeof message.dataBoostEnabled !== "boolean") - return "dataBoostEnabled: boolean expected"; return null; }; @@ -43372,8 +43354,6 @@ throw TypeError(".google.spanner.v1.ExecuteSqlRequest.requestOptions: object expected"); message.requestOptions = $root.google.spanner.v1.RequestOptions.fromObject(object.requestOptions); } - if (object.dataBoostEnabled != null) - message.dataBoostEnabled = Boolean(object.dataBoostEnabled); return message; }; @@ -43419,7 +43399,6 @@ object.seqno = options.longs === String ? "0" : 0; object.queryOptions = null; object.requestOptions = null; - object.dataBoostEnabled = false; } if (message.session != null && message.hasOwnProperty("session")) object.session = message.session; @@ -43450,8 +43429,6 @@ object.queryOptions = $root.google.spanner.v1.ExecuteSqlRequest.QueryOptions.toObject(message.queryOptions, options); if (message.requestOptions != null && message.hasOwnProperty("requestOptions")) object.requestOptions = $root.google.spanner.v1.RequestOptions.toObject(message.requestOptions, options); - if (message.dataBoostEnabled != null && message.hasOwnProperty("dataBoostEnabled")) - object.dataBoostEnabled = message.dataBoostEnabled; return object; }; @@ -46107,7 +46084,6 @@ * @property {Uint8Array|null} [resumeToken] ReadRequest resumeToken * @property {Uint8Array|null} [partitionToken] ReadRequest partitionToken * @property {google.spanner.v1.IRequestOptions|null} [requestOptions] ReadRequest requestOptions - * @property {boolean|null} [dataBoostEnabled] ReadRequest dataBoostEnabled */ /** @@ -46206,14 +46182,6 @@ */ ReadRequest.prototype.requestOptions = null; - /** - * ReadRequest dataBoostEnabled. - * @member {boolean} dataBoostEnabled - * @memberof google.spanner.v1.ReadRequest - * @instance - */ - ReadRequest.prototype.dataBoostEnabled = false; - /** * Creates a new ReadRequest instance using the specified properties. * @function create @@ -46259,8 +46227,6 @@ writer.uint32(/* id 10, wireType 2 =*/82).bytes(message.partitionToken); if (message.requestOptions != null && Object.hasOwnProperty.call(message, "requestOptions")) $root.google.spanner.v1.RequestOptions.encode(message.requestOptions, writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim(); - if (message.dataBoostEnabled != null && Object.hasOwnProperty.call(message, "dataBoostEnabled")) - writer.uint32(/* id 16, wireType 0 =*/128).bool(message.dataBoostEnabled); return writer; }; @@ -46337,10 +46303,6 @@ message.requestOptions = $root.google.spanner.v1.RequestOptions.decode(reader, reader.uint32()); break; } - case 16: { - message.dataBoostEnabled = reader.bool(); - break; - } default: reader.skipType(tag & 7); break; @@ -46416,9 +46378,6 @@ if (error) return "requestOptions." + error; } - if (message.dataBoostEnabled != null && message.hasOwnProperty("dataBoostEnabled")) - if (typeof message.dataBoostEnabled !== "boolean") - return "dataBoostEnabled: boolean expected"; return null; }; @@ -46481,8 +46440,6 @@ throw TypeError(".google.spanner.v1.ReadRequest.requestOptions: object expected"); message.requestOptions = $root.google.spanner.v1.RequestOptions.fromObject(object.requestOptions); } - if (object.dataBoostEnabled != null) - message.dataBoostEnabled = Boolean(object.dataBoostEnabled); return message; }; @@ -46527,7 +46484,6 @@ object.partitionToken = $util.newBuffer(object.partitionToken); } object.requestOptions = null; - object.dataBoostEnabled = false; } if (message.session != null && message.hasOwnProperty("session")) object.session = message.session; @@ -46555,8 +46511,6 @@ object.partitionToken = options.bytes === String ? $util.base64.encode(message.partitionToken, 0, message.partitionToken.length) : options.bytes === Array ? Array.prototype.slice.call(message.partitionToken) : message.partitionToken; if (message.requestOptions != null && message.hasOwnProperty("requestOptions")) object.requestOptions = $root.google.spanner.v1.RequestOptions.toObject(message.requestOptions, options); - if (message.dataBoostEnabled != null && message.hasOwnProperty("dataBoostEnabled")) - object.dataBoostEnabled = message.dataBoostEnabled; return object; }; diff --git a/protos/protos.json b/protos/protos.json index 667d6ecd9..9fc57be4b 100644 --- a/protos/protos.json +++ b/protos/protos.json @@ -4604,10 +4604,6 @@ "requestOptions": { "type": "RequestOptions", "id": 11 - }, - "dataBoostEnabled": { - "type": "bool", - "id": 15 } }, "nested": { @@ -4872,10 +4868,6 @@ "requestOptions": { "type": "RequestOptions", "id": 11 - }, - "dataBoostEnabled": { - "type": "bool", - "id": 16 } } }, diff --git a/src/v1/spanner_client.ts b/src/v1/spanner_client.ts index 4f13e606b..3b47a41e6 100644 --- a/src/v1/spanner_client.ts +++ b/src/v1/spanner_client.ts @@ -824,12 +824,6 @@ export class SpannerClient { * Query optimizer configuration to use for the given query. * @param {google.spanner.v1.RequestOptions} request.requestOptions * Common options for this request. - * @param {boolean} request.dataBoostEnabled - * If this is for a partitioned read and this field is set to `true`, the - * request will be executed via Spanner independent compute resources. - * - * If the field is set to `true` but the request does not set - * `partition_token`, the API will return an `INVALID_ARGUMENT` error. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. @@ -1081,12 +1075,6 @@ export class SpannerClient { * PartitionReadRequest message used to create this partition_token. * @param {google.spanner.v1.RequestOptions} request.requestOptions * Common options for this request. - * @param {boolean} request.dataBoostEnabled - * If this is for a partitioned query and this field is set to `true`, the - * request will be executed via Spanner independent compute resources. - * - * If the field is set to `true` but the request does not set - * `partition_token`, the API will return an `INVALID_ARGUMENT` error. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. @@ -1782,12 +1770,6 @@ export class SpannerClient { * Query optimizer configuration to use for the given query. * @param {google.spanner.v1.RequestOptions} request.requestOptions * Common options for this request. - * @param {boolean} request.dataBoostEnabled - * If this is for a partitioned read and this field is set to `true`, the - * request will be executed via Spanner independent compute resources. - * - * If the field is set to `true` but the request does not set - * `partition_token`, the API will return an `INVALID_ARGUMENT` error. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} @@ -1866,12 +1848,6 @@ export class SpannerClient { * PartitionReadRequest message used to create this partition_token. * @param {google.spanner.v1.RequestOptions} request.requestOptions * Common options for this request. - * @param {boolean} request.dataBoostEnabled - * If this is for a partitioned query and this field is set to `true`, the - * request will be executed via Spanner independent compute resources. - * - * If the field is set to `true` but the request does not set - * `partition_token`, the API will return an `INVALID_ARGUMENT` error. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} From b914981d584ad7e195c66407c70093bac007b7c0 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 17 Mar 2023 10:47:57 +0530 Subject: [PATCH 05/10] chore: store nodejs build artifacts in placer (#1826) Source-Link: https://github.com/googleapis/synthtool/commit/3602660ae703daadcb7bc2f87bf601241665f3f8 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest@sha256:e6d785d6de3cab027f6213d95ccedab4cab3811b0d3172b78db2216faa182e32 Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 4 ++-- .kokoro/publish.sh | 14 +++++++++++++- .kokoro/release/publish.cfg | 12 ++++++++++++ 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 788f7a9fd..0b836e119 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,4 +1,4 @@ -# Copyright 2022 Google LLC +# Copyright 2023 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest - digest: sha256:fe04ae044dadf5ad88d979dbcc85e0e99372fb5d6316790341e6aca5e4e3fbc8 + digest: sha256:e6d785d6de3cab027f6213d95ccedab4cab3811b0d3172b78db2216faa182e32 diff --git a/.kokoro/publish.sh b/.kokoro/publish.sh index 949e3e1d0..ca1d47af3 100755 --- a/.kokoro/publish.sh +++ b/.kokoro/publish.sh @@ -27,4 +27,16 @@ NPM_TOKEN=$(cat $KOKORO_KEYSTORE_DIR/73713_google-cloud-npm-token-1) echo "//wombat-dressing-room.appspot.com/:_authToken=${NPM_TOKEN}" > ~/.npmrc npm install -npm publish --access=public --registry=https://wombat-dressing-room.appspot.com +npm pack . +# npm provides no way to specify, observe, or predict the name of the tarball +# file it generates. We have to look in the current directory for the freshest +# .tgz file. +TARBALL=$(ls -1 -t *.tgz | head -1) + +npm publish --access=public --registry=https://wombat-dressing-room.appspot.com "$TARBALL" + +# Kokoro collects *.tgz and package-lock.json files and stores them in Placer +# so we can generate SBOMs and attestations. +# However, we *don't* want Kokoro to collect package-lock.json and *.tgz files +# that happened to be installed with dependencies. +find node_modules -name package-lock.json -o -name "*.tgz" | xargs rm -f \ No newline at end of file diff --git a/.kokoro/release/publish.cfg b/.kokoro/release/publish.cfg index 978c3da09..7617f60bb 100644 --- a/.kokoro/release/publish.cfg +++ b/.kokoro/release/publish.cfg @@ -37,3 +37,15 @@ env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/nodejs-spanner/.kokoro/publish.sh" } + +# Store the packages we uploaded to npmjs.org and their corresponding +# package-lock.jsons in Placer. That way, we have a record of exactly +# what we published, and which version of which tools we used to publish +# it, which we can use to generate SBOMs and attestations. +action { + define_artifacts { + regex: "github/**/*.tgz" + regex: "github/**/package-lock.json" + strip_prefix: "github" + } +} From f915bd16cf7e817243e46a319b3e6f270b24bf68 Mon Sep 17 00:00:00 2001 From: surbhigarg92 Date: Fri, 17 Mar 2023 14:10:12 +0530 Subject: [PATCH 06/10] fix: Logic for retrying specifiied internal errors (#1822) Fixes #1808 --- src/partial-result-stream.ts | 11 +---------- src/transaction-runner.ts | 29 +++++++++++++++++++++++++++-- test/spanner.ts | 28 ++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 12 deletions(-) diff --git a/src/partial-result-stream.ts b/src/partial-result-stream.ts index 77eefc2e9..a3d42ee6d 100644 --- a/src/partial-result-stream.ts +++ b/src/partial-result-stream.ts @@ -23,6 +23,7 @@ import {common as p} from 'protobufjs'; import {Readable, Transform} from 'stream'; import * as streamEvents from 'stream-events'; import {grpc} from 'google-gax'; +import {isRetryableInternalError} from './transaction-runner'; import {codec, JSONOptions, Json, Field, Value} from './codec'; import {google} from '../protos/protos'; @@ -552,13 +553,3 @@ export function partialResultStream( function _hasResumeToken(chunk: google.spanner.v1.PartialResultSet): boolean { return is.defined(chunk.resumeToken) && chunk.resumeToken.length > 0; } - -function isRetryableInternalError(err: grpc.ServiceError): boolean { - return ( - err.code === grpc.status.INTERNAL && - (err.message.includes( - 'Received unexpected EOS on DATA frame from server' - ) || - err.message.includes('Received RST_STREAM')) - ); -} diff --git a/src/transaction-runner.ts b/src/transaction-runner.ts index 24a53939d..7f697cd86 100644 --- a/src/transaction-runner.ts +++ b/src/transaction-runner.ts @@ -175,9 +175,14 @@ export abstract class Runner { Math.floor(Math.random() * 1000) ); } + /** Returns whether the given error should cause a transaction retry. */ shouldRetry(err: grpc.ServiceError): boolean { - return RETRYABLE.includes(err.code!) || isSessionNotFoundError(err); + return ( + RETRYABLE.includes(err.code!) || + isSessionNotFoundError(err) || + isRetryableInternalError(err) + ); } /** * Retrieves a transaction to run against. @@ -233,7 +238,10 @@ export abstract class Runner { // Note that if the error is a 'Session not found' error, it will be // thrown here. We do this to bubble this error up to the caller who is // responsible for retrying the transaction on a different session. - if (!RETRYABLE.includes(lastError.code!)) { + if ( + !RETRYABLE.includes(lastError.code!) && + !isRetryableInternalError(lastError) + ) { throw lastError; } @@ -367,3 +375,20 @@ export class AsyncTransactionRunner extends Runner { return this.runFn(transaction); } } + +/** + * Checks whether the given error is a retryable internal error. + * @param error the error to check + * @return true if the error is a retryable internal error, and otherwise false. + */ +export function isRetryableInternalError(err: grpc.ServiceError): boolean { + return ( + err.code === grpc.status.INTERNAL && + (err.message.includes( + 'Received unexpected EOS on DATA frame from server' + ) || + err.message.includes('RST_STREAM') || + err.message.includes('HTTP/2 error code: INTERNAL_ERROR') || + err.message.includes('Connection closed with unknown cause')) + ); +} diff --git a/test/spanner.ts b/test/spanner.ts index daf560999..bd399e204 100644 --- a/test/spanner.ts +++ b/test/spanner.ts @@ -2937,6 +2937,34 @@ describe('Spanner with mock server', () => { await database.close(); }); + it('should retry on internal error', async () => { + let attempts = 0; + const database = newTestDatabase(); + + const [updated] = await database.runTransactionAsync( + (transaction): Promise => { + transaction.begin(); + return transaction.runUpdate(insertSql).then(updateCount => { + if (!attempts) { + spannerMock.setExecutionTime( + spannerMock.commit, + SimulatedExecutionTime.ofError({ + code: grpc.status.INTERNAL, + message: 'Received RST_STREAM', + } as MockError) + ); + } + attempts++; + return transaction.commit().then(() => updateCount); + }); + } + ); + assert.strictEqual(updated, 1); + assert.strictEqual(attempts, 2); + + await database.close(); + }); + describe('batch-readonly-transaction', () => { it('should use session from pool', async () => { const database = newTestDatabase({min: 0, incStep: 1}); From 7f6d4ccce9269197312f2d795ef854e1789e8fce Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 21 Mar 2023 13:24:12 +0000 Subject: [PATCH 07/10] fix: Correcting the proto field Id for field data_boost_enabled (#1827) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 517156905 Source-Link: https://togithub.com/googleapis/googleapis/commit/f30cd5ec52d3ed03cb56e8233079ddd44e5571f7 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/6a3b040daef7db3fc3b879ad08f5480aa037818a Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNmEzYjA0MGRhZWY3ZGIzZmMzYjg3OWFkMDhmNTQ4MGFhMDM3ODE4YSJ9 --- protos/google/spanner/v1/spanner.proto | 14 ++++++++ protos/protos.d.ts | 12 +++++++ protos/protos.js | 46 ++++++++++++++++++++++++ protos/protos.json | 8 +++++ src/v1/database_admin_client.ts | 48 ++++++++++++++++++++++++++ src/v1/instance_admin_client.ts | 36 +++++++++++++++++++ src/v1/spanner_client.ts | 24 +++++++++++++ 7 files changed, 188 insertions(+) diff --git a/protos/google/spanner/v1/spanner.proto b/protos/google/spanner/v1/spanner.proto index ef772170b..d25e87aa2 100644 --- a/protos/google/spanner/v1/spanner.proto +++ b/protos/google/spanner/v1/spanner.proto @@ -643,6 +643,13 @@ message ExecuteSqlRequest { // Common options for this request. RequestOptions request_options = 11; + + // If this is for a partitioned query and this field is set to `true`, the + // request will be executed via Spanner independent compute resources. + // + // If the field is set to `true` but the request does not set + // `partition_token`, the API will return an `INVALID_ARGUMENT` error. + bool data_boost_enabled = 16; } // The request for [ExecuteBatchDml][google.spanner.v1.Spanner.ExecuteBatchDml]. @@ -949,6 +956,13 @@ message ReadRequest { // Common options for this request. RequestOptions request_options = 11; + + // If this is for a partitioned read and this field is set to `true`, the + // request will be executed via Spanner independent compute resources. + // + // If the field is set to `true` but the request does not set + // `partition_token`, the API will return an `INVALID_ARGUMENT` error. + bool data_boost_enabled = 15; } // The request for [BeginTransaction][google.spanner.v1.Spanner.BeginTransaction]. diff --git a/protos/protos.d.ts b/protos/protos.d.ts index 91552afe3..b7fd19956 100644 --- a/protos/protos.d.ts +++ b/protos/protos.d.ts @@ -17400,6 +17400,9 @@ export namespace google { /** ExecuteSqlRequest requestOptions */ requestOptions?: (google.spanner.v1.IRequestOptions|null); + + /** ExecuteSqlRequest dataBoostEnabled */ + dataBoostEnabled?: (boolean|null); } /** Represents an ExecuteSqlRequest. */ @@ -17444,6 +17447,9 @@ export namespace google { /** ExecuteSqlRequest requestOptions. */ public requestOptions?: (google.spanner.v1.IRequestOptions|null); + /** ExecuteSqlRequest dataBoostEnabled. */ + public dataBoostEnabled: boolean; + /** * Creates a new ExecuteSqlRequest instance using the specified properties. * @param [properties] Properties to set @@ -18566,6 +18572,9 @@ export namespace google { /** ReadRequest requestOptions */ requestOptions?: (google.spanner.v1.IRequestOptions|null); + + /** ReadRequest dataBoostEnabled */ + dataBoostEnabled?: (boolean|null); } /** Represents a ReadRequest. */ @@ -18607,6 +18616,9 @@ export namespace google { /** ReadRequest requestOptions. */ public requestOptions?: (google.spanner.v1.IRequestOptions|null); + /** ReadRequest dataBoostEnabled. */ + public dataBoostEnabled: boolean; + /** * Creates a new ReadRequest instance using the specified properties. * @param [properties] Properties to set diff --git a/protos/protos.js b/protos/protos.js index ad74f311f..0ba61e505 100644 --- a/protos/protos.js +++ b/protos/protos.js @@ -42925,6 +42925,7 @@ * @property {number|Long|null} [seqno] ExecuteSqlRequest seqno * @property {google.spanner.v1.ExecuteSqlRequest.IQueryOptions|null} [queryOptions] ExecuteSqlRequest queryOptions * @property {google.spanner.v1.IRequestOptions|null} [requestOptions] ExecuteSqlRequest requestOptions + * @property {boolean|null} [dataBoostEnabled] ExecuteSqlRequest dataBoostEnabled */ /** @@ -43031,6 +43032,14 @@ */ ExecuteSqlRequest.prototype.requestOptions = null; + /** + * ExecuteSqlRequest dataBoostEnabled. + * @member {boolean} dataBoostEnabled + * @memberof google.spanner.v1.ExecuteSqlRequest + * @instance + */ + ExecuteSqlRequest.prototype.dataBoostEnabled = false; + /** * Creates a new ExecuteSqlRequest instance using the specified properties. * @function create @@ -43080,6 +43089,8 @@ $root.google.spanner.v1.ExecuteSqlRequest.QueryOptions.encode(message.queryOptions, writer.uint32(/* id 10, wireType 2 =*/82).fork()).ldelim(); if (message.requestOptions != null && Object.hasOwnProperty.call(message, "requestOptions")) $root.google.spanner.v1.RequestOptions.encode(message.requestOptions, writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim(); + if (message.dataBoostEnabled != null && Object.hasOwnProperty.call(message, "dataBoostEnabled")) + writer.uint32(/* id 16, wireType 0 =*/128).bool(message.dataBoostEnabled); return writer; }; @@ -43177,6 +43188,10 @@ message.requestOptions = $root.google.spanner.v1.RequestOptions.decode(reader, reader.uint32()); break; } + case 16: { + message.dataBoostEnabled = reader.bool(); + break; + } default: reader.skipType(tag & 7); break; @@ -43266,6 +43281,9 @@ if (error) return "requestOptions." + error; } + if (message.dataBoostEnabled != null && message.hasOwnProperty("dataBoostEnabled")) + if (typeof message.dataBoostEnabled !== "boolean") + return "dataBoostEnabled: boolean expected"; return null; }; @@ -43354,6 +43372,8 @@ throw TypeError(".google.spanner.v1.ExecuteSqlRequest.requestOptions: object expected"); message.requestOptions = $root.google.spanner.v1.RequestOptions.fromObject(object.requestOptions); } + if (object.dataBoostEnabled != null) + message.dataBoostEnabled = Boolean(object.dataBoostEnabled); return message; }; @@ -43399,6 +43419,7 @@ object.seqno = options.longs === String ? "0" : 0; object.queryOptions = null; object.requestOptions = null; + object.dataBoostEnabled = false; } if (message.session != null && message.hasOwnProperty("session")) object.session = message.session; @@ -43429,6 +43450,8 @@ object.queryOptions = $root.google.spanner.v1.ExecuteSqlRequest.QueryOptions.toObject(message.queryOptions, options); if (message.requestOptions != null && message.hasOwnProperty("requestOptions")) object.requestOptions = $root.google.spanner.v1.RequestOptions.toObject(message.requestOptions, options); + if (message.dataBoostEnabled != null && message.hasOwnProperty("dataBoostEnabled")) + object.dataBoostEnabled = message.dataBoostEnabled; return object; }; @@ -46084,6 +46107,7 @@ * @property {Uint8Array|null} [resumeToken] ReadRequest resumeToken * @property {Uint8Array|null} [partitionToken] ReadRequest partitionToken * @property {google.spanner.v1.IRequestOptions|null} [requestOptions] ReadRequest requestOptions + * @property {boolean|null} [dataBoostEnabled] ReadRequest dataBoostEnabled */ /** @@ -46182,6 +46206,14 @@ */ ReadRequest.prototype.requestOptions = null; + /** + * ReadRequest dataBoostEnabled. + * @member {boolean} dataBoostEnabled + * @memberof google.spanner.v1.ReadRequest + * @instance + */ + ReadRequest.prototype.dataBoostEnabled = false; + /** * Creates a new ReadRequest instance using the specified properties. * @function create @@ -46227,6 +46259,8 @@ writer.uint32(/* id 10, wireType 2 =*/82).bytes(message.partitionToken); if (message.requestOptions != null && Object.hasOwnProperty.call(message, "requestOptions")) $root.google.spanner.v1.RequestOptions.encode(message.requestOptions, writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim(); + if (message.dataBoostEnabled != null && Object.hasOwnProperty.call(message, "dataBoostEnabled")) + writer.uint32(/* id 15, wireType 0 =*/120).bool(message.dataBoostEnabled); return writer; }; @@ -46303,6 +46337,10 @@ message.requestOptions = $root.google.spanner.v1.RequestOptions.decode(reader, reader.uint32()); break; } + case 15: { + message.dataBoostEnabled = reader.bool(); + break; + } default: reader.skipType(tag & 7); break; @@ -46378,6 +46416,9 @@ if (error) return "requestOptions." + error; } + if (message.dataBoostEnabled != null && message.hasOwnProperty("dataBoostEnabled")) + if (typeof message.dataBoostEnabled !== "boolean") + return "dataBoostEnabled: boolean expected"; return null; }; @@ -46440,6 +46481,8 @@ throw TypeError(".google.spanner.v1.ReadRequest.requestOptions: object expected"); message.requestOptions = $root.google.spanner.v1.RequestOptions.fromObject(object.requestOptions); } + if (object.dataBoostEnabled != null) + message.dataBoostEnabled = Boolean(object.dataBoostEnabled); return message; }; @@ -46484,6 +46527,7 @@ object.partitionToken = $util.newBuffer(object.partitionToken); } object.requestOptions = null; + object.dataBoostEnabled = false; } if (message.session != null && message.hasOwnProperty("session")) object.session = message.session; @@ -46511,6 +46555,8 @@ object.partitionToken = options.bytes === String ? $util.base64.encode(message.partitionToken, 0, message.partitionToken.length) : options.bytes === Array ? Array.prototype.slice.call(message.partitionToken) : message.partitionToken; if (message.requestOptions != null && message.hasOwnProperty("requestOptions")) object.requestOptions = $root.google.spanner.v1.RequestOptions.toObject(message.requestOptions, options); + if (message.dataBoostEnabled != null && message.hasOwnProperty("dataBoostEnabled")) + object.dataBoostEnabled = message.dataBoostEnabled; return object; }; diff --git a/protos/protos.json b/protos/protos.json index 9fc57be4b..35a883d97 100644 --- a/protos/protos.json +++ b/protos/protos.json @@ -4604,6 +4604,10 @@ "requestOptions": { "type": "RequestOptions", "id": 11 + }, + "dataBoostEnabled": { + "type": "bool", + "id": 16 } }, "nested": { @@ -4868,6 +4872,10 @@ "requestOptions": { "type": "RequestOptions", "id": 11 + }, + "dataBoostEnabled": { + "type": "bool", + "id": 15 } } }, diff --git a/src/v1/database_admin_client.ts b/src/v1/database_admin_client.ts index 5156f30c6..d3a829724 100644 --- a/src/v1/database_admin_client.ts +++ b/src/v1/database_admin_client.ts @@ -526,6 +526,8 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. + * @example include:samples/generated/v1/database_admin.get_database.js + * region_tag:spanner_v1_generated_DatabaseAdmin_GetDatabase_async */ getDatabase( request?: protos.google.spanner.admin.database.v1.IGetDatabaseRequest, @@ -619,6 +621,8 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. + * @example include:samples/generated/v1/database_admin.drop_database.js + * region_tag:spanner_v1_generated_DatabaseAdmin_DropDatabase_async */ dropDatabase( request?: protos.google.spanner.admin.database.v1.IDropDatabaseRequest, @@ -712,6 +716,8 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. + * @example include:samples/generated/v1/database_admin.get_database_ddl.js + * region_tag:spanner_v1_generated_DatabaseAdmin_GetDatabaseDdl_async */ getDatabaseDdl( request?: protos.google.spanner.admin.database.v1.IGetDatabaseDdlRequest, @@ -825,6 +831,8 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. + * @example include:samples/generated/v1/database_admin.set_iam_policy.js + * region_tag:spanner_v1_generated_DatabaseAdmin_SetIamPolicy_async */ setIamPolicy( request?: protos.google.iam.v1.ISetIamPolicyRequest, @@ -917,6 +925,8 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. + * @example include:samples/generated/v1/database_admin.get_iam_policy.js + * region_tag:spanner_v1_generated_DatabaseAdmin_GetIamPolicy_async */ getIamPolicy( request?: protos.google.iam.v1.IGetIamPolicyRequest, @@ -1013,6 +1023,8 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. + * @example include:samples/generated/v1/database_admin.test_iam_permissions.js + * region_tag:spanner_v1_generated_DatabaseAdmin_TestIamPermissions_async */ testIamPermissions( request?: protos.google.iam.v1.ITestIamPermissionsRequest, @@ -1096,6 +1108,8 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. + * @example include:samples/generated/v1/database_admin.get_backup.js + * region_tag:spanner_v1_generated_DatabaseAdmin_GetBackup_async */ getBackup( request?: protos.google.spanner.admin.database.v1.IGetBackupRequest, @@ -1194,6 +1208,8 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. + * @example include:samples/generated/v1/database_admin.update_backup.js + * region_tag:spanner_v1_generated_DatabaseAdmin_UpdateBackup_async */ updateBackup( request?: protos.google.spanner.admin.database.v1.IUpdateBackupRequest, @@ -1285,6 +1301,8 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. + * @example include:samples/generated/v1/database_admin.delete_backup.js + * region_tag:spanner_v1_generated_DatabaseAdmin_DeleteBackup_async */ deleteBackup( request?: protos.google.spanner.admin.database.v1.IDeleteBackupRequest, @@ -1402,6 +1420,8 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. + * @example include:samples/generated/v1/database_admin.create_database.js + * region_tag:spanner_v1_generated_DatabaseAdmin_CreateDatabase_async */ createDatabase( request?: protos.google.spanner.admin.database.v1.ICreateDatabaseRequest, @@ -1496,6 +1516,8 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. + * @example include:samples/generated/v1/database_admin.create_database.js + * region_tag:spanner_v1_generated_DatabaseAdmin_CreateDatabase_async */ async checkCreateDatabaseProgress( name: string @@ -1564,6 +1586,8 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. + * @example include:samples/generated/v1/database_admin.update_database_ddl.js + * region_tag:spanner_v1_generated_DatabaseAdmin_UpdateDatabaseDdl_async */ updateDatabaseDdl( request?: protos.google.spanner.admin.database.v1.IUpdateDatabaseDdlRequest, @@ -1658,6 +1682,8 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. + * @example include:samples/generated/v1/database_admin.update_database_ddl.js + * region_tag:spanner_v1_generated_DatabaseAdmin_UpdateDatabaseDdl_async */ async checkUpdateDatabaseDdlProgress( name: string @@ -1726,6 +1752,8 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. + * @example include:samples/generated/v1/database_admin.create_backup.js + * region_tag:spanner_v1_generated_DatabaseAdmin_CreateBackup_async */ createBackup( request?: protos.google.spanner.admin.database.v1.ICreateBackupRequest, @@ -1820,6 +1848,8 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. + * @example include:samples/generated/v1/database_admin.create_backup.js + * region_tag:spanner_v1_generated_DatabaseAdmin_CreateBackup_async */ async checkCreateBackupProgress( name: string @@ -1895,6 +1925,8 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. + * @example include:samples/generated/v1/database_admin.copy_backup.js + * region_tag:spanner_v1_generated_DatabaseAdmin_CopyBackup_async */ copyBackup( request?: protos.google.spanner.admin.database.v1.ICopyBackupRequest, @@ -1989,6 +2021,8 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. + * @example include:samples/generated/v1/database_admin.copy_backup.js + * region_tag:spanner_v1_generated_DatabaseAdmin_CopyBackup_async */ async checkCopyBackupProgress( name: string @@ -2064,6 +2098,8 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. + * @example include:samples/generated/v1/database_admin.restore_database.js + * region_tag:spanner_v1_generated_DatabaseAdmin_RestoreDatabase_async */ restoreDatabase( request?: protos.google.spanner.admin.database.v1.IRestoreDatabaseRequest, @@ -2158,6 +2194,8 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. + * @example include:samples/generated/v1/database_admin.restore_database.js + * region_tag:spanner_v1_generated_DatabaseAdmin_RestoreDatabase_async */ async checkRestoreDatabaseProgress( name: string @@ -2359,6 +2397,8 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. + * @example include:samples/generated/v1/database_admin.list_databases.js + * region_tag:spanner_v1_generated_DatabaseAdmin_ListDatabases_async */ listDatabasesAsync( request?: protos.google.spanner.admin.database.v1.IListDatabasesRequest, @@ -2671,6 +2711,8 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. + * @example include:samples/generated/v1/database_admin.list_backups.js + * region_tag:spanner_v1_generated_DatabaseAdmin_ListBackups_async */ listBackupsAsync( request?: protos.google.spanner.admin.database.v1.IListBackupsRequest, @@ -3013,6 +3055,8 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. + * @example include:samples/generated/v1/database_admin.list_database_operations.js + * region_tag:spanner_v1_generated_DatabaseAdmin_ListDatabaseOperations_async */ listDatabaseOperationsAsync( request?: protos.google.spanner.admin.database.v1.IListDatabaseOperationsRequest, @@ -3425,6 +3469,8 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. + * @example include:samples/generated/v1/database_admin.list_backup_operations.js + * region_tag:spanner_v1_generated_DatabaseAdmin_ListBackupOperations_async */ listBackupOperationsAsync( request?: protos.google.spanner.admin.database.v1.IListBackupOperationsRequest, @@ -3627,6 +3673,8 @@ export class DatabaseAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. + * @example include:samples/generated/v1/database_admin.list_database_roles.js + * region_tag:spanner_v1_generated_DatabaseAdmin_ListDatabaseRoles_async */ listDatabaseRolesAsync( request?: protos.google.spanner.admin.database.v1.IListDatabaseRolesRequest, diff --git a/src/v1/instance_admin_client.ts b/src/v1/instance_admin_client.ts index 46f69c394..7fece782b 100644 --- a/src/v1/instance_admin_client.ts +++ b/src/v1/instance_admin_client.ts @@ -493,6 +493,8 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. + * @example include:samples/generated/v1/instance_admin.get_instance_config.js + * region_tag:spanner_v1_generated_InstanceAdmin_GetInstanceConfig_async */ getInstanceConfig( request?: protos.google.spanner.admin.instance.v1.IGetInstanceConfigRequest, @@ -608,6 +610,8 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. + * @example include:samples/generated/v1/instance_admin.delete_instance_config.js + * region_tag:spanner_v1_generated_InstanceAdmin_DeleteInstanceConfig_async */ deleteInstanceConfig( request?: protos.google.spanner.admin.instance.v1.IDeleteInstanceConfigRequest, @@ -709,6 +713,8 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. + * @example include:samples/generated/v1/instance_admin.get_instance.js + * region_tag:spanner_v1_generated_InstanceAdmin_GetInstance_async */ getInstance( request?: protos.google.spanner.admin.instance.v1.IGetInstanceRequest, @@ -809,6 +815,8 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. + * @example include:samples/generated/v1/instance_admin.delete_instance.js + * region_tag:spanner_v1_generated_InstanceAdmin_DeleteInstance_async */ deleteInstance( request?: protos.google.spanner.admin.instance.v1.IDeleteInstanceRequest, @@ -920,6 +928,8 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. + * @example include:samples/generated/v1/instance_admin.set_iam_policy.js + * region_tag:spanner_v1_generated_InstanceAdmin_SetIamPolicy_async */ setIamPolicy( request?: protos.google.iam.v1.ISetIamPolicyRequest, @@ -1009,6 +1019,8 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. + * @example include:samples/generated/v1/instance_admin.get_iam_policy.js + * region_tag:spanner_v1_generated_InstanceAdmin_GetIamPolicy_async */ getIamPolicy( request?: protos.google.iam.v1.IGetIamPolicyRequest, @@ -1101,6 +1113,8 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#regular-methods) * for more details and examples. + * @example include:samples/generated/v1/instance_admin.test_iam_permissions.js + * region_tag:spanner_v1_generated_InstanceAdmin_TestIamPermissions_async */ testIamPermissions( request?: protos.google.iam.v1.ITestIamPermissionsRequest, @@ -1240,6 +1254,8 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. + * @example include:samples/generated/v1/instance_admin.create_instance_config.js + * region_tag:spanner_v1_generated_InstanceAdmin_CreateInstanceConfig_async */ createInstanceConfig( request?: protos.google.spanner.admin.instance.v1.ICreateInstanceConfigRequest, @@ -1334,6 +1350,8 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. + * @example include:samples/generated/v1/instance_admin.create_instance_config.js + * region_tag:spanner_v1_generated_InstanceAdmin_CreateInstanceConfig_async */ async checkCreateInstanceConfigProgress( name: string @@ -1432,6 +1450,8 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. + * @example include:samples/generated/v1/instance_admin.update_instance_config.js + * region_tag:spanner_v1_generated_InstanceAdmin_UpdateInstanceConfig_async */ updateInstanceConfig( request?: protos.google.spanner.admin.instance.v1.IUpdateInstanceConfigRequest, @@ -1526,6 +1546,8 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. + * @example include:samples/generated/v1/instance_admin.update_instance_config.js + * region_tag:spanner_v1_generated_InstanceAdmin_UpdateInstanceConfig_async */ async checkUpdateInstanceConfigProgress( name: string @@ -1607,6 +1629,8 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. + * @example include:samples/generated/v1/instance_admin.create_instance.js + * region_tag:spanner_v1_generated_InstanceAdmin_CreateInstance_async */ createInstance( request?: protos.google.spanner.admin.instance.v1.ICreateInstanceRequest, @@ -1701,6 +1725,8 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. + * @example include:samples/generated/v1/instance_admin.create_instance.js + * region_tag:spanner_v1_generated_InstanceAdmin_CreateInstance_async */ async checkCreateInstanceProgress( name: string @@ -1789,6 +1815,8 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. + * @example include:samples/generated/v1/instance_admin.update_instance.js + * region_tag:spanner_v1_generated_InstanceAdmin_UpdateInstance_async */ updateInstance( request?: protos.google.spanner.admin.instance.v1.IUpdateInstanceRequest, @@ -1883,6 +1911,8 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#long-running-operations) * for more details and examples. + * @example include:samples/generated/v1/instance_admin.update_instance.js + * region_tag:spanner_v1_generated_InstanceAdmin_UpdateInstance_async */ async checkUpdateInstanceProgress( name: string @@ -2090,6 +2120,8 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. + * @example include:samples/generated/v1/instance_admin.list_instance_configs.js + * region_tag:spanner_v1_generated_InstanceAdmin_ListInstanceConfigs_async */ listInstanceConfigsAsync( request?: protos.google.spanner.admin.instance.v1.IListInstanceConfigsRequest, @@ -2441,6 +2473,8 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. + * @example include:samples/generated/v1/instance_admin.list_instance_config_operations.js + * region_tag:spanner_v1_generated_InstanceAdmin_ListInstanceConfigOperations_async */ listInstanceConfigOperationsAsync( request?: protos.google.spanner.admin.instance.v1.IListInstanceConfigOperationsRequest, @@ -2703,6 +2737,8 @@ export class InstanceAdminClient { * Please see the * [documentation](https://github.com/googleapis/gax-nodejs/blob/master/client-libraries.md#auto-pagination) * for more details and examples. + * @example include:samples/generated/v1/instance_admin.list_instances.js + * region_tag:spanner_v1_generated_InstanceAdmin_ListInstances_async */ listInstancesAsync( request?: protos.google.spanner.admin.instance.v1.IListInstancesRequest, diff --git a/src/v1/spanner_client.ts b/src/v1/spanner_client.ts index 3b47a41e6..5e6f2bfe8 100644 --- a/src/v1/spanner_client.ts +++ b/src/v1/spanner_client.ts @@ -824,6 +824,12 @@ export class SpannerClient { * Query optimizer configuration to use for the given query. * @param {google.spanner.v1.RequestOptions} request.requestOptions * Common options for this request. + * @param {boolean} request.dataBoostEnabled + * If this is for a partitioned query and this field is set to `true`, the + * request will be executed via Spanner independent compute resources. + * + * If the field is set to `true` but the request does not set + * `partition_token`, the API will return an `INVALID_ARGUMENT` error. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. @@ -1075,6 +1081,12 @@ export class SpannerClient { * PartitionReadRequest message used to create this partition_token. * @param {google.spanner.v1.RequestOptions} request.requestOptions * Common options for this request. + * @param {boolean} request.dataBoostEnabled + * If this is for a partitioned read and this field is set to `true`, the + * request will be executed via Spanner independent compute resources. + * + * If the field is set to `true` but the request does not set + * `partition_token`, the API will return an `INVALID_ARGUMENT` error. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Promise} - The promise which resolves to an array. @@ -1770,6 +1782,12 @@ export class SpannerClient { * Query optimizer configuration to use for the given query. * @param {google.spanner.v1.RequestOptions} request.requestOptions * Common options for this request. + * @param {boolean} request.dataBoostEnabled + * If this is for a partitioned query and this field is set to `true`, the + * request will be executed via Spanner independent compute resources. + * + * If the field is set to `true` but the request does not set + * `partition_token`, the API will return an `INVALID_ARGUMENT` error. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} @@ -1848,6 +1866,12 @@ export class SpannerClient { * PartitionReadRequest message used to create this partition_token. * @param {google.spanner.v1.RequestOptions} request.requestOptions * Common options for this request. + * @param {boolean} request.dataBoostEnabled + * If this is for a partitioned read and this field is set to `true`, the + * request will be executed via Spanner independent compute resources. + * + * If the field is set to `true` but the request does not set + * `partition_token`, the API will return an `INVALID_ARGUMENT` error. * @param {object} [options] * Call options. See {@link https://googleapis.dev/nodejs/google-gax/latest/interfaces/CallOptions.html|CallOptions} for more details. * @returns {Stream} From cbdc3e8cf87e6f9f12021081635b08394b2d8616 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 5 Apr 2023 11:55:32 -0700 Subject: [PATCH 08/10] chore: update import paths for Go targets to match open source location (#1831) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: update import paths for Go targets to match open source location chore: update go_package in protos to match open source location chore: add explicit release levels to Go gapic targets PiperOrigin-RevId: 520705454 Source-Link: https://github.com/googleapis/googleapis/commit/1cfcea4fbef317c44cc13d73017a0b0462c4737d Source-Link: https://github.com/googleapis/googleapis-gen/commit/15732ab75211b0255433d6f87415e8a3ce466826 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMTU3MzJhYjc1MjExYjAyNTU0MzNkNmY4NzQxNWU4YTNjZTQ2NjgyNiJ9 * 🦉 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 --- protos/google/spanner/admin/database/v1/backup.proto | 2 +- protos/google/spanner/admin/database/v1/common.proto | 2 +- .../spanner/admin/database/v1/spanner_database_admin.proto | 2 +- protos/google/spanner/admin/instance/v1/common.proto | 2 +- .../spanner/admin/instance/v1/spanner_instance_admin.proto | 2 +- protos/google/spanner/v1/commit_response.proto | 2 +- protos/google/spanner/v1/keys.proto | 2 +- protos/google/spanner/v1/mutation.proto | 2 +- protos/google/spanner/v1/query_plan.proto | 2 +- protos/google/spanner/v1/result_set.proto | 2 +- protos/google/spanner/v1/spanner.proto | 2 +- protos/google/spanner/v1/transaction.proto | 2 +- protos/google/spanner/v1/type.proto | 2 +- protos/protos.json | 6 +++--- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/protos/google/spanner/admin/database/v1/backup.proto b/protos/google/spanner/admin/database/v1/backup.proto index 5e019543e..fce69a2f3 100644 --- a/protos/google/spanner/admin/database/v1/backup.proto +++ b/protos/google/spanner/admin/database/v1/backup.proto @@ -24,7 +24,7 @@ import "google/protobuf/timestamp.proto"; import "google/spanner/admin/database/v1/common.proto"; option csharp_namespace = "Google.Cloud.Spanner.Admin.Database.V1"; -option go_package = "google.golang.org/genproto/googleapis/spanner/admin/database/v1;database"; +option go_package = "cloud.google.com/go/spanner/admin/database/apiv1/databasepb;databasepb"; option java_multiple_files = true; option java_outer_classname = "BackupProto"; option java_package = "com.google.spanner.admin.database.v1"; diff --git a/protos/google/spanner/admin/database/v1/common.proto b/protos/google/spanner/admin/database/v1/common.proto index 720ebb95d..32d7519e3 100644 --- a/protos/google/spanner/admin/database/v1/common.proto +++ b/protos/google/spanner/admin/database/v1/common.proto @@ -22,7 +22,7 @@ import "google/protobuf/timestamp.proto"; import "google/rpc/status.proto"; option csharp_namespace = "Google.Cloud.Spanner.Admin.Database.V1"; -option go_package = "google.golang.org/genproto/googleapis/spanner/admin/database/v1;database"; +option go_package = "cloud.google.com/go/spanner/admin/database/apiv1/databasepb;databasepb"; option java_multiple_files = true; option java_outer_classname = "CommonProto"; option java_package = "com.google.spanner.admin.database.v1"; diff --git a/protos/google/spanner/admin/database/v1/spanner_database_admin.proto b/protos/google/spanner/admin/database/v1/spanner_database_admin.proto index 91489ae4b..4d98fa131 100644 --- a/protos/google/spanner/admin/database/v1/spanner_database_admin.proto +++ b/protos/google/spanner/admin/database/v1/spanner_database_admin.proto @@ -29,7 +29,7 @@ import "google/spanner/admin/database/v1/backup.proto"; import "google/spanner/admin/database/v1/common.proto"; option csharp_namespace = "Google.Cloud.Spanner.Admin.Database.V1"; -option go_package = "google.golang.org/genproto/googleapis/spanner/admin/database/v1;database"; +option go_package = "cloud.google.com/go/spanner/admin/database/apiv1/databasepb;databasepb"; option java_multiple_files = true; option java_outer_classname = "SpannerDatabaseAdminProto"; option java_package = "com.google.spanner.admin.database.v1"; diff --git a/protos/google/spanner/admin/instance/v1/common.proto b/protos/google/spanner/admin/instance/v1/common.proto index e93b33476..ffb69748f 100644 --- a/protos/google/spanner/admin/instance/v1/common.proto +++ b/protos/google/spanner/admin/instance/v1/common.proto @@ -19,7 +19,7 @@ package google.spanner.admin.instance.v1; import "google/protobuf/timestamp.proto"; option csharp_namespace = "Google.Cloud.Spanner.Admin.Instance.V1"; -option go_package = "google.golang.org/genproto/googleapis/spanner/admin/instance/v1;instance"; +option go_package = "cloud.google.com/go/spanner/admin/instance/apiv1/instancepb;instancepb"; option java_multiple_files = true; option java_outer_classname = "CommonProto"; option java_package = "com.google.spanner.admin.instance.v1"; diff --git a/protos/google/spanner/admin/instance/v1/spanner_instance_admin.proto b/protos/google/spanner/admin/instance/v1/spanner_instance_admin.proto index 85b041134..0b4a35705 100644 --- a/protos/google/spanner/admin/instance/v1/spanner_instance_admin.proto +++ b/protos/google/spanner/admin/instance/v1/spanner_instance_admin.proto @@ -29,7 +29,7 @@ import "google/protobuf/timestamp.proto"; import "google/spanner/admin/instance/v1/common.proto"; option csharp_namespace = "Google.Cloud.Spanner.Admin.Instance.V1"; -option go_package = "google.golang.org/genproto/googleapis/spanner/admin/instance/v1;instance"; +option go_package = "cloud.google.com/go/spanner/admin/instance/apiv1/instancepb;instancepb"; option java_multiple_files = true; option java_outer_classname = "SpannerInstanceAdminProto"; option java_package = "com.google.spanner.admin.instance.v1"; diff --git a/protos/google/spanner/v1/commit_response.proto b/protos/google/spanner/v1/commit_response.proto index 69e073092..436a002b8 100644 --- a/protos/google/spanner/v1/commit_response.proto +++ b/protos/google/spanner/v1/commit_response.proto @@ -19,7 +19,7 @@ package google.spanner.v1; import "google/protobuf/timestamp.proto"; option csharp_namespace = "Google.Cloud.Spanner.V1"; -option go_package = "google.golang.org/genproto/googleapis/spanner/v1;spanner"; +option go_package = "cloud.google.com/go/spanner/apiv1/spannerpb;spannerpb"; option java_multiple_files = true; option java_outer_classname = "CommitResponseProto"; option java_package = "com.google.spanner.v1"; diff --git a/protos/google/spanner/v1/keys.proto b/protos/google/spanner/v1/keys.proto index df3607aa4..8fb4757f5 100644 --- a/protos/google/spanner/v1/keys.proto +++ b/protos/google/spanner/v1/keys.proto @@ -19,7 +19,7 @@ package google.spanner.v1; import "google/protobuf/struct.proto"; option csharp_namespace = "Google.Cloud.Spanner.V1"; -option go_package = "google.golang.org/genproto/googleapis/spanner/v1;spanner"; +option go_package = "cloud.google.com/go/spanner/apiv1/spannerpb;spannerpb"; option java_multiple_files = true; option java_outer_classname = "KeysProto"; option java_package = "com.google.spanner.v1"; diff --git a/protos/google/spanner/v1/mutation.proto b/protos/google/spanner/v1/mutation.proto index eae0af72d..cced61f33 100644 --- a/protos/google/spanner/v1/mutation.proto +++ b/protos/google/spanner/v1/mutation.proto @@ -21,7 +21,7 @@ import "google/protobuf/struct.proto"; import "google/spanner/v1/keys.proto"; option csharp_namespace = "Google.Cloud.Spanner.V1"; -option go_package = "google.golang.org/genproto/googleapis/spanner/v1;spanner"; +option go_package = "cloud.google.com/go/spanner/apiv1/spannerpb;spannerpb"; option java_multiple_files = true; option java_outer_classname = "MutationProto"; option java_package = "com.google.spanner.v1"; diff --git a/protos/google/spanner/v1/query_plan.proto b/protos/google/spanner/v1/query_plan.proto index 9ea40fe4a..c0903bdd7 100644 --- a/protos/google/spanner/v1/query_plan.proto +++ b/protos/google/spanner/v1/query_plan.proto @@ -19,7 +19,7 @@ package google.spanner.v1; import "google/protobuf/struct.proto"; option csharp_namespace = "Google.Cloud.Spanner.V1"; -option go_package = "google.golang.org/genproto/googleapis/spanner/v1;spanner"; +option go_package = "cloud.google.com/go/spanner/apiv1/spannerpb;spannerpb"; option java_multiple_files = true; option java_outer_classname = "QueryPlanProto"; option java_package = "com.google.spanner.v1"; diff --git a/protos/google/spanner/v1/result_set.proto b/protos/google/spanner/v1/result_set.proto index 36df232bc..cfa5719c4 100644 --- a/protos/google/spanner/v1/result_set.proto +++ b/protos/google/spanner/v1/result_set.proto @@ -23,7 +23,7 @@ import "google/spanner/v1/type.proto"; option cc_enable_arenas = true; option csharp_namespace = "Google.Cloud.Spanner.V1"; -option go_package = "google.golang.org/genproto/googleapis/spanner/v1;spanner"; +option go_package = "cloud.google.com/go/spanner/apiv1/spannerpb;spannerpb"; option java_multiple_files = true; option java_outer_classname = "ResultSetProto"; option java_package = "com.google.spanner.v1"; diff --git a/protos/google/spanner/v1/spanner.proto b/protos/google/spanner/v1/spanner.proto index d25e87aa2..0c71e03d9 100644 --- a/protos/google/spanner/v1/spanner.proto +++ b/protos/google/spanner/v1/spanner.proto @@ -32,7 +32,7 @@ import "google/spanner/v1/transaction.proto"; import "google/spanner/v1/type.proto"; option csharp_namespace = "Google.Cloud.Spanner.V1"; -option go_package = "google.golang.org/genproto/googleapis/spanner/v1;spanner"; +option go_package = "cloud.google.com/go/spanner/apiv1/spannerpb;spannerpb"; option java_multiple_files = true; option java_outer_classname = "SpannerProto"; option java_package = "com.google.spanner.v1"; diff --git a/protos/google/spanner/v1/transaction.proto b/protos/google/spanner/v1/transaction.proto index 49ab5cf52..4b7fe4a9d 100644 --- a/protos/google/spanner/v1/transaction.proto +++ b/protos/google/spanner/v1/transaction.proto @@ -20,7 +20,7 @@ import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; option csharp_namespace = "Google.Cloud.Spanner.V1"; -option go_package = "google.golang.org/genproto/googleapis/spanner/v1;spanner"; +option go_package = "cloud.google.com/go/spanner/apiv1/spannerpb;spannerpb"; option java_multiple_files = true; option java_outer_classname = "TransactionProto"; option java_package = "com.google.spanner.v1"; diff --git a/protos/google/spanner/v1/type.proto b/protos/google/spanner/v1/type.proto index 712ec187f..290b5540d 100644 --- a/protos/google/spanner/v1/type.proto +++ b/protos/google/spanner/v1/type.proto @@ -19,7 +19,7 @@ package google.spanner.v1; import "google/api/field_behavior.proto"; option csharp_namespace = "Google.Cloud.Spanner.V1"; -option go_package = "google.golang.org/genproto/googleapis/spanner/v1;spanner"; +option go_package = "cloud.google.com/go/spanner/apiv1/spannerpb;spannerpb"; option java_multiple_files = true; option java_outer_classname = "TypeProto"; option java_package = "com.google.spanner.v1"; diff --git a/protos/protos.json b/protos/protos.json index 35a883d97..e864c04c2 100644 --- a/protos/protos.json +++ b/protos/protos.json @@ -1262,7 +1262,7 @@ "v1": { "options": { "csharp_namespace": "Google.Cloud.Spanner.Admin.Database.V1", - "go_package": "google.golang.org/genproto/googleapis/spanner/admin/database/v1;database", + "go_package": "cloud.google.com/go/spanner/admin/database/apiv1/databasepb;databasepb", "java_multiple_files": true, "java_outer_classname": "SpannerDatabaseAdminProto", "java_package": "com.google.spanner.admin.database.v1", @@ -2712,7 +2712,7 @@ "v1": { "options": { "csharp_namespace": "Google.Cloud.Spanner.Admin.Instance.V1", - "go_package": "google.golang.org/genproto/googleapis/spanner/admin/instance/v1;instance", + "go_package": "cloud.google.com/go/spanner/admin/instance/apiv1/instancepb;instancepb", "java_multiple_files": true, "java_outer_classname": "SpannerInstanceAdminProto", "java_package": "com.google.spanner.admin.instance.v1", @@ -3577,7 +3577,7 @@ "v1": { "options": { "csharp_namespace": "Google.Cloud.Spanner.V1", - "go_package": "google.golang.org/genproto/googleapis/spanner/v1;spanner", + "go_package": "cloud.google.com/go/spanner/apiv1/spannerpb;spannerpb", "java_multiple_files": true, "java_outer_classname": "SpannerProto", "java_package": "com.google.spanner.v1", From 6ecd366da7183d502c710cb5c879984c276b12db Mon Sep 17 00:00:00 2001 From: surbhigarg92 Date: Thu, 6 Apr 2023 08:11:52 +0000 Subject: [PATCH 09/10] fix: Begin transaction foes not handle error (#1833) --- src/transaction.ts | 2 +- test/spanner.ts | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/transaction.ts b/src/transaction.ts index 853bfb77f..2d771b38c 100644 --- a/src/transaction.ts +++ b/src/transaction.ts @@ -1774,7 +1774,7 @@ export class Transaction extends Dml { } else if (!this._useInRunner) { reqOpts.singleUseTransaction = this._options; } else { - this.begin().then(() => this.commit(options, callback)); + this.begin().then(() => this.commit(options, callback), callback); return; } diff --git a/test/spanner.ts b/test/spanner.ts index bd399e204..8b24a2468 100644 --- a/test/spanner.ts +++ b/test/spanner.ts @@ -3382,6 +3382,30 @@ describe('Spanner with mock server', () => { }) as v1.BeginTransactionRequest; assert.ok(beginTxnRequest, 'beginTransaction was called'); }); + + it('should throw error if begin transaction fails on blind commit', async () => { + const database = newTestDatabase(); + const err = { + message: 'Test error', + } as MockError; + spannerMock.setExecutionTime( + spannerMock.beginTransaction, + SimulatedExecutionTime.ofError(err) + ); + try { + await database.runTransactionAsync(async tx => { + tx.insert('foo', {id: 1, name: 'One'}); + await tx.commit(); + }); + } catch (e) { + assert.strictEqual( + (e as ServiceError).message, + '2 UNKNOWN: Test error' + ); + } finally { + await database.close(); + } + }); }); describe('table', () => { From 23ec0609714551a1101447d42305ffaa9287d1d5 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 6 Apr 2023 10:02:12 +0000 Subject: [PATCH 10/10] chore(main): release 6.8.0 (#1821) :robot: I have created a release *beep* *boop* --- ## [6.8.0](https://togithub.com/googleapis/nodejs-spanner/compare/v6.7.2...v6.8.0) (2023-04-06) ### Features * Adding new fields for Serverless analytics ([#1816](https://togithub.com/googleapis/nodejs-spanner/issues/1816)) ([2a6ca6f](https://togithub.com/googleapis/nodejs-spanner/commit/2a6ca6f09215752f9451d625ac02837e9d70b66a)) ### Bug Fixes * Begin transaction foes not handle error ([#1833](https://togithub.com/googleapis/nodejs-spanner/issues/1833)) ([6ecd366](https://togithub.com/googleapis/nodejs-spanner/commit/6ecd366da7183d502c710cb5c879984c276b12db)) * Correcting the proto field Id for field data_boost_enabled ([#1827](https://togithub.com/googleapis/nodejs-spanner/issues/1827)) ([7f6d4cc](https://togithub.com/googleapis/nodejs-spanner/commit/7f6d4ccce9269197312f2d795ef854e1789e8fce)) * Logic for retrying specifiied internal errors ([#1822](https://togithub.com/googleapis/nodejs-spanner/issues/1822)) ([f915bd1](https://togithub.com/googleapis/nodejs-spanner/commit/f915bd16cf7e817243e46a319b3e6f270b24bf68)), closes [#1808](https://togithub.com/googleapis/nodejs-spanner/issues/1808) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- CHANGELOG.md | 14 ++++++++++++++ package.json | 2 +- samples/package.json | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36409ffb6..6accc1af8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,20 @@ [1]: https://www.npmjs.com/package/nodejs-spanner?activeTab=versions +## [6.8.0](https://github.com/googleapis/nodejs-spanner/compare/v6.7.2...v6.8.0) (2023-04-06) + + +### Features + +* Adding new fields for Serverless analytics ([#1816](https://github.com/googleapis/nodejs-spanner/issues/1816)) ([2a6ca6f](https://github.com/googleapis/nodejs-spanner/commit/2a6ca6f09215752f9451d625ac02837e9d70b66a)) + + +### Bug Fixes + +* Begin transaction foes not handle error ([#1833](https://github.com/googleapis/nodejs-spanner/issues/1833)) ([6ecd366](https://github.com/googleapis/nodejs-spanner/commit/6ecd366da7183d502c710cb5c879984c276b12db)) +* Correcting the proto field Id for field data_boost_enabled ([#1827](https://github.com/googleapis/nodejs-spanner/issues/1827)) ([7f6d4cc](https://github.com/googleapis/nodejs-spanner/commit/7f6d4ccce9269197312f2d795ef854e1789e8fce)) +* Logic for retrying specifiied internal errors ([#1822](https://github.com/googleapis/nodejs-spanner/issues/1822)) ([f915bd1](https://github.com/googleapis/nodejs-spanner/commit/f915bd16cf7e817243e46a319b3e6f270b24bf68)), closes [#1808](https://github.com/googleapis/nodejs-spanner/issues/1808) + ## [6.7.2](https://github.com/googleapis/nodejs-spanner/compare/v6.7.1...v6.7.2) (2023-02-17) diff --git a/package.json b/package.json index 9a6308232..0c16388a0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/spanner", "description": "Cloud Spanner Client Library for Node.js", - "version": "6.7.2", + "version": "6.8.0", "license": "Apache-2.0", "author": "Google Inc.", "engines": { diff --git a/samples/package.json b/samples/package.json index 5fea4283c..701573b7e 100644 --- a/samples/package.json +++ b/samples/package.json @@ -16,7 +16,7 @@ "dependencies": { "@google-cloud/kms": "^3.0.0", "@google-cloud/precise-date": "^3.0.0", - "@google-cloud/spanner": "^6.7.2", + "@google-cloud/spanner": "^6.8.0", "yargs": "^16.0.0" }, "devDependencies": {