Merge branch 'main' into fix-cancel-job-b467066417

Author: jinseopkim0

generation_config.yaml

@@ -1,4 +1,4 @@
-googleapis_commitish: 05c4b6d37258ab81054529451cdf804f2918441f
+googleapis_commitish: 00bb3db8a8cc88f0755e872856462b902d6dd8c4
 libraries_bom_version: 26.83.0
 is_monorepo: true
 libraries:

java-alloydb/proto-google-cloud-alloydb-v1/src/main/java/com/google/cloud/alloydb/v1/Cluster.java

@@ -6627,7 +6627,7 @@ public com.google.cloud.alloydb.v1.Cluster.NetworkConfigOrBuilder getNetworkConf
    * </code>
    *
    * @deprecated google.cloud.alloydb.v1.Cluster.network is deprecated. See
-   *     google/cloud/alloydb/v1/resources.proto;l=682
+   *     google/cloud/alloydb/v1/resources.proto;l=687
    * @return The network.
    */
   @java.lang.Override
@@ -6660,7 +6660,7 @@ public java.lang.String getNetwork() {
    * </code>
    *
    * @deprecated google.cloud.alloydb.v1.Cluster.network is deprecated. See
-   *     google/cloud/alloydb/v1/resources.proto;l=682
+   *     google/cloud/alloydb/v1/resources.proto;l=687
    * @return The bytes for network.
    */
   @java.lang.Override
@@ -7016,7 +7016,7 @@ public com.google.cloud.alloydb.v1.AutomatedBackupPolicy getAutomatedBackupPolic
    * <code>.google.cloud.alloydb.v1.SslConfig ssl_config = 18 [deprecated = true];</code>
    *
    * @deprecated google.cloud.alloydb.v1.Cluster.ssl_config is deprecated. See
-   *     google/cloud/alloydb/v1/resources.proto;l=717
+   *     google/cloud/alloydb/v1/resources.proto;l=722
    * @return Whether the sslConfig field is set.
    */
   @java.lang.Override
@@ -7035,7 +7035,7 @@ public boolean hasSslConfig() {
    * <code>.google.cloud.alloydb.v1.SslConfig ssl_config = 18 [deprecated = true];</code>
    *
    * @deprecated google.cloud.alloydb.v1.Cluster.ssl_config is deprecated. See
-   *     google/cloud/alloydb/v1/resources.proto;l=717
+   *     google/cloud/alloydb/v1/resources.proto;l=722
    * @return The sslConfig.
    */
   @java.lang.Override
@@ -11812,7 +11812,7 @@ public com.google.cloud.alloydb.v1.Cluster.NetworkConfigOrBuilder getNetworkConf
      * </code>
      *
      * @deprecated google.cloud.alloydb.v1.Cluster.network is deprecated. See
-     *     google/cloud/alloydb/v1/resources.proto;l=682
+     *     google/cloud/alloydb/v1/resources.proto;l=687
      * @return The network.
      */
     @java.lang.Deprecated
@@ -11844,7 +11844,7 @@ public java.lang.String getNetwork() {
      * </code>
      *
      * @deprecated google.cloud.alloydb.v1.Cluster.network is deprecated. See
-     *     google/cloud/alloydb/v1/resources.proto;l=682
+     *     google/cloud/alloydb/v1/resources.proto;l=687
      * @return The bytes for network.
      */
     @java.lang.Deprecated
@@ -11876,7 +11876,7 @@ public com.google.protobuf.ByteString getNetworkBytes() {
      * </code>
      *
      * @deprecated google.cloud.alloydb.v1.Cluster.network is deprecated. See
-     *     google/cloud/alloydb/v1/resources.proto;l=682
+     *     google/cloud/alloydb/v1/resources.proto;l=687
      * @param value The network to set.
      * @return This builder for chaining.
      */
@@ -11907,7 +11907,7 @@ public Builder setNetwork(java.lang.String value) {
      * </code>
      *
      * @deprecated google.cloud.alloydb.v1.Cluster.network is deprecated. See
-     *     google/cloud/alloydb/v1/resources.proto;l=682
+     *     google/cloud/alloydb/v1/resources.proto;l=687
      * @return This builder for chaining.
      */
     @java.lang.Deprecated
@@ -11934,7 +11934,7 @@ public Builder clearNetwork() {
      * </code>
      *
      * @deprecated google.cloud.alloydb.v1.Cluster.network is deprecated. See
-     *     google/cloud/alloydb/v1/resources.proto;l=682
+     *     google/cloud/alloydb/v1/resources.proto;l=687
      * @param value The bytes for network to set.
      * @return This builder for chaining.
      */
@@ -12811,7 +12811,7 @@ public Builder clearAutomatedBackupPolicy() {
      * <code>.google.cloud.alloydb.v1.SslConfig ssl_config = 18 [deprecated = true];</code>
      *
      * @deprecated google.cloud.alloydb.v1.Cluster.ssl_config is deprecated. See
-     *     google/cloud/alloydb/v1/resources.proto;l=717
+     *     google/cloud/alloydb/v1/resources.proto;l=722
      * @return Whether the sslConfig field is set.
      */
     @java.lang.Deprecated
@@ -12829,7 +12829,7 @@ public boolean hasSslConfig() {
      * <code>.google.cloud.alloydb.v1.SslConfig ssl_config = 18 [deprecated = true];</code>
      *
      * @deprecated google.cloud.alloydb.v1.Cluster.ssl_config is deprecated. See
-     *     google/cloud/alloydb/v1/resources.proto;l=717
+     *     google/cloud/alloydb/v1/resources.proto;l=722
      * @return The sslConfig.
      */
     @java.lang.Deprecated

java-alloydb/proto-google-cloud-alloydb-v1/src/main/java/com/google/cloud/alloydb/v1/ClusterOrBuilder.java

@@ -572,7 +572,7 @@ java.lang.String getLabelsOrDefault(
    * </code>
    *
    * @deprecated google.cloud.alloydb.v1.Cluster.network is deprecated. See
-   *     google/cloud/alloydb/v1/resources.proto;l=682
+   *     google/cloud/alloydb/v1/resources.proto;l=687
    * @return The network.
    */
   @java.lang.Deprecated
@@ -594,7 +594,7 @@ java.lang.String getLabelsOrDefault(
    * </code>
    *
    * @deprecated google.cloud.alloydb.v1.Cluster.network is deprecated. See
-   *     google/cloud/alloydb/v1/resources.proto;l=682
+   *     google/cloud/alloydb/v1/resources.proto;l=687
    * @return The bytes for network.
    */
   @java.lang.Deprecated
@@ -827,7 +827,7 @@ java.lang.String getAnnotationsOrDefault(
    * <code>.google.cloud.alloydb.v1.SslConfig ssl_config = 18 [deprecated = true];</code>
    *
    * @deprecated google.cloud.alloydb.v1.Cluster.ssl_config is deprecated. See
-   *     google/cloud/alloydb/v1/resources.proto;l=717
+   *     google/cloud/alloydb/v1/resources.proto;l=722
    * @return Whether the sslConfig field is set.
    */
   @java.lang.Deprecated
@@ -843,7 +843,7 @@ java.lang.String getAnnotationsOrDefault(
    * <code>.google.cloud.alloydb.v1.SslConfig ssl_config = 18 [deprecated = true];</code>
    *
    * @deprecated google.cloud.alloydb.v1.Cluster.ssl_config is deprecated. See
-   *     google/cloud/alloydb/v1/resources.proto;l=717
+   *     google/cloud/alloydb/v1/resources.proto;l=722
    * @return The sslConfig.
    */
   @java.lang.Deprecated

java-alloydb/proto-google-cloud-alloydb-v1/src/main/java/com/google/cloud/alloydb/v1/DatabaseVersion.java

@@ -92,6 +92,16 @@ public enum DatabaseVersion implements com.google.protobuf.ProtocolMessageEnum {
    * <code>POSTGRES_17 = 5;</code>
    */
   POSTGRES_17(5),
+  /**
+   *
+   *
+   * <pre>
+   * The database version is Postgres 18.
+   * </pre>
+   *
+   * <code>POSTGRES_18 = 6;</code>
+   */
+  POSTGRES_18(6),
   UNRECOGNIZED(-1),
   ;
 
@@ -171,6 +181,17 @@ public enum DatabaseVersion implements com.google.protobuf.ProtocolMessageEnum {
    */
   public static final int POSTGRES_17_VALUE = 5;
 
+  /**
+   *
+   *
+   * <pre>
+   * The database version is Postgres 18.
+   * </pre>
+   *
+   * <code>POSTGRES_18 = 6;</code>
+   */
+  public static final int POSTGRES_18_VALUE = 6;
+
   public final int getNumber() {
     if (this == UNRECOGNIZED) {
       throw new java.lang.IllegalArgumentException(
@@ -207,6 +228,8 @@ public static DatabaseVersion forNumber(int value) {
         return POSTGRES_16;
       case 5:
         return POSTGRES_17;
+      case 6:
+        return POSTGRES_18;
       default:
         return null;
     }

java-alloydb/proto-google-cloud-alloydb-v1/src/main/java/com/google/cloud/alloydb/v1/ResourcesProto.java

@@ -793,34 +793,36 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\013ClusterView\022\034\n"
           + "\030CLUSTER_VIEW_UNSPECIFIED\020\000\022\026\n"
           + "\022CLUSTER_VIEW_BASIC\020\001\022\"\n"
-          + "\036CLUSTER_VIEW_CONTINUOUS_BACKUP\020\002*\214\001\n"
+          + "\036CLUSTER_VIEW_CONTINUOUS_BACKUP\020\002*\235\001\n"
           + "\017DatabaseVersion\022 \n"
           + "\034DATABASE_VERSION_UNSPECIFIED\020\000\022\023\n"
           + "\013POSTGRES_13\020\001\032\002\010\001\022\017\n"
           + "\013POSTGRES_14\020\002\022\017\n"
           + "\013POSTGRES_15\020\003\022\017\n"
           + "\013POSTGRES_16\020\004\022\017\n"
-          + "\013POSTGRES_17\020\005*N\n"
+          + "\013POSTGRES_17\020\005\022\017\n"
+          + "\013POSTGRES_18\020\006*N\n"
           + "\020SubscriptionType\022!\n"
           + "\035SUBSCRIPTION_TYPE_UNSPECIFIED\020\000\022\014\n"
           + "\010STANDARD\020\001\022\t\n"
           + "\005TRIAL\020\002B\247\005\n"
-          + "\033com.google.cloud.alloydb.v1B\016ResourcesProtoP\001Z5cloud.google.com/go/allo"
-          + "ydb/apiv1/alloydbpb;alloydbpb\252\002\027Google.C"
-          + "loud.AlloyDb.V1\312\002\027Google\\Cloud\\AlloyDb\\V1\352\002\032Google::Cloud::AlloyDB::V1\352A\246\001\n"
-          + "(cloudkms.googleapis.com/CryptoKeyVersion\022zpr",
-      "ojects/{project}/locations/{location}/ke"
-          + "yRings/{key_ring}/cryptoKeys/{crypto_key"
-          + "}/cryptoKeyVersions/{crypto_key_version}"
-          + "\352AN\n\036compute.googleapis.com/Network\022,pro"
-          + "jects/{project}/global/networks/{network"
-          + "}\352Ax\n!cloudkms.googleapis.com/CryptoKey\022"
-          + "Sprojects/{project}/locations/{location}"
-          + "/keyRings/{key_ring}/cryptoKeys/{crypto_"
-          + "key}\352Aw\n(compute.googleapis.com/ServiceA"
-          + "ttachment\022Kprojects/{project}/regions/{r"
-          + "egion}/serviceAttachments/{service_attac"
-          + "hment}b\006proto3"
+          + "\033com.google.cloud.alloydb.v1B\016ResourcesProtoP\001Z5cloud.g"
+          + "oogle.com/go/alloydb/apiv1/alloydbpb;all"
+          + "oydbpb\252\002\027Google.Cloud.AlloyDb.V1\312\002\027Googl"
+          + "e\\Cloud\\AlloyDb\\V1\352\002\032Google::Cloud::AlloyDB::V1\352A\246\001\n"
+          + "(cloudkms.googleapis.com/Cry",
+      "ptoKeyVersion\022zprojects/{project}/locati"
+          + "ons/{location}/keyRings/{key_ring}/crypt"
+          + "oKeys/{crypto_key}/cryptoKeyVersions/{cr"
+          + "ypto_key_version}\352AN\n\036compute.googleapis"
+          + ".com/Network\022,projects/{project}/global/"
+          + "networks/{network}\352Ax\n!cloudkms.googleap"
+          + "is.com/CryptoKey\022Sprojects/{project}/loc"
+          + "ations/{location}/keyRings/{key_ring}/cr"
+          + "yptoKeys/{crypto_key}\352Aw\n(compute.google"
+          + "apis.com/ServiceAttachment\022Kprojects/{pr"
+          + "oject}/regions/{region}/serviceAttachmen"
+          + "ts/{service_attachment}b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(

java-alloydb/proto-google-cloud-alloydb-v1/src/main/proto/google/cloud/alloydb/v1/resources.proto

@@ -11,6 +11,7 @@
 // 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.
+// LINT: LEGACY_NAMES
 
 syntax = "proto3";
 
@@ -103,6 +104,10 @@ enum DatabaseVersion {
 
   // The database version is Postgres 17.
   POSTGRES_17 = 5;
+
+  // The database version is Postgres 18.
+  POSTGRES_18 = 6;
+
 }
 
 // Subscription_type added to distinguish between Standard and Trial

java-bigquery-jdbc/.gitignore

@@ -7,4 +7,7 @@ target-it/**
 tools/**/*.class
 tools/**/drivers/**
 tools/**/logs/**
-tools/**/*.jfr
+tools/**/*.jfr
+
+# Gemini/Jetski agent custom skills
+.agents/

java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryArrowResultSet.java

@@ -21,6 +21,7 @@
 
 import com.google.cloud.bigquery.BigQuery;
 import com.google.cloud.bigquery.Field;
+import com.google.cloud.bigquery.Job;
 import com.google.cloud.bigquery.Schema;
 import com.google.cloud.bigquery.StandardSQLTypeName;
 import com.google.cloud.bigquery.exception.BigQueryJdbcException;
@@ -93,9 +94,10 @@ private BigQueryArrowResultSet(
       int fromIndex,
       int toIndexExclusive,
       Thread ownedThread,
-      BigQuery bigQuery)
+      BigQuery bigQuery,
+      Job job)
       throws SQLException {
-    super(bigQuery, statement, schema, isNested);
+    super(bigQuery, statement, schema, isNested, job);
     LOG.finestTrace("<init>");
     this.totalRows = totalRows;
     this.buffer = buffer;
@@ -128,6 +130,19 @@ static BigQueryArrowResultSet of(
       Thread ownedThread,
       BigQuery bigQuery)
       throws SQLException {
+    return of(schema, arrowSchema, totalRows, statement, buffer, ownedThread, bigQuery, null);
+  }
+
+  static BigQueryArrowResultSet of(
+      Schema schema,
+      ArrowSchema arrowSchema,
+      long totalRows,
+      BigQueryStatement statement,
+      BlockingQueue<BigQueryArrowBatchWrapper> buffer,
+      Thread ownedThread,
+      BigQuery bigQuery,
+      Job job)
+      throws SQLException {
     return new BigQueryArrowResultSet(
         schema,
         arrowSchema,
@@ -139,7 +154,8 @@ static BigQueryArrowResultSet of(
         -1,
         -1,
         ownedThread,
-        bigQuery);
+        bigQuery,
+        job);
   }
 
   BigQueryArrowResultSet() throws SQLException {
@@ -159,7 +175,18 @@ static BigQueryArrowResultSet getNestedResultSet(
       Schema schema, BigQueryArrowBatchWrapper nestedBatch, int fromIndex, int toIndexExclusive)
       throws SQLException {
     return new BigQueryArrowResultSet(
-        schema, null, -1, null, null, nestedBatch, true, fromIndex, toIndexExclusive, null, null);
+        schema,
+        null,
+        -1,
+        null,
+        null,
+        nestedBatch,
+        true,
+        fromIndex,
+        toIndexExclusive,
+        null,
+        null,
+        null);
   }
 
   private class ArrowDeserializer implements AutoCloseable {