Merge pull request #8850 from garypicher/revertPR8305

Revert "Batch remote partition restart"

Author: garypicher

dev/com.ibm.jbatch.container/src/com/ibm/jbatch/container/persistence/jpa/JobExecutionEntity.java

@@ -101,20 +101,30 @@ public String run() {
     @JoinColumn(name = "FK_JOBINSTANCEID", nullable = false)
     private JobInstanceEntity jobInstance;
 
-    //@OneToMany(mappedBy = "jobExec", cascade = CascadeType.REMOVE)
+    //@OneToMany(mappedBy="jobExec",cascade=CascadeType.REMOVE)
     //private Collection<RemotableSplitFlowEntity> splitFlowExecutions;
 
+    //@OneToMany(mappedBy="jobExec",cascade=CascadeType.REMOVE)
+    //private Collection<RemotablePartitionEntity> partitionExecutions;
+
     @OneToMany(mappedBy = "jobExec", cascade = CascadeType.REMOVE)
     private Collection<StepThreadExecutionEntity> stepThreadExecutions;
 
+    /*
+     * 222050 - backout 205106
+     *
+     * @OneToMany(mappedBy = "jobExec", cascade = CascadeType.REMOVE)
+     * private Collection<RemotablePartitionEntity> remotablePartitions;
+     */
+
     // For JPA
-    public JobExecutionEntity() {
-    }
+    public JobExecutionEntity() {}
 
     // For in-memory persistence
     public JobExecutionEntity(long jobExecId) {
         this.jobExecId = jobExecId;
         //this.splitFlowExecutions = new ArrayList<RemotableSplitFlowEntity>();
+        // 222050 - backout 205106 this.remotablePartitions = Collections.synchronizedList(new ArrayList<RemotablePartitionEntity>());
         this.stepThreadExecutions = Collections.synchronizedList(new ArrayList<StepThreadExecutionEntity>());
     }
 
@@ -136,11 +146,14 @@ public void setStepThreadExecutions(Collection<StepThreadExecutionEntity> stepTh
     }
 
     public Collection<RemotablePartitionEntity> getRemotablePartitions() {
+        // 220050 - Backout 205106
+        // return remotablePartitions;
         return null;
     }
 
     public void setRemotablePartitions(Collection<RemotablePartitionEntity> remotablePartitions) {
-        // Intentionally empty, see JobExecutionEntityV3
+        // 222050 - Backout 205106
+        // this.remotablePartitions = remotablePartitions;
     }
 
     @Override

dev/com.ibm.jbatch.container/src/com/ibm/jbatch/container/persistence/jpa/JobExecutionEntityExtractor.java

@@ -41,9 +41,7 @@ public Class extractClassFromRow(Record record, Session session) {
             throw new BatchRuntimeException(ex);
         }
 
-        if (tableversion == 3) {
-            return JobExecutionEntityV3.class;
-        } else if (tableversion == 2) {
+        if (tableversion == 2) {
             return JobExecutionEntityV2.class;
         } else {
             return JobExecutionEntity.class;

dev/com.ibm.jbatch.container/src/com/ibm/jbatch/container/persistence/jpa/JobExecutionEntityV3.java

@@ -16,16 +16,11 @@
 
 import javax.batch.runtime.JobExecution;
 import javax.persistence.Column;
-import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.IdClass;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
 import javax.persistence.Temporal;
-import javax.persistence.UniqueConstraint;
 
 import com.ibm.jbatch.container.ws.RemotablePartitionState;
 import com.ibm.jbatch.container.ws.WSRemotablePartitionExecution;
@@ -34,16 +29,29 @@
  * @author skurz
  *
  */
-@NamedQueries({
-
-                @NamedQuery(name = RemotablePartitionEntity.GET_ALL_RELATED_REMOTABLE_PARTITIONS, query = "SELECT r FROM RemotablePartitionEntity r WHERE r.stepExecutionEntity.stepExecutionId IN (SELECT s.stepExecutionId FROM StepThreadExecutionEntity s WHERE s.topLevelStepExecution.stepExecutionId = :topLevelStepExecutionId AND TYPE(s) = StepThreadExecutionEntity ) ORDER BY r.stepExecutionEntity.partitionNumber ASC"),
-
-                @NamedQuery(name = RemotablePartitionEntity.GET_PARTITION_STEP_THREAD_EXECUTIONIDS_BY_SERVERID_AND_STATUSES_QUERY, query = "SELECT r FROM RemotablePartitionEntity r WHERE r.serverId = :serverid AND r.stepExecutionEntity.batchStatus IN :status ORDER BY r.stepExecutionEntity.startTime DESC"),
-})
-
+/*
+ * 222050 - Backout 205106
+ *
+ * @NamedQueries({
+ *
+ * @NamedQuery(name = RemotablePartitionEntity.GET_ALL_RELATED_REMOTABLE_PARTITIONS,
+ * query =
+ * "SELECT r FROM RemotablePartitionEntity r WHERE r.stepExecutionEntity.stepExecutionId IN (SELECT s.stepExecutionId FROM StepThreadExecutionEntity s WHERE s.topLevelStepExecution.stepExecutionId = :topLevelStepExecutionId AND TYPE(s) = StepThreadExecutionEntity ) ORDER BY r.stepExecutionEntity.partitionNumber ASC"
+ * ),
+ *
+ * @NamedQuery(name = RemotablePartitionEntity.GET_PARTITION_STEP_THREAD_EXECUTIONIDS_BY_SERVERID_AND_STATUSES_QUERY,
+ * query = "SELECT r FROM RemotablePartitionEntity r WHERE r.serverId = :serverid AND r.stepExecutionEntity.batchStatus IN :status ORDER BY r.stepExecutionEntity.startTime DESC"),
+ * })
+ */
 @IdClass(RemotablePartitionKey.class)
-@Table(uniqueConstraints = @UniqueConstraint(columnNames = { "FK_JOBEXECUTIONID", "STEPNAME", "PARTNUM" }))
-@Entity
+
+/*
+ * 222050 - Backout 205106
+ *
+ * @Table(uniqueConstraints = @UniqueConstraint(columnNames = { "FK_JOBEXECUTIONID", "STEPNAME", "PARTNUM" }))
+ *
+ * @Entity
+ */
 public class RemotablePartitionEntity implements WSRemotablePartitionExecution {
 
     // Repeat everywhere we use so caller has to think through granting privilege
@@ -89,8 +97,7 @@ public String run() {
     @Column(name = "LASTUPDATED")
     private Date lastUpdated;
 
-    public RemotablePartitionEntity() {
-    }
+    public RemotablePartitionEntity() {}
 
     public RemotablePartitionEntity(JobExecutionEntity jobExecution,
                                     RemotablePartitionKey partitionKey) {

dev/com.ibm.jbatch.container/src/com/ibm/jbatch/container/persistence/jpa/RemotablePartitionEntity.java

@@ -41,8 +41,9 @@
 @DiscriminatorColumn(name = "THREADTYPE", discriminatorType = DiscriminatorType.CHAR)
 @DiscriminatorValue("P")
 // The base level is (P)artition, and (T)op-level extends this
-@NamedQuery(name = StepThreadExecutionEntity.GET_STEP_THREAD_EXECUTIONIDS_BY_JOB_EXEC_AND_STATUSES_QUERY, query = "SELECT e FROM StepThreadExecutionEntity e" +
-                                                                                                                  " WHERE e.jobExec.jobExecId=:jobExecutionId AND e.batchStatus IN :status ORDER BY e.stepExecutionId ASC")
+@NamedQuery(name = StepThreadExecutionEntity.GET_STEP_THREAD_EXECUTIONIDS_BY_JOB_EXEC_AND_STATUSES_QUERY,
+                query = "SELECT e FROM StepThreadExecutionEntity e" +
+                        " WHERE e.jobExec.jobExecId=:jobExecutionId AND e.batchStatus IN :status ORDER BY e.stepExecutionId ASC")
 @Entity
 @Table(uniqueConstraints = @UniqueConstraint(columnNames = { "FK_JOBEXECID", "STEPNAME", "PARTNUM" }))
 public class StepThreadExecutionEntity implements WSPartitionStepThreadExecution, StepExecution, EntityConstants {
@@ -142,6 +143,11 @@ public StepThreadExecutionEntity(long stepExecutionId, JobExecutionEntity jobExe
     @JoinColumn(name = "FK_JOBEXECID", nullable = false)
     private JobExecutionEntity jobExec;
 
+    /* 220050 - Backout 205106
+    @OneToOne(optional = true, mappedBy = "stepExecutionEntity", cascade = CascadeType.REMOVE)
+    private RemotablePartitionEntity remotablePartition;
+    */
+
     // Easiest to allow this to be null otherwise we'd have to worry about
     // how to supply the generated key value to this column too.
     @ManyToOne
@@ -208,14 +214,17 @@ public void setReadCount(long readCount) {
      * @return the remotablePartition
      */
     public RemotablePartitionEntity getRemotablePartition() {
+        //222050 - Backout 205106
+        //return remotablePartition;
         return null;
     }
 
     /**
      * @param remotablePartition the remotablePartition to set
      */
     public void setRemotablePartition(RemotablePartitionEntity remotablePartition) {
-        // Intentionally empty, see StepThreadExecutionEntityV2
+        //222050 Backout 205106
+        //this.remotablePartition = remotablePartition;
     }
 
     public long getWriteCount() {