Merge branch 'googleapis:main' into main

src/tabular-api-surface.ts

@@ -902,8 +902,23 @@ Please use the format 'prezzy' or '${instance.name}/tables/prezzy'.`);
       typeof optionsOrCallback === 'function' ? optionsOrCallback : cb!;
     const gaxOptions =
       typeof optionsOrCallback === 'object' ? optionsOrCallback : {};
+
+    /*
+    The following line of code sets the timeout if it was provided while
+    creating the client. This will be used to determine if the client should
+    retry on DEADLINE_EXCEEDED errors. Eventually, this will be handled
+    downstream in google-gax.
+     */
+    const timeout = gaxOptions?.timeout;
+    const callTimeMillis = new Date().getTime();
+
     this.sampleRowKeysStream(gaxOptions)
-      .on('error', callback)
+      .on('error', (error: grpc.ServiceError) => {
+        if (timeout && timeout > new Date().getTime() - callTimeMillis) {
+          error.code = grpc.status.DEADLINE_EXCEEDED;
+        }
+        callback(error);
+      })
       .pipe(
         concat((keys: string[]) => {
           callback(null, keys);

test/test-proxy/checkAndMutateRowService.ts

@@ -65,6 +65,31 @@ describe('TestProxy/CheckAndMutateRow', () => {
         },
       ],
     },
+    {
+      tableName: 'projects/projectId/instances/instance/tables/test-table',
+      appProfileId: 'test-app-profile',
+      rowKey: Buffer.from('test-row-key'),
+      predicateFilter: null,
+      trueMutations: [
+        {
+          setCell: {
+            familyName: '',
+            timestampMicros: 1000007,
+            columnQualifier: Buffer.from(''),
+            value: Buffer.from(''),
+          },
+        },
+        {
+          setCell: {
+            familyName: '',
+            timestampMicros: 1000007,
+            columnQualifier: Buffer.from(''),
+            value: Buffer.from(''),
+          },
+        },
+      ],
+      falseMutations: [],
+    },
   ];
   describe('Ensure the proper request is passed to the Gapic Layer', () => {
     const clientId = 'TestCheckAndMutateRow_NoRetry_TransientError';

testproxy/known_failures.txt

@@ -1,6 +1,5 @@
 TestMutateRow_Generic_DeadlineExceeded\|
 TestMutateRow_Generic_CloseClient\|
-TestMutateRows_Generic_CloseClient\|
 TestMutateRows_Retry_WithRoutingCookie\|
 TestReadRow_Generic_DeadlineExceeded\|
 TestReadRow_Retry_WithRoutingCookie\|
@@ -12,8 +11,5 @@ TestReadRows_Retry_WithRoutingCookie\|
 TestReadRows_Retry_WithRoutingCookie_MultipleErrorResponses\|
 TestReadRows_Retry_WithRetryInfo\|
 TestReadRows_Retry_WithRetryInfo_MultipleErrorResponse\|
-TestCheckAndMutateRow_NoRetry_TrueMutations\|
-TestCheckAndMutateRow_NoRetry_FalseMutations\|
-TestSampleRowKeys_Generic_DeadlineExceeded\|
 TestSampleRowKeys_Retry_WithRoutingCookie\|
 TestSampleRowKeys_Generic_CloseClient

testproxy/services/bulk-mutate-rows.js

@@ -48,7 +48,7 @@ const bulkMutateRows = ({clientMap}) =>
         : [];
       return {
         status: {
-          code: error.code,
+          code: error.code ? error.code : grpc.status.UNKNOWN,
           details: [],
           message: error.message,
         },

testproxy/services/check-and-mutate-row.js

@@ -34,15 +34,19 @@ const {
  * @returns {FilterConfigOption[]} An array of mutations in the handwritten layer format.
  */
 function handwrittenLayerMutations(gapicLayerMutations) {
-  return createFlatMutationsListWithFnInverse(
-    [
-      {
-        mutations: gapicLayerMutations,
-      },
-    ],
-    mutationParseInverse,
-    1
-  );
+  return gapicLayerMutations
+    .map(mutation =>
+      createFlatMutationsListWithFnInverse(
+        [
+          {
+            mutations: [mutation],
+          },
+        ],
+        mutationParseInverse,
+        1
+      )
+    )
+    .flat();
 }
 
 /**

testproxy/services/sample-row-keys.js

@@ -14,38 +14,34 @@
 'use strict';
 
 const grpc = require('@grpc/grpc-js');
-
+const {
+  getSRKRequest,
+} = require('../../build/testproxy/services/utils/request/sampleRowKeys.js');
 const normalizeCallback = require('./utils/normalize-callback.js');
 
-const v2 = Symbol.for('v2');
-
 const sampleRowKeys = ({clientMap}) =>
   normalizeCallback(async rawRequest => {
     const {request} = rawRequest;
-    const {request: sampleRowKeysRequest} = request;
-    const {tableName} = sampleRowKeysRequest;
-    const {clientId} = request;
+    const {clientId, request: sampleRowKeysRequest} = request;
+    const {appProfileId, tableName} = sampleRowKeysRequest;
+
+    const bigtable = clientMap.get(clientId);
+    bigtable.appProfileId = appProfileId;
+
+    try {
+      const response = await getSRKRequest(bigtable, {appProfileId, tableName});
 
-    const appProfileId = clientMap.get(clientId).appProfileId;
-    const client = clientMap.get(clientId)[v2];
-    const samples = await new Promise((res, rej) => {
-      const response = [];
-      client
-        .sampleRowKeys({
-          appProfileId,
-          tableName,
-        })
-        .on('data', data => {
-          response.push(data);
-        })
-        .on('error', rej)
-        .on('end', () => res(response));
-    });
+      return {
+        status: {code: grpc.status.OK, details: []},
+        response,
+      };
+    } catch (error) {
+      console.error('Error:', error.code);
 
-    return {
-      status: {code: grpc.status.OK, details: []},
-      samples,
-    };
+      return {
+        status: {code: error.code, details: []},
+      };
+    }
   });
 
 module.exports = sampleRowKeys;

testproxy/services/utils/request/sampleRowKeys.ts

@@ -0,0 +1,48 @@
+// Copyright 2025 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import * as protos from '../../../../protos/protos';
+
+type SRKRequest = protos.google.bigtable.v2.ISampleRowKeysRequest;
+type SRKResponse = protos.google.bigtable.v2.ISampleRowKeysResponse;
+
+/**
+ * This function will create a request that can be passed into the
+ * handwritten ßsampleRowKeys method and calls the Gapic layer under the hood.
+ *
+ * @param {any} client Bigtable client
+ * @param {SRKRequest} request The sampleRowKeys request information
+ * that can be sent to the Gapic layer.
+ * @returns {Promise<SRKResponse>} A reponse that can be passed into the
+ * sampleRowKeys Gapic layer.
+ */
+export function getSRKRequest(
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  client: any,
+  request: SRKRequest
+): Promise<SRKResponse> {
+  const {tableName} = request;
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const getTableInfo = (bigtable: any, tableName: any) => {
+    const [, , , instanceId, , tableId] = tableName.split('/');
+    const instance = bigtable.instance(instanceId);
+    return instance.table(tableId);
+  };
+
+  const table = getTableInfo(client, tableName);
+  const sampleRowKeysResponse = table.sampleRowKeys();
+
+  return sampleRowKeysResponse;
+}