googleapis · lqiu96 · Dec 19, 2025 · Dec 18, 2025 · lqiu96 · Dec 18, 2025
@@ -210,6 +210,9 @@ public boolean exists() {
    */
   public boolean isDone() {
     checkNotDryRun("isDone");
+    if (hasDoneState()) {
+      return true;
+    }
     Span isDone = null;
     if (options.isOpenTelemetryTracingEnabled() && options.getOpenTelemetryTracer() != null) {
       isDone =
@@ -220,14 +223,18 @@ public boolean isDone() {
     }
     try (Scope isDoneScope = isDone != null ? isDone.makeCurrent() : null) {
       Job job = bigquery.getJob(getJobId(), JobOption.fields(BigQuery.JobField.STATUS));
-      return job == null || JobStatus.State.DONE.equals(job.getStatus().getState());
+      return job == null || job.hasDoneState();
     } finally {
       if (isDone != null) {
         isDone.end();
       }
     }
   }
 
+  private boolean hasDoneState() {
+    return getStatus() != null && JobStatus.State.DONE.equals(getStatus().getState());
+  }
+
   /** See {@link #waitFor(BigQueryRetryConfig, RetryOption...)} */
   public Job waitFor(RetryOption... waitOptions) throws InterruptedException {
     return waitForInternal(DEFAULT_RETRY_CONFIG, waitOptions);

@@ -157,11 +157,9 @@ public void testExists_False() {
 
   @Test
   public void testIsDone_True() {
-    BigQuery.JobOption[] expectedOptions = {BigQuery.JobOption.fields(BigQuery.JobField.STATUS)};
     Job job = expectedJob.toBuilder().setStatus(new JobStatus(JobStatus.State.DONE)).build();
-    when(bigquery.getJob(JOB_INFO.getJobId(), expectedOptions)).thenReturn(job);
     assertTrue(job.isDone());
-    verify(bigquery).getJob(JOB_INFO.getJobId(), expectedOptions);
+    verify(bigquery, times(0)).getJob(eq(JOB_INFO.getJobId()), any());
   }
 
   @Test
@@ -176,8 +174,10 @@ public void testIsDone_False() {
   @Test
   public void testIsDone_NotExists() {
     BigQuery.JobOption[] expectedOptions = {BigQuery.JobOption.fields(BigQuery.JobField.STATUS)};
+    Job jobWithRunningState =
+        expectedJob.toBuilder().setStatus(new JobStatus(JobStatus.State.RUNNING)).build();
     when(bigquery.getJob(JOB_INFO.getJobId(), expectedOptions)).thenReturn(null);
-    assertTrue(job.isDone());
+    assertTrue(jobWithRunningState.isDone());
     verify(bigquery).getJob(JOB_INFO.getJobId(), expectedOptions);
   }