Merge branch 'main' into fix-testbench-localhost-hang

Author: Dhriti07

.github/workflows/update_generation_config.yaml

@@ -15,8 +15,6 @@
 # downstream client libraries before they are released.
 name: Update generation configuration
 on:
-  schedule:
-  - cron: '0 2 * * *'
   workflow_dispatch:
 jobs:
   update-generation-config:

README.md

@@ -17,7 +17,6 @@
 from typing import List, Optional
 from glob import glob
 import json
-import requests
 
 class CloudClient:
   repo: str = None
@@ -41,6 +40,8 @@ def __init__(self, repo: dict):
   # For sorting, we want to sort by release level, then API pretty_name
   def __lt__(self, other):
     if self.release_level == other.release_level:
+      if self.title == other.title:
+        return (self.artifact_id or "") < (other.artifact_id or "")
       return self.title < other.title
 
     return other.release_level < self.release_level
@@ -88,16 +89,6 @@ def generate_table_contents(clients: List[CloudClient]) -> List[str]:
   return content_rows + [client_row(client) for client in clients]
 
 
-REPO_METADATA_URL_FORMAT = "https://raw.githubusercontent.com/{repo_slug}/main/.repo-metadata.json"
-
-def client_for_repo(repo_slug) -> Optional[CloudClient]:
-  url = REPO_METADATA_URL_FORMAT.format(repo_slug=repo_slug)
-  response = requests.get(url)
-  if response.status_code != requests.codes.ok:
-    return
-
-  return CloudClient(response.json())
-
 def client_for_module(module) -> Optional[CloudClient]:
   with open ('%s/.repo-metadata.json' % module, "r") as metadata_file:
     data = json.load(metadata_file)
@@ -117,39 +108,21 @@ def client_for_module(module) -> Optional[CloudClient]:
   'java-shared-config',
   'java-shared-dependencies',
   'java-samples',
+  'java-showcase',
   'java-vertexai'
 ]
 
 LIBRARIES_IN_MONOREPO = glob("java-*")
 
-def allowed_remote_repo(repo) -> bool:
-  return (repo['language'].lower() == 'java'
-          and repo['full_name'].startswith('googleapis/java-')
-          and repo['full_name'] not in
-          [ 'googleapis/%s' % repo for repo in (REPO_EXCLUSION + LIBRARIES_IN_MONOREPO)])
-
-def _fetch_repo_list(page):
-  url = "https://api.github.com/search/repositories"
-  response = requests.get(url, params = {
-    'q': 'org:googleapis is:public archived:false language:java',
-    'per_page': 100,
-    'page': page,
-  })
-  return response.json()['items']
-
 def all_clients() -> List[CloudClient]:
-  page = 1
   clients = []
-  while (True):
-    repos = _fetch_repo_list(page)
-    if not repos:
-      break
-    clients.extend([client_for_repo(repo['full_name']) for repo in repos if allowed_remote_repo(repo)])
-    page += 1
-  clients.extend([client_for_module(module) for module in LIBRARIES_IN_MONOREPO if
-                  module not in REPO_EXCLUSION])
-
-  return [client for client in clients if client]
+  for module in sorted(LIBRARIES_IN_MONOREPO):
+    if module not in REPO_EXCLUSION:
+      client = client_for_module(module)
+      if client:
+        clients.append(client)
+
+  return clients
 
 
 clients = sorted(all_clients())

generate-readme.py

@@ -1,4 +1,4 @@
-googleapis_commitish: 0db4dc67dd805d20294c6dc34068c37f546d71da
+googleapis_commitish: ff15be54722218705740b9fc6223d264c4cdb6dd
 libraries_bom_version: 26.83.0
 is_monorepo: true
 libraries:

generation_config.yaml

