Skip to content

fix(bigquery-jdbc): explicitly set location when available for temporary dataset #13508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Neenu1995 wants to merge 2 commits into
base: main
Choose a base branch
from
+94 −4
Open

fix(bigquery-jdbc): explicitly set location when available for temporary dataset #13508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4d359c
fix(bigquery-jdbc): explicitly set location when available for tempor…
Neenu1995 Jun 17, 2026
a3dfacd
nit
Neenu1995 Jun 17, 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
12 changes: 8 additions & 4 deletions java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1375,11 +1375,15 @@ private void checkIfDatasetExistElseCreate(String datasetName) {
Dataset dataset = bigQuery.getDataset(DatasetId.of(datasetName));
if (dataset == null) {
LOG.info("Creating a hidden dataset: %s ", datasetName);
DatasetInfo datasetInfo =
DatasetInfo.Builder datasetInfoBuilder =
DatasetInfo.newBuilder(datasetName)
.setDefaultTableLifetime(this.querySettings.getDestinationDatasetExpirationTime())
.build();
bigQuery.create(datasetInfo);
.setDefaultTableLifetime(this.querySettings.getDestinationDatasetExpirationTime());
if (this.connection != null
&& this.connection.getLocation() != null
&& !this.connection.getLocation().isEmpty()) {
datasetInfoBuilder.setLocation(this.connection.getLocation());

@logachev logachev Jun 17, 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.

nit: we don't need all these checks. connection can't be null & if Location is null, so be it.. SDK will handle null Location the same way as no location.

E.g. we do it in executeJob()

}
bigQuery.create(datasetInfoBuilder.build());
}
}

Expand Down
44 changes: 44 additions & 0 deletions java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryStatementTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
import com.google.cloud.bigquery.BigQuery;
import com.google.cloud.bigquery.BigQuery.QueryResultsOption;
import com.google.cloud.bigquery.BigQueryOptions;
import com.google.cloud.bigquery.DatasetId;
import com.google.cloud.bigquery.DatasetInfo;
import com.google.cloud.bigquery.Field;
import com.google.cloud.bigquery.FieldList;
import com.google.cloud.bigquery.FieldValueList;
Expand Down Expand Up @@ -707,4 +709,46 @@ public void testSetAndGetFetchSize() throws SQLException {
bigQueryStatement.setFetchSize(100);
assertEquals(100, bigQueryStatement.getFetchSize());
}

@Test
public void testTemporaryDatasetCreationRespectsConnectionLocation()
throws SQLException, InterruptedException {
// 1. Setup mock connection with location and destination dataset
doReturn("europe-west3").when(bigQueryConnection).getLocation();
doReturn("temp_dataset").when(bigQueryConnection).getDestinationDataset();

// Re-instantiate bigQueryStatement so it regenerates querySettings with these mocked connection
// values
BigQueryStatement statement = new BigQueryStatement(bigQueryConnection);
BigQueryStatement statementSpy = Mockito.spy(statement);

// 2. Mock bigQuery.getDataset to return null (triggering creation)
doReturn(null).when(bigquery).getDataset(eq(DatasetId.of("temp_dataset")));

// 2b. Mock bigQuery.create for dry run during getStatementType
Job dryRunJobMock = getJobMock(null, null, StatementType.SELECT);
doReturn(dryRunJobMock).when(bigquery).create(any(JobInfo.class));

// 3. Mock bigquery.queryWithTimeout(...) to return tableResult (so execution doesn't fail on
// query execution)
TableResult result = mock(TableResult.class);
doReturn(result)
.when(bigquery)
.queryWithTimeout(any(QueryJobConfiguration.class), any(JobId.class), any());
doReturn(mock(BigQueryJsonResultSet.class))
.when(statementSpy)
.processJsonResultSet(eq(result), any());

// 4. Capture DatasetInfo passed to bigQuery.create()
ArgumentCaptor<DatasetInfo> datasetInfoCaptor = ArgumentCaptor.forClass(DatasetInfo.class);

// 5. Execute query
statementSpy.executeQuery("SELECT 1");

// 6. Verify dataset was created with correct location
verify(bigquery).create(datasetInfoCaptor.capture());
DatasetInfo createdDatasetInfo = datasetInfoCaptor.getValue();
assertEquals("temp_dataset", createdDatasetInfo.getDatasetId().getDataset());
assertEquals("europe-west3", createdDatasetInfo.getLocation());
}
}
42 changes: 42 additions & 0 deletions java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITStatementTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
import static org.junit.jupiter.api.Assertions.assertTrue;

import com.google.cloud.ServiceOptions;
import com.google.cloud.bigquery.BigQuery;
import com.google.cloud.bigquery.BigQueryOptions;
import com.google.cloud.bigquery.Dataset;
import com.google.cloud.bigquery.DatasetId;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.ResultSet;
Expand Down Expand Up @@ -412,4 +416,42 @@ int getSizeOfResultSet(ResultSet resultSet) throws SQLException {
}
return count;
}

@Test
public void testTemporaryDatasetLocation() throws SQLException, InterruptedException {
String projectId = DEFAULT_CATALOG;
String location = "europe-west3";
String randomSuffix = String.valueOf(100 + new Random().nextInt(900));
String tempDatasetName = "jdbc_temp_dataset_" + System.currentTimeMillis() + "_" + randomSuffix;

String customConnectionUrl =
"jdbc:bigquery://https://www.googleapis.com/bigquery/v2:443;ProjectId="
+ projectId
+ ";OAuthType=3;Timeout=3600;Location="
+ location
+ ";AllowLargeResults=true;LargeResultsDataset="
+ tempDatasetName
+ ";";

BigQuery bigQuery = BigQueryOptions.getDefaultInstance().getService();
try (Connection connection = DriverManager.getConnection(customConnectionUrl)) {
Statement statement = connection.createStatement();
String query = "SELECT 1 as val;";
try (ResultSet rs = statement.executeQuery(query)) {
assertTrue(rs.next());
assertEquals(1, rs.getInt("val"));
}

Dataset dataset = bigQuery.getDataset(DatasetId.of(tempDatasetName));

@logachev logachev Jun 17, 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.

nit: should we validate that this dataset actually has data? (e.g. ensure that it is indeed the dataset that was used to write results to). Might require larger query

assertNotNull(dataset);
assertEquals(location, dataset.getLocation());
} finally {
try {
bigQuery.delete(
DatasetId.of(tempDatasetName), BigQuery.DatasetDeleteOption.deleteContents());
} catch (Exception e) {
// Ignore cleanup exceptions to avoid masking the primary test failure
}
}
Comment thread
Neenu1995 marked this conversation as resolved.
}
}
Loading