From 1b0b21b7dae97507bfcb449ed78fabff636747f5 Mon Sep 17 00:00:00 2001
From: Praful Makani <praful@qlogic.io>
Date: Tue, 10 Dec 2019 21:18:38 +0530
Subject: [PATCH] fix: parentjobid in listjobs (#20)

---
 .../com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java    | 3 ++-
 .../java/com/google/cloud/bigquery/it/ITBigQueryTest.java    | 5 +----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java
index 445a589b8..efebd53a4 100644
--- a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java
+++ b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java
@@ -510,7 +510,8 @@ public Tuple<String, Iterable<Job>> listJobs(String projectId, Map<Option, ?> op
               .setStateFilter(Option.STATE_FILTER.<List<String>>get(options))
               .setMaxResults(Option.MAX_RESULTS.getLong(options))
               .setPageToken(Option.PAGE_TOKEN.getString(options))
-              .setProjection(DEFAULT_PROJECTION);
+              .setProjection(DEFAULT_PROJECTION)
+              .setParentJobId(Option.PARENT_JOB_ID.getString(options));
       if (Option.MIN_CREATION_TIME.getLong(options) != null) {
         request.setMinCreationTime(BigInteger.valueOf(Option.MIN_CREATION_TIME.getLong(options)));
       }
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java
index fd1b38f4f..ade2e65cf 100644
--- a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java
+++ b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java
@@ -1271,7 +1271,6 @@ public void testQuery() throws InterruptedException {
 
   @Test
   public void testScriptStatistics() throws InterruptedException {
-    long currentTime = System.currentTimeMillis();
     String script =
         "-- Declare a variable to hold names as an array.\n"
             + "DECLARE top_names ARRAY<STRING>;\n"
@@ -1295,9 +1294,7 @@ public void testScriptStatistics() throws InterruptedException {
     JobStatistics jobStatistics = info.getStatistics();
     String parentJobId = info.getJobId().getJob();
     assertEquals(2, jobStatistics.getNumChildJobs().longValue());
-    Page<Job> page =
-        bigquery.listJobs(
-            JobListOption.parentJobId(parentJobId), JobListOption.minCreationTime(currentTime));
+    Page<Job> page = bigquery.listJobs(JobListOption.parentJobId(parentJobId));
     for (Job job : page.iterateAll()) {
       JobStatistics.ScriptStatistics scriptStatistics = job.getStatistics().getScriptStatistics();
       if (scriptStatistics != null) {