@@ -125,7 +125,7 @@
 public final class BigtableInstanceAdminClient implements AutoCloseable {
   private final String projectId;
   private final BigtableInstanceAdminStub stub;
-  private final BaseBigtableInstanceAdminClient baseClient;
+  private final BigtableInstanceAdminClientV2 v2Client;
 
   /** Constructs an instance of BigtableInstanceAdminClient with the given project ID. */
   public static BigtableInstanceAdminClient create(@Nonnull String projectId) throws IOException {
@@ -148,7 +148,7 @@ private BigtableInstanceAdminClient(
       @Nonnull String projectId, @Nonnull BigtableInstanceAdminStub stub) {
     this.projectId = projectId;
     this.stub = stub;
-    this.baseClient = BaseBigtableInstanceAdminClient.create(stub);
+    this.v2Client = new BigtableInstanceAdminClientV2(stub);
   }
 
   /** Gets the project ID this client is associated with. */
@@ -157,11 +157,11 @@ public String getProjectId() {
   }
 
   /**
-   * Returns the modern autogenerated client. This provides access to the newest features and
-   * proto-based methods.
+   * Returns the modern V2 client. This provides access to the newest features and proto-based
+   * methods.
    */
-  public BaseBigtableInstanceAdminClient getBaseClient() {
-    return baseClient;
+  public BigtableInstanceAdminClientV2 getBaseClient() {
+    return v2Client;
   }
 
   /** Closes the client and frees all resources associated with it (like thread pools). */

java-bigtable/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminClient.java

@@ -89,6 +89,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ScheduledExecutorService;
 import javax.annotation.Nonnull;
 
 /**
@@ -169,7 +170,7 @@ public final class BigtableTableAdminClient implements AutoCloseable {
   private final EnhancedBigtableTableAdminStub stub;
   private final String projectId;
   private final String instanceId;
-  private final BaseBigtableTableAdminClient baseClient;
+  private BigtableTableAdminClientV2 v2Client;
 
   /** Constructs an instance of BigtableTableAdminClient with the given project and instance IDs. */
   public static BigtableTableAdminClient create(
@@ -209,7 +210,6 @@ private BigtableTableAdminClient(
     this.projectId = projectId;
     this.instanceId = instanceId;
     this.stub = stub;
-    this.baseClient = BaseBigtableTableAdminClient.create(stub);
   }
 
   /** Gets the project ID of the instance whose tables this client manages. */
@@ -223,11 +223,29 @@ public String getInstanceId() {
   }
 
   /**
-   * Returns the modern autogenerated client. This provides access to the newest features and
-   * proto-based methods.
-   */
-  public BaseBigtableTableAdminClient getBaseClient() {
-    return baseClient;
+   * Returns the modern V2 client. This provides access to the newest features and proto-based
+   * methods.
+   */
+  public synchronized BigtableTableAdminClientV2 getBaseClient() {
+    if (v2Client == null) {
+      ScheduledExecutorService backgroundExecutor =
+          stub.getSettings().getBackgroundExecutorProvider().getExecutor();
+      boolean shouldAutoClose =
+          stub.getSettings().getBackgroundExecutorProvider().shouldAutoClose();
+
+      try {
+        v2Client =
+            BigtableTableAdminClientV2.create(
+                stub,
+                stub.getSettings(),
+                stub.getClientContext().getClock(),
+                backgroundExecutor,
+                shouldAutoClose);
+      } catch (IOException e) {
+        throw new IllegalStateException("Failed to initialize modern V2 table admin client", e);
+      }
+    }
+    return v2Client;
   }
 
   @Override

java-bigtable/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClient.java

@@ -108,7 +108,8 @@ public static final BigtableTableAdminClientV2 create(BaseBigtableTableAdminSett
 
     OperationCallable<Void, Empty, OptimizeRestoredTableMetadata>
         optimizeRestoredTableOperationBaseCallable =
-            createOptimizeRestoredTableOperationBaseCallable(stub, settings, backgroundExecutor);
+            createOptimizeRestoredTableOperationBaseCallable(
+                stub, settings.getStubSettings().getClock(), backgroundExecutor);
 
     return new BigtableTableAdminClientV2(
         stub,
@@ -118,6 +119,34 @@ public static final BigtableTableAdminClientV2 create(BaseBigtableTableAdminSett
         optimizeRestoredTableOperationBaseCallable);
   }
 
+  /**
+   * Package-private factory method to construct an instance of {@link BigtableTableAdminClientV2}
+   * by reusing an existing stub, settings, clock, and background executor.
+   *
+   * <p>This is used by the legacy {@code BigtableTableAdminClient}'s escape hatch ({@code
+   * getBaseClient()}) to wrap the legacy client's active stub, ensuring the underlying gRPC channel
+   * and resources are shared rather than recreated.
+   */
+  static BigtableTableAdminClientV2 create(
+      GrpcBigtableTableAdminStub stub,
+      BigtableTableAdminStubSettings settings,
+      ApiClock clock,
+      ScheduledExecutorService backgroundExecutor,
+      boolean shouldAutoClose)
+      throws IOException {
+    AwaitConsistencyCallableV2 awaitConsistencyCallable =
+        createAwaitConsistencyCallable(stub, settings, clock, backgroundExecutor);
+    OperationCallable<Void, Empty, OptimizeRestoredTableMetadata>
+        optimizeRestoredTableOperationBaseCallable =
+            createOptimizeRestoredTableOperationBaseCallable(stub, clock, backgroundExecutor);
+    return new BigtableTableAdminClientV2(
+        stub,
+        backgroundExecutor,
+        shouldAutoClose,
+        awaitConsistencyCallable,
+        optimizeRestoredTableOperationBaseCallable);
+  }
+
   protected BigtableTableAdminClientV2(
       GrpcBigtableTableAdminStub stub,
       @Nullable ScheduledExecutorService backgroundExecutor,
@@ -156,7 +185,7 @@ private static AwaitConsistencyCallableV2 createAwaitConsistencyCallable(
   private static OperationCallable<Void, Empty, OptimizeRestoredTableMetadata>
       createOptimizeRestoredTableOperationBaseCallable(
           GrpcBigtableTableAdminStub stub,
-          BaseBigtableTableAdminSettings settings,
+          ApiClock clock,
           ScheduledExecutorService backgroundExecutor)
           throws IOException {
 
@@ -229,7 +258,7 @@ public Empty apply(OperationSnapshot input) {
     // (including channels, credentials, and headers) for executing the polling RPCs.
     ClientContext clientContext =
         ClientContext.newBuilder()
-            .setClock(settings.getStubSettings().getClock())
+            .setClock(clock)
             .setExecutor(backgroundExecutor)
             .setDefaultCallContext(GrpcCallContext.createDefault())
             .build();

java-bigtable/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminClientV2.java

@@ -245,4 +245,12 @@ public UnaryCallable<ConsistencyRequest, Void> awaitConsistencyCallable() {
       awaitOptimizeRestoredTableCallable() {
     return optimizeRestoredTableOperationBaseCallable;
   }
+
+  public BigtableTableAdminStubSettings getSettings() {
+    return settings;
+  }
+
+  public ClientContext getClientContext() {
+    return clientContext;
+  }
 }

java-bigtable/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/EnhancedBigtableTableAdminStub.java

@@ -772,6 +772,8 @@ default void readRows(
      * delimit contiguous sections of the table of approximately equal size,
      * which can be used to break up the data for distributed tasks like
      * mapreduces.
+     * If a `row_range` is provided in the request, the returned samples will be
+     * restricted to the specified range.
      * </pre>
      */
     default void sampleRowKeys(
@@ -1045,6 +1047,8 @@ public void readRows(
      * delimit contiguous sections of the table of approximately equal size,
      * which can be used to break up the data for distributed tasks like
      * mapreduces.
+     * If a `row_range` is provided in the request, the returned samples will be
+     * restricted to the specified range.
      * </pre>
      */
     public void sampleRowKeys(
@@ -1326,6 +1330,8 @@ public io.grpc.stub.BlockingClientCall<?, com.google.bigtable.v2.ReadRowsRespons
      * delimit contiguous sections of the table of approximately equal size,
      * which can be used to break up the data for distributed tasks like
      * mapreduces.
+     * If a `row_range` is provided in the request, the returned samples will be
+     * restricted to the specified range.
      * </pre>
      */
     @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/10918")
@@ -1586,6 +1592,8 @@ public java.util.Iterator<com.google.bigtable.v2.ReadRowsResponse> readRows(
      * delimit contiguous sections of the table of approximately equal size,
      * which can be used to break up the data for distributed tasks like
      * mapreduces.
+     * If a `row_range` is provided in the request, the returned samples will be
+     * restricted to the specified range.
      * </pre>
      */
     public java.util.Iterator<com.google.bigtable.v2.SampleRowKeysResponse> sampleRowKeys(