Skip to content
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

Jump to bottom

feat: add fast query path support when empty jobId object is passed #2349

Merged
merged 17 commits into from
Nov 11, 2022
Merged

feat: add fast query path support when empty jobId object is passed #2349

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8b579c1
feat: add fast query path support with job location
Neenu1995 Oct 12, 2022
29231ec
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Oct 12, 2022
e32bd91
chore: fix NPE
Neenu1995 Oct 13, 2022
0909c94
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Oct 13, 2022
31b1db2
chore: respect user specified location
Neenu1995 Oct 13, 2022
669dc21
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Oct 13, 2022
1c3aa8d
chore: fix test
Neenu1995 Oct 13, 2022
9f2deaf
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Oct 13, 2022
1f82f2e
Merge branch 'fix-query-path' of https://github.com/googleapis/java-b…
gcf-owl-bot[bot] Oct 13, 2022
59f1774
chore add IT tests
Neenu1995 Nov 4, 2022
248a771
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Nov 4, 2022
5d81b6c
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Nov 4, 2022
04bebf2
Merge branch 'fix-query-path' of https://github.com/googleapis/java-b…
gcf-owl-bot[bot] Nov 4, 2022
3d0df91
chore: allow users to specify project ID with JobID
Neenu1995 Nov 8, 2022
b92df77
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Nov 8, 2022
d30ee23
chore: fix conditions
Neenu1995 Nov 9, 2022
2c4c8f7
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Nov 9, 2022
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
10 changes: 9 additions & 1 deletion 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 @@ -1294,7 +1294,7 @@ public TableResult query(QueryJobConfiguration configuration, JobOption... optio
// If all parameters passed in configuration are supported by the query() method on the backend,
// put on fast path
QueryRequestInfo requestInfo = new QueryRequestInfo(configuration);
if (requestInfo.isFastQuerySupported()) {
if (requestInfo.isFastQuerySupported(null)) {
String projectId = getOptions().getProjectId();
QueryRequest content = requestInfo.toPb();
return queryRpc(projectId, content, options);
Expand Down Expand Up @@ -1379,6 +1379,14 @@ public com.google.api.services.bigquery.model.QueryResponse call() {
public TableResult query(QueryJobConfiguration configuration, JobId jobId, JobOption... options)
throws InterruptedException, JobException {
Job.checkNotDryRun(configuration, "query");
// If all parameters passed in configuration are supported by the query() method on the backend,
// put on fast path
QueryRequestInfo requestInfo = new QueryRequestInfo(configuration);
if (requestInfo.isFastQuerySupported(jobId)) {
Neenu1995 marked this conversation as resolved.
Show resolved Hide resolved
String projectId = getOptions().getProjectId();
Neenu1995 marked this conversation as resolved.
Show resolved Hide resolved
QueryRequest content = requestInfo.toPb();
return queryRpc(projectId, content, options);
}
return create(JobInfo.of(jobId, configuration), options).getQueryResults();
}

Expand Down
6 changes: 4 additions & 2 deletions google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryRequestInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ final class QueryRequestInfo {
this.useQueryCache = config.useQueryCache();
}

boolean isFastQuerySupported() {
boolean isFastQuerySupported(JobId jobId) {
return config.getClustering() == null
&& config.getCreateDisposition() == null
&& config.getDestinationEncryptionConfiguration() == null
Expand All @@ -70,7 +70,9 @@ boolean isFastQuerySupported() {
&& config.getTableDefinitions() == null
&& config.getTimePartitioning() == null
&& config.getUserDefinedFunctions() == null
&& config.getWriteDisposition() == null;
&& config.getWriteDisposition() == null
&& jobId.getJob() == null
Neenu1995 marked this conversation as resolved.
Show resolved Hide resolved
&& jobId.getLocation() != null;
}

QueryRequest toPb() {
Expand Down
8 changes: 6 additions & 2 deletions google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/QueryRequestInfoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,12 @@ public class QueryRequestInfoTest {

@Test
public void testIsFastQuerySupported() {
assertEquals(false, REQUEST_INFO.isFastQuerySupported());
assertEquals(true, REQUEST_INFO_SUPPORTED.isFastQuerySupported());
JobId jobIdSupported = JobId.newBuilder().setLocation("US").build();
JobId jobIdNotSupported = JobId.newBuilder().setJob("random-job-id").build();
assertEquals(false, REQUEST_INFO.isFastQuerySupported(jobIdSupported));
assertEquals(true, REQUEST_INFO_SUPPORTED.isFastQuerySupported(jobIdSupported));
assertEquals(false, REQUEST_INFO.isFastQuerySupported(jobIdNotSupported));
assertEquals(false, REQUEST_INFO_SUPPORTED.isFastQuerySupported(jobIdNotSupported));
}

@Test
Expand Down