You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2013/01/11 17:07:34 UTC
svn commit: r1432120 - in /airavata/trunk/modules/registry:
airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/
airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/
airavata-jpa...
Author: chathuri
Date: Fri Jan 11 16:07:34 2013
New Revision: 1432120
URL: http://svn.apache.org/viewvc?rev=1432120&view=rev
Log:
changing Node_data table to have execution index
Modified:
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_Data.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_DataPK.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeDataResource.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-derby.sql
airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-mysql.sql
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/NodeDataResourceTest.java
airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/data-derby.sql
airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/data-derby.sql
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_Data.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_Data.java?rev=1432120&r1=1432119&r2=1432120&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_Data.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_Data.java Fri Jan 11 16:07:34 2013
@@ -38,6 +38,9 @@ public class Node_Data {
@Id
private String node_id;
+ @Id
+ private int execution_index;
+
private String node_type;
@Lob
private byte[] inputs;
@@ -118,5 +121,13 @@ public class Node_Data {
public void setWorkflow_instanceID(String workflow_instanceID) {
this.workflow_instanceID = workflow_instanceID;
}
+
+ public int getExecution_index() {
+ return execution_index;
+ }
+
+ public void setExecution_index(int execution_index) {
+ this.execution_index = execution_index;
+ }
}
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_DataPK.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_DataPK.java?rev=1432120&r1=1432119&r2=1432120&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_DataPK.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Node_DataPK.java Fri Jan 11 16:07:34 2013
@@ -24,14 +24,16 @@ package org.apache.airavata.persistance.
public class Node_DataPK {
private String workflow_instanceID;
private String node_id;
+ private int execution_index;
public Node_DataPK() {
;
}
- public Node_DataPK(String workflow_instanceID, String node_id) {
+ public Node_DataPK(String workflow_instanceID, String node_id, int execution_index) {
this.workflow_instanceID = workflow_instanceID;
this.node_id = node_id;
+ this.execution_index = execution_index;
}
@Override
@@ -59,4 +61,12 @@ public class Node_DataPK {
public void setNode_id(String node_id) {
this.node_id = node_id;
}
+
+ public int getExecution_index() {
+ return execution_index;
+ }
+
+ public void setExecution_index(int execution_index) {
+ this.execution_index = execution_index;
+ }
}
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeDataResource.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeDataResource.java?rev=1432120&r1=1432119&r2=1432120&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeDataResource.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/NodeDataResource.java Fri Jan 11 16:07:34 2013
@@ -45,6 +45,7 @@ public class NodeDataResource extends Ab
private String status;
private Timestamp startTime;
private Timestamp lastUpdateTime;
+ private int executionIndex;
public WorkflowDataResource getWorkflowDataResource() {
return workflowDataResource;
@@ -136,7 +137,7 @@ public class NodeDataResource extends Ab
lastUpdateTime = new Timestamp(date.getTime());
}
EntityManager em = ResourceUtils.getEntityManager();
- Node_Data existingNodeData = em.find(Node_Data.class, new Node_DataPK(workflowDataResource.getWorkflowInstanceID(), nodeID));
+ Node_Data existingNodeData = em.find(Node_Data.class, new Node_DataPK(workflowDataResource.getWorkflowInstanceID(), nodeID, executionIndex));
em.close();
em = ResourceUtils.getEntityManager();
@@ -159,6 +160,7 @@ public class NodeDataResource extends Ab
nodeData.setLast_update_time(lastUpdateTime);
nodeData.setStart_time(startTime);
nodeData.setStatus(status);
+ nodeData.setExecution_index(executionIndex);
if(existingNodeData != null){
existingNodeData.setInputs(inputsByte);
existingNodeData.setOutputs(outputsByte);
@@ -166,6 +168,7 @@ public class NodeDataResource extends Ab
existingNodeData.setNode_type(nodeType);
existingNodeData.setStart_time(startTime);
existingNodeData.setStatus(status);
+ existingNodeData.setExecution_index(executionIndex);
nodeData = em.merge(existingNodeData);
} else {
em.persist(nodeData);
@@ -173,4 +176,12 @@ public class NodeDataResource extends Ab
em.getTransaction().commit();
em.close();
}
+
+ public int getExecutionIndex() {
+ return executionIndex;
+ }
+
+ public void setExecutionIndex(int executionIndex) {
+ this.executionIndex = executionIndex;
+ }
}
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java?rev=1432120&r1=1432119&r2=1432120&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java Fri Jan 11 16:07:34 2013
@@ -536,6 +536,7 @@ public class Utils {
nodeDataResource.setStatus(o.getStatus());
nodeDataResource.setStartTime(o.getStart_time());
nodeDataResource.setLastUpdateTime(o.getLast_update_time());
+ nodeDataResource.setExecutionIndex(o.getExecution_index());
return nodeDataResource;
}
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-derby.sql
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-derby.sql?rev=1432120&r1=1432119&r2=1432120&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-derby.sql (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-derby.sql Fri Jan 11 16:07:34 2013
@@ -176,7 +176,8 @@ create table Node_Data
status varchar(100),
start_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
last_update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- PRIMARY KEY(workflow_instanceID, node_id),
+ execution_index int NOT NULL,
+ PRIMARY KEY(workflow_instanceID, node_id, execution_index),
FOREIGN KEY (workflow_instanceID) REFERENCES Workflow_Data(workflow_instanceID) ON DELETE CASCADE
);
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-mysql.sql
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-mysql.sql?rev=1432120&r1=1432119&r2=1432120&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-mysql.sql (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/resources/data-mysql.sql Fri Jan 11 16:07:34 2013
@@ -174,7 +174,8 @@ create table Node_Data
status varchar(100),
start_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
last_update_time TIMESTAMP DEFAULT now() on update now(),
- PRIMARY KEY(workflow_instanceID, node_id),
+ execution_index int NOT NULL,
+ PRIMARY KEY(workflow_instanceID, node_id, execution_index),
FOREIGN KEY (workflow_instanceID) REFERENCES Workflow_Data(workflow_instanceID) ON DELETE CASCADE
);
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/NodeDataResourceTest.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/NodeDataResourceTest.java?rev=1432120&r1=1432119&r2=1432120&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/NodeDataResourceTest.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/java/org/apache/airavata/persistance/registry/jpa/NodeDataResourceTest.java Fri Jan 11 16:07:34 2013
@@ -66,6 +66,7 @@ public class NodeDataResourceTest extend
nodeDataResource.setInputs("testInput");
nodeDataResource.setStatus("testStatus");
+ nodeDataResource.setExecutionIndex(0);
nodeDataResource.save();
assertTrue("node data resource saved successfully", workflowDataResource.isNodeExists("testNodeID"));
Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/data-derby.sql
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/data-derby.sql?rev=1432120&r1=1432119&r2=1432120&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/data-derby.sql (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/test/resources/data-derby.sql Fri Jan 11 16:07:34 2013
@@ -176,7 +176,8 @@ create table Node_Data
status varchar(100),
start_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
last_update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- PRIMARY KEY(workflow_instanceID, node_id),
+ execution_index int NOT NULL,
+ PRIMARY KEY(workflow_instanceID, node_id, execution_index),
FOREIGN KEY (workflow_instanceID) REFERENCES Workflow_Data(workflow_instanceID) ON DELETE CASCADE
);
@@ -192,3 +193,5 @@ create table Gram_Data
);
+
+
Modified: airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/data-derby.sql
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/data-derby.sql?rev=1432120&r1=1432119&r2=1432120&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/data-derby.sql (original)
+++ airavata/trunk/modules/registry/airavata-registry-test/src/test/resources/data-derby.sql Fri Jan 11 16:07:34 2013
@@ -176,7 +176,8 @@ create table Node_Data
status varchar(100),
start_time TIMESTAMP DEFAULT '0000-00-00 00:00:00',
last_update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- PRIMARY KEY(workflow_instanceID, node_id),
+ execution_index int NOT NULL,
+ PRIMARY KEY(workflow_instanceID, node_id, execution_index),
FOREIGN KEY (workflow_instanceID) REFERENCES Workflow_Data(workflow_instanceID) ON DELETE CASCADE
);
@@ -192,3 +193,5 @@ create table Gram_Data
);
+
+