Skip to content

Improve JdbcStepExecutionDao::getLastStepExecution to reuse JdbcJobExecutionDao::getJobExecution #5133

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

Open
quaff wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −18
Open

Improve JdbcStepExecutionDao::getLastStepExecution to reuse JdbcJobExecutionDao::getJobExecution #5133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 4 additions & 18 deletions ...rc/main/java/org/springframework/batch/core/repository/dao/jdbc/JdbcStepExecutionDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.ExitStatus;
import org.springframework.batch.core.job.JobExecution;
import org.springframework.batch.core.job.JobInstance;
import org.springframework.batch.core.step.StepExecution;
Expand Down Expand Up @@ -91,7 +89,7 @@ public class JdbcStepExecutionDao extends AbstractJdbcBatchMetadataDao implement
private static final String GET_STEP_EXECUTION = GET_RAW_STEP_EXECUTIONS + " WHERE STEP_EXECUTION_ID = ?";

private static final String GET_LAST_STEP_EXECUTION = """
SELECT SE.STEP_EXECUTION_ID, SE.STEP_NAME, SE.START_TIME, SE.END_TIME, SE.STATUS, SE.COMMIT_COUNT, SE.READ_COUNT, SE.FILTER_COUNT, SE.WRITE_COUNT, SE.EXIT_CODE, SE.EXIT_MESSAGE, SE.READ_SKIP_COUNT, SE.WRITE_SKIP_COUNT, SE.PROCESS_SKIP_COUNT, SE.ROLLBACK_COUNT, SE.LAST_UPDATED, SE.VERSION, SE.CREATE_TIME, JE.JOB_EXECUTION_ID, JE.START_TIME, JE.END_TIME, JE.STATUS, JE.EXIT_CODE, JE.EXIT_MESSAGE, JE.CREATE_TIME, JE.LAST_UPDATED, JE.VERSION
SELECT SE.STEP_EXECUTION_ID, SE.STEP_NAME, SE.JOB_EXECUTION_ID, SE.START_TIME, SE.END_TIME, SE.STATUS, SE.COMMIT_COUNT, SE.READ_COUNT, SE.FILTER_COUNT, SE.WRITE_COUNT, SE.EXIT_CODE, SE.EXIT_MESSAGE, SE.READ_SKIP_COUNT, SE.WRITE_SKIP_COUNT, SE.PROCESS_SKIP_COUNT, SE.ROLLBACK_COUNT, SE.LAST_UPDATED, SE.VERSION, SE.CREATE_TIME
FROM %PREFIX%JOB_EXECUTION JE
JOIN %PREFIX%STEP_EXECUTION SE ON SE.JOB_EXECUTION_ID = JE.JOB_EXECUTION_ID
WHERE JE.JOB_INSTANCE_ID = ? AND SE.STEP_NAME = ?
Expand Down Expand Up @@ -320,21 +318,9 @@ public StepExecution getLastStepExecution(JobInstance jobInstance, String stepNa
statement.setString(2, stepName);
try (ResultSet rs = statement.executeQuery()) {
if (rs.next()) {
Long jobExecutionId = rs.getLong(19);
JobExecution jobExecution = new JobExecution(jobExecutionId, jobInstance,
jobExecutionDao.getJobParameters(jobExecutionId));
jobExecution.setStartTime(
rs.getTimestamp(20) == null ? null : rs.getTimestamp(20).toLocalDateTime());
jobExecution
.setEndTime(rs.getTimestamp(21) == null ? null : rs.getTimestamp(21).toLocalDateTime());
jobExecution.setStatus(BatchStatus.valueOf(rs.getString(22)));
jobExecution.setExitStatus(new ExitStatus(rs.getString(23), rs.getString(24)));
jobExecution.setCreateTime(
rs.getTimestamp(25) == null ? null : rs.getTimestamp(25).toLocalDateTime());
jobExecution.setLastUpdated(
rs.getTimestamp(26) == null ? null : rs.getTimestamp(26).toLocalDateTime());
jobExecution.setVersion(rs.getInt(27));
return new StepExecutionRowMapper(jobExecution).mapRow(rs, 0);
return new StepExecutionRowMapper(
jobExecutionDao.getJobExecution(rs.getLong("JOB_EXECUTION_ID")))
.mapRow(rs, 0);
}
return null;
}
Expand Down
17 changes: 17 additions & 0 deletions ...st/java/org/springframework/batch/core/repository/dao/jdbc/JdbcStepExecutionDaoTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,4 +158,21 @@ void testDeleteStepExecution() {
Assertions.assertEquals(0, JdbcTestUtils.countRowsInTable(jdbcTemplate, "BATCH_STEP_EXECUTION"));
}

@Test
void testGetLastStepExecution() {
// Given
JobParameters jobParameters = new JobParameters();
JobInstance jobInstance = jdbcJobInstanceDao.createJobInstance("job", jobParameters);
JobExecution jobExecution = jdbcJobExecutionDao.createJobExecution(jobInstance, jobParameters);
jdbcStepExecutionDao.createStepExecution("step1", jobExecution);
jdbcStepExecutionDao.createStepExecution("step2", jobExecution);
StepExecution stepExecution = jdbcStepExecutionDao.createStepExecution("step2", jobExecution);

// when
StepExecution lastStepExecution = jdbcStepExecutionDao.getLastStepExecution(jobInstance, "step2");

// Then
assertEquals(stepExecution, lastStepExecution);
}

}