Skip to content

Commit 3cfd0a0

Browse files
logachevlogachev
authored
Merge branch 'main' into kirl/jdbc_presubmit
2 parents 4bf7bab + bd5835f commit 3cfd0a0

File tree

9 files changed

+100
-71
lines changed

9 files changed

+100
-71
lines changed

‎CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Changelog
22

3+
## [2.57.2](https://github.com/googleapis/java-bigquery/compare/v2.57.1...v2.57.2) (2026-01-16)
4+
5+
6+
### Bug Fixes
7+
8+
* Gracefully handle thread interruption in ConnectionImpl to preve… ([#4047](https://github.com/googleapis/java-bigquery/issues/4047)) ([031deb0](https://github.com/googleapis/java-bigquery/commit/031deb00f153b47d37655b025fcef298a3db0e0b))
9+
* Job.isDone() uses Job.Status.State if available ([#4039](https://github.com/googleapis/java-bigquery/issues/4039)) ([fa0a12e](https://github.com/googleapis/java-bigquery/commit/fa0a12e3cf171abab528c318ba3f4260b69a5274))
10+
11+
12+
### Documentation
13+
14+
* Add specific samples for creating and query timestamps ([#4051](https://github.com/googleapis/java-bigquery/issues/4051)) ([fac16a8](https://github.com/googleapis/java-bigquery/commit/fac16a8eb05a6e13e406feeb9761259cdbf8e674))
15+
316
## [2.57.1](https://github.com/googleapis/java-bigquery/compare/v2.57.0...v2.57.1) (2025-12-12)
417

518

‎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.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquery:current} -->
9+
<version>2.57.2</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.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquery:current} -->
6+
<version>2.57.2</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.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquery:current} -->
57+
<version>2.57.2</version><!-- {x-version-update:google-cloud-bigquery:current} -->
5858
</dependency>
5959
</dependencies>
6060
</dependencyManagement>

‎google-cloud-bigquery-jdbc/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<parent>
7474
<groupId>com.google.cloud</groupId>
7575
<artifactId>google-cloud-bigquery-parent</artifactId>
76-
<version>2.57.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquery:current} -->
76+
<version>2.57.2</version><!-- {x-version-update:google-cloud-bigquery:current} -->
7777
</parent>
7878
<dependencies>
7979
<dependency>

‎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.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquery:current} -->
6+
<version>2.57.2</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.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquery:current} -->
14+
<version>2.57.2</version><!-- {x-version-update:google-cloud-bigquery:current} -->
1515
</parent>
1616
<properties>
1717
<site.installationModule>google-cloud-bigquery</site.installationModule>

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

