Skip to content
This repository was archived by the owner on Mar 23, 2026. It is now read-only.

fix(jdbc): various perf improvements #4114

Merged
logachev merged 4 commits into from
Mar 6, 2026
Merged

fix(jdbc): various perf improvements #4114

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5819829
fix(jdbc): various minor perf improvements
logachev Feb 24, 2026
27bcfaf
lint + fix unittest
logachev Mar 4, 2026
e119f74
Merge branch 'main' into kirl/minor_perf_improvements
logachev Mar 4, 2026
9db3f68
Fix reading
logachev Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions ...-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import com.google.cloud.bigquery.Job;
import com.google.cloud.bigquery.JobInfo;
import com.google.cloud.bigquery.QueryJobConfiguration;
import com.google.cloud.bigquery.QueryJobConfiguration.JobCreationMode;
import com.google.cloud.bigquery.exception.BigQueryJdbcException;
import com.google.cloud.bigquery.exception.BigQueryJdbcRuntimeException;
import com.google.cloud.bigquery.exception.BigQueryJdbcSqlFeatureNotSupportedException;
Expand Down Expand Up @@ -159,10 +160,10 @@ public class BigQueryConnection extends BigQueryNoOpsConnection {
this.authProperties =
BigQueryJdbcOAuthUtility.parseOAuthProperties(url, this.connectionClassName);
this.catalog =
BigQueryJdbcUrlUtility.parseStringProperty(
BigQueryJdbcUrlUtility.parseStringPropertyLazyDefault(
url,
BigQueryJdbcUrlUtility.PROJECT_ID_PROPERTY_NAME,
BigQueryOptions.getDefaultProjectId(),
() -> BigQueryOptions.getDefaultProjectId(),
this.connectionClassName);
this.universeDomain =
BigQueryJdbcUrlUtility.parseStringProperty(
Expand Down Expand Up @@ -1064,7 +1065,10 @@ private BigQuery getBigQueryConnection() {
}

BigQueryOptions options = bigQueryOptions.setHeaderProvider(HEADER_PROVIDER).build();
options.setQueryPreviewEnabled(String.valueOf(this.useStatelessQueryMode));
options.setDefaultJobCreationMode(
this.useStatelessQueryMode
? JobCreationMode.JOB_CREATION_OPTIONAL
: JobCreationMode.JOB_CREATION_REQUIRED);
return options.getService();
}

Expand Down
12 changes: 12 additions & 0 deletions ...igquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryConnectionProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@
package com.google.cloud.bigquery.jdbc;

import java.util.List;
import java.util.function.Supplier;

class BigQueryConnectionProperty {

private final String name;
private final String description;
private final String defaultValue;
private final Supplier<String> defaultValueSupplier;
private final List<String> validValues;

public String getName() {
Expand All @@ -34,6 +36,9 @@ public String getDescription() {
}

public String getDefaultValue() {
if (defaultValueSupplier != null) {
return defaultValueSupplier.get();
}
return defaultValue;
}

Expand All @@ -43,6 +48,7 @@ public List<String> getValidValues() {

BigQueryConnectionProperty(Builder builder) {
this.name = builder.name;
this.defaultValueSupplier = builder.defaultValueSupplier;
this.defaultValue = builder.defaultValue;
this.description = builder.description;
this.validValues = builder.validValues;
Expand Down Expand Up @@ -79,6 +85,7 @@ static final class Builder {
private String name;
private String description;
private String defaultValue;
private Supplier<String> defaultValueSupplier = null;
private List<String> validValues;

private Builder(BigQueryConnectionProperty bigQueryConnectionProperty) {
Expand All @@ -105,6 +112,11 @@ Builder setDefaultValue(String defaultValue) {
return this;
}

Builder setLazyDefaultValue(Supplier<String> defaultValueSupplier) {
this.defaultValueSupplier = defaultValueSupplier;
return this;
}

Builder setValidValues(List<String> validValues) {
this.validValues = validValues;
return this;
Expand Down
27 changes: 16 additions & 11 deletions ...-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcOAuthUtility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import java.awt.Desktop;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
Expand Down Expand Up @@ -331,11 +332,11 @@ private static boolean isFileExists(String filename) {
}
}

private static boolean isJson(String value) {
private static boolean isJson(byte[] value) {
try {
// This is done this way to ensure strict Json parsing
// https://github.com/google/gson/issues/1208#issuecomment-2120764686
InputStream stream = new ByteArrayInputStream(value.getBytes());
InputStream stream = new ByteArrayInputStream(value);
InputStreamReader reader = new InputStreamReader(stream);
JsonReader jsonReader = new JsonReader(reader);
jsonReader.setStrictness(Strictness.STRICT);
Expand Down Expand Up @@ -365,17 +366,21 @@ private static GoogleCredentials getGoogleServiceAccountCredentials(

final String keyPath = pvtKeyPath != null ? pvtKeyPath : pvtKey;
PrivateKey key = null;
InputStream stream = null;
byte[] keyBytes = pvtKey != null ? pvtKey.getBytes() : null;

if (isFileExists(keyPath)) {
key = privateKeyFromP12File(keyPath, p12Password);
if (key == null) {
stream = Files.newInputStream(Paths.get(keyPath));
}
} else if (isJson(pvtKey)) {
stream = new ByteArrayInputStream(pvtKey.getBytes());
InputStream stream = new FileInputStream(keyPath);
keyBytes = stream.readNBytes(1024 * 1024);
stream.close();

@gemini-code-assist gemini-code-assist Bot Mar 4, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

security-medium medium

A resource leak vulnerability exists in the getGoogleServiceAccountCredentials method. The FileInputStream is not properly closed in a finally block or with a try-with-resources statement, which can lead to file descriptor exhaustion if an exception occurs during stream.readNBytes(). It's recommended to use a try-with-resources statement to ensure the stream is always closed correctly.

Suggested change
InputStream stream = new FileInputStream(keyPath);
keyBytes = stream.readNBytes(1024 * 1024);
stream.close();
try (InputStream stream = new FileInputStream(keyPath)) {
keyBytes = stream.readNBytes(1024 * 1024);
}

}

InputStream stream = null;
if (isJson(keyBytes)) {
stream = new ByteArrayInputStream(keyBytes);
} else if (pvtKey != null) {
key = privateKeyFromPkcs8(pvtKey);
} else {
key = privateKeyFromP12Bytes(keyBytes, p12Password);

@gemini-code-assist gemini-code-assist Bot Mar 4, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

security-medium medium

The getGoogleServiceAccountCredentials method can throw a NullPointerException if keyBytes is null, which happens when OAuthType=0 (Service Account) is specified in the connection URL but no private key or key path is provided. This NPE occurs in privateKeyFromP12Bytes when calling new ByteArrayInputStream(privateKey) and is not caught, leading to an application crash (Denial of Service).

}
Comment thread
logachev marked this conversation as resolved.

if (stream != null) {
Expand Down Expand Up @@ -703,9 +708,9 @@ private static GoogleCredentials getServiceAccountImpersonatedCredentials(
impersonationLifetimeInt);
}

static PrivateKey privateKeyFromP12File(String privateKeyFile, String password) {
static PrivateKey privateKeyFromP12Bytes(byte[] privateKey, String password) {
try {
InputStream stream = Files.newInputStream(Paths.get(privateKeyFile));
InputStream stream = new ByteArrayInputStream(privateKey);
return SecurityUtils.loadPrivateKeyFromKeyStore(
SecurityUtils.getPkcs12KeyStore(), stream, "notasecret", "privatekey", password);
} catch (IOException | GeneralSecurityException e) {
Expand Down
16 changes: 15 additions & 1 deletion ...ud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcUrlUtility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
import java.util.function.Supplier;
import java.util.logging.Level;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
Expand Down Expand Up @@ -358,7 +359,7 @@ protected boolean removeEldestEntry(Map.Entry<String, Map<String, String>> eldes
BigQueryConnectionProperty.newBuilder()
.setName(PROJECT_ID_PROPERTY_NAME)
.setDescription("A globally unique identifier for your project.")
.setDefaultValue(BigQueryOptions.getDefaultProjectId())
.setLazyDefaultValue(() -> BigQueryOptions.getDefaultProjectId())
.build(),
BigQueryConnectionProperty.newBuilder()
.setName(LOG_PATH_PROPERTY_NAME)
Expand Down Expand Up @@ -790,6 +791,19 @@ static String parseStringProperty(
return defaultValue;
}

static String parseStringPropertyLazyDefault(
String url,
String propertyName,
Supplier<String> defaultValueSupplier,
String callerClassName) {
LOG.finest("++enter++\t" + callerClassName);
String parsedValue = BigQueryJdbcUrlUtility.parseUriProperty(url, propertyName);
if (parsedValue != null) {
return parsedValue;
}
return defaultValueSupplier.get();
}

static List<String> parseStringListProperty(
String url, String propertyName, String callerClassName) {
LOG.finest("++enter++\t" + callerClassName);
Expand Down
35 changes: 35 additions & 0 deletions ...ud-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryConnectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
import com.google.api.gax.rpc.HeaderProvider;
import com.google.api.gax.rpc.TransportChannelProvider;
import com.google.cloud.bigquery.BigQuery;
import com.google.cloud.bigquery.QueryJobConfiguration.JobCreationMode;
import com.google.cloud.bigquery.exception.BigQueryJdbcException;
import com.google.cloud.bigquery.storage.v1.BigQueryReadClient;
import com.google.cloud.bigquery.storage.v1.BigQueryWriteClient;
Expand All @@ -38,6 +40,9 @@ public class BigQueryConnectionTest {

private static final String DEFAULT_VERSION = "0.0.0";
private static final String DEFAULT_JDBC_TOKEN_VALUE = "Google-BigQuery-JDBC-Driver";
private static final String BASE_URL =
"jdbc:bigquery://https://www.googleapis.com/bigquery/v2:443;"
+ "OAuthType=2;OAuthAccessToken=redacted;ProjectId=project;";
private String expectedVersion;

@Before
Expand Down Expand Up @@ -381,4 +386,34 @@ public void testBigQueryReadClientKeepAliveSettings() throws SQLException, IOExc
assertTrue(grpcProvider.getKeepAliveWithoutCalls());
}
}

@Test
public void testBigQueryJobCreationMode_required() throws Exception {
String url = BASE_URL + "JobCreationMode=1;";
try (BigQueryConnection connection = new BigQueryConnection(url)) {
BigQuery bq = connection.getBigQuery();
assertEquals(
bq.getOptions().getDefaultJobCreationMode(), JobCreationMode.JOB_CREATION_REQUIRED);
}
}

@Test
public void testBigQueryJobCreationMode_optional() throws Exception {
String url = BASE_URL + "JobCreationMode=2;";
try (BigQueryConnection connection = new BigQueryConnection(url)) {
BigQuery bq = connection.getBigQuery();
assertEquals(
bq.getOptions().getDefaultJobCreationMode(), JobCreationMode.JOB_CREATION_OPTIONAL);
}
}

@Test
public void testBigQueryJobCreationMode_default() throws Exception {
String url = BASE_URL;
try (BigQueryConnection connection = new BigQueryConnection(url)) {
BigQuery bq = connection.getBigQuery();
assertEquals(
bq.getOptions().getDefaultJobCreationMode(), JobCreationMode.JOB_CREATION_OPTIONAL);
}
}
}
19 changes: 7 additions & 12 deletions ...query-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcOAuthUtilityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.security.PrivateKey;
import java.util.Collections;
Expand Down Expand Up @@ -472,31 +473,25 @@ public void testPrivateKeyFromPkcs8_wrong() {
// keytool -genkey -alias privatekey -keyalg RSA -keysize 2048 -storepass notasecret \
// -keypass notasecret -storetype pkcs12 -keystore ./fake.p12
@Test
public void testPrivateKeyFromP12File() {
public void testPrivateKeyFromP12Bytes() {
URL resource = BigQueryJdbcOAuthUtilityTest.class.getResource("/fake.p12");
try {
PrivateKey pk =
BigQueryJdbcOAuthUtility.privateKeyFromP12File(
Paths.get(resource.toURI()).toAbsolutePath().toString(), "notasecret");
BigQueryJdbcOAuthUtility.privateKeyFromP12Bytes(
Files.readAllBytes(Paths.get(resource.toURI())), "notasecret");
assertNotNull(pk);
} catch (Exception e) {
assertTrue(false);
}
}

@Test
public void testPrivateKeyFromP12File_missing_file() {
PrivateKey pk = BigQueryJdbcOAuthUtility.privateKeyFromP12File("", "");
assertNull(pk);
}

@Test
public void testPrivateKeyFromP12File_wrong_password() {
public void testPrivateKeyFromP12Bytes_wrong_password() {
URL resource = BigQueryJdbcOAuthUtilityTest.class.getResource("/fake.p12");
try {
PrivateKey pk =
BigQueryJdbcOAuthUtility.privateKeyFromP12File(
Paths.get(resource.toURI()).toAbsolutePath().toString(), "fake");
BigQueryJdbcOAuthUtility.privateKeyFromP12Bytes(
Files.readAllBytes(Paths.get(resource.toURI())), "fake");
assertNull(pk);
} catch (Exception e) {
assertTrue(false);
Expand Down
Loading