Commitfa0a12e

authored

fix: Job.isDone() uses Job.Status.State if available (#4039)

1 parent7198340 commitfa0a12eCopy full SHA for fa0a12e

File tree

+12

-5

lines changed

google-cloud-bigquery/src
- main/java/com/google/cloud/bigquery
  - Job.java
- test/java/com/google/cloud/bigquery
  - JobTest.java

+12

-5

lines changed

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -210,6 +210,9 @@ public boolean exists() {`
`210`	`210`	`*/`
`211`	`211`	`publicbooleanisDone() {`
`212`	`212`	`checkNotDryRun("isDone");`
	`213`	`+if (hasDoneState()) {`
	`214`	`+returntrue;`
	`215`	`+ }`
`213`	`216`	`SpanisDone =null;`
`214`	`217`	`if (options.isOpenTelemetryTracingEnabled() &&options.getOpenTelemetryTracer() !=null) {`
`215`	`218`	`isDone =`
`@@ -220,14 +223,18 @@ public boolean isDone() {`
`220`	`223`	`}`
`221`	`224`	`try (ScopeisDoneScope =isDone !=null ?isDone.makeCurrent() :null) {`
`222`	`225`	`Jobjob =bigquery.getJob(getJobId(),JobOption.fields(BigQuery.JobField.STATUS));`
`223`		`-returnjob ==null \|\|JobStatus.State.DONE.equals(job.getStatus().getState());`
	`226`	`+returnjob ==null \|\|job.hasDoneState();`
`224`	`227`	`}finally {`
`225`	`228`	`if (isDone !=null) {`
`226`	`229`	`isDone.end();`
`227`	`230`	`}`
`228`	`231`	`}`
`229`	`232`	`}`
`230`	`233`
	`234`	`+privatebooleanhasDoneState() {`
	`235`	`+returngetStatus() !=null &&JobStatus.State.DONE.equals(getStatus().getState());`
	`236`	`+ }`
	`237`	`+`
`231`	`238`	`/** See {@link #waitFor(BigQueryRetryConfig, RetryOption...)} */`
`232`	`239`	`publicJobwaitFor(RetryOption...waitOptions)throwsInterruptedException {`
`233`	`240`	`returnwaitForInternal(DEFAULT_RETRY_CONFIG,waitOptions);`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -157,11 +157,9 @@ public void testExists_False() {`
`157`	`157`
`158`	`158`	`@Test`
`159`	`159`	`publicvoidtestIsDone_True() {`
`160`		`-BigQuery.JobOption[]expectedOptions = {BigQuery.JobOption.fields(BigQuery.JobField.STATUS)};`
`161`	`160`	`Jobjob =expectedJob.toBuilder().setStatus(newJobStatus(JobStatus.State.DONE)).build();`
`162`		`-when(bigquery.getJob(JOB_INFO.getJobId(),expectedOptions)).thenReturn(job);`
`163`	`161`	`assertTrue(job.isDone());`
`164`		`-verify(bigquery).getJob(JOB_INFO.getJobId(),expectedOptions);`
	`162`	`+verify(bigquery,times(0)).getJob(eq(JOB_INFO.getJobId()),any());`
`165`	`163`	`}`
`166`	`164`
`167`	`165`	`@Test`
`@@ -176,8 +174,10 @@ public void testIsDone_False() {`
`176`	`174`	`@Test`
`177`	`175`	`publicvoidtestIsDone_NotExists() {`
`178`	`176`	`BigQuery.JobOption[]expectedOptions = {BigQuery.JobOption.fields(BigQuery.JobField.STATUS)};`
	`177`	`+JobjobWithRunningState =`
	`178`	`+expectedJob.toBuilder().setStatus(newJobStatus(JobStatus.State.RUNNING)).build();`
`179`	`179`	`when(bigquery.getJob(JOB_INFO.getJobId(),expectedOptions)).thenReturn(null);`
`180`		`-assertTrue(job.isDone());`
	`180`	`+assertTrue(jobWithRunningState.isDone());`
`181`	`181`	`verify(bigquery).getJob(JOB_INFO.getJobId(),expectedOptions);`
`182`	`182`	`}`
`183`	`183`

Comments

(0)