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

fix: make sure to fall back to old query path when query job is incomplete #941

Merged
merged 5 commits into from Nov 13, 2020
Merged

fix: make sure to fall back to old query path when query job is incomplete #941

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4231057
fix: make sure to fall back to old query path when query job is incom…
stephaniewang526 Nov 12, 2020
fd75e60
nit
stephaniewang526 Nov 12, 2020
e561ab4
address comments
stephaniewang526 Nov 13, 2020
6a782a8
add comment
stephaniewang526 Nov 13, 2020
5aa0f7f
nit update
stephaniewang526 Nov 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java
View file
Open in desktop
Expand Up @@ -1268,20 +1268,20 @@ public com.google.api.services.bigquery.model.QueryResponse call() {

long numRows;
Schema schema;
if (results.getSchema() == null && results.getJobComplete()) {
JobId jobId = JobId.fromPb(results.getJobReference());
Job job = getJob(jobId, options);
TableResult tableResult = job.getQueryResults();
return tableResult;
} else {
schema = results.getSchema() == null ? null : Schema.fromPb(results.getSchema());
if (results.getJobComplete() && results.getSchema() != null) {
schema = Schema.fromPb(results.getSchema());
if (results.getNumDmlAffectedRows() == null && results.getTotalRows() == null) {
numRows = 0L;
} else if (results.getNumDmlAffectedRows() != null) {
numRows = results.getNumDmlAffectedRows();
} else {
numRows = results.getTotalRows().longValue();
}
} else {
stephaniewang526 marked this conversation as resolved.
Show resolved Hide resolved
JobId jobId = JobId.fromPb(results.getJobReference());
Job job = getJob(jobId, options);
TableResult tableResult = job.getQueryResults();
stephaniewang526 marked this conversation as resolved.
Show resolved Hide resolved
return tableResult;
}

if (results.getPageToken() != null) {
Expand Down
57 changes: 57 additions & 0 deletions google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java
View file
Open in desktop
Expand Up @@ -1955,6 +1955,63 @@ public void testFastQueryMultiplePages() throws InterruptedException {
verify(bigqueryRpcMock).queryRpc(PROJECT, requestInfo.toPb());
}

@Test
public void testFastQuerySlowDdl() throws InterruptedException {
// mock new fast query path response when running a query that takes more than 10s
JobId queryJob = JobId.of(PROJECT, JOB);
com.google.api.services.bigquery.model.QueryResponse queryResponsePb =
new com.google.api.services.bigquery.model.QueryResponse()
.setJobComplete(false) // false when query does not complete in 10s
.setJobReference(queryJob.toPb()) // backend sends back a jobReference
.setRows(ImmutableList.of(TABLE_ROW))
.setSchema(TABLE_SCHEMA.toPb());

// mock job response from backend
com.google.api.services.bigquery.model.Job responseJob =
new com.google.api.services.bigquery.model.Job()
.setConfiguration(QUERY_JOB_CONFIGURATION_FOR_QUERY.toPb())
.setJobReference(queryJob.toPb())
.setId(JOB)
.setStatus(new com.google.api.services.bigquery.model.JobStatus().setState("DONE"));

// mock old query path response when falling back
GetQueryResultsResponse queryResultsResponsePb =
new GetQueryResultsResponse()
.setJobReference(responseJob.getJobReference())
.setRows(ImmutableList.of(TABLE_ROW))
.setJobComplete(true)
.setTotalRows(BigInteger.valueOf(1L))
.setSchema(TABLE_SCHEMA.toPb());

QueryRequestInfo requestInfo = new QueryRequestInfo(QUERY_JOB_CONFIGURATION_FOR_QUERY);
QueryRequest requestPb = requestInfo.toPb();

when(bigqueryRpcMock.queryRpc(PROJECT, requestPb)).thenReturn(queryResponsePb);
responseJob.getConfiguration().getQuery().setDestinationTable(TABLE_ID.toPb());
when(bigqueryRpcMock.getJob(PROJECT, JOB, null, EMPTY_RPC_OPTIONS)).thenReturn(responseJob);
when(bigqueryRpcMock.getQueryResults(
PROJECT, JOB, null, BigQueryImpl.optionMap(Job.DEFAULT_QUERY_WAIT_OPTIONS)))
.thenReturn(queryResultsResponsePb);
when(bigqueryRpcMock.listTableData(PROJECT, DATASET, TABLE, EMPTY_RPC_OPTIONS))
.thenReturn(new TableDataList().setRows(ImmutableList.of(TABLE_ROW)).setTotalRows(1L));

bigquery = options.getService();
TableResult result = bigquery.query(QUERY_JOB_CONFIGURATION_FOR_QUERY);
assertThat(result.getSchema()).isEqualTo(TABLE_SCHEMA);
assertThat(result.getTotalRows()).isEqualTo(1);
for (FieldValueList row : result.getValues()) {
assertThat(row.get(0).getBooleanValue()).isFalse();
assertThat(row.get(1).getLongValue()).isEqualTo(1);
}

verify(bigqueryRpcMock).queryRpc(PROJECT, requestInfo.toPb());
verify(bigqueryRpcMock).getJob(PROJECT, JOB, null, EMPTY_RPC_OPTIONS);
verify(bigqueryRpcMock)
.getQueryResults(
PROJECT, JOB, null, BigQueryImpl.optionMap(Job.DEFAULT_QUERY_WAIT_OPTIONS));
verify(bigqueryRpcMock).listTableData(PROJECT, DATASET, TABLE, EMPTY_RPC_OPTIONS);
}

@Test
public void testQueryRequestCompletedOptions() throws InterruptedException {
JobId queryJob = JobId.of(PROJECT, JOB);
Expand Down
30 changes: 30 additions & 0 deletions google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java
View file
Open in desktop
Expand Up @@ -1813,6 +1813,36 @@ public void testFastDDLQuery() throws InterruptedException {
}
}

@Test
public void testFastQuerySlowDDL() throws InterruptedException {
String tableName =
stephaniewang526 marked this conversation as resolved.
Show resolved Hide resolved
"test_table_fast_query_ddl_slow_" + UUID.randomUUID().toString().substring(0, 8);
// This query take more than 10s to run and should fall back on the old query path
String slowDdlQuery =
String.format(
"CREATE OR REPLACE TABLE %s AS SELECT unique_key, agency, complaint_type, descriptor, street_name, city, landmark FROM `bigquery-public-data.new_york.311_service_requests`",
tableName);
QueryJobConfiguration ddlConfig =
QueryJobConfiguration.newBuilder(slowDdlQuery)
.setDefaultDataset(DatasetId.of(DATASET))
.build();
TableResult result = bigquery.query(ddlConfig);
assertEquals(0, result.getTotalRows());
assertNotNull(result.getSchema());
// Verify correctness of table content
String sqlQuery = String.format("SELECT * FROM %s.%s", DATASET, tableName);
QueryJobConfiguration sqlConfig = QueryJobConfiguration.newBuilder(sqlQuery).build();
TableResult resultAfterDDL = bigquery.query(sqlConfig);
for (FieldValueList row : resultAfterDDL.getValues()) {
FieldValue unique_key = row.get(0);
assertEquals(unique_key, row.get("unique_key"));
FieldValue agency = row.get(1);
assertEquals(agency, row.get("agency"));
FieldValue complaint_type = row.get(2);
assertEquals(complaint_type, row.get("complaint_type"));
}
}

@Test
public void testFastQueryHTTPException() throws InterruptedException {
String queryInvalid =
Expand Down