Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve the lookup for running job executions in CommandLineJobRunner

Browse Source 
Before this commit, getting the running job executions loaded
all job executions from the database and filtered them in-memory.

This commit uses `JobExplorer#findRunningJobExecutions` which issues
a query that does the filtering on the database side. This change
considerably improves the performance of stopping a job.

Resolves BATCH-2422
This commit is contained in:
Mahmoud Ben Hassine
2019-06-21 16:44:13 +02:00
committed by Michael Minella
parent fda70ccbcb
commit 872845cae8
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/CommandLineJobRunnerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2006-2013 the original author or authors.
* Copyright 2006-2019 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.
@@ -20,6 +20,7 @@ import java.io.InputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Properties;
import java.util.Set;
@@ -52,6 +53,7 @@ import static org.junit.Assert.assertTrue;
/**
* @author Lucas Ward
* @author Mahmoud Ben Hassine
*
*/
public class CommandLineJobRunnerTests {
@@ -242,7 +244,7 @@ public class CommandLineJobRunnerTests {
String[] args = new String[] { jobPath, "-stop", jobName };
StubJobExplorer.jobInstances = Arrays.asList(new JobInstance(3L, jobName));
CommandLineJobRunner.main(args);
assertEquals(0, StubSystemExiter.status);
assertEquals(1, StubSystemExiter.status);
}
@Test
@@ -258,7 +260,7 @@ public class CommandLineJobRunnerTests {
String[] args = new String[] { jobPath, "-stop", jobName };
StubJobExplorer.jobInstances = Arrays.asList(new JobInstance(5L, jobName));
CommandLineJobRunner.main(args);
assertEquals(0, StubSystemExiter.status);
assertEquals(1, StubSystemExiter.status);
}
@Test
@@ -267,7 +269,7 @@ public class CommandLineJobRunnerTests {
JobInstance jobInstance = new JobInstance(3L, jobName);
StubJobExplorer.jobInstances = Arrays.asList(jobInstance);
CommandLineJobRunner.main(args);
assertEquals(0, StubSystemExiter.status);
assertEquals(1, StubSystemExiter.status);
}
@Test
@@ -455,7 +457,7 @@ public class CommandLineJobRunnerTests {
@Override
public Set<JobExecution> findRunningJobExecutions(String jobName) {
throw new UnsupportedOperationException();
return new HashSet<>();
}
@Override