Skip to content

Fix BigQuery JDBC manual commit mode region mismatch for non-US locations #13285

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
yagudin10 wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −2
Open

Fix BigQuery JDBC manual commit mode region mismatch for non-US locations #13285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion ...-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,10 @@ public Job create(JobInfo jobInfo, JobOption... options) {
new Supplier<JobId>() {
@Override
public JobId get() {
return JobId.of();
// Explicitly set the location for a new job when provided in options.
// Otherwise, the job may be created with an incorrect location
// (e.g. in transaction mode outside the US).
return JobId.of().setLocation(getOptions().getLocation());
}
};
return create(jobInfo, idProvider, options);
Expand Down
4 changes: 3 additions & 1 deletion ...le-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,6 +795,8 @@ public void testCreateJobTelemetry() throws Exception {
"{\"kind\":\"bigquery#job\",\"id\":\""
+ PROJECT_ID
+ ":"
+ LOCATION
+ ":"
+ JOB_ID
+ "\",\"status\":{\"state\":\"DONE\"}}");

Expand All @@ -804,7 +806,7 @@ public void testCreateJobTelemetry() throws Exception {

verifyRequest("POST", "/projects/" + PROJECT_ID + "/jobs");
Map<String, String> attributes = new HashMap<>();
attributes.put("bq.rpc.response.job.id", PROJECT_ID + ":" + JOB_ID);
attributes.put("bq.rpc.response.job.id", PROJECT_ID + ":" + LOCATION + ":" + JOB_ID);
attributes.put("bq.rpc.response.job.status.state", "DONE");
verifySpan(
"com.google.cloud.bigquery.BigQueryRpc.createJob",
Expand Down
Loading