RESOLVED - issue BATCH-368: StepExecution attributes can overflow and cause spurious OptimisticLockingException

http://jira.springframework.org/browse/BATCH-368

Removed STATISTICS column from BATCH_STEP_EXECUTION.

Author: dsyer

spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcStepExecutionDao.java

@@ -19,7 +19,6 @@
 import org.springframework.batch.io.exception.BatchCriticalException;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.repeat.ExitStatus;
-import org.springframework.batch.support.PropertiesConverter;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.OptimisticLockingFailureException;
@@ -63,18 +62,18 @@ public class JdbcStepExecutionDao extends AbstractJdbcBatchMetadataDao implement
 			+ " KEY_NAME, STRING_VAL, DOUBLE_VAL, LONG_VAL, OBJECT_VAL) values(?,?,?,?,?,?,?)";
 
 	private static final String SAVE_STEP_EXECUTION = "INSERT into %PREFIX%STEP_EXECUTION(STEP_EXECUTION_ID, VERSION, STEP_NAME, JOB_EXECUTION_ID, START_TIME, "
-			+ "END_TIME, STATUS, COMMIT_COUNT, TASK_COUNT, TASK_STATISTICS, CONTINUABLE, EXIT_CODE, EXIT_MESSAGE) "
-			+ "values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+			+ "END_TIME, STATUS, COMMIT_COUNT, TASK_COUNT, CONTINUABLE, EXIT_CODE, EXIT_MESSAGE) "
+			+ "values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
 
 	private static final String UPDATE_STEP_EXECUTION_CONTEXT = "UPDATE %PREFIX%STEP_EXECUTION_CONTEXT set "
 			+ "TYPE_CD = ?, STRING_VAL = ?, DOUBLE_VAL = ?, LONG_VAL = ?, OBJECT_VAL = ? where STEP_EXECUTION_ID = ? and KEY_NAME = ?";
 
 	private static final String UPDATE_STEP_EXECUTION = "UPDATE %PREFIX%STEP_EXECUTION set START_TIME = ?, END_TIME = ?, "
-			+ "STATUS = ?, COMMIT_COUNT = ?, TASK_COUNT = ?, TASK_STATISTICS = ?, CONTINUABLE = ? , EXIT_CODE = ?, "
+			+ "STATUS = ?, COMMIT_COUNT = ?, TASK_COUNT = ?, CONTINUABLE = ? , EXIT_CODE = ?, "
 			+ "EXIT_MESSAGE = ?, VERSION = ? where STEP_EXECUTION_ID = ? and VERSION = ?";
 
 	private static final String GET_STEP_EXECUTION = "SELECT STEP_EXECUTION_ID, STEP_NAME, START_TIME, END_TIME, STATUS, COMMIT_COUNT,"
-			+ " TASK_COUNT, TASK_STATISTICS, CONTINUABLE, EXIT_CODE, EXIT_MESSAGE from %PREFIX%STEP_EXECUTION where STEP_NAME = ? and JOB_EXECUTION_ID = ?";
+			+ " TASK_COUNT, CONTINUABLE, EXIT_CODE, EXIT_MESSAGE from %PREFIX%STEP_EXECUTION where STEP_NAME = ? and JOB_EXECUTION_ID = ?";
 
 	private static final int EXIT_MESSAGE_LENGTH = 250;
 
@@ -179,14 +178,13 @@ public void saveStepExecution(StepExecution stepExecution) {
 				stepExecution.getStepName(), stepExecution.getJobExecutionId(), stepExecution.getStartTime(),
 				stepExecution.getEndTime(), stepExecution.getStatus().toString(), stepExecution.getCommitCount(),
 				stepExecution.getTaskCount(),
-				PropertiesConverter.propertiesToString(stepExecution.getExecutionContext().getProperties()),
 				stepExecution.getExitStatus().isContinuable() ? "Y" : "N", stepExecution.getExitStatus().getExitCode(),
 				stepExecution.getExitStatus().getExitDescription() };
 		getJdbcTemplate().update(
 				getQuery(SAVE_STEP_EXECUTION),
 				parameters,
 				new int[] { Types.INTEGER, Types.INTEGER, Types.VARCHAR, Types.INTEGER, Types.TIMESTAMP,
-						Types.TIMESTAMP, Types.VARCHAR, Types.INTEGER, Types.INTEGER, Types.VARCHAR, Types.CHAR,
+						Types.TIMESTAMP, Types.VARCHAR, Types.INTEGER, Types.INTEGER, Types.CHAR,
 						Types.VARCHAR, Types.VARCHAR });
 	}
 
