You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@batchee.apache.org by st...@apache.org on 2014/04/01 11:02:11 UTC
git commit: BATCHEE-25 remove reserved words from our DB columns
Repository: incubator-batchee
Updated Branches:
refs/heads/master 0688f95f0 -> f7b8fd798
BATCHEE-25 remove reserved words from our DB columns
Project: http://git-wip-us.apache.org/repos/asf/incubator-batchee/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-batchee/commit/f7b8fd79
Tree: http://git-wip-us.apache.org/repos/asf/incubator-batchee/tree/f7b8fd79
Diff: http://git-wip-us.apache.org/repos/asf/incubator-batchee/diff/f7b8fd79
Branch: refs/heads/master
Commit: f7b8fd798c3604de9021ced87b073f8118126bf2
Parents: 0688f95
Author: Mark Struberg <st...@apache.org>
Authored: Tue Apr 1 11:01:23 2014 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Tue Apr 1 11:01:23 2014 +0200
----------------------------------------------------------------------
.../services/persistence/jdbc/Dictionary.java | 5 +++--
.../jpa/domain/StepExecutionEntity.java | 17 +++++++++++++++++
2 files changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/f7b8fd79/jbatch/src/main/java/org/apache/batchee/container/services/persistence/jdbc/Dictionary.java
----------------------------------------------------------------------
diff --git a/jbatch/src/main/java/org/apache/batchee/container/services/persistence/jdbc/Dictionary.java b/jbatch/src/main/java/org/apache/batchee/container/services/persistence/jdbc/Dictionary.java
index cfb8f84..d0095e4 100644
--- a/jbatch/src/main/java/org/apache/batchee/container/services/persistence/jdbc/Dictionary.java
+++ b/jbatch/src/main/java/org/apache/batchee/container/services/persistence/jdbc/Dictionary.java
@@ -72,8 +72,9 @@ public class Dictionary {
String JOB_EXECUTION_MOST_RECENT = SELECT + "%s" + FROM + "%s" + WHERE + "%s = ? ORDER BY %s DESC";
String DELETE_JOB_EXECUTION = DELETE + "%s" + WHERE + "%s = ?";
- String[] STEP_EXECUTION_COLUMNS = { "id", "batchStatus", "commit", "endTime", "exitStatus", "filter", "lastRunStepExecutionId", "numPartitions",
- "persistentData", "processSkip", "read", "readSkip", "rollback", "startCount", "startTime", "stepName", "write", "writeSkip", "EXECUTION_EXECUTIONID" };
+ String[] STEP_EXECUTION_COLUMNS = { "id", "batchStatus", "EXEC_COMMIT", "endTime", "exitStatus", "EXEC_FILTER", "lastRunStepExecutionId", "numPartitions",
+ "persistentData", "EXEC_PROCESSSKIP", "EXEC_READ", "EXEC_READSKIP", "EXEC_ROLLBACK", "startCount", "startTime", "stepName",
+ "EXEC_WRITE", "EXEC_WRITESKIP", "EXECUTION_EXECUTIONID" };
String CREATE_STEP_EXECUTION = CREATE_TABLE +
"%s(%s %s %s" + ", %s %s, %s %s, %s %s, %s %s, %s %s, %s %s, %s %s, %s %s, %s %s, %s %s, %s %s, %s %s, %s %s, %s %s, %s %s, %s %s, %s %s, %s %s, PRIMARY KEY (id))";
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/f7b8fd79/jbatch/src/main/java/org/apache/batchee/container/services/persistence/jpa/domain/StepExecutionEntity.java
----------------------------------------------------------------------
diff --git a/jbatch/src/main/java/org/apache/batchee/container/services/persistence/jpa/domain/StepExecutionEntity.java b/jbatch/src/main/java/org/apache/batchee/container/services/persistence/jpa/domain/StepExecutionEntity.java
index 9333090..0e4a5a2 100644
--- a/jbatch/src/main/java/org/apache/batchee/container/services/persistence/jpa/domain/StepExecutionEntity.java
+++ b/jbatch/src/main/java/org/apache/batchee/container/services/persistence/jpa/domain/StepExecutionEntity.java
@@ -17,6 +17,7 @@
package org.apache.batchee.container.services.persistence.jpa.domain;
import javax.batch.runtime.BatchStatus;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
@@ -52,13 +53,29 @@ public class StepExecutionEntity {
private BatchStatus batchStatus;
private String stepName;
+
+ @Column(name="EXEC_READ")
private long read;
+
+ @Column(name="EXEC_WRITE")
private long write;
+
+ @Column(name="EXEC_COMMIT")
private long commit;
+
+ @Column(name="EXEC_ROLLBACK")
private long rollback;
+
+ @Column(name="EXEC_READSKIP")
private long readSkip;
+
+ @Column(name="EXEC_PROCESSSKIP")
private long processSkip;
+
+ @Column(name="EXEC_FILTER")
private long filter;
+
+ @Column(name="EXEC_WRITESKIP")
private long writeSkip;
@Temporal(TemporalType.TIMESTAMP)