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: schema and totalRows for duplicate request ids #804

Merged
merged 3 commits into from Oct 19, 2020
+61 −8
Merged

fix: schema and totalRows for duplicate request ids #804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2731141
fix: schema and totalRows for duplicate request ids
Oct 15, 2020
32d3d35
fix: modify code and test case
Oct 16, 2020
3982ea5
fix: address comment
Oct 16, 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
25 changes: 17 additions & 8 deletions google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java
View file
Open in desktop
Expand Up @@ -1239,7 +1239,8 @@ public TableResult query(QueryJobConfiguration configuration, JobOption... optio
}

private TableResult queryRpc(
final String projectId, final QueryRequest content, JobOption... options) {
final String projectId, final QueryRequest content, JobOption... options)
throws InterruptedException {
com.google.api.services.bigquery.model.QueryResponse results;
try {
results =
Expand All @@ -1265,14 +1266,22 @@ public com.google.api.services.bigquery.model.QueryResponse call() {
throw new BigQueryException(bigQueryErrors);
}

Schema schema = results.getSchema() == null ? null : Schema.fromPb(results.getSchema());
Long numRows;
if (results.getNumDmlAffectedRows() == null && results.getTotalRows() == null) {
numRows = 0L;
} else if (results.getNumDmlAffectedRows() != null) {
numRows = results.getNumDmlAffectedRows();
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 {
numRows = results.getTotalRows().longValue();
schema = results.getSchema() == null ? null : 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();
}
}

if (results.getPageToken() != null) {
Expand Down
44 changes: 44 additions & 0 deletions google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java
View file
Open in desktop
Expand Up @@ -1608,6 +1608,35 @@ public void testFastQueryMultipleRuns() throws InterruptedException {
assertFalse(result2.hasNextPage());
}

@Test
public void testFastQuerySinglePageDuplicateRequestIds() throws InterruptedException {
String query =
"SELECT TimestampField, StringField, BooleanField FROM " + TABLE_ID_FASTQUERY.getTable();
QueryJobConfiguration config =
QueryJobConfiguration.newBuilder(query).setDefaultDataset(DatasetId.of(DATASET)).build();
TableResult result = bigquery.query(config);
assertEquals(QUERY_RESULT_SCHEMA, result.getSchema());
assertEquals(2, result.getTotalRows());
assertNull(result.getNextPage());
assertNull(result.getNextPageToken());
assertFalse(result.hasNextPage());

TableResult result1 = bigquery.query(config);
assertEquals(QUERY_RESULT_SCHEMA, result1.getSchema());
assertEquals(2, result1.getTotalRows());
assertNull(result1.getNextPage());
assertNull(result1.getNextPageToken());
assertFalse(result1.hasNextPage());

config.toBuilder().setQuery(query).build();
TableResult result2 = bigquery.query(config);
assertEquals(QUERY_RESULT_SCHEMA, result2.getSchema());
assertEquals(2, result2.getTotalRows());
assertNull(result2.getNextPage());
assertNull(result2.getNextPageToken());
assertFalse(result2.hasNextPage());
}

@Test
public void testFastSQLQuery() throws InterruptedException {
String query =
Expand Down Expand Up @@ -1650,6 +1679,21 @@ public void testFastSQLQueryMultiPage() throws InterruptedException {
assertNotNull(result.getNextPage());
assertNotNull(result.getNextPageToken());
assertTrue(result.hasNextPage());

TableResult result1 = bigquery.query(config);
assertEquals(LARGE_TABLE_SCHEMA, result.getSchema());
assertEquals(313348, result.getTotalRows());
assertNotNull(result1.getNextPage());
assertNotNull(result1.getNextPageToken());
assertTrue(result1.hasNextPage());

config.toBuilder().setQuery(query).build();
TableResult result2 = bigquery.query(config);
assertEquals(LARGE_TABLE_SCHEMA, result2.getSchema());
assertEquals(313348, result2.getTotalRows());
assertNotNull(result2.getNextPage());
assertNotNull(result2.getNextPageToken());
assertTrue(result2.hasNextPage());
}

@Test
Expand Down