Skip to content

Commit 14ee56a

Browse files
whuffman36whuffman36
authored
Merge branch 'main' into otel
2 parents a5657ad + 63b8bdb commit 14ee56a

File tree

13 files changed

+45
-51
lines changed

13 files changed

+45
-51
lines changed

‎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.50.1</version><!-- {x-version-update:google-cloud-bigquery:current} -->
9+
<version>2.50.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.50.1</version><!-- {x-version-update:google-cloud-bigquery:current} -->
6+
<version>2.50.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.50.1</version><!-- {x-version-update:google-cloud-bigquery:current} -->
57+
<version>2.50.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.50.1</version><!-- {x-version-update:google-cloud-bigquery:current} -->
6+
<version>2.50.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.50.1</version><!-- {x-version-update:google-cloud-bigquery:current} -->
14+
<version>2.50.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/BigQueryImpl.java‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -496,27 +496,24 @@ public com.google.api.services.bigquery.model.Job call() throws IOException {
496496
createException = e;
497497
}
498498

499-
if (!idRandom) {
500-
if (createException instanceof BigQueryException
501-
&& createException.getCause() != null
502-
&& createException.getCause().getMessage() != null) {
503-
504-
/*GoogleJsonResponseException createExceptionCause =
505-
(GoogleJsonResponseException) createException.getCause();*/
506-
507-
Pattern pattern = Pattern.compile(".*Already.*Exists:.*Job.*", Pattern.CASE_INSENSITIVE);
508-
Matcher matcher = pattern.matcher(createException.getCause().getMessage());
509-
510-
if (matcher.find()) {
511-
// If the Job ALREADY EXISTS, retrieve it.
512-
Job job = this.getJob(jobInfo.getJobId(), JobOption.fields(JobField.STATISTICS));
513-
514-
long jobCreationTime = job.getStatistics().getCreationTime();
515-
long jobMinStaleTime = System.currentTimeMillis();
516-
long jobMaxStaleTime =
517-
java.time.Instant.ofEpochMilli(jobMinStaleTime)
518-
.minus(1, java.time.temporal.ChronoUnit.DAYS)
519-
.toEpochMilli();
499+
if (!idRandom) {
500+
if (createException instanceof BigQueryException
501+
&& createException.getCause() != null
502+
&& createException.getCause().getMessage() != null) {
503+
504+
Pattern pattern = Pattern.compile(".*Already.*Exists:.*Job.*", Pattern.CASE_INSENSITIVE);
505+
Matcher matcher = pattern.matcher(createException.getCause().getMessage());
506+
507+
if (matcher.find()) {
508+
// If the Job ALREADY EXISTS, retrieve it.
509+
Job job = this.getJob(jobInfo.getJobId(), JobOption.fields(JobField.STATISTICS));
510+
511+
long jobCreationTime = job.getStatistics().getCreationTime();
512+
long jobMinStaleTime = System.currentTimeMillis();
513+
long jobMaxStaleTime =
514+
java.time.Instant.ofEpochMilli(jobMinStaleTime)
515+
.minus(1, java.time.temporal.ChronoUnit.DAYS)
516+
.toEpochMilli();
520517

521518
// Only return the job if it has been created in the past 24 hours.
522519
// This is assuming any job older than 24 hours is a valid duplicate JobID

‎google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryJobConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ private Builder(com.google.api.services.bigquery.model.JobConfiguration configur
187187
this();
188188
JobConfigurationQuery queryConfigurationPb = configurationPb.getQuery();
189189
this.query = queryConfigurationPb.getQuery();
190-
// Allows to get undeclaredqueryparameters in jobstatistics2
190+
// Allows to get undeclared query parameters in jobstatistics
191191
if (queryConfigurationPb.getQueryParameters() == null
192192
&& queryConfigurationPb.getParameterMode() != null) {
193193
parameterMode = queryConfigurationPb.getParameterMode();

‎google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,8 @@ public Dataset createSkipExceptionTranslation(Dataset dataset, Map<Option, ?> op
208208
.insert(dataset.getDatasetReference().getProjectId(), dataset)
209209
.setPrettyPrint(false)
210210
.setFields(Option.FIELDS.getString(options));
211-
for (Map.Entry<Option, ?> entry : options.entrySet()) {
212-
if (entry.getKey() == Option.ACCESS_POLICY_VERSION && entry.getValue() != null) {
213-
bqCreateRequest.setAccessPolicyVersion((Integer) entry.getValue());
214-
}
211+
if (options.containsKey(Option.ACCESS_POLICY_VERSION)) {
212+
bqCreateRequest.setAccessPolicyVersion((Integer) options.get(Option.ACCESS_POLICY_VERSION));
215213
}
216214
return bqCreateRequest.execute();
217215
}

‎google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,7 +1383,7 @@ public void testUpdateDatasetWithSelectedFields() {
13831383
}
13841384

13851385
@Test
1386-
public void testUpdateDatabaseWithAccessPolicyVersion() throws IOException {
1386+
public void testUpdateDatasetWithAccessPolicyVersion() throws IOException {
13871387
String accessPolicyDataset = RemoteBigQueryHelper.generateDatasetName();
13881388
ServiceAccountCredentials credentials =
13891389
(ServiceAccountCredentials) GoogleCredentials.getApplicationDefault();
@@ -1876,7 +1876,7 @@ public void testCreateDatasetWithAccessPolicyVersion() throws IOException {
18761876
}
18771877

18781878
@Test(expected = BigQueryException.class)
1879-
public void testCreateDatabaseWithInvalidAccessPolicyVersion() throws IOException {
1879+
public void testCreateDatasetWithInvalidAccessPolicyVersion() throws IOException {
18801880
String accessPolicyDataset = RemoteBigQueryHelper.generateDatasetName();
18811881
ServiceAccountCredentials credentials =
18821882
(ServiceAccountCredentials) GoogleCredentials.getApplicationDefault();
@@ -4089,8 +4089,7 @@ public void testBQResultSetPagination() throws SQLException {
40894089
assertEquals(300000, cnt); // total 300000 rows should be read
40904090
}
40914091

4092-
// @Test - Temporarily disabling till https://github.com/googleapis/gax-java/issues/1712 or
4093-
// b/235591056 are resolved
4092+
@Test
40944093
public void testReadAPIIterationAndOrder()
40954094
throws SQLException { // use read API to read 300K records and check the order
40964095
String query =
@@ -4289,8 +4288,7 @@ public void testCreateDefaultConnection() throws BigQuerySQLException {
42894288
assertTrue(connection.close());
42904289
}
42914290

4292-
// @Test - Temporarily disabling till https://github.com/googleapis/gax-java/issues/1712 or
4293-
// b/235591056 are resolved
4291+
@Test
42944292
public void testReadAPIConnectionMultiClose()
42954293
throws
42964294
SQLException { // use read API to read 300K records, then closes the connection. This test

‎pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-bigquery-parent</artifactId>
66
<packaging>pom</packaging>
7-
<version>2.50.1</version><!-- {x-version-update:google-cloud-bigquery:current} -->
7+
<version>2.50.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquery:current} -->
88
<name>BigQuery Parent</name>
99
<url>https://github.com/googleapis/java-bigquery</url>
1010
<description>
@@ -54,7 +54,7 @@
5454
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
5555
<github.global.server>github</github.global.server>
5656
<site.installationModule>google-cloud-bigquery-parent</site.installationModule>
57-
<google-api-services-bigquery.version>v2-rev20250427-2.0.0</google-api-services-bigquery.version>
57+
<google-api-services-bigquery.version>v2-rev20250511-2.0.0</google-api-services-bigquery.version>
5858
</properties>
5959

6060
<dependencyManagement>
@@ -88,7 +88,7 @@
8888
<dependency>
8989
<groupId>com.google.cloud</groupId>
9090
<artifactId>google-cloud-datacatalog-bom</artifactId>
91-
<version>1.66.0</version>
91+
<version>1.69.0</version>
9292
<type>pom</type>
9393
<scope>import</scope>
9494
</dependency>
@@ -102,7 +102,7 @@
102102
<dependency>
103103
<groupId>com.google.cloud</groupId>
104104
<artifactId>google-cloud-bigquery</artifactId>
105-
<version>2.50.1</version><!-- {x-version-update:google-cloud-bigquery:current} -->
105+
<version>2.50.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquery:current} -->
106106
</dependency>
107107

108108
<dependency>
@@ -152,13 +152,13 @@
152152
<dependency>
153153
<groupId>com.google.cloud</groupId>
154154
<artifactId>google-cloud-bigqueryconnection</artifactId>
155-
<version>2.62.0</version>
155+
<version>2.65.0</version>
156156
<scope>test</scope>
157157
</dependency>
158158
<dependency>
159159
<groupId>com.google.api.grpc</groupId>
160160
<artifactId>proto-google-cloud-bigqueryconnection-v1</artifactId>
161-
<version>2.63.0</version>
161+
<version>2.65.0</version>
162162
<scope>test</scope>
163163
</dependency>
164164
</dependencies>

‎samples/install-without-bom/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@
6363
<dependency>
6464
<groupId>com.google.cloud</groupId>
6565
<artifactId>google-cloud-bigtable</artifactId>
66-
<version>2.58.2</version>
66+
<version>2.59.0</version>
6767
<scope>test</scope>
6868
</dependency>
6969
<dependency>
7070
<groupId>com.google.cloud</groupId>
7171
<artifactId>google-cloud-bigqueryconnection</artifactId>
72-
<version>2.62.0</version>
72+
<version>2.65.0</version>
7373
<scope>test</scope>
7474
</dependency>
7575
<dependency>

‎samples/snapshot/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>com.google.cloud</groupId>
4646
<artifactId>google-cloud-bigquery</artifactId>
47-
<version>2.50.1</version>
47+
<version>2.50.2-SNAPSHOT</version>
4848
</dependency>
4949
<!-- {x-version-update-end} -->
5050
<dependency>
@@ -61,13 +61,13 @@
6161
<dependency>
6262
<groupId>com.google.cloud</groupId>
6363
<artifactId>google-cloud-bigtable</artifactId>
64-
<version>2.58.2</version>
64+
<version>2.59.0</version>
6565
<scope>test</scope>
6666
</dependency>
6767
<dependency>
6868
<groupId>com.google.cloud</groupId>
6969
<artifactId>google-cloud-bigqueryconnection</artifactId>
70-
<version>2.62.0</version>
70+
<version>2.65.0</version>
7171
<scope>test</scope>
7272
</dependency>
7373
<dependency>

0 commit comments

Comments
 (0)