RESOLVED - issue BATCH-332: Rename the JOB_ID column to JOB_INSTANCE_ID in the status tables

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

JOB_ID and STEP_ID columns renamed to JOB_INSTANCE_ID and STEP_INSTANCE_ID
This commit is contained in:
robokaso
2008-02-04 09:52:46 +00:00
parent 3071ab6596
commit ab29fb637b
12 changed files with 46 additions and 46 deletions

View File

@@ -60,7 +60,7 @@ public class JdbcJobDao implements JobDao, InitializingBean {
private static final String CREATE_JOB = "INSERT into %PREFIX%JOB_INSTANCE(ID, JOB_NAME, JOB_KEY)"
+ " values (?, ?, ?)";
private static final String CREATE_JOB_PARAMETERS = "INSERT into %PREFIX%JOB_INSTANCE_PARAMS(JOB_ID, KEY_NAME, TYPE_CD, " +
private static final String CREATE_JOB_PARAMETERS = "INSERT into %PREFIX%JOB_INSTANCE_PARAMS(JOB_INSTANCE_ID, KEY_NAME, TYPE_CD, " +
"STRING_VAL, DATE_VAL, LONG_VAL) values (?, ?, ?, ?, ?, ?)";
/**
@@ -73,11 +73,11 @@ public class JdbcJobDao implements JobDao, InitializingBean {
private static final String FIND_JOBS = "SELECT ID, STATUS from %PREFIX%JOB_INSTANCE where JOB_NAME = ? and JOB_KEY = ?";
private static final String GET_JOB_EXECUTION_COUNT = "SELECT count(ID) from %PREFIX%JOB_EXECUTION "
+ "where JOB_ID = ?";
+ "where JOB_INSTANCE_ID = ?";
protected static final Log logger = LogFactory.getLog(JdbcJobDao.class);
private static final String SAVE_JOB_EXECUTION = "INSERT into %PREFIX%JOB_EXECUTION(ID, JOB_ID, START_TIME, "
private static final String SAVE_JOB_EXECUTION = "INSERT into %PREFIX%JOB_EXECUTION(ID, JOB_INSTANCE_ID, START_TIME, "
+ "END_TIME, STATUS, CONTINUABLE, EXIT_CODE, EXIT_MESSAGE) values (?, ?, ?, ?, ?, ?, ?, ?)";
private static final String UPDATE_JOB = "UPDATE %PREFIX%JOB_INSTANCE set STATUS = ? where ID = ?";
@@ -451,7 +451,7 @@ public class JdbcJobDao implements JobDao, InitializingBean {
public static class JobExecutionRowMapper implements RowMapper {
public static final String FIND_JOB_EXECUTIONS = "SELECT ID, START_TIME, END_TIME, STATUS, CONTINUABLE, EXIT_CODE, EXIT_MESSAGE from %PREFIX%JOB_EXECUTION"
+ " where JOB_ID = ?";
+ " where JOB_INSTANCE_ID = ?";
public static final String GET_JOB_EXECUTION = "SELECT ID, START_TIME, END_TIME, STATUS, CONTINUABLE, EXIT_CODE, EXIT_MESSAGE from %PREFIX%JOB_EXECUTION"
+ " where ID = ?";

View File

@@ -61,26 +61,26 @@ import org.springframework.util.StringUtils;
*/
public class JdbcStepDao implements StepDao, InitializingBean {
private static final String CREATE_STEP = "INSERT into %PREFIX%STEP_INSTANCE(ID, JOB_ID, STEP_NAME) values (?, ?, ?)";
private static final String CREATE_STEP = "INSERT into %PREFIX%STEP_INSTANCE(ID, JOB_INSTANCE_ID, STEP_NAME) values (?, ?, ?)";
private static final int EXIT_MESSAGE_LENGTH = 250;
private static final String FIND_STEP = "SELECT ID, STATUS, RESTART_DATA from %PREFIX%STEP_INSTANCE where JOB_ID = ? "
private static final String FIND_STEP = "SELECT ID, STATUS, RESTART_DATA from %PREFIX%STEP_INSTANCE where JOB_INSTANCE_ID = ? "
+ "and STEP_NAME = ?";
private static final String FIND_STEP_EXECUTIONS = "SELECT ID, JOB_EXECUTION_ID, START_TIME, END_TIME, STATUS, COMMIT_COUNT,"
+ " TASK_COUNT, TASK_STATISTICS, CONTINUABLE, EXIT_CODE, EXIT_MESSAGE from %PREFIX%STEP_EXECUTION where STEP_ID = ?";
+ " TASK_COUNT, TASK_STATISTICS, CONTINUABLE, EXIT_CODE, EXIT_MESSAGE from %PREFIX%STEP_EXECUTION where STEP_INSTANCE_ID = ?";
// Step SQL statements
private static final String FIND_STEPS = "SELECT ID, STEP_NAME, STATUS, RESTART_DATA from %PREFIX%STEP_INSTANCE where JOB_ID = ?";
private static final String FIND_STEPS = "SELECT ID, STEP_NAME, STATUS, RESTART_DATA from %PREFIX%STEP_INSTANCE where JOB_INSTANCE_ID = ?";
private static final String GET_STEP_EXECUTION_COUNT = "SELECT count(ID) from %PREFIX%STEP_EXECUTION where "
+ "STEP_ID = ?";
+ "STEP_INSTANCE_ID = ?";
protected static final Log logger = LogFactory.getLog(JdbcStepDao.class);
// StepExecution statements
private static final String SAVE_STEP_EXECUTION = "INSERT into %PREFIX%STEP_EXECUTION(ID, VERSION, STEP_ID, JOB_EXECUTION_ID, START_TIME, "
private static final String SAVE_STEP_EXECUTION = "INSERT into %PREFIX%STEP_EXECUTION(ID, VERSION, STEP_INSTANCE_ID, JOB_EXECUTION_ID, START_TIME, "
+ "END_TIME, STATUS, COMMIT_COUNT, TASK_COUNT, TASK_STATISTICS, CONTINUABLE, EXIT_CODE, EXIT_MESSAGE) "
+ "values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
@@ -178,7 +178,7 @@ public class JdbcStepDao implements StepDao, InitializingBean {
}
else {
// This error will likely never be thrown, because there should
// never be two steps with the same name and Job_ID due to database
// never be two steps with the same name and JOB_INSTANCE_ID due to database
// constraints.
throw new IncorrectResultSizeDataAccessException("Step Invalid, multiple steps found for StepName:"
+ stepName + " and JobId:" + job.getId(), 1, steps.size());
@@ -226,7 +226,7 @@ public class JdbcStepDao implements StepDao, InitializingBean {
* @see StepDao#findSteps(JobInstance)
*
* Sql implementation which uses a RowMapper to populate a list of all rows
* in the step table with the same JOB_ID.
* in the step table with the same JOB_INSTANCE_ID.
*
* @throws IllegalArgumentException if jobId is null.
*/

View File

@@ -21,7 +21,7 @@ CREATE TABLE BATCH_JOB_INSTANCE (
CREATE TABLE BATCH_JOB_EXECUTION (
ID BIGINT PRIMARY KEY ,
VERSION BIGINT,
JOB_ID BIGINT NOT NULL,
JOB_INSTANCE_ID BIGINT NOT NULL,
START_TIME TIMESTAMP NOT NULL ,
END_TIME TIMESTAMP ,
STATUS VARCHAR(10),
@@ -30,7 +30,7 @@ CREATE TABLE BATCH_JOB_EXECUTION (
EXIT_MESSAGE VARCHAR(2500));
CREATE TABLE BATCH_JOB_INSTANCE_PARAMS (
JOB_ID BIGINT NOT NULL ,
JOB_INSTANCE_ID BIGINT NOT NULL ,
TYPE_CD VARCHAR(6) NOT NULL ,
KEY_NAME VARCHAR(100) NOT NULL ,
STRING_VAL VARCHAR(250) ,
@@ -40,7 +40,7 @@ CREATE TABLE BATCH_JOB_INSTANCE_PARAMS (
CREATE TABLE BATCH_STEP_INSTANCE (
ID BIGINT PRIMARY KEY ,
VERSION BIGINT,
JOB_ID BIGINT NOT NULL,
JOB_INSTANCE_ID BIGINT NOT NULL,
STEP_NAME VARCHAR(100) NOT NULL,
STATUS VARCHAR(10),
RESTART_DATA VARCHAR(2500));
@@ -48,7 +48,7 @@ CREATE TABLE BATCH_STEP_INSTANCE (
CREATE TABLE BATCH_STEP_EXECUTION (
ID BIGINT PRIMARY KEY ,
VERSION BIGINT NOT NULL,
STEP_ID BIGINT NOT NULL,
STEP_INSTANCE_ID BIGINT NOT NULL,
JOB_EXECUTION_ID BIGINT NOT NULL,
START_TIME TIMESTAMP NOT NULL ,
END_TIME TIMESTAMP ,

View File

@@ -21,7 +21,7 @@ CREATE TABLE BATCH_JOB_INSTANCE (
CREATE TABLE BATCH_JOB_EXECUTION (
ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
VERSION BIGINT,
JOB_ID BIGINT NOT NULL,
JOB_INSTANCE_ID BIGINT NOT NULL,
START_TIME TIMESTAMP NOT NULL ,
END_TIME TIMESTAMP ,
STATUS VARCHAR(10),
@@ -30,7 +30,7 @@ CREATE TABLE BATCH_JOB_EXECUTION (
EXIT_MESSAGE VARCHAR(2500));
CREATE TABLE BATCH_JOB_INSTANCE_PARAMS (
JOB_ID BIGINT NOT NULL ,
JOB_INSTANCE_ID BIGINT NOT NULL ,
TYPE_CD VARCHAR(6) NOT NULL ,
KEY_NAME VARCHAR(100) NOT NULL ,
STRING_VAL VARCHAR(250) ,
@@ -40,7 +40,7 @@ CREATE TABLE BATCH_JOB_INSTANCE_PARAMS (
CREATE TABLE BATCH_STEP_INSTANCE (
ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
VERSION BIGINT,
JOB_ID BIGINT NOT NULL,
JOB_INSTANCE_ID BIGINT NOT NULL,
STEP_NAME VARCHAR(100) NOT NULL,
STATUS VARCHAR(10),
RESTART_DATA VARCHAR(2500));
@@ -48,7 +48,7 @@ CREATE TABLE BATCH_STEP_INSTANCE (
CREATE TABLE BATCH_STEP_EXECUTION (
ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY,
VERSION BIGINT NOT NULL,
STEP_ID BIGINT NOT NULL,
STEP_INSTANCE_ID BIGINT NOT NULL,
JOB_EXECUTION_ID BIGINT NOT NULL,
START_TIME TIMESTAMP NOT NULL ,
END_TIME TIMESTAMP ,

View File

@@ -21,7 +21,7 @@ CREATE TABLE BATCH_JOB_INSTANCE (
CREATE TABLE BATCH_JOB_EXECUTION (
ID BIGINT IDENTITY PRIMARY KEY ,
VERSION BIGINT,
JOB_ID BIGINT NOT NULL,
JOB_INSTANCE_ID BIGINT NOT NULL,
START_TIME TIMESTAMP NOT NULL ,
END_TIME TIMESTAMP ,
STATUS VARCHAR(10),
@@ -30,7 +30,7 @@ CREATE TABLE BATCH_JOB_EXECUTION (
EXIT_MESSAGE VARCHAR(2500));
CREATE TABLE BATCH_JOB_INSTANCE_PARAMS (
JOB_ID BIGINT NOT NULL ,
JOB_INSTANCE_ID BIGINT NOT NULL ,
TYPE_CD VARCHAR(6) NOT NULL ,
KEY_NAME VARCHAR(100) NOT NULL ,
STRING_VAL VARCHAR(250) ,
@@ -40,7 +40,7 @@ CREATE TABLE BATCH_JOB_INSTANCE_PARAMS (
CREATE TABLE BATCH_STEP_INSTANCE (
ID BIGINT IDENTITY PRIMARY KEY ,
VERSION BIGINT,
JOB_ID BIGINT NOT NULL,
JOB_INSTANCE_ID BIGINT NOT NULL,
STEP_NAME VARCHAR(100) NOT NULL,
STATUS VARCHAR(10),
RESTART_DATA VARCHAR(2500));
@@ -48,7 +48,7 @@ CREATE TABLE BATCH_STEP_INSTANCE (
CREATE TABLE BATCH_STEP_EXECUTION (
ID BIGINT IDENTITY PRIMARY KEY ,
VERSION BIGINT NOT NULL,
STEP_ID BIGINT NOT NULL,
STEP_INSTANCE_ID BIGINT NOT NULL,
JOB_EXECUTION_ID BIGINT NOT NULL,
START_TIME TIMESTAMP NOT NULL ,
END_TIME TIMESTAMP ,

View File

@@ -21,7 +21,7 @@ CREATE TABLE BATCH_JOB_INSTANCE (
CREATE TABLE BATCH_JOB_EXECUTION (
ID BIGINT unsigned PRIMARY KEY ,
VERSION BIGINT,
JOB_ID BIGINT NOT NULL,
JOB_INSTANCE_ID BIGINT NOT NULL,
START_TIME TIMESTAMP NOT NULL ,
END_TIME TIMESTAMP ,
STATUS VARCHAR(10),
@@ -30,7 +30,7 @@ CREATE TABLE BATCH_JOB_EXECUTION (
EXIT_MESSAGE VARCHAR(2500));
CREATE TABLE BATCH_JOB_INSTANCE_PARAMS (
JOB_ID BIGINT NOT NULL ,
JOB_INSTANCE_ID BIGINT NOT NULL ,
TYPE_CD VARCHAR(6) NOT NULL ,
KEY_NAME VARCHAR(100) NOT NULL ,
STRING_VAL VARCHAR(250) ,
@@ -40,7 +40,7 @@ CREATE TABLE BATCH_JOB_INSTANCE_PARAMS (
CREATE TABLE BATCH_STEP_INSTANCE (
ID BIGINT unsigned PRIMARY KEY ,
VERSION BIGINT,
JOB_ID BIGINT NOT NULL,
JOB_INSTANCE_ID BIGINT NOT NULL,
STEP_NAME VARCHAR(100) NOT NULL,
STATUS VARCHAR(10),
RESTART_DATA VARCHAR(2500));
@@ -48,7 +48,7 @@ CREATE TABLE BATCH_STEP_INSTANCE (
CREATE TABLE BATCH_STEP_EXECUTION (
ID BIGINT unsigned PRIMARY KEY ,
VERSION BIGINT NOT NULL,
STEP_ID BIGINT NOT NULL,
STEP_INSTANCE_ID BIGINT NOT NULL,
JOB_EXECUTION_ID BIGINT NOT NULL,
START_TIME TIMESTAMP NOT NULL ,
END_TIME TIMESTAMP ,

View File

@@ -21,7 +21,7 @@ CREATE TABLE BATCH_JOB_INSTANCE (
CREATE TABLE BATCH_JOB_EXECUTION (
ID NUMBER(38) PRIMARY KEY ,
VERSION NUMBER(38),
JOB_ID NUMBER(38) NOT NULL,
JOB_INSTANCE_ID NUMBER(38) NOT NULL,
START_TIME TIMESTAMP NOT NULL ,
END_TIME TIMESTAMP ,
STATUS VARCHAR(10),
@@ -30,7 +30,7 @@ CREATE TABLE BATCH_JOB_EXECUTION (
EXIT_MESSAGE VARCHAR(2500));
CREATE TABLE BATCH_JOB_INSTANCE_PARAMS (
JOB_ID BIGINT NOT NULL ,
JOB_INSTANCE_ID BIGINT NOT NULL ,
TYPE_CD VARCHAR(6) NOT NULL ,
KEY_NAME VARCHAR(100) NOT NULL ,
STRING_VAL VARCHAR(250) ,
@@ -40,7 +40,7 @@ CREATE TABLE BATCH_JOB_INSTANCE_PARAMS (
CREATE TABLE BATCH_STEP_INSTANCE (
ID NUMBER(38) PRIMARY KEY ,
VERSION NUMBER(38),
JOB_ID NUMBER(38) NOT NULL,
JOB_INSTANCE_ID NUMBER(38) NOT NULL,
STEP_NAME VARCHAR(100) NOT NULL,
STATUS VARCHAR(10),
RESTART_DATA VARCHAR(2500));
@@ -48,7 +48,7 @@ CREATE TABLE BATCH_STEP_INSTANCE (
CREATE TABLE BATCH_STEP_EXECUTION (
ID NUMBER(38) PRIMARY KEY ,
VERSION NUMBER(38) NOT NULL,
STEP_ID NUMBER(38) NOT NULL,
STEP_INSTANCE_ID NUMBER(38) NOT NULL,
JOB_EXECUTION_ID NUMBER(38) NOT NULL,
START_TIME TIMESTAMP NOT NULL ,
END_TIME TIMESTAMP ,

View File

@@ -21,7 +21,7 @@ CREATE TABLE BATCH_JOB_INSTANCE (
CREATE TABLE BATCH_JOB_EXECUTION (
ID BIGINT PRIMARY KEY ,
VERSION BIGINT,
JOB_ID BIGINT NOT NULL,
JOB_INSTANCE_ID BIGINT NOT NULL,
START_TIME TIMESTAMP NOT NULL ,
END_TIME TIMESTAMP ,
STATUS VARCHAR(10),
@@ -30,7 +30,7 @@ CREATE TABLE BATCH_JOB_EXECUTION (
EXIT_MESSAGE VARCHAR(2500));
CREATE TABLE BATCH_JOB_INSTANCE_PARAMS (
JOB_ID BIGINT NOT NULL ,
JOB_INSTANCE_ID BIGINT NOT NULL ,
TYPE_CD VARCHAR(6) NOT NULL ,
KEY_NAME VARCHAR(100) NOT NULL ,
STRING_VAL VARCHAR(250) ,
@@ -40,7 +40,7 @@ CREATE TABLE BATCH_JOB_INSTANCE_PARAMS (
CREATE TABLE BATCH_STEP_INSTANCE (
ID BIGINT PRIMARY KEY ,
VERSION BIGINT,
JOB_ID BIGINT NOT NULL,
JOB_INSTANCE_ID BIGINT NOT NULL,
STEP_NAME VARCHAR(100) NOT NULL,
STATUS VARCHAR(10),
RESTART_DATA VARCHAR(2500));
@@ -48,7 +48,7 @@ CREATE TABLE BATCH_STEP_INSTANCE (
CREATE TABLE BATCH_STEP_EXECUTION (
ID BIGINT PRIMARY KEY ,
VERSION BIGINT NOT NULL,
STEP_ID BIGINT NOT NULL,
STEP_INSTANCE_ID BIGINT NOT NULL,
JOB_EXECUTION_ID BIGINT NOT NULL,
START_TIME TIMESTAMP NOT NULL ,
END_TIME TIMESTAMP ,

View File

@@ -9,7 +9,7 @@ CREATE TABLE BATCH_JOB_INSTANCE (
CREATE TABLE BATCH_JOB_EXECUTION (
ID ${BIGINT} $!{IDENTITY} PRIMARY KEY $!{GENERATED},
VERSION ${BIGINT},
JOB_ID ${BIGINT} NOT NULL,
JOB_INSTANCE_ID ${BIGINT} NOT NULL,
START_TIME TIMESTAMP NOT NULL ,
END_TIME TIMESTAMP ,
STATUS VARCHAR(10),
@@ -18,7 +18,7 @@ CREATE TABLE BATCH_JOB_EXECUTION (
EXIT_MESSAGE VARCHAR(2500));
CREATE TABLE BATCH_JOB_INSTANCE_PARAMS (
JOB_ID BIGINT NOT NULL ,
JOB_INSTANCE_ID BIGINT NOT NULL ,
TYPE_CD VARCHAR(6) NOT NULL ,
KEY_NAME VARCHAR(100) NOT NULL ,
STRING_VAL VARCHAR(250) ,
@@ -28,7 +28,7 @@ CREATE TABLE BATCH_JOB_INSTANCE_PARAMS (
CREATE TABLE BATCH_STEP_INSTANCE (
ID ${BIGINT} $!{IDENTITY} PRIMARY KEY $!{GENERATED},
VERSION ${BIGINT},
JOB_ID ${BIGINT} NOT NULL,
JOB_INSTANCE_ID ${BIGINT} NOT NULL,
STEP_NAME VARCHAR(100) NOT NULL,
STATUS VARCHAR(10),
RESTART_DATA VARCHAR(2500));
@@ -36,7 +36,7 @@ CREATE TABLE BATCH_STEP_INSTANCE (
CREATE TABLE BATCH_STEP_EXECUTION (
ID ${BIGINT} $!{IDENTITY} PRIMARY KEY $!{GENERATED},
VERSION ${BIGINT} NOT NULL,
STEP_ID ${BIGINT} NOT NULL,
STEP_INSTANCE_ID ${BIGINT} NOT NULL,
JOB_EXECUTION_ID ${BIGINT} NOT NULL,
START_TIME TIMESTAMP NOT NULL ,
END_TIME TIMESTAMP ,

View File

@@ -21,7 +21,7 @@ public class JdbcJobDaoTests extends AbstractJobDaoTests {
jobDao.update(jobExecution);
List executions = jdbcTemplate.queryForList(
"SELECT * FROM BATCH_JOB_EXECUTION where JOB_ID=?",
"SELECT * FROM BATCH_JOB_EXECUTION where JOB_INSTANCE_ID=?",
new Object[] { jobInstance.getId() });
assertEquals(1, executions.size());
assertEquals(LONG_STRING.substring(0, 250), ((Map) executions.get(0))

View File

@@ -31,7 +31,7 @@ public class JdbcStepDaoTests extends AbstractStepDaoTests {
stepDao.update(stepExecution);
List executions = jdbcTemplate.queryForList(
"SELECT * FROM BATCH_STEP_EXECUTION where STEP_ID=?",
"SELECT * FROM BATCH_STEP_EXECUTION where STEP_INSTANCE_ID=?",
new Object[] { step1.getId() });
assertEquals(1, executions.size());
assertEquals(LONG_STRING.substring(0, 250), ((Map) executions.get(0))

View File

@@ -9,7 +9,7 @@ CREATE TABLE BATCH_JOB_INSTANCE (
CREATE TABLE BATCH_JOB_EXECUTION (
ID BIGINT IDENTITY PRIMARY KEY ,
VERSION BIGINT,
JOB_ID BIGINT NOT NULL,
JOB_INSTANCE_ID BIGINT NOT NULL,
START_TIME TIMESTAMP NOT NULL ,
END_TIME TIMESTAMP ,
STATUS VARCHAR(10),
@@ -18,7 +18,7 @@ CREATE TABLE BATCH_JOB_EXECUTION (
EXIT_MESSAGE VARCHAR(2500));
CREATE TABLE BATCH_JOB_INSTANCE_PARAMS (
JOB_ID BIGINT NOT NULL ,
JOB_INSTANCE_ID BIGINT NOT NULL ,
TYPE_CD VARCHAR(6) NOT NULL ,
KEY_NAME VARCHAR(100) NOT NULL ,
STRING_VAL VARCHAR(250) ,
@@ -28,7 +28,7 @@ CREATE TABLE BATCH_JOB_INSTANCE_PARAMS (
CREATE TABLE BATCH_STEP_INSTANCE (
ID BIGINT IDENTITY PRIMARY KEY ,
VERSION BIGINT,
JOB_ID BIGINT NOT NULL,
JOB_INSTANCE_ID BIGINT NOT NULL,
STEP_NAME VARCHAR(100) NOT NULL,
STATUS VARCHAR(10),
RESTART_DATA VARCHAR(2500));
@@ -36,7 +36,7 @@ CREATE TABLE BATCH_STEP_INSTANCE (
CREATE TABLE BATCH_STEP_EXECUTION (
ID BIGINT IDENTITY PRIMARY KEY ,
VERSION BIGINT NOT NULL,
STEP_ID BIGINT NOT NULL,
STEP_INSTANCE_ID BIGINT NOT NULL,
JOB_EXECUTION_ID BIGINT NOT NULL,
START_TIME TIMESTAMP NOT NULL ,
END_TIME TIMESTAMP ,