Skip to content

BigQuery : Fix Location configurable at BigQueryOptions #4329

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

Merged
sduskis merged 4 commits into from
Jan 25, 2019
Merged

BigQuery : Fix Location configurable at BigQueryOptions #4329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e6c4f2b
Fix Location configurable from BigQueryOptions
Jan 9, 2019
4dd861b
modified code
Jan 11, 2019
91cbd36
modified code and add test case
Jan 11, 2019
1b22ee1
removed unused location
Jan 11, 2019
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
24 changes: 21 additions & 3 deletions ...d-clients/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 @@ -679,7 +679,13 @@ public Job getJob(String jobId, JobOption... options) {
@Override
public Job getJob(JobId jobId, JobOption... options) {
final Map<BigQueryRpc.Option, ?> optionsMap = optionMap(options);
final JobId completeJobId = jobId.setProjectId(getOptions().getProjectId());
final JobId completeJobId =
jobId
.setProjectId(getOptions().getProjectId())
.setLocation(
jobId.getLocation() == null && getOptions().getLocation() != null
? getOptions().getLocation()
: jobId.getLocation());
try {
com.google.api.services.bigquery.model.Job answer =
runWithRetries(
Expand Down Expand Up @@ -742,7 +748,13 @@ public boolean cancel(String jobId) {

@Override
public boolean cancel(JobId jobId) {
final JobId completeJobId = jobId.setProjectId(getOptions().getProjectId());
final JobId completeJobId =
jobId
.setProjectId(getOptions().getProjectId())
.setLocation(
jobId.getLocation() == null && getOptions().getLocation() != null
? getOptions().getLocation()
: jobId.getLocation());
try {
return runWithRetries(
new Callable<Boolean>() {
Expand Down Expand Up @@ -784,7 +796,13 @@ private static QueryResponse getQueryResults(
JobId jobId,
final BigQueryOptions serviceOptions,
final Map<BigQueryRpc.Option, ?> optionsMap) {
final JobId completeJobId = jobId.setProjectId(serviceOptions.getProjectId());
final JobId completeJobId =
jobId
.setProjectId(serviceOptions.getProjectId())
.setLocation(
jobId.getLocation() == null && serviceOptions.getLocation() != null
? serviceOptions.getLocation()
: jobId.getLocation());
try {
GetQueryResultsResponse results =
runWithRetries(
Expand Down
13 changes: 13 additions & 0 deletions ...lients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public class BigQueryOptions extends ServiceOptions<BigQuery, BigQueryOptions> {
private static final String BIGQUERY_SCOPE = "https://www.googleapis.com/auth/bigquery";
private static final Set<String> SCOPES = ImmutableSet.of(BIGQUERY_SCOPE);
private static final long serialVersionUID = -2437598817433266049L;
private final String location;

public static class DefaultBigQueryFactory implements BigQueryFactory {

Expand All @@ -56,6 +57,8 @@ public ServiceRpc create(BigQueryOptions options) {

public static class Builder extends ServiceOptions.Builder<BigQuery, BigQueryOptions, Builder> {

private String location;

private Builder() {}

private Builder(BigQueryOptions options) {
Expand All @@ -71,6 +74,11 @@ public Builder setTransportOptions(TransportOptions transportOptions) {
return super.setTransportOptions(transportOptions);
}

public Builder setLocation(String location) {
this.location = location;
return this;
}

@Override
public BigQueryOptions build() {
return new BigQueryOptions(this);
Expand All @@ -79,6 +87,7 @@ public BigQueryOptions build() {

private BigQueryOptions(Builder builder) {
super(BigQueryFactory.class, BigQueryRpcFactory.class, builder, new BigQueryDefaults());
this.location = builder.location;
}

private static class BigQueryDefaults implements ServiceDefaults<BigQuery, BigQueryOptions> {
Expand Down Expand Up @@ -112,6 +121,10 @@ protected BigQueryRpc getBigQueryRpcV2() {
return (BigQueryRpc) getRpc();
}

public String getLocation() {
return location;
}

@SuppressWarnings("unchecked")
@Override
public Builder toBuilder() {
Expand Down
4 changes: 4 additions & 0 deletions ...le-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/JobId.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@ JobId setProjectId(String projectId) {
return getProject() != null ? this : toBuilder().setProject(projectId).build();
}

JobId setLocation(String location) {
return getLocation() != null ? this : toBuilder().setLocation(location).build();
}

JobReference toPb() {
return new JobReference()
.setProjectId(getProject())
Expand Down
46 changes: 46 additions & 0 deletions ...ients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
public class BigQueryImplTest {

private static final String PROJECT = "project";
private static final String LOCATION = "US";
private static final String OTHER_PROJECT = "otherProject";
private static final String DATASET = "dataset";
private static final String TABLE = "table";
Expand Down Expand Up @@ -293,6 +294,16 @@ private BigQueryOptions createBigQueryOptionsForProject(
.build();
}

private BigQueryOptions createBigQueryOptionsForProjectWithLocation(
String project, BigQueryRpcFactory rpcFactory) {
return BigQueryOptions.newBuilder()
.setProjectId(project)
.setLocation(LOCATION)
.setServiceRpcFactory(rpcFactory)
.setRetrySettings(ServiceOptions.getNoRetrySettings())
.build();
}

@Before
public void setUp() {
rpcFactoryMock = EasyMock.createMock(BigQueryRpcFactory.class);
Expand Down Expand Up @@ -1179,6 +1190,17 @@ public void testGetJob() {
assertEquals(new Job(bigquery, new JobInfo.BuilderImpl(COMPLETE_COPY_JOB)), job);
}

@Test
public void testGetJobWithLocation() {
EasyMock.expect(bigqueryRpcMock.getJob(PROJECT, JOB, LOCATION, EMPTY_RPC_OPTIONS))
.andReturn(COMPLETE_COPY_JOB.toPb());
EasyMock.replay(bigqueryRpcMock);
BigQueryOptions options = createBigQueryOptionsForProjectWithLocation(PROJECT, rpcFactoryMock);
bigquery = options.getService();
Job job = bigquery.getJob(JOB);
assertEquals(new Job(bigquery, new JobInfo.BuilderImpl(COMPLETE_COPY_JOB)), job);
}

@Test
public void testGetJobFromJobId() {
EasyMock.expect(bigqueryRpcMock.getJob(PROJECT, JOB, null, EMPTY_RPC_OPTIONS))
Expand All @@ -1189,6 +1211,17 @@ public void testGetJobFromJobId() {
assertEquals(new Job(bigquery, new JobInfo.BuilderImpl(COMPLETE_COPY_JOB)), job);
}

@Test
public void testGetJobFromJobIdWithLocation() {
EasyMock.expect(bigqueryRpcMock.getJob(PROJECT, JOB, LOCATION, EMPTY_RPC_OPTIONS))
.andReturn(COMPLETE_COPY_JOB.toPb());
EasyMock.replay(bigqueryRpcMock);
BigQueryOptions options = createBigQueryOptionsForProjectWithLocation(PROJECT, rpcFactoryMock);
bigquery = options.getService();
Job job = bigquery.getJob(JobId.of(JOB));
assertEquals(new Job(bigquery, new JobInfo.BuilderImpl(COMPLETE_COPY_JOB)), job);
}

@Test
public void testGetJobFromJobIdWithProject() {
JobId jobId = JobId.of(OTHER_PROJECT, JOB);
Expand All @@ -1201,6 +1234,19 @@ public void testGetJobFromJobIdWithProject() {
assertEquals(new Job(bigquery, new JobInfo.BuilderImpl(jobInfo)), job);
}

@Test
public void testGetJobFromJobIdWithProjectWithLocation() {
JobId jobId = JobId.of(OTHER_PROJECT, JOB);
JobInfo jobInfo = COPY_JOB.setProjectId(OTHER_PROJECT);
EasyMock.expect(bigqueryRpcMock.getJob(OTHER_PROJECT, JOB, LOCATION, EMPTY_RPC_OPTIONS))
.andReturn(jobInfo.toPb());
EasyMock.replay(bigqueryRpcMock);
BigQueryOptions options = createBigQueryOptionsForProjectWithLocation(PROJECT, rpcFactoryMock);
bigquery = options.getService();
Job job = bigquery.getJob(jobId);
assertEquals(new Job(bigquery, new JobInfo.BuilderImpl(jobInfo)), job);
}

@Test
public void testListJobs() {
bigquery = options.getService();
Expand Down