Merge branch 'main' into migrate-java-cloud-bom

Author: jinseopkim0

java-bigquery-jdbc/pom.xml

@@ -157,6 +157,10 @@
                       <pattern>org.json</pattern>
                       <shadedPattern>com.google.bqjdbc.shaded.org.json</shadedPattern>
                     </relocation>
+                    <relocation>
+                      <pattern>org.slf4j</pattern>
+                      <shadedPattern>com.google.bqjdbc.shaded.org.slf4j</shadedPattern>
+                    </relocation>
                     <relocation>
                       <pattern>io.grpc</pattern>
                       <shadedPattern>com.google.bqjdbc.shaded.io.grpc</shadedPattern>

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

@@ -362,15 +362,13 @@ public class BigQueryConnection extends BigQueryNoOpsConnection {
 
       this.headerProvider = createHeaderProvider();
       this.bigQuery = getBigQueryConnection();
-      // Fixed thread pool queues tasks to limit concurrent metadata calls and prevent API
-      // throttling.
-      this.metadataExecutor =
-          BigQueryJdbcMdc.newFixedThreadPool(
-              String.format("BQ-Metadata-%s", connectionId), metadataFetchThreadCount);
       // Cached pool executes queries immediately without queueing and reclaims all idle threads
       // when inactive, minimizing resources.
       this.queryExecutor =
           BigQueryJdbcMdc.newCachedThreadPool(String.format("BQ-Query-%s", connectionId));
+      this.metadataExecutor =
+          BigQueryJdbcMdc.newFixedThreadPool(
+              String.format("BQ-Metadata-%s", connectionId), this.metadataFetchThreadCount);
     }
   }
 

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

@@ -18,6 +18,7 @@
 
 import com.google.cloud.bigquery.exception.BigQueryJdbcException;
 import com.google.cloud.bigquery.exception.BigQueryJdbcRuntimeException;
+import com.google.cloud.bigquery.jdbc.utils.BigQueryJdbcVersionUtility;
 import io.grpc.LoadBalancerRegistry;
 import io.grpc.internal.PickFirstLoadBalancerProvider;
 import java.io.IOException;
@@ -55,9 +56,6 @@ public class BigQueryDriver implements Driver {
 
   private static final BigQueryJdbcCustomLogger LOG =
       new BigQueryJdbcCustomLogger(BigQueryDriver.class.getName());
-  // TODO: update this when JDBC goes GA
-  private static final int JDBC_MAJOR_VERSION = 0;
-  private static final int JDBC_MINOR_VERSION = 1;
   static BigQueryDriver registeredBigqueryJdbcDriver;
 
   static {
@@ -243,13 +241,13 @@ public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) {
   @Override
   public int getMajorVersion() {
     LOG.finest("++enter++");
-    return JDBC_MAJOR_VERSION;
+    return BigQueryJdbcVersionUtility.getDriverMajorVersion();
   }
 
   @Override
   public int getMinorVersion() {
     LOG.finest("++enter++");
-    return JDBC_MINOR_VERSION;
+    return BigQueryJdbcVersionUtility.getDriverMinorVersion();
   }
 
   @Override

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

@@ -109,6 +109,23 @@ static BigQueryJsonResultSet of(
         schema, totalRows, buffer, statement, false, null, -1, -1, ownedTasks, null, null);
   }
 
+  static BigQueryJsonResultSet of(
+      Schema schema,
+      long totalRows,
+      BlockingQueue<BigQueryFieldValueListWrapper> buffer,
+      BigQueryStatement statement,
+      Future<?> ownedTask) {
+    return of(schema, totalRows, buffer, statement, new Future<?>[] {ownedTask});
+  }
+
+  static BigQueryJsonResultSet of(
+      Schema schema,
+      long totalRows,
+      BlockingQueue<BigQueryFieldValueListWrapper> buffer,
+      BigQueryStatement statement) {
+    return of(schema, totalRows, buffer, statement, (Future<?>[]) null);
+  }
+
   BigQueryJsonResultSet() {
     super(null, null, null, false);
     totalRows = 0;

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

@@ -0,0 +1,90 @@
+/*
+ * Copyright 2026 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
+ *
+ * http://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.
+ */
+
+package com.google.cloud.bigquery.jdbc.utils;
+
+import com.google.cloud.bigquery.jdbc.BigQueryJdbcCustomLogger;
+import java.io.InputStream;
+import java.util.Properties;
+
+/** Utility class to load and parse the JDBC driver version from dependencies.properties. */
+public final class BigQueryJdbcVersionUtility {
+
+  private static final BigQueryJdbcCustomLogger LOG =
+      new BigQueryJdbcCustomLogger(BigQueryJdbcVersionUtility.class.getName());
+
+  private static final String DRIVER_VERSION;
+  private static final int DRIVER_MAJOR_VERSION;
+  private static final int DRIVER_MINOR_VERSION;
+
+  static {
+    String version = "0.0.0";
+    int major = 0;
+    int minor = 0;
+    try (InputStream input =
+        BigQueryJdbcVersionUtility.class.getResourceAsStream(
+            "/com/google/cloud/bigquery/jdbc/dependencies.properties")) {
+      if (input == null) {
+        throw new IllegalArgumentException(
+            "Could not find dependencies.properties. Driver version information is unavailable.");
+      }
+
+      Properties props = new Properties();
+      props.load(input);
+      String versionString = props.getProperty("version.jdbc");
+      if (versionString == null || versionString.trim().isEmpty()) {
+        throw new IllegalArgumentException(
+            "The property version.jdbc not found or empty in dependencies.properties.");
+      }
+
+      version = versionString.trim();
+      String[] parts = version.split("\\.");
+      if (parts.length < 2) {
+        throw new IllegalArgumentException("Unexpected version format: " + versionString);
+      }
+      major = Integer.parseInt(parts[0]);
+      String minorPart = parts[1];
+      String numericMinor = minorPart.replaceAll("[^0-9].*", "");
+      if (!numericMinor.isEmpty()) {
+        minor = Integer.parseInt(numericMinor);
+      }
+    } catch (Exception e) {
+      LOG.severe(
+          "Error reading dependencies.properties. Driver version information is unavailable. Error: "
+              + e.getMessage(),
+          e);
+    }
+    DRIVER_VERSION = version;
+    DRIVER_MAJOR_VERSION = major;
+    DRIVER_MINOR_VERSION = minor;
+  }
+
+  private BigQueryJdbcVersionUtility() {
+    // Utility class, static methods only.
+  }
+
+  public static String getDriverVersion() {
+    return DRIVER_VERSION;
+  }
+
+  public static int getDriverMajorVersion() {
+    return DRIVER_MAJOR_VERSION;
+  }
+
+  public static int getDriverMinorVersion() {
+    return DRIVER_MINOR_VERSION;
+  }
+}