Skip to content

GH-5356: Optimize findRunningJobExecutions to use batch query #5357

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
Wordbe wants to merge 2 commits into
base: main
Choose a base branch
from
+51 −13
Open

GH-5356: Optimize findRunningJobExecutions to use batch query #5357

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0dca52
GH-5356: Optimize findRunningJobExecutions to use batch query
Wordbe Mar 24, 2026
eb10ea6
Use stream to build jobInstanceMap in findRunningJobExecutions
Wordbe Mar 28, 2026
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
28 changes: 17 additions & 11 deletions ...main/java/org/springframework/batch/core/repository/dao/mongodb/MongoJobExecutionDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2024-2025 the original author or authors.
* Copyright 2024-2026 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -21,9 +21,12 @@
import java.time.ZoneId;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

import org.springframework.batch.core.job.JobExecution;
import org.springframework.batch.core.job.JobInstance;
Expand Down Expand Up @@ -116,18 +119,21 @@ public JobExecution getLastJobExecution(JobInstance jobInstance) {
@Override
public Set<JobExecution> findRunningJobExecutions(String jobName) {
List<JobInstance> jobInstances = this.jobInstanceDao.findJobInstancesByName(jobName);
Set<JobExecution> runningJobExecutions = new HashSet<>();
if (jobInstances.isEmpty()) {
return Collections.emptySet();
}
Map<Long, JobInstance> jobInstanceMap = new HashMap<>();
Copy link
Copy Markdown
Contributor

@quaff quaff Mar 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use streams here.

Map<Long, JobInstance> jobInstanceMap = jobInstances.stream().collect(Collectors.toMap(JobInstance::getId, Function.identity()));

Copy link
Copy Markdown
Contributor Author

@Wordbe Wordbe Mar 28, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the suggestion! Applied in the latest commit eb10ea6

for (JobInstance jobInstance : jobInstances) {
Query query = query(
where("jobInstanceId").is(jobInstance.getId()).and("status").in("STARTING", "STARTED", "STOPPING"));
this.mongoOperations
.find(query, org.springframework.batch.core.repository.persistence.JobExecution.class,
JOB_EXECUTIONS_COLLECTION_NAME)
.stream()
.map(jobExecution -> convert(jobExecution, jobInstance))
.forEach(runningJobExecutions::add);
jobInstanceMap.put(jobInstance.getId(), jobInstance);
}
return runningJobExecutions;
Query query = query(
where("jobInstanceId").in(jobInstanceMap.keySet()).and("status").in("STARTING", "STARTED", "STOPPING"));
return this.mongoOperations
.find(query, org.springframework.batch.core.repository.persistence.JobExecution.class,
JOB_EXECUTIONS_COLLECTION_NAME)
.stream()
.map(jobExecution -> convert(jobExecution, jobInstanceMap.get(jobExecution.getJobInstanceId())))
.collect(Collectors.toSet());
}

@Override
Expand Down
36 changes: 35 additions & 1 deletion ...g/springframework/batch/core/repository/support/MongoJobExecutionDaoIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2008-2025 the original author or authors.
* Copyright 2008-2026 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -39,6 +39,7 @@
import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

import static org.junit.jupiter.api.Assertions.*;

Expand Down Expand Up @@ -241,6 +242,39 @@ void testFindRunningExecutions(@Autowired StepExecutionDao stepExecutionDao) {

}

@Test
void testFindRunningExecutionsAcrossMultipleInstances(@Autowired JobInstanceDao jobInstanceDao) {
String jobName = "multiInstanceJob";
JobInstance instance1 = jobInstanceDao.createJobInstance(jobName,
new JobParametersBuilder().addLong("id", 1L).toJobParameters());
JobInstance instance2 = jobInstanceDao.createJobInstance(jobName,
new JobParametersBuilder().addLong("id", 2L).toJobParameters());
LocalDateTime now = LocalDateTime.now();

JobExecution running1 = dao.createJobExecution(instance1, jobParameters);
running1.setStatus(BatchStatus.STARTED);
running1.setStartTime(now);
dao.updateJobExecution(running1);

JobExecution completed = dao.createJobExecution(instance2, jobParameters);
completed.setStatus(BatchStatus.COMPLETED);
completed.setStartTime(now);
completed.setEndTime(now);
dao.updateJobExecution(completed);

JobExecution running2 = dao.createJobExecution(instance2, jobParameters);
running2.setStatus(BatchStatus.STARTED);
running2.setStartTime(now);
dao.updateJobExecution(running2);

Set<JobExecution> result = dao.findRunningJobExecutions(jobName);

assertEquals(2, result.size());
Set<Long> ids = result.stream().map(JobExecution::getId).collect(Collectors.toSet());
assertTrue(ids.contains(running1.getId()));
assertTrue(ids.contains(running2.getId()));
}

/**
* Check the execution is returned
*/
Expand Down
Loading