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

Commit 576a92a

Browse files
committed
Merge branch 'main' into PR #3942 to update
2 parents 4ab5d38 + 7198340 commit 576a92a

10 files changed

Lines changed: 346 additions & 26 deletions

File tree

benchmark/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>google-cloud-bigquery-parent</artifactId>
88
<groupId>com.google.cloud</groupId>
9-
<version>2.57.1</version><!-- {x-version-update:google-cloud-bigquery:current} -->
9+
<version>2.57.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquery:current} -->
1010
</parent>
1111

1212
<properties>

google-cloud-bigquery-bom/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-bigquery-bom</artifactId>
6-
<version>2.57.1</version><!-- {x-version-update:google-cloud-bigquery:current} -->
6+
<version>2.57.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquery:current} -->
77
<packaging>pom</packaging>
88
<parent>
99
<groupId>com.google.cloud</groupId>
@@ -54,7 +54,7 @@
5454
<dependency>
5555
<groupId>com.google.cloud</groupId>
5656
<artifactId>google-cloud-bigquery</artifactId>
57-
<version>2.57.1</version><!-- {x-version-update:google-cloud-bigquery:current} -->
57+
<version>2.57.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquery:current} -->
5858
</dependency>
5959
</dependencies>
6060
</dependencyManagement>

google-cloud-bigquery/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-bigquery</artifactId>
6-
<version>2.57.1</version><!-- {x-version-update:google-cloud-bigquery:current} -->
6+
<version>2.57.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquery:current} -->
77
<packaging>jar</packaging>
88
<name>BigQuery</name>
99
<url>https://github.com/googleapis/java-bigquery</url>
1010
<description>BigQuery</description>
1111
<parent>
1212
<groupId>com.google.cloud</groupId>
1313
<artifactId>google-cloud-bigquery-parent</artifactId>
14-
<version>2.57.1</version><!-- {x-version-update:google-cloud-bigquery:current} -->
14+
<version>2.57.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquery:current} -->
1515
</parent>
1616
<properties>
1717
<site.installationModule>google-cloud-bigquery</site.installationModule>

google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryParameterValue.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -328,9 +328,9 @@ public static QueryParameterValue timestamp(Long value) {
328328
* <p>This method supports up to picosecond precision (12 digits) for timestamp. Input should
329329
* conform to ISO8601 format.
330330
*
331-
* <p>Must be in the format "yyyy-MM-dd HH:mm:ss.SSSSSS{SSSSSSS}ZZ", e.g. "2014-08-19
332-
* 12:41:35.123456+00:00" for microsecond precision and "2014-08-19 12:41:35.123456789123+00:00"
333-
* for picosecond precision
331+
* <p>Should be in the format "yyyy-MM-dd HH:mm:ss.SSSSSS{SSSSSSS}Z", e.g. "2014-08-19
332+
* 12:41:35.123456Z" for microsecond precision and "2014-08-19 12:41:35.123456789123Z" for
333+
* picosecond precision
334334
*/
335335
public static QueryParameterValue timestamp(String value) {
336336
return of(value, StandardSQLTypeName.TIMESTAMP);

google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/testing/RemoteBigQueryHelper.java

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,18 +120,27 @@ public static RemoteBigQueryHelper create(String projectId, InputStream keyStrea
120120
* credentials.
121121
*/
122122
public static RemoteBigQueryHelper create() {
123+
return create(BigQueryOptions.newBuilder());
124+
}
125+
126+
/**
127+
* Creates a {@code RemoteBigQueryHelper} object using default project id and authentication
128+
* credentials.
129+
*
130+
* @param bigqueryOptionsBuilder Custom BigqueryOptions.Builder with some pre-defined settings
131+
*/
132+
public static RemoteBigQueryHelper create(BigQueryOptions.Builder bigqueryOptionsBuilder) {
123133
HttpTransportOptions transportOptions = BigQueryOptions.getDefaultHttpTransportOptions();
124134
transportOptions =
125135
transportOptions.toBuilder()
126136
.setConnectTimeout(connectTimeout)
127137
.setReadTimeout(connectTimeout)
128138
.build();
129-
BigQueryOptions bigqueryOptions =
130-
BigQueryOptions.newBuilder()
139+
BigQueryOptions.Builder builder =
140+
bigqueryOptionsBuilder
131141
.setRetrySettings(retrySettings())
132-
.setTransportOptions(transportOptions)
133-
.build();
134-
return new RemoteBigQueryHelper(bigqueryOptions);
142+
.setTransportOptions(transportOptions);
143+
return new RemoteBigQueryHelper(builder.build());
135144
}
136145

137146
private static RetrySettings retrySettings() {

0 commit comments

Comments
 (0)