Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure sub-query use for Job instances. #5563

Merged
merged 4 commits into from
Nov 28, 2023
Merged

Ensure sub-query use for Job instances. #5563

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1bf1052
Ensure sub-query use for Job instances.
corneil Nov 22, 2023
d8faa9e
Fix imports and spacing.
corneil Nov 26, 2023
42f2a71
Fix imports and spacing.
corneil Nov 26, 2023
6331680
Fixed wildcard imports.
corneil Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../main/java/org/springframework/cloud/dataflow/server/repository/AggregateJobQueryDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
* @author Corneil du Plessis
*/
public interface AggregateJobQueryDao {
Page<JobInstanceExecutions> listJobInstances(String jobName, Pageable pageable);
Page<JobInstanceExecutions> listJobInstances(String jobName, Pageable pageable) throws NoSuchJobException;
corneil marked this conversation as resolved.
Show resolved Hide resolved

Page<TaskJobExecution> listJobExecutions(String jobName, BatchStatus status, Pageable pageable) throws NoSuchJobExecutionException;

Expand Down
22 changes: 15 additions & 7 deletions ...n/java/org/springframework/cloud/dataflow/server/repository/JdbcAggregateJobQueryDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package org.springframework.cloud.dataflow.server.repository;

import javax.sql.DataSource;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.time.Instant;
Expand All @@ -29,6 +28,7 @@
import java.util.Map;
import java.util.TreeMap;
import java.util.stream.Collectors;
import javax.sql.DataSource;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -69,6 +69,7 @@
import org.springframework.jdbc.core.RowCallbackHandler;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;

/**
Expand Down Expand Up @@ -238,17 +239,18 @@ public JdbcAggregateJobQueryDao(DataSource dataSource, SchemaService schemaServi

byJobInstanceIdWithStepCountPagingQueryProvider = getPagingQueryProvider(FIELDS_WITH_STEP_COUNT, FROM_CLAUSE_TASK_EXEC_BATCH, JOB_INSTANCE_ID_FILTER);
byTaskExecutionIdWithStepCountPagingQueryProvider = getPagingQueryProvider(FIELDS_WITH_STEP_COUNT, FROM_CLAUSE_TASK_EXEC_BATCH, TASK_EXECUTION_ID_FILTER);
jobExecutionsPagingQueryProviderByName = getPagingQueryProvider(FIND_JOBS_FIELDS, FIND_JOBS_FROM, FIND_JOBS_WHERE, Collections.singletonMap("JOB_INSTANCE_ID", Order.DESCENDING));
jobExecutionsPagingQueryProviderByName = getPagingQueryProvider(FIND_JOBS_FIELDS, FIND_JOBS_FROM, FIND_JOBS_WHERE, Collections.singletonMap("E.JOB_EXECUTION_ID", Order.DESCENDING));
byJobExecutionIdAndSchemaPagingQueryProvider = getPagingQueryProvider(FIELDS_WITH_STEP_COUNT, FROM_CLAUSE_TASK_EXEC_BATCH, FIND_BY_ID_SCHEMA);

}

@Override
public Page<JobInstanceExecutions> listJobInstances(String jobName, Pageable pageable) {
public Page<JobInstanceExecutions> listJobInstances(String jobName, Pageable pageable) throws NoSuchJobException {
int total = countJobExecutions(jobName);
List<JobInstanceExecutions> taskJobInstancesForJobName = total > 0
? getTaskJobInstancesForJobName(jobName, pageable)
: Collections.emptyList();
if (total == 0) {
throw new NoSuchJobException("No Job with that name either current or historic: [" + jobName + "]");
}
List<JobInstanceExecutions> taskJobInstancesForJobName = getTaskJobInstancesForJobName(jobName, pageable);
return new PageImpl<>(taskJobInstancesForJobName, pageable, total);

}
Expand All @@ -273,7 +275,13 @@ public JobInstanceExecutions getJobInstanceExecutions(long jobInstanceId, String
} else if (executions.size() > 1) {
throw new RuntimeException("Expected a single JobInstanceExecutions not " + executions.size());
}
return executions.get(0);
JobInstanceExecutions jobInstanceExecution = executions.get(0);
if (!ObjectUtils.isEmpty(jobInstanceExecution.getTaskJobExecutions())) {
jobInstanceExecution.getTaskJobExecutions().forEach((execution) ->
jobServiceContainer.get(execution.getSchemaTarget()).addStepExecutions(execution.getJobExecution())
);
}
return jobInstanceExecution;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...in/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskJobService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ public TaskJobExecution getJobExecution(long id, String schemaTarget) throws NoS
}

@Override
public Page<JobInstanceExecutions> listTaskJobInstancesForJobName(Pageable pageable, String jobName) {
public Page<JobInstanceExecutions> listTaskJobInstancesForJobName(Pageable pageable, String jobName) throws NoSuchJobException {
onobc marked this conversation as resolved.
Show resolved Hide resolved
Assert.notNull(pageable, "pageable must not be null");
Assert.notNull(jobName, "jobName must not be null");
return aggregateJobQueryDao.listJobInstances(jobName, pageable);
Expand Down
9 changes: 4 additions & 5 deletions ...ava/org/springframework/cloud/dataflow/server/controller/JobExecutionControllerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,7 @@
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;

import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
Expand Down Expand Up @@ -212,7 +210,8 @@ public void testGetExecutionWithJobProperties() throws Exception {
.andExpect(jsonPath("$.executionId", is(10)))
.andExpect(jsonPath("$.jobExecution.jobParameters.parameters", Matchers.hasKey(("javaUtilDate"))))
.andExpect(jsonPath("$.jobExecution.stepExecutions", hasSize(1))).andReturn();
assertThat(result.getResponse().getContentAsString()).contains("{\"identifying\":true,\"value\":\"2023-06-07T04:00:00.000+00:00\",\"type\":\"DATE\"}");
assertThat(result.getResponse().getContentAsString()).contains("\"identifying\":true");
assertThat(result.getResponse().getContentAsString()).contains("\"type\":\"DATE\"");
}

@Test
Expand All @@ -231,7 +230,7 @@ public void testGetAllExecutions() throws Exception {
.andDo(print())
.andExpect(status().isOk())
.andExpect(jsonPath("$._embedded.jobExecutionResourceList", hasSize(10)))
.andExpect(jsonPath("$._embedded.jobExecutionResourceList[*].executionId", containsInAnyOrder(10, 9, 8, 7, 6, 5, 4, 3, 2, 1)));
.andExpect(jsonPath("$._embedded.jobExecutionResourceList[*].executionId", containsInRelativeOrder(10, 9, 8, 7, 6, 5, 4, 3, 2, 1)));
}

@Test
Expand Down
56 changes: 30 additions & 26 deletions ...java/org/springframework/cloud/dataflow/server/controller/JobInstanceControllerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,13 @@

package org.springframework.cloud.dataflow.server.controller;

import java.util.ArrayList;
import java.util.Date;

import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;

import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobInstance;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.batch.BatchProperties;
Expand All @@ -52,22 +49,21 @@
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.web.context.WebApplicationContext;

import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
import java.util.ArrayList;
import java.util.Date;

import static org.hamcrest.Matchers.*;
corneil marked this conversation as resolved.
Show resolved Hide resolved
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;

/**
* @author Glenn Renfro
* @author Corneil du Plessis
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = { JobDependencies.class,
PropertyPlaceholderAutoConfiguration.class, BatchProperties.class })
@EnableConfigurationProperties({ CommonApplicationProperties.class })
@SpringBootTest(classes = {JobDependencies.class,
PropertyPlaceholderAutoConfiguration.class, BatchProperties.class})
@EnableConfigurationProperties({CommonApplicationProperties.class})
@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
@AutoConfigureTestDatabase(replace = Replace.ANY)
public class JobInstanceControllerTests {
Expand Down Expand Up @@ -105,7 +101,7 @@ public class JobInstanceControllerTests {
@Before
public void setupMockMVC() {
this.mockMvc = MockMvcBuilders.webAppContextSetup(wac)
.defaultRequest(get("/").accept(MediaType.APPLICATION_JSON)).build();
.defaultRequest(get("/").accept(MediaType.APPLICATION_JSON)).build();
if (!initialized) {
createSampleJob(JOB_NAME_ORIG, 1);
createSampleJob(JOB_NAME_FOO, 1);
Expand All @@ -122,36 +118,41 @@ public void testJobInstanceControllerConstructorMissingRepository() {
@Test
public void testGetInstanceNotFound() throws Exception {
mockMvc.perform(get("/jobs/instances/1345345345345").accept(MediaType.APPLICATION_JSON))
.andExpect(status().isNotFound());
.andExpect(status().isNotFound());
}

@Test
public void testGetInstance() throws Exception {
mockMvc.perform(get("/jobs/instances/1").accept(MediaType.APPLICATION_JSON)).andExpect(status().isOk())
.andExpect(content().json("{jobInstanceId: " + 1 + "}"));
mockMvc.perform(get("/jobs/instances/1").accept(MediaType.APPLICATION_JSON))
onobc marked this conversation as resolved.
Show resolved Hide resolved
.andExpect(status().isOk())
.andExpect(jsonPath("$.jobInstanceId", equalTo(1)))
.andExpect(jsonPath("$.jobExecutions[0].stepExecutionCount", equalTo(1)))
.andExpect(jsonPath("$.jobExecutions[0].jobExecution.stepExecutions", hasSize(1)));
}

@Test
public void testGetInstancesByName() throws Exception {
mockMvc.perform(get("/jobs/instances/").param("name", JOB_NAME_ORIG).accept(MediaType.APPLICATION_JSON)).andDo(print())
.andExpect(status().isOk()).andExpect(jsonPath("$._embedded.jobInstanceResourceList[0].jobName", is(JOB_NAME_ORIG)))
.andExpect(jsonPath("$._embedded.jobInstanceResourceList", hasSize(1)));
mockMvc.perform(get("/jobs/instances/").param("name", JOB_NAME_ORIG).accept(MediaType.APPLICATION_JSON))
.andExpect(status().isOk())
.andExpect(jsonPath("$._embedded.jobInstanceResourceList[0].jobName", is(JOB_NAME_ORIG)))
.andExpect(jsonPath("$._embedded.jobInstanceResourceList", hasSize(1)));
}

@Test
public void testGetExecutionsByNameMultipleResult() throws Exception {
mockMvc.perform(get("/jobs/instances/").param("name", JOB_NAME_FOOBAR).accept(MediaType.APPLICATION_JSON))
.andExpect(status().isOk()).andExpect(jsonPath("$._embedded.jobInstanceResourceList[0].jobName", is(JOB_NAME_FOOBAR)))
.andExpect(jsonPath("$._embedded.jobInstanceResourceList[0].jobExecutions[0].executionId", is(4)))
.andExpect(jsonPath("$._embedded.jobInstanceResourceList[0].jobExecutions[1].executionId", is(3)))
.andExpect(jsonPath("$._embedded.jobInstanceResourceList", hasSize(1)));
.andExpect(status().isOk())
.andExpect(jsonPath("$._embedded.jobInstanceResourceList[0].jobName", is(JOB_NAME_FOOBAR)))
.andExpect(jsonPath("$._embedded.jobInstanceResourceList[0].jobExecutions[0].executionId", is(4)))
.andExpect(jsonPath("$._embedded.jobInstanceResourceList[0].jobExecutions[1].executionId", is(3)))
.andExpect(jsonPath("$._embedded.jobInstanceResourceList", hasSize(1)));
}

@Test
public void testGetInstanceByNameNotFound() throws Exception {
mockMvc.perform(get("/jobs/instances/").param("name", "BAZ").accept(MediaType.APPLICATION_JSON))
.andExpect(status().is4xxClientError()).andReturn().getResponse().getContentAsString()
.contains("NoSuchJobException");
.andExpect(status().is4xxClientError())
.andExpect(content().string(containsString("NoSuchJobException")));
}

private void createSampleJob(String jobName, int jobExecutionCount) {
Expand All @@ -165,6 +166,9 @@ private void createSampleJob(String jobName, int jobExecutionCount) {
TaskBatchDao taskBatchDao = taskBatchDaoContainer.get(defaultSchemaTarget);
for (int i = 0; i < jobExecutionCount; i++) {
JobExecution jobExecution = jobRepository.createJobExecution(instance, new JobParameters(), null);
StepExecution stepExecution = new StepExecution("foo", jobExecution, 1L);
stepExecution.setId(null);
jobRepository.add(stepExecution);
taskBatchDao.saveRelationship(taskExecution, jobExecution);
}
}
Expand Down
Loading