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

BATCH-1495: added limit to chunk provider to prevent runaway skips on read (limit is max(commit-interval, 100))

Browse Source
This commit is contained in:
dsyer
2010-09-06 12:31:15 +00:00
parent 984a254fed
commit fafbe544be
8 changed files with 171 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantChunkProviderTests.java Executable file
View File

@@ -0,0 +1,53 @@
package org.springframework.batch.core.step.item;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import java.util.Arrays;
import java.util.Collections;
import org.junit.Test;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobInstance;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.StepContribution;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.core.step.skip.LimitCheckingItemSkipPolicy;
import org.springframework.batch.item.ItemReader;
import org.springframework.batch.item.ParseException;
import org.springframework.batch.item.UnexpectedInputException;
import org.springframework.batch.item.support.ListItemReader;
import org.springframework.batch.repeat.support.RepeatTemplate;
public class FaultTolerantChunkProviderTests {
private FaultTolerantChunkProvider<String> provider;
private StepContribution contribution = new StepContribution(new StepExecution("foo", new JobExecution(
new JobInstance(123L, new JobParameters(), "job"))));
@Test
public void testProvide() throws Exception {
provider = new FaultTolerantChunkProvider<String>(new ListItemReader<String>(Arrays.asList("foo", "bar")),
new RepeatTemplate());
Chunk<String> chunk = provider.provide(contribution);
assertNotNull(chunk);
assertEquals(2, chunk.getItems().size());
}
@Test
public void testProvideWithOverflow() throws Exception {
provider = new FaultTolerantChunkProvider<String>(new ItemReader<String>() {
public String read() throws Exception, UnexpectedInputException, ParseException {
throw new RuntimeException("Planned");
}
}, new RepeatTemplate());
provider.setSkipPolicy(new LimitCheckingItemSkipPolicy(Integer.MAX_VALUE, Collections.<Class<? extends Throwable>,Boolean>singletonMap(Exception.class, Boolean.TRUE)));
provider.setMaxSkipsOnRead(10);
Chunk<String> chunk = null;
chunk = provider.provide(contribution);
assertNotNull(chunk);
assertEquals(0, chunk.getItems().size());
assertEquals(10, chunk.getErrors().size());
}
}

27
spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleChunkProviderTests.java
View File

@@ -5,7 +5,6 @@ import static org.junit.Assert.assertNotNull;
import java.util.Arrays;
import org.junit.Before;
import org.junit.Test;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobInstance;
@@ -22,17 +21,31 @@ public class SimpleChunkProviderTests {
private StepContribution contribution = new StepContribution(new StepExecution("foo", new JobExecution(
new JobInstance(123L, new JobParameters(), "job"))));
@Before
public void setUp() {
provider = new SimpleChunkProvider<String>(new ListItemReader<String>(Arrays.asList("foo", "bar")),
new RepeatTemplate());
}
@Test
public void testProvide() throws Exception {
provider = new SimpleChunkProvider<String>(new ListItemReader<String>(Arrays.asList("foo", "bar")),
new RepeatTemplate());
Chunk<String> chunk = provider.provide(contribution);
assertNotNull(chunk);
assertEquals(2, chunk.getItems().size());
}
@Test
public void testProvideWithOverflow() throws Exception {
provider = new SimpleChunkProvider<String>(new ListItemReader<String>(Arrays.asList("foo", "bar")),
new RepeatTemplate()) {
@Override
protected String read(StepContribution contribution, Chunk<String> chunk) throws SkipOverflowException,
Exception {
chunk.skip(new RuntimeException("Planned"));
throw new SkipOverflowException("Overflow");
}
};
Chunk<String> chunk = null;
chunk = provider.provide(contribution);
assertNotNull(chunk);
assertEquals(0, chunk.getItems().size());
assertEquals(1, chunk.getErrors().size());
}
}