add codecov

google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java

@@ -200,19 +200,17 @@ public Page<FieldValueList> getNextPage() {
     }
   }
 
-  private class QueryPageFetcher implements NextPageFetcher<FieldValueList> {
+  private class QueryPageFetcher extends Thread implements NextPageFetcher<FieldValueList> {
 
     private static final long serialVersionUID = -8501991114794410114L;
     private final Map<BigQueryRpc.Option, ?> requestOptions;
     private final BigQueryOptions serviceOptions;
-    private final Job job;
-    private final boolean jobStatus;
+    private Job job;
     private final TableId table;
     private final Schema schema;
 
     QueryPageFetcher(
         JobId jobId,
-        boolean jobStatus,
         Schema schema,
         BigQueryOptions serviceOptions,
         String cursor,
@@ -221,19 +219,19 @@ private class QueryPageFetcher implements NextPageFetcher<FieldValueList> {
           PageImpl.nextRequestOptions(BigQueryRpc.Option.PAGE_TOKEN, cursor, optionMap);
       this.serviceOptions = serviceOptions;
       this.job = getJob(jobId);
-      this.jobStatus = jobStatus;
       this.table = ((QueryJobConfiguration) job.getConfiguration()).getDestinationTable();
       this.schema = schema;
     }
 
     @Override
     public Page<FieldValueList> getNextPage() {
-      try {
-        if (!jobStatus) {
-          job.waitFor();
+      while (!JobStatus.State.DONE.equals(job.getStatus().getState())) {
+        try {
+          sleep(5000);
+        } catch (InterruptedException ex) {
+          throw new RuntimeException(ex.getMessage());
         }
-      } catch (InterruptedException ex) {
-        throw new RuntimeException(ex);
+        job = job.reload();
       }
       return listTableData(table, schema, serviceOptions, requestOptions).x();
     }
@@ -1277,15 +1275,13 @@ public com.google.api.services.bigquery.model.QueryResponse call() {
 
     if (results.getPageToken() != null) {
       JobId jobId = JobId.fromPb(results.getJobReference());
-      boolean jobStatus = results.getJobComplete();
       String cursor = results.getPageToken();
       return new TableResult(
           schema,
           numRows,
           new PageImpl<>(
               // fetch next pages of results
-              new QueryPageFetcher(
-                  jobId, jobStatus, schema, getOptions(), cursor, optionMap(options)),
+              new QueryPageFetcher(jobId, schema, getOptions(), cursor, optionMap(options)),
               cursor,
               // cache first page of result
               transformTableData(results.getRows(), schema)));

google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java

@@ -1879,6 +1879,17 @@ public void testFastQueryMultiplePages() throws InterruptedException {
             .setStatus(new com.google.api.services.bigquery.model.JobStatus().setState("DONE"));
     responseJob.getConfiguration().getQuery().setDestinationTable(TABLE_ID.toPb());
     when(bigqueryRpcMock.getJob(PROJECT, JOB, null, EMPTY_RPC_OPTIONS)).thenReturn(responseJob);
+    when(bigqueryRpcMock.listTableData(
+            PROJECT,
+            DATASET,
+            TABLE,
+            BigQueryImpl.optionMap(BigQuery.TableDataListOption.pageToken(CURSOR))))
+        .thenReturn(
+            new TableDataList()
+                .setPageToken(CURSOR)
+                .setRows(ImmutableList.of(TABLE_ROW))
+                .setTotalRows(1L));
+
     com.google.api.services.bigquery.model.QueryResponse queryResponsePb =
         new com.google.api.services.bigquery.model.QueryResponse()
             .setCacheHit(false)
@@ -1898,7 +1909,14 @@ public void testFastQueryMultiplePages() throws InterruptedException {
     TableResult result = bigquery.query(QUERY_JOB_CONFIGURATION_FOR_QUERY);
     assertTrue(result.hasNextPage());
     assertNotNull(result.getNextPageToken());
+    assertNotNull(result.getNextPage());
     verify(bigqueryRpcMock).getJob(PROJECT, JOB, null, EMPTY_RPC_OPTIONS);
+    verify(bigqueryRpcMock)
+        .listTableData(
+            PROJECT,
+            DATASET,
+            TABLE,
+            BigQueryImpl.optionMap(BigQuery.TableDataListOption.pageToken(CURSOR)));
     verify(bigqueryRpcMock).queryRpc(PROJECT, requestInfo.toPb());
   }