Skip to content

Improve retrieval of running job executions #5131

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
+6 −16
Open

Improve retrieval of running job executions #5131

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: 6 additions & 16 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 @@ -26,6 +26,7 @@
import java.util.Set;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Expand Down Expand Up @@ -106,7 +107,7 @@ SELECT COUNT(*)
private static final String GET_RUNNING_EXECUTION_FOR_INSTANCE = """
SELECT E.JOB_EXECUTION_ID
FROM %PREFIX%JOB_EXECUTION E, %PREFIX%JOB_INSTANCE I
WHERE E.JOB_INSTANCE_ID=I.JOB_INSTANCE_ID AND I.JOB_INSTANCE_ID=? AND E.STATUS IN ('STARTING', 'STARTED', 'STOPPING')
WHERE E.JOB_INSTANCE_ID=I.JOB_INSTANCE_ID AND I.JOB_NAME=? AND E.STATUS IN ('STARTING', 'STARTED', 'STOPPING')
""";

private static final String CURRENT_VERSION_JOB_EXECUTION = """
Expand Down Expand Up @@ -340,21 +341,10 @@ private long getJobInstanceId(long jobExecutionId) {

@Override
public Set<JobExecution> findRunningJobExecutions(String jobName) {
final Set<JobExecution> result = new HashSet<>();
List<Long> jobInstanceIds = this.jobInstanceDao.getJobInstanceIds(jobName);
for (long jobInstanceId : jobInstanceIds) {
List<Long> runningJobExecutionIds = getJdbcTemplate()
.queryForList(getQuery(GET_RUNNING_EXECUTION_FOR_INSTANCE), Long.class, jobInstanceId);
if (runningJobExecutionIds.isEmpty()) {
continue;
}
// There should be only one running execution per job instance, enforced at
// startup time
Long jobExecutionId = runningJobExecutionIds.get(0);
JobExecution runningJobExecution = getJobExecution(jobExecutionId);
result.add(runningJobExecution);
}
return result;
return getJdbcTemplate().queryForList(getQuery(GET_RUNNING_EXECUTION_FOR_INSTANCE), Long.class, jobName)
.stream()
.map(this::getJobExecution)
.collect(Collectors.toSet());
}

@Override
Expand Down