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

BATCH-1128: Updated FaultTolerantChunkProcessor's recovery procedure so that StepExecution.writeCount is not updated during throttling because writes will be rolled back.

Browse Source
This commit is contained in:
dhgarrette
2009-03-09 06:08:39 +00:00
parent d47d275e0a
commit ae808ede21
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java
View File

@@ -134,7 +134,7 @@ public class SkipSampleFunctionalTests {
Map<String, Object> execution1 = this.getJobExecution(id1);
assertEquals("COMPLETED", execution1.get("STATUS"));
this.validateLaunchWithSkips();
this.validateLaunchWithSkips(id1);
//
// Clear the data
@@ -148,7 +148,7 @@ public class SkipSampleFunctionalTests {
Map<String, Object> execution2 = this.getJobExecution(id2);
assertEquals("COMPLETED", execution2.get("STATUS"));
this.validateLaunchWithoutSkips();
this.validateLaunchWithoutSkips(id2);
//
// Make sure that the launches were separate executions and separate
@@ -158,7 +158,7 @@ public class SkipSampleFunctionalTests {
assertTrue(!execution1.get("JOB_INSTANCE_ID").equals(execution2.get("JOB_INSTANCE_ID")));
}
private void validateLaunchWithSkips() {
private void validateLaunchWithSkips(long jobExecutionId) {
// Step1: 9 input records, 1 skipped in process, 1 skipped in write =>
// 7 written to output
assertEquals(7, SimpleJdbcTestUtils.countRowsInTable(simpleJdbcTemplate, "TRADE"));
@@ -175,9 +175,14 @@ public class SkipSampleFunctionalTests {
}
assertEquals(new BigDecimal("340.45"), tradeWriter.getTotalPrice());
Map<String, Object> step1Execution = this.getStepExecution(jobExecutionId, "step1");
assertEquals(new Long(3), step1Execution.get("COMMIT_COUNT"));
assertEquals(new Long(8), step1Execution.get("READ_COUNT"));
assertEquals(new Long(7), step1Execution.get("WRITE_COUNT"));
}
private void validateLaunchWithoutSkips() {
private void validateLaunchWithoutSkips(long jobExecutionId) {
// Step1: 5 input records => 5 written to output
assertEquals(5, SimpleJdbcTestUtils.countRowsInTable(simpleJdbcTemplate, "TRADE"));
@@ -195,6 +200,17 @@ public class SkipSampleFunctionalTests {
jobExecutionId);
}
private Map<String, Object> getStepExecution(long jobExecutionId, String stepName) {
for (Map<String, Object> rs : simpleJdbcTemplate.queryForList(
"SELECT * from BATCH_STEP_EXECUTION where JOB_EXECUTION_ID = ? and STEP_NAME = ?", jobExecutionId,
stepName)) {
System.err.println(rs);
}
return simpleJdbcTemplate.queryForMap(
"SELECT * from BATCH_STEP_EXECUTION where JOB_EXECUTION_ID = ? and STEP_NAME = ?", jobExecutionId,
stepName);
}
/**
* Launch the entire job, including all steps, in order.
*