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

BATCH-7: Remove transaction synchronization and state management from input/output sources (formerly buffering)

Browse Source 
http://jira.springframework.org/browse/BATCH-7

Use StreamManager to start/end transaction in step executor
This commit is contained in:
dsyer
2008-01-31 22:36:26 +00:00
parent f5d8a32cdb
commit 2c3d43d7bd
27 changed files with 194 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-batch-execution/.classpath
View File

@@ -4,7 +4,7 @@
<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**/*.java" including="**" kind="src" path="src/main/resources"/>
<classpathentry excluding="**/*.java" including="**" kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.devzuz.q.maven.jdt.core.mavenClasspathContainer"/>
<classpathentry exported="true" kind="con" path="org.devzuz.q.maven.jdt.core.mavenClasspathContainer"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

8
spring-batch-execution/.settings/org.eclipse.jdt.core.prefs
View File

@@ -1,5 +1,7 @@
#Fri Aug 03 14:01:44 BST 2007
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
#Thu Jan 31 17:05:10 GMT 2008
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.source=1.4
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
org.eclipse.jdt.core.compiler.compliance=1.4
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
org.eclipse.jdt.core.compiler.source=1.4

77
spring-batch-execution/src/main/java/org/springframework/batch/execution/step/simple/SimpleStepExecutor.java
View File

@@ -46,12 +46,9 @@ import org.springframework.batch.repeat.exception.handler.ExceptionHandler;
import org.springframework.batch.repeat.exception.handler.SimpleLimitExceptionHandler;
import org.springframework.batch.repeat.policy.SimpleCompletionPolicy;
import org.springframework.batch.repeat.support.RepeatTemplate;
import org.springframework.batch.repeat.synch.BatchTransactionSynchronizationManager;
import org.springframework.batch.support.transaction.ResourcelessTransactionManager;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionCallback;
import org.springframework.transaction.support.TransactionTemplate;
import org.springframework.util.Assert;
/**
@@ -94,7 +91,7 @@ public class SimpleStepExecutor {
private AbstractStep step;
private StreamManager streamManager = new SimpleStreamManager();
private StreamManager streamManager;
/**
* Package private constructor so the factory can create a the executor.
@@ -106,8 +103,8 @@ public class SimpleStepExecutor {
/**
* Public setter for the {@link StreamManager}. This will be used to create
* the {@link StepContext}, and hence any component that is a
* {@link ItemStream} and in step scope will be registered with the service. The
* {@link StepContext} is then a source of aggregate statistics for the
* {@link ItemStream} and in step scope will be registered with the service.
* The {@link StepContext} is then a source of aggregate statistics for the
* step.
*
* @param streamManager the {@link StreamManager} to set. Default is a
@@ -180,6 +177,10 @@ public class SimpleStepExecutor {
ExitStatus status = ExitStatus.FAILED;
if (streamManager==null) {
streamManager = new SimpleStreamManager(transactionManager);
}
StepContext parentStepContext = StepSynchronizationManager.getContext();
final StepContext stepContext = new SimpleStepContext(stepExecution, parentStepContext, streamManager);
StepSynchronizationManager.register(stepContext);
@@ -192,7 +193,7 @@ public class SimpleStepExecutor {
if (saveStreamContext && isRestart) {
stepContext.setInitialStreamContext(stepInstance.getStreamContext());
}
try {
stepExecution.setStartTime(new Date(System.currentTimeMillis()));
@@ -210,40 +211,31 @@ public class SimpleStepExecutor {
ExitStatus result;
TransactionStatus transaction = streamManager.getTransaction(stepContext);
try {
result = (ExitStatus) new TransactionTemplate(transactionManager)
.execute(new TransactionCallback() {
public Object doInTransaction(TransactionStatus status) {
/*
* New transaction obtained,
* resynchronize
* TransactionSynchronization objects
*/
BatchTransactionSynchronizationManager.resynchronize();
ExitStatus result;
/*
* New transaction obtained, resynchronize
* TransactionSynchronization objects
*/
result = processChunk(step, contribution);
result = processChunk(step, contribution);
// TODO: check that stepExecution can
// aggregate these contributions if they
// come in asynchronously.
StreamContext statistics = stepContext.getStreamContext();
contribution.setStreamContext(new GenericStreamContext(statistics.getProperties()));
contribution.incrementCommitCount();
// Apply the contribution to the step
// only if chunk was successful
stepExecution.apply(contribution);
// TODO: check that stepExecution can
// aggregate these contributions if they
// come in asynchronously.
StreamContext statistics = stepContext.getStreamContext();
contribution.setStreamContext(new GenericStreamContext(statistics
.getProperties()));
contribution.incrementCommitCount();
// Apply the contribution to the step
// only if chunk was successful
stepExecution.apply(contribution);
if (saveStreamContext) {
stepInstance.setStreamContext(stepContext.getStreamContext());
jobRepository.update(stepInstance);
}
jobRepository.saveOrUpdate(stepExecution);
return result;
}
});
if (saveStreamContext) {
stepInstance.setStreamContext(stepContext.getStreamContext());
jobRepository.update(stepInstance);
}
jobRepository.saveOrUpdate(stepExecution);
}
catch (Throwable t) {
@@ -255,6 +247,7 @@ public class SimpleStepExecutor {
* comes outside the transaction.
*/
stepExecution.rollback();
streamManager.rollback(transaction);
if (t instanceof RuntimeException) {
throw (RuntimeException) t;
}
@@ -268,10 +261,11 @@ public class SimpleStepExecutor {
// caller
interruptionPolicy.checkInterrupted(context);
streamManager.commit(transaction);
return result;
}
});
updateStatus(stepExecution, BatchStatus.COMPLETED);
@@ -298,12 +292,7 @@ public class SimpleStepExecutor {
}
finally {
// clear any registered synchronizations
try {
StepSynchronizationManager.close();
}
finally {
BatchTransactionSynchronizationManager.clearSynchronizations();
}
StepSynchronizationManager.close();
}
}

4
spring-batch-execution/src/test/java/org/springframework/batch/execution/scope/SimpleStepContextTests.java
View File

@@ -27,7 +27,7 @@ import org.springframework.batch.item.ItemStream;
import org.springframework.batch.item.StreamContext;
import org.springframework.batch.item.stream.GenericStreamContext;
import org.springframework.batch.item.stream.ItemStreamAdapter;
import org.springframework.batch.item.stream.StreamManager;
import org.springframework.batch.item.stream.SimpleStreamManager;
import org.springframework.batch.support.PropertiesConverter;
/**
@@ -155,7 +155,7 @@ public class SimpleStepContextTests extends TestCase {
* @author Dave Syer
*
*/
private class StubStreamManager implements StreamManager {
private class StubStreamManager extends SimpleStreamManager {
private final Map map;
private StubStreamManager(Map map) {

2
spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/SimpleStepExecutorTests.java
View File

@@ -412,7 +412,7 @@ public class SimpleStepExecutorTests extends TestCase {
assertEquals(false, stepExecution.getStreamContext().containsKey("foo"));
final Map map = new HashMap();
stepExecutor.setStreamManager(new SimpleStreamManager() {
stepExecutor.setStreamManager(new SimpleStreamManager(new ResourcelessTransactionManager()) {
public StreamContext getStreamContext(Object key) {
// TODO Auto-generated method stub
return new GenericStreamContext(PropertiesConverter.stringToProperties("foo=bar"));