Skip to content

Commit

Permalink
Merge pull request #644 from aozarov/master
Browse files Browse the repository at this point in the history
Revert #625 and Fixes #624
  • Loading branch information
mziccard committed Feb 12, 2016
2 parents 8fb9e91 + f920986 commit 47dcc63
Showing 1 changed file with 7 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import com.google.gcloud.bigquery.InsertAllResponse;
import com.google.gcloud.bigquery.Job;
import com.google.gcloud.bigquery.JobInfo;
import com.google.gcloud.bigquery.JobStatistics;
import com.google.gcloud.bigquery.LoadJobConfiguration;
import com.google.gcloud.bigquery.QueryJobConfiguration;
import com.google.gcloud.bigquery.QueryRequest;
Expand Down Expand Up @@ -683,10 +684,9 @@ public void testQuery() throws InterruptedException {
rowCount++;
}
assertEquals(2, rowCount);
// todo(mziccard) uncomment as soon as #624 is closed
// Job queryJob = bigquery.getJob(response.jobId());
// JobStatistics.QueryStatistics statistics = queryJob.statistics();
// assertNotNull(statistics.queryPlan());
Job queryJob = bigquery.getJob(response.jobId());
JobStatistics.QueryStatistics statistics = queryJob.statistics();
assertNotNull(statistics.queryPlan());
}

@Test
Expand Down Expand Up @@ -851,10 +851,9 @@ public void testQueryJob() throws InterruptedException {
}
assertEquals(2, rowCount);
assertTrue(bigquery.delete(DATASET, tableName));
// todo(mziccard) uncomment as soon as #624 is closed
// Job queryJob = bigquery.getJob(remoteJob.jobId());
// JobStatistics.QueryStatistics statistics = queryJob.statistics();
// assertNotNull(statistics.queryPlan());
Job queryJob = bigquery.getJob(remoteJob.jobId());
JobStatistics.QueryStatistics statistics = queryJob.statistics();
assertNotNull(statistics.queryPlan());
}

@Test
Expand Down

0 comments on commit 47dcc63

Please sign in to comment.