Lines changed: 77 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,6 @@ class ITBigQueryTest {
223223
private static final String DATASET = RemoteBigQueryHelper.generateDatasetName();
224224
private static final String UK_DATASET = RemoteBigQueryHelper.generateDatasetName();
225225
private static final String DESCRIPTION = "Test dataset";
226-
private static final String OTHER_DATASET = RemoteBigQueryHelper.generateDatasetName();
227226
private static final String MODEL_DATASET = RemoteBigQueryHelper.generateDatasetName();
228227
private static final String ROUTINE_DATASET = RemoteBigQueryHelper.generateDatasetName();
229228
private static final String PROJECT_ID = ServiceOptions.getDefaultProjectId();
@@ -1190,7 +1189,6 @@ static void afterClass() throws Exception {
11901189
if (bigquery != null) {
11911190
RemoteBigQueryHelper.forceDelete(bigquery, DATASET);
11921191
RemoteBigQueryHelper.forceDelete(bigquery, UK_DATASET);
1193-
RemoteBigQueryHelper.forceDelete(bigquery, OTHER_DATASET);
11941192
RemoteBigQueryHelper.forceDelete(bigquery, MODEL_DATASET);
11951193
RemoteBigQueryHelper.forceDelete(bigquery, ROUTINE_DATASET);
11961194
}
@@ -1347,67 +1345,76 @@ void testGetDatasetWithAccessPolicyVersion() throws IOException {
13471345

13481346
@Test
13491347
void testUpdateDataset() {
1348+
String datasetName = RemoteBigQueryHelper.generateDatasetName();
13501349
Dataset dataset =
13511350
bigquery.create(
1352-
DatasetInfo.newBuilder(OTHER_DATASET)
1351+
DatasetInfo.newBuilder(datasetName)
13531352
.setDescription("Some Description")
13541353
.setLabels(Collections.singletonMap("a", "b"))
13551354
.build());
1356-
assertThat(dataset).isNotNull();
1357-
assertThat(dataset.getDatasetId().getProject()).isEqualTo(bigquery.getOptions().getProjectId());
1358-
assertThat(dataset.getDatasetId().getDataset()).isEqualTo(OTHER_DATASET);
1359-
assertThat(dataset.getDescription()).isEqualTo("Some Description");
1360-
assertThat(dataset.getLabels()).containsExactly("a", "b");
1361-
assertThat(dataset.getStorageBillingModel()).isNull();
1362-
assertThat(dataset.getMaxTimeTravelHours()).isNull();
1363-
1364-
Map<String, String> updateLabels = new HashMap<>();
1365-
updateLabels.put("x", "y");
1366-
updateLabels.put("a", null);
1367-
Dataset updatedDataset =
1368-
bigquery.update(
1369-
dataset.toBuilder()
1370-
.setDescription("Updated Description")
1371-
.setLabels(updateLabels)
1372-
.setStorageBillingModel("LOGICAL")
1373-
.setMaxTimeTravelHours(MAX_TIME_TRAVEL_HOURS)
1374-
.build());
1375-
assertThat(updatedDataset.getDescription()).isEqualTo("Updated Description");
1376-
assertThat(updatedDataset.getLabels()).containsExactly("x", "y");
1377-
assertThat(updatedDataset.getStorageBillingModel()).isEqualTo("LOGICAL");
1378-
assertThat(updatedDataset.getMaxTimeTravelHours()).isEqualTo(MAX_TIME_TRAVEL_HOURS);
1379-
1380-
updatedDataset = bigquery.update(updatedDataset.toBuilder().setLabels(null).build());
1381-
assertThat(updatedDataset.getLabels()).isEmpty();
1382-
assertThat(dataset.delete()).isTrue();
1355+
try {
1356+
assertThat(dataset).isNotNull();
1357+
assertThat(dataset.getDatasetId().getProject())
1358+
.isEqualTo(bigquery.getOptions().getProjectId());
1359+
assertThat(dataset.getDatasetId().getDataset()).isEqualTo(datasetName);
1360+
assertThat(dataset.getDescription()).isEqualTo("Some Description");
1361+
assertThat(dataset.getLabels()).containsExactly("a", "b");
1362+
assertThat(dataset.getStorageBillingModel()).isNull();
1363+
assertThat(dataset.getMaxTimeTravelHours()).isNull();
1364+
1365+
Map<String, String> updateLabels = new HashMap<>();
1366+
updateLabels.put("x", "y");
1367+
updateLabels.put("a", null);
1368+
Dataset updatedDataset =
1369+
bigquery.update(
1370+
dataset.toBuilder()
1371+
.setDescription("Updated Description")
1372+
.setLabels(updateLabels)
1373+
.setStorageBillingModel("LOGICAL")
1374+
.setMaxTimeTravelHours(MAX_TIME_TRAVEL_HOURS)
1375+
.build());
1376+
assertThat(updatedDataset.getDescription()).isEqualTo("Updated Description");
1377+
assertThat(updatedDataset.getLabels()).containsExactly("x", "y");
1378+
assertThat(updatedDataset.getStorageBillingModel()).isEqualTo("LOGICAL");
1379+
assertThat(updatedDataset.getMaxTimeTravelHours()).isEqualTo(MAX_TIME_TRAVEL_HOURS);
1380+
1381+
updatedDataset = bigquery.update(updatedDataset.toBuilder().setLabels(null).build());
1382+
assertThat(updatedDataset.getLabels()).isEmpty();
1383+
} finally {
1384+
dataset.delete();
1385+
}
13831386
}
13841387

13851388
@Test
13861389
void testUpdateDatasetWithSelectedFields() {
1390+
String datasetName = RemoteBigQueryHelper.generateDatasetName();
13871391
Dataset dataset =
13881392
bigquery.create(
1389-
DatasetInfo.newBuilder(OTHER_DATASET).setDescription("Some Description").build());
1390-
assertNotNull(dataset);
1391-
assertEquals(bigquery.getOptions().getProjectId(), dataset.getDatasetId().getProject());
1392-
assertEquals(OTHER_DATASET, dataset.getDatasetId().getDataset());
1393-
assertEquals("Some Description", dataset.getDescription());
1394-
Dataset updatedDataset =
1395-
bigquery.update(
1396-
dataset.toBuilder().setDescription("Updated Description").build(),
1397-
DatasetOption.fields(DatasetField.DESCRIPTION));
1398-
assertEquals("Updated Description", updatedDataset.getDescription());
1399-
assertNull(updatedDataset.getCreationTime());
1400-
assertNull(updatedDataset.getDefaultTableLifetime());
1401-
assertNull(updatedDataset.getAcl());
1402-
assertNull(updatedDataset.getEtag());
1403-
assertNull(updatedDataset.getFriendlyName());
1404-
assertNull(updatedDataset.getGeneratedId());
1405-
assertNull(updatedDataset.getLastModified());
1406-
assertNull(updatedDataset.getLocation());
1407-
assertNull(updatedDataset.getSelfLink());
1408-
assertNull(updatedDataset.getStorageBillingModel());
1409-
assertNull(updatedDataset.getMaxTimeTravelHours());
1410-
assertTrue(dataset.delete());
1393+
DatasetInfo.newBuilder(datasetName).setDescription("Some Description").build());
1394+
try {
1395+
assertNotNull(dataset);
1396+
assertEquals(bigquery.getOptions().getProjectId(), dataset.getDatasetId().getProject());
1397+
assertEquals(datasetName, dataset.getDatasetId().getDataset());
1398+
assertEquals("Some Description", dataset.getDescription());
1399+
Dataset updatedDataset =
1400+
bigquery.update(
1401+
dataset.toBuilder().setDescription("Updated Description").build(),
1402+
DatasetOption.fields(DatasetField.DESCRIPTION));
1403+
assertEquals("Updated Description", updatedDataset.getDescription());
1404+
assertNull(updatedDataset.getCreationTime());
1405+
assertNull(updatedDataset.getDefaultTableLifetime());
1406+
assertNull(updatedDataset.getAcl());
1407+
assertNull(updatedDataset.getEtag());
1408+
assertNull(updatedDataset.getFriendlyName());
1409+
assertNull(updatedDataset.getGeneratedId());
1410+
assertNull(updatedDataset.getLastModified());
1411+
assertNull(updatedDataset.getLocation());
1412+
assertNull(updatedDataset.getSelfLink());
1413+
assertNull(updatedDataset.getStorageBillingModel());
1414+
assertNull(updatedDataset.getMaxTimeTravelHours());
1415+
} finally {
1416+
dataset.delete();
1417+
}
14111418
}
14121419

14131420
@Test
@@ -2680,17 +2687,26 @@ void testListTablesWithRangePartitioning() {
26802687
try {
26812688
Page<Table> tables = bigquery.listTables(DATASET);
26822689
boolean found = false;
2683-
Iterator<Table> tableIterator = tables.getValues().iterator();
2684-
while (tableIterator.hasNext() && !found) {
2685-
StandardTableDefinition standardTableDefinition = tableIterator.next().getDefinition();
2686-
if (standardTableDefinition.getRangePartitioning() != null) {
2687-
assertEquals(RANGE_PARTITIONING, standardTableDefinition.getRangePartitioning());
2688-
assertEquals(RANGE, standardTableDefinition.getRangePartitioning().getRange());
2689-
assertEquals("IntegerField", standardTableDefinition.getRangePartitioning().getField());
2690-
found = true;
2690+
for (Table table : tables.getValues()) {
2691+
// Look for the table that matches the newly partitioned table. Other tables in the
2692+
// dataset may not be partitioned and cannot match to them.
2693+
if (!table
2694+
.getTableId()
2695+
.getTable()
2696+
.equals(createdRangePartitioningTable.getTableId().getTable())) {
2697+
continue;
26912698
}
2699+
2700+
StandardTableDefinition standardTableDefinition = table.getDefinition();
2701+
RangePartitioning rangePartitioning = standardTableDefinition.getRangePartitioning();
2702+
assertNotNull(rangePartitioning);
2703+
assertEquals(RANGE_PARTITIONING, rangePartitioning);
2704+
assertEquals(RANGE, rangePartitioning.getRange());
2705+
assertEquals("IntegerField", rangePartitioning.getField());
2706+
found = true;
2707+
break;
26922708
}
2693-
assertTrue(found);
2709+
assertTrue(found, "Created range partitioned table was not found in the dataset list.");
26942710
} finally {
26952711
createdRangePartitioningTable.delete();
26962712
}

‎pom.xml‎

Lines changed: 2 additions & 2 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.57.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquery:current} -->
7+
<version>2.57.2</version><!-- {x-version-update:google-cloud-bigquery:current} -->
88
<name>BigQuery Parent</name>
99
<url>https://github.com/googleapis/java-bigquery</url>
1010
<description>
@@ -93,7 +93,7 @@
9393
<dependency>
9494
<groupId>com.google.cloud</groupId>
9595
<artifactId>google-cloud-bigquery</artifactId>
96-
<version>2.57.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquery:current} -->
96+
<version>2.57.2</version><!-- {x-version-update:google-cloud-bigquery:current} -->
9797
</dependency>
9898

9999
<dependency>

‎samples/snapshot/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<dependency>
5757
<groupId>com.google.cloud</groupId>
5858
<artifactId>google-cloud-bigquery</artifactId>
59-
<version>2.57.2-SNAPSHOT</version>
59+
<version>2.57.2</version>
6060
</dependency>
6161
<!-- {x-version-update-end} -->
6262
<dependency>

‎versions.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Format:
22
# module:released-version:current-version
33

4-
google-cloud-bigquery:2.57.1:2.57.2-SNAPSHOT
4+
google-cloud-bigquery:2.57.2:2.57.2
55
google-cloud-bigquery-jdbc:0.1.0:0.1.1-SNAPSHOT

0 commit comments

Comments
 (0)