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

Commit 5819829

Browse files
logachevlogachev
committed
fix(jdbc): various minor perf improvements
1 parent 776caa1 commit 5819829

6 files changed

Lines changed: 83 additions & 27 deletions

File tree

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import com.google.cloud.bigquery.Job;
3333
import com.google.cloud.bigquery.JobInfo;
3434
import com.google.cloud.bigquery.QueryJobConfiguration;
35+
import com.google.cloud.bigquery.QueryJobConfiguration.JobCreationMode;
3536
import com.google.cloud.bigquery.exception.BigQueryJdbcException;
3637
import com.google.cloud.bigquery.exception.BigQueryJdbcRuntimeException;
3738
import com.google.cloud.bigquery.exception.BigQueryJdbcSqlFeatureNotSupportedException;
@@ -159,10 +160,10 @@ public class BigQueryConnection extends BigQueryNoOpsConnection {
159160
this.authProperties =
160161
BigQueryJdbcOAuthUtility.parseOAuthProperties(url, this.connectionClassName);
161162
this.catalog =
162-
BigQueryJdbcUrlUtility.parseStringProperty(
163+
BigQueryJdbcUrlUtility.parseStringPropertyLazyDefault(
163164
url,
164165
BigQueryJdbcUrlUtility.PROJECT_ID_PROPERTY_NAME,
165-
BigQueryOptions.getDefaultProjectId(),
166+
() -> BigQueryOptions.getDefaultProjectId(),
166167
this.connectionClassName);
167168
this.universeDomain =
168169
BigQueryJdbcUrlUtility.parseStringProperty(
@@ -1064,7 +1065,7 @@ private BigQuery getBigQueryConnection() {
10641065
}
10651066

10661067
BigQueryOptions options = bigQueryOptions.setHeaderProvider(HEADER_PROVIDER).build();
1067-
options.setQueryPreviewEnabled(String.valueOf(this.useStatelessQueryMode));
1068+
options.setDefaultJobCreationMode(this.useStatelessQueryMode ? JobCreationMode.JOB_CREATION_OPTIONAL : JobCreationMode.JOB_CREATION_REQUIRED);
10681069
return options.getService();
10691070
}
10701071

‎google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryConnectionProperty.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@
1717
package com.google.cloud.bigquery.jdbc;
1818

1919
import java.util.List;
20+
import java.util.function.Supplier;
2021

2122
class BigQueryConnectionProperty {
2223

2324
private final String name;
2425
private final String description;
2526
private final String defaultValue;
27+
private final Supplier<String> defaultValueSupplier;
2628
private final List<String> validValues;
2729

2830
public String getName() {
@@ -34,6 +36,9 @@ public String getDescription() {
3436
}
3537

3638
public String getDefaultValue() {
39+
if (defaultValueSupplier != null){
40+
return defaultValueSupplier.get();
41+
}
3742
return defaultValue;
3843
}
3944

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

4449
BigQueryConnectionProperty(Builder builder) {
4550
this.name = builder.name;
51+
this.defaultValueSupplier = builder.defaultValueSupplier;
4652
this.defaultValue = builder.defaultValue;
4753
this.description = builder.description;
4854
this.validValues = builder.validValues;
@@ -79,6 +85,7 @@ static final class Builder {
7985
private String name;
8086
private String description;
8187
private String defaultValue;
88+
private Supplier<String> defaultValueSupplier = null;
8289
private List<String> validValues;
8390

8491
private Builder(BigQueryConnectionProperty bigQueryConnectionProperty) {
@@ -105,6 +112,11 @@ Builder setDefaultValue(String defaultValue) {
105112
return this;
106113
}
107114

115+
Builder setLazyDefaultValue(Supplier<String> defaultValueSupplier) {
116+
this.defaultValueSupplier = defaultValueSupplier;
117+
return this;
118+
}
119+
108120
Builder setValidValues(List<String> validValues) {
109121
this.validValues = validValues;
110122
return this;

‎google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcOAuthUtility.java‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -331,11 +331,11 @@ private static boolean isFileExists(String filename) {
331331
}
332332
}
333333

334-
private static boolean isJson(String value) {
334+
private static boolean isJson(byte[] value) {
335335
try {
336336
// This is done this way to ensure strict Json parsing
337337
// https://github.com/google/gson/issues/1208#issuecomment-2120764686
338-
InputStream stream = new ByteArrayInputStream(value.getBytes());
338+
InputStream stream = new ByteArrayInputStream(value);
339339
InputStreamReader reader = new InputStreamReader(stream);
340340
JsonReader jsonReader = new JsonReader(reader);
341341
jsonReader.setStrictness(Strictness.STRICT);
@@ -366,16 +366,18 @@ private static GoogleCredentials getGoogleServiceAccountCredentials(
366366
final String keyPath = pvtKeyPath != null ? pvtKeyPath : pvtKey;
367367
PrivateKey key = null;
368368
InputStream stream = null;
369-
369+
byte[] keyBytes = pvtKey != null ? pvtKey.getBytes() : null;
370+
370371
if (isFileExists(keyPath)) {
371-
key = privateKeyFromP12File(keyPath, p12Password);
372-
if (key == null) {
373-
stream = Files.newInputStream(Paths.get(keyPath));
374-
}
375-
} else if (isJson(pvtKey)) {
376-
stream = new ByteArrayInputStream(pvtKey.getBytes());
372+
keyBytes = Files.readAllBytes(Paths.get(keyPath));
373+
}
374+
375+
if (isJson(keyBytes)) {
376+
stream = new ByteArrayInputStream(keyBytes);
377377
} else if (pvtKey != null) {
378378
key = privateKeyFromPkcs8(pvtKey);
379+
} else {
380+
key = privateKeyFromP12Bytes(keyBytes, p12Password);
379381
}
380382

381383
if (stream != null) {
@@ -703,9 +705,9 @@ private static GoogleCredentials getServiceAccountImpersonatedCredentials(
703705
impersonationLifetimeInt);
704706
}
705707

706-
static PrivateKey privateKeyFromP12File(String privateKeyFile, String password) {
708+
static PrivateKey privateKeyFromP12Bytes(byte[] privateKey, String password) {
707709
try {
708-
InputStream stream = Files.newInputStream(Paths.get(privateKeyFile));
710+
InputStream stream = new ByteArrayInputStream(privateKey);
709711
return SecurityUtils.loadPrivateKeyFromKeyStore(
710712
SecurityUtils.getPkcs12KeyStore(), stream, "notasecret", "privatekey", password);
711713
} catch (IOException | GeneralSecurityException e) {

‎google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcUrlUtility.java‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.util.List;
2727
import java.util.Map;
2828
import java.util.Map.Entry;
29+
import java.util.function.Supplier;
2930
import java.util.Properties;
3031
import java.util.Set;
3132
import java.util.logging.Level;
@@ -340,7 +341,7 @@ final class BigQueryJdbcUrlUtility {
340341
BigQueryConnectionProperty.newBuilder()
341342
.setName(PROJECT_ID_PROPERTY_NAME)
342343
.setDescription("A globally unique identifier for your project.")
343-
.setDefaultValue(BigQueryOptions.getDefaultProjectId())
344+
.setLazyDefaultValue(() -> BigQueryOptions.getDefaultProjectId())
344345
.build(),
345346
BigQueryConnectionProperty.newBuilder()
346347
.setName(LOG_PATH_PROPERTY_NAME)
@@ -680,6 +681,16 @@ static String parseStringProperty(
680681
return defaultValue;
681682
}
682683

684+
static String parseStringPropertyLazyDefault(
685+
String url, String propertyName, Supplier<String> defaultValueSupplier, String callerClassName) {
686+
LOG.finest("++enter++\t" + callerClassName);
687+
String parsedValue = BigQueryJdbcUrlUtility.parseUriProperty(url, propertyName);
688+
if (parsedValue != null) {
689+
return parsedValue;
690+
}
691+
return defaultValueSupplier.get();
692+
}
693+
683694
static List<String> parseStringListProperty(
684695
String url, String propertyName, String callerClassName) {
685696
LOG.finest("++enter++\t" + callerClassName);

‎google-cloud-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryConnectionTest.java‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
2222
import com.google.api.gax.rpc.HeaderProvider;
2323
import com.google.api.gax.rpc.TransportChannelProvider;
24+
import com.google.cloud.bigquery.BigQuery;
25+
import com.google.cloud.bigquery.QueryJobConfiguration.JobCreationMode;
2426
import com.google.cloud.bigquery.exception.BigQueryJdbcException;
2527
import com.google.cloud.bigquery.storage.v1.BigQueryReadClient;
2628
import com.google.cloud.bigquery.storage.v1.BigQueryWriteClient;
@@ -381,4 +383,37 @@ public void testBigQueryReadClientKeepAliveSettings() throws SQLException, IOExc
381383
assertTrue(grpcProvider.getKeepAliveWithoutCalls());
382384
}
383385
}
386+
387+
@Test
388+
public void testBigQueryJobCreationMode_required() throws Exception {
389+
String url =
390+
"jdbc:bigquery://https://www.googleapis.com/bigquery/v2:443;"
391+
+ "OAuthType=3;JobCreationMode=1;";
392+
try (BigQueryConnection connection = new BigQueryConnection(url)) {
393+
BigQuery bq = connection.getBigQuery();
394+
assertEquals(bq.getOptions().getDefaultJobCreationMode(), JobCreationMode.JOB_CREATION_REQUIRED);
395+
}
396+
}
397+
398+
@Test
399+
public void testBigQueryJobCreationMode_optional() throws Exception {
400+
String url =
401+
"jdbc:bigquery://https://www.googleapis.com/bigquery/v2:443;"
402+
+ "OAuthType=3;JobCreationMode=2;";
403+
try (BigQueryConnection connection = new BigQueryConnection(url)) {
404+
BigQuery bq = connection.getBigQuery();
405+
assertEquals(bq.getOptions().getDefaultJobCreationMode(), JobCreationMode.JOB_CREATION_OPTIONAL);
406+
}
407+
}
408+
409+
@Test
410+
public void testBigQueryJobCreationMode_default() throws Exception {
411+
String url =
412+
"jdbc:bigquery://https://www.googleapis.com/bigquery/v2:443;"
413+
+ "OAuthType=3;";
414+
try (BigQueryConnection connection = new BigQueryConnection(url)) {
415+
BigQuery bq = connection.getBigQuery();
416+
assertEquals(bq.getOptions().getDefaultJobCreationMode(), JobCreationMode.JOB_CREATION_OPTIONAL);
417+
}
418+
}
384419
}

‎google-cloud-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcOAuthUtilityTest.java‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import java.net.URI;
3333
import java.net.URISyntaxException;
3434
import java.net.URL;
35+
import java.nio.file.Files;
3536
import java.nio.file.Paths;
3637
import java.security.PrivateKey;
3738
import java.util.Collections;
@@ -472,31 +473,25 @@ public void testPrivateKeyFromPkcs8_wrong() {
472473
// keytool -genkey -alias privatekey -keyalg RSA -keysize 2048 -storepass notasecret \
473474
// -keypass notasecret -storetype pkcs12 -keystore ./fake.p12
474475
@Test
475-
public void testPrivateKeyFromP12File() {
476+
public void testPrivateKeyFromP12Bytes() {
476477
URL resource = BigQueryJdbcOAuthUtilityTest.class.getResource("/fake.p12");
477478
try {
478479
PrivateKey pk =
479-
BigQueryJdbcOAuthUtility.privateKeyFromP12File(
480-
Paths.get(resource.toURI()).toAbsolutePath().toString(), "notasecret");
480+
BigQueryJdbcOAuthUtility.privateKeyFromP12Bytes(
481+
Files.readAllBytes(Paths.get(resource.toURI())), "notasecret");
481482
assertNotNull(pk);
482483
} catch (Exception e) {
483484
assertTrue(false);
484485
}
485486
}
486487

487488
@Test
488-
public void testPrivateKeyFromP12File_missing_file() {
489-
PrivateKey pk = BigQueryJdbcOAuthUtility.privateKeyFromP12File("", "");
490-
assertNull(pk);
491-
}
492-
493-
@Test
494-
public void testPrivateKeyFromP12File_wrong_password() {
489+
public void testPrivateKeyFromP12Bytes_wrong_password() {
495490
URL resource = BigQueryJdbcOAuthUtilityTest.class.getResource("/fake.p12");
496491
try {
497492
PrivateKey pk =
498-
BigQueryJdbcOAuthUtility.privateKeyFromP12File(
499-
Paths.get(resource.toURI()).toAbsolutePath().toString(), "fake");
493+
BigQueryJdbcOAuthUtility.privateKeyFromP12Bytes(
494+
Files.readAllBytes(Paths.get(resource.toURI())), "fake");
500495
assertNull(pk);
501496
} catch (Exception e) {
502497
assertTrue(false);

0 commit comments

Comments
 (0)