fix: merge conflicts

googleapis · May 28, 2024 · d5a5091 · d5a5091
1 parent ad7894f
commit d5a5091
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/samples/batch-write.js b/samples/batch-write.js
@@ -30,20 +30,9 @@ async function main(
     AlbumTitle: 'Total Junk',
   });
 
-  const options = {
-    requestOptions: {
-      priority:
-        protos.google.spanner.v1.RequestOptions.Priority.PRIORITY_MEDIUM,
-      transactionTag: 'transaction-tag',
-    },
-    gaxOptions: {
-      timeout: 1000,
-    },
-  };
-
   try {
     database
-      .batchWrite([mutationGroups, mutationGroups1], options)
+      .batchWrite([mutationGroups, mutationGroups1])
       .on('error', console.error)
       .on('data', response => {
         console.log('response: ', response);

diff --git a/src/database.ts b/src/database.ts
@@ -3218,7 +3218,7 @@ class Database extends common.GrpcServiceObject {
    */
   batchWrite(
     mutationGroups: MutationGroup[],
-    options: BatchWriteOptions
+    options?: BatchWriteOptions
   ): NodeJS.ReadableStream {
     const proxyStream: Transform = through.obj();
 
@@ -3227,13 +3227,13 @@ class Database extends common.GrpcServiceObject {
         proxyStream.destroy(err);
         return;
       }
-      const gaxOpts = extend(true, {}, options.gaxOptions);
+      const gaxOpts = extend(true, {}, options?.gaxOptions);
       const reqOpts = Object.assign(
         {} as spannerClient.spanner.v1.BatchWriteRequest,
         {
           session: session!.formattedName_!,
           mutationGroups: mutationGroups.map(mg => mg.proto()),
-          requestOptions: options.requestOptions,
+          requestOptions: options?.requestOptions,
         }
       );
       let dataReceived = false;