Empty table results can have a schema (#4185)

mikekap · sduskis · commit 2e239f7148c8 · 2019-02-07T11:00:29.000-05:00
* Update EmptyTableResult.java

* Update Job.java

* add test case
diff --git a/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/EmptyTableResult.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/EmptyTableResult.java
@@ -18,14 +18,15 @@
 
 import com.google.api.core.InternalApi;
 import com.google.cloud.PageImpl;
+import javax.annotation.Nullable;
 
 public class EmptyTableResult extends TableResult {
 
   private static final long serialVersionUID = -4831062717210349819L;
 
   /** An empty {@code TableResult} to avoid making API requests to unlistable tables. */
   @InternalApi("Exposed for testing")
-  public EmptyTableResult() {
-    super(null, 0, new PageImpl<FieldValueList>(null, "", null));
+  public EmptyTableResult(@Nullable Schema schema) {
+    super(schema, 0, new PageImpl<FieldValueList>(null, "", null));
   }
 }
diff --git a/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Job.java b/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/Job.java
@@ -305,7 +305,7 @@ public TableResult getQueryResults(QueryResultsOption... options)
     // Listing table data might fail, such as with CREATE VIEW queries.
     // Avoid a tabledata.list API request by returning an empty TableResult.
     if (response.getTotalRows() == 0) {
-      return new EmptyTableResult();
+      return new EmptyTableResult(response.getSchema());
     }
 
     TableId table = ((QueryJobConfiguration) getConfiguration()).getDestinationTable();
diff --git a/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobTest.java b/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/JobTest.java
@@ -302,6 +302,55 @@ public Iterable<FieldValueList> getValues() {
     verify(status, mockOptions);
   }
 
+  @Test
+  public void testWaitForAndGetQueryResultsEmptyWithSchema() throws InterruptedException {
+    QueryJobConfiguration jobConfig =
+        QueryJobConfiguration.newBuilder("CREATE VIEW").setDestinationTable(TABLE_ID1).build();
+    QueryStatistics jobStatistics =
+        QueryStatistics.newBuilder()
+            .setCreationTimestamp(1L)
+            .setEndTime(3L)
+            .setStartTime(2L)
+            .build();
+    JobInfo jobInfo =
+        JobInfo.newBuilder(jobConfig)
+            .setJobId(JOB_ID)
+            .setStatistics(jobStatistics)
+            .setJobId(JOB_ID)
+            .setEtag(ETAG)
+            .setGeneratedId(GENERATED_ID)
+            .setSelfLink(SELF_LINK)
+            .setUserEmail(EMAIL)
+            .setStatus(JOB_STATUS)
+            .build();
+
+    initializeExpectedJob(2, jobInfo);
+    JobStatus status = createStrictMock(JobStatus.class);
+    expect(bigquery.getOptions()).andReturn(mockOptions);
+    expect(mockOptions.getClock()).andReturn(CurrentMillisClock.getDefaultClock()).times(2);
+    Job completedJob = expectedJob.toBuilder().setStatus(status).build();
+    QueryResponse completedQuery =
+        QueryResponse.newBuilder()
+            .setCompleted(true)
+            .setTotalRows(0)
+            .setSchema(Schema.of(Field.of("field1", LegacySQLTypeName.BOOLEAN)))
+            .setErrors(ImmutableList.<BigQueryError>of())
+            .build();
+
+    expect(bigquery.getQueryResults(jobInfo.getJobId(), Job.DEFAULT_QUERY_WAIT_OPTIONS))
+        .andReturn(completedQuery);
+    expect(bigquery.getJob(JOB_INFO.getJobId())).andReturn(completedJob);
+    expect(bigquery.getQueryResults(jobInfo.getJobId(), Job.DEFAULT_QUERY_WAIT_OPTIONS))
+        .andReturn(completedQuery);
+
+    replay(status, bigquery, mockOptions);
+    initializeJob(jobInfo);
+    assertThat(job.waitFor(TEST_RETRY_OPTIONS)).isSameAs(completedJob);
+    assertThat(job.getQueryResults().getSchema())
+        .isEqualTo(Schema.of(Field.of("field1", LegacySQLTypeName.BOOLEAN)));
+    verify(status, mockOptions);
+  }
+
   @Test
   public void testWaitForAndGetQueryResults() throws InterruptedException {
     QueryJobConfiguration jobConfig =

Original file line number	Diff line number	Diff line change
`@@ -18,14 +18,15 @@`
`18`	`18`
`19`	`19`	`import com.google.api.core.InternalApi;`
`20`	`20`	`import com.google.cloud.PageImpl;`
	`21`	`+import javax.annotation.Nullable;`
`21`	`22`
`22`	`23`	`public class EmptyTableResult extends TableResult {`
`23`	`24`
`24`	`25`	`private static final long serialVersionUID = -4831062717210349819L;`
`25`	`26`
`26`	`27`	`/** An empty {@code TableResult} to avoid making API requests to unlistable tables. */`
`27`	`28`	`@InternalApi("Exposed for testing")`
`28`		`- public EmptyTableResult() {`
`29`		`- super(null, 0, new PageImpl<FieldValueList>(null, "", null));`
	`29`	`+ public EmptyTableResult(@Nullable Schema schema) {`
	`30`	`+ super(schema, 0, new PageImpl<FieldValueList>(null, "", null));`
`30`	`31`	`}`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,7 @@ public TableResult getQueryResults(QueryResultsOption... options)`
`305`	`305`	`// Listing table data might fail, such as with CREATE VIEW queries.`
`306`	`306`	`// Avoid a tabledata.list API request by returning an empty TableResult.`
`307`	`307`	`if (response.getTotalRows() == 0) {`
`308`		`- return new EmptyTableResult();`
	`308`	`+ return new EmptyTableResult(response.getSchema());`
`309`	`309`	`}`
`310`	`310`
`311`	`311`	`TableId table = ((QueryJobConfiguration) getConfiguration()).getDestinationTable();`