@@ -314,15 +312,14 @@ public void updateStepExecution(StepExecution stepExecution) {
 			Integer version = new Integer(stepExecution.getVersion().intValue() + 1);
 			Object[] parameters = new Object[] { stepExecution.getStartTime(), stepExecution.getEndTime(),
 					stepExecution.getStatus().toString(), stepExecution.getCommitCount(), stepExecution.getTaskCount(),
-					PropertiesConverter.propertiesToString(stepExecution.getExecutionContext().getProperties()),
 					stepExecution.getExitStatus().isContinuable() ? "Y" : "N",
 					stepExecution.getExitStatus().getExitCode(), exitDescription, version, stepExecution.getId(),
 					stepExecution.getVersion() };
 			int count = getJdbcTemplate().update(
 					getQuery(UPDATE_STEP_EXECUTION),
 					parameters,
 					new int[] { Types.TIMESTAMP, Types.TIMESTAMP, Types.VARCHAR, Types.INTEGER, Types.INTEGER,
-							Types.VARCHAR, Types.CHAR, Types.VARCHAR, Types.VARCHAR, Types.INTEGER, Types.INTEGER,
+							Types.CHAR, Types.VARCHAR, Types.VARCHAR, Types.INTEGER, Types.INTEGER,
 							Types.INTEGER });
 
 			// Avoid concurrent modifications...
@@ -356,7 +353,7 @@ public Object mapRow(ResultSet rs, int rowNum) throws SQLException {
 			stepExecution.setCommitCount(rs.getInt(6));
 			stepExecution.setTaskCount(rs.getInt(7));
 			stepExecution
-					.setExitStatus(new ExitStatus("Y".equals(rs.getString(9)), rs.getString(10), rs.getString(11)));
+					.setExitStatus(new ExitStatus("Y".equals(rs.getString(8)), rs.getString(9), rs.getString(10)));
 			stepExecution.setExecutionContext(findExecutionContext(stepExecution));
 			return stepExecution;
 		}
@@ -408,7 +405,6 @@ public static AttributeType getType(String typeAsString) {
 			return null;
 		}
 	}
-
 	public StepExecution getStepExecution(JobExecution jobExecution, Step step) {
 		List executions = getJdbcTemplate().query(getQuery(GET_STEP_EXECUTION),
 				new Object[] { step.getName(), jobExecution.getId() }, new StepExecutionRowMapper(jobExecution, step));

spring-batch-execution/src/main/resources/schema-db2.sql

@@ -46,7 +46,6 @@ CREATE TABLE BATCH_STEP_EXECUTION  (
 	STATUS VARCHAR(10),
 	COMMIT_COUNT BIGINT , 
 	TASK_COUNT BIGINT , 
-	TASK_STATISTICS VARCHAR(4000),
 	CONTINUABLE CHAR(1),
 	EXIT_CODE VARCHAR(20),
 	EXIT_MESSAGE VARCHAR(2500));

spring-batch-execution/src/main/resources/schema-derby.sql

@@ -46,7 +46,6 @@ CREATE TABLE BATCH_STEP_EXECUTION  (
 	STATUS VARCHAR(10),
 	COMMIT_COUNT BIGINT , 
 	TASK_COUNT BIGINT , 
-	TASK_STATISTICS VARCHAR(4000),
 	CONTINUABLE CHAR(1),
 	EXIT_CODE VARCHAR(20),
 	EXIT_MESSAGE VARCHAR(2500));

spring-batch-execution/src/main/resources/schema-hsqldb.sql

@@ -46,7 +46,6 @@ CREATE TABLE BATCH_STEP_EXECUTION  (
 	STATUS VARCHAR(10),
 	COMMIT_COUNT BIGINT , 
 	TASK_COUNT BIGINT , 
-	TASK_STATISTICS VARCHAR(4000),
 	CONTINUABLE CHAR(1),
 	EXIT_CODE VARCHAR(20),
 	EXIT_MESSAGE VARCHAR(2500));

spring-batch-execution/src/main/resources/schema-mysql.sql

@@ -46,7 +46,6 @@ CREATE TABLE BATCH_STEP_EXECUTION  (
 	STATUS VARCHAR(10),
 	COMMIT_COUNT BIGINT , 
 	TASK_COUNT BIGINT , 
-	TASK_STATISTICS VARCHAR(4000),
 	CONTINUABLE CHAR(1),
 	EXIT_CODE VARCHAR(20),
 	EXIT_MESSAGE VARCHAR(2500));

spring-batch-execution/src/main/resources/schema-oracle10g.sql

@@ -46,7 +46,6 @@ CREATE TABLE BATCH_STEP_EXECUTION  (
 	STATUS VARCHAR(10),
 	COMMIT_COUNT NUMBER(38) , 
 	TASK_COUNT NUMBER(38) , 
-	TASK_STATISTICS VARCHAR(4000),
 	CONTINUABLE CHAR(1),
 	EXIT_CODE VARCHAR(20),
 	EXIT_MESSAGE VARCHAR(2500));

spring-batch-execution/src/main/resources/schema-postgresql.sql

@@ -46,7 +46,6 @@ CREATE TABLE BATCH_STEP_EXECUTION  (
 	STATUS VARCHAR(10),
 	COMMIT_COUNT BIGINT , 
 	TASK_COUNT BIGINT , 
-	TASK_STATISTICS VARCHAR(4000),
 	CONTINUABLE CHAR(1),
 	EXIT_CODE VARCHAR(20),
 	EXIT_MESSAGE VARCHAR(2500));

spring-batch-execution/src/main/sql/init.sql.vpp

@@ -35,7 +35,6 @@ CREATE TABLE BATCH_STEP_EXECUTION  (
 	STATUS VARCHAR(10),
 	COMMIT_COUNT ${BIGINT} , 
 	TASK_COUNT ${BIGINT} , 
-	TASK_STATISTICS VARCHAR(4000),
 	CONTINUABLE CHAR(1),
 	EXIT_CODE VARCHAR(20),
 	EXIT_MESSAGE VARCHAR(2500));

spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql

@@ -35,7 +35,6 @@ CREATE TABLE BATCH_STEP_EXECUTION  (
 	STATUS VARCHAR(10),
 	COMMIT_COUNT BIGINT , 
 	TASK_COUNT BIGINT , 
-	TASK_STATISTICS VARCHAR(4000),
 	CONTINUABLE CHAR(1),
 	EXIT_CODE VARCHAR(20),
 	EXIT_MESSAGE VARCHAR(2500));