Skip to content

Improve "JdbcJobExecutionDao#synchronizeStatus(StepExecution)" #5365

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
+13 −10
Open

Improve "JdbcJobExecutionDao#synchronizeStatus(StepExecution)" #5365

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
23 changes: 13 additions & 10 deletions ...src/main/java/org/springframework/batch/core/repository/dao/jdbc/JdbcJobExecutionDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
Expand Down Expand Up @@ -79,8 +80,8 @@ SELECT COUNT(*)
WHERE JOB_EXECUTION_ID = ?
""";

private static final String GET_STATUS = """
SELECT STATUS
private static final String GET_VERSION_AND_STATUS = """
SELECT VERSION, STATUS
FROM %PREFIX%JOB_EXECUTION
WHERE JOB_EXECUTION_ID = ?
""";
Expand Down Expand Up @@ -346,14 +347,16 @@ public Set<JobExecution> findRunningJobExecutions(String jobName) {

@Override
public void synchronizeStatus(JobExecution jobExecution) {
int currentVersion = getJdbcTemplate().queryForObject(getQuery(CURRENT_VERSION_JOB_EXECUTION), Integer.class,
jobExecution.getId());

if (currentVersion != jobExecution.getVersion()) {
String status = getJdbcTemplate().queryForObject(getQuery(GET_STATUS), String.class, jobExecution.getId());
jobExecution.upgradeStatus(BatchStatus.valueOf(status));
jobExecution.setVersion(currentVersion);
}
getJdbcTemplate().query(getQuery(GET_VERSION_AND_STATUS), rs -> {
Integer currentVersion = rs.getInt("VERSION");
if (!Objects.equals(currentVersion, jobExecution.getVersion())) {
BatchStatus currentStatus = BatchStatus.valueOf(rs.getString("STATUS"));
if (currentStatus.isGreaterThan(jobExecution.getStatus())) {
jobExecution.upgradeStatus(currentStatus);
}
jobExecution.setVersion(currentVersion);
}
}, jobExecution.getId());
}

/**
Expand Down
Loading