Repository: airavata Updated Branches: refs/heads/master 962389c91 -> a33dd2a91
making experiment input value clob Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a33dd2a9 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a33dd2a9 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a33dd2a9 Branch: refs/heads/master Commit: a33dd2a91f920ee3b4190af863eb1b27bae7b6d2 Parents: 962389c Author: Chathuri Wimalasena <[email protected]> Authored: Tue Jul 8 14:19:16 2014 -0400 Committer: Chathuri Wimalasena <[email protected]> Committed: Tue Jul 8 14:19:16 2014 -0400 ---------------------------------------------------------------------- .../airavata/client/samples/CreateLaunchExperiment.java | 2 +- .../src/test/resources/registry-derby.sql | 11 +++++++---- .../src/test/resources/registry-derby.sql | 11 +++++++---- .../src/test/resources/registry-derby.sql | 11 +++++++---- .../persistance/registry/jpa/model/Experiment_Input.java | 7 ++++--- .../registry/jpa/model/Experiment_Output.java | 7 ++++--- .../registry/jpa/resources/ExperimentInputResource.java | 8 ++++++-- .../registry/jpa/resources/ExperimentOutputResource.java | 8 ++++++-- .../persistance/registry/jpa/resources/Utils.java | 4 ++-- .../src/main/resources/registry-derby.sql | 4 ++-- .../src/main/resources/registry-mysql.sql | 4 ++-- .../src/test/resources/registry-derby.sql | 11 +++++++---- 12 files changed, 55 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/a33dd2a9/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java index 9cc3e12..c5fe434 100644 --- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java +++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java @@ -135,6 +135,7 @@ public class CreateLaunchExperiment { Map<String, JobStatus> jobStatuses = null; while (true) { try { + Thread.sleep(5000); jobStatuses = client.getJobStatuses(expId); Set<String> strings = jobStatuses.keySet(); for (String key : strings) { @@ -155,7 +156,6 @@ public class CreateLaunchExperiment { return; } System.out.println(experimentStatus); - Thread.sleep(5000); } catch (Exception e) { e.printStackTrace(); } http://git-wip-us.apache.org/repos/asf/airavata/blob/a33dd2a9/modules/gfac/airavata-gfac-service/src/test/resources/registry-derby.sql ---------------------------------------------------------------------- diff --git a/modules/gfac/airavata-gfac-service/src/test/resources/registry-derby.sql b/modules/gfac/airavata-gfac-service/src/test/resources/registry-derby.sql index 5bf2c3f..05c4667 100644 --- a/modules/gfac/airavata-gfac-service/src/test/resources/registry-derby.sql +++ b/modules/gfac/airavata-gfac-service/src/test/resources/registry-derby.sql @@ -162,7 +162,7 @@ CREATE TABLE EXPERIMENT_INPUT INPUT_KEY VARCHAR(255) NOT NULL, INPUT_TYPE VARCHAR(255), METADATA VARCHAR(255), - VALUE VARCHAR(255), + VALUE CLOB, PRIMARY KEY(EXPERIMENT_ID,INPUT_KEY), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE ); @@ -173,7 +173,7 @@ CREATE TABLE EXPERIMENT_OUTPUT OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), - VALUE VARCHAR(255), + VALUE CLOB, PRIMARY KEY(EXPERIMENT_ID,OUTPUT_KEY), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE ); @@ -185,6 +185,8 @@ CREATE TABLE WORKFLOW_NODE_DETAIL NODE_INSTANCE_ID VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, NODE_NAME VARCHAR(255) NOT NULL, + EXECUTION_UNIT VARCHAR(255) NOT NULL, + EXECUTION_UNIT_DATA VARCHAR(255), PRIMARY KEY(NODE_INSTANCE_ID), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE ); @@ -196,6 +198,7 @@ CREATE TABLE TASK_DETAIL CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, APPLICATION_ID VARCHAR(255), APPLICATION_VERSION VARCHAR(255), + APPLICATION_DEPLOYMENT_ID VARCHAR(255), PRIMARY KEY(TASK_ID), FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE ); @@ -226,7 +229,7 @@ CREATE TABLE APPLICATION_INPUT INPUT_KEY VARCHAR(255) NOT NULL, INPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), - VALUE VARCHAR(255), + VALUE CLOB, PRIMARY KEY(TASK_ID,INPUT_KEY), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE ); @@ -237,7 +240,7 @@ CREATE TABLE APPLICATION_OUTPUT OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), - VALUE VARCHAR(255), + VALUE CLOB, PRIMARY KEY(TASK_ID,OUTPUT_KEY), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE ); http://git-wip-us.apache.org/repos/asf/airavata/blob/a33dd2a9/modules/orchestrator/airavata-orchestrator-service/src/test/resources/registry-derby.sql ---------------------------------------------------------------------- diff --git a/modules/orchestrator/airavata-orchestrator-service/src/test/resources/registry-derby.sql b/modules/orchestrator/airavata-orchestrator-service/src/test/resources/registry-derby.sql index 5bf2c3f..05c4667 100644 --- a/modules/orchestrator/airavata-orchestrator-service/src/test/resources/registry-derby.sql +++ b/modules/orchestrator/airavata-orchestrator-service/src/test/resources/registry-derby.sql @@ -162,7 +162,7 @@ CREATE TABLE EXPERIMENT_INPUT INPUT_KEY VARCHAR(255) NOT NULL, INPUT_TYPE VARCHAR(255), METADATA VARCHAR(255), - VALUE VARCHAR(255), + VALUE CLOB, PRIMARY KEY(EXPERIMENT_ID,INPUT_KEY), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE ); @@ -173,7 +173,7 @@ CREATE TABLE EXPERIMENT_OUTPUT OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), - VALUE VARCHAR(255), + VALUE CLOB, PRIMARY KEY(EXPERIMENT_ID,OUTPUT_KEY), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE ); @@ -185,6 +185,8 @@ CREATE TABLE WORKFLOW_NODE_DETAIL NODE_INSTANCE_ID VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, NODE_NAME VARCHAR(255) NOT NULL, + EXECUTION_UNIT VARCHAR(255) NOT NULL, + EXECUTION_UNIT_DATA VARCHAR(255), PRIMARY KEY(NODE_INSTANCE_ID), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE ); @@ -196,6 +198,7 @@ CREATE TABLE TASK_DETAIL CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, APPLICATION_ID VARCHAR(255), APPLICATION_VERSION VARCHAR(255), + APPLICATION_DEPLOYMENT_ID VARCHAR(255), PRIMARY KEY(TASK_ID), FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE ); @@ -226,7 +229,7 @@ CREATE TABLE APPLICATION_INPUT INPUT_KEY VARCHAR(255) NOT NULL, INPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), - VALUE VARCHAR(255), + VALUE CLOB, PRIMARY KEY(TASK_ID,INPUT_KEY), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE ); @@ -237,7 +240,7 @@ CREATE TABLE APPLICATION_OUTPUT OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), - VALUE VARCHAR(255), + VALUE CLOB, PRIMARY KEY(TASK_ID,OUTPUT_KEY), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE ); http://git-wip-us.apache.org/repos/asf/airavata/blob/a33dd2a9/modules/orchestrator/orchestrator-core/src/test/resources/registry-derby.sql ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/src/test/resources/registry-derby.sql b/modules/orchestrator/orchestrator-core/src/test/resources/registry-derby.sql index 5bf2c3f..05c4667 100644 --- a/modules/orchestrator/orchestrator-core/src/test/resources/registry-derby.sql +++ b/modules/orchestrator/orchestrator-core/src/test/resources/registry-derby.sql @@ -162,7 +162,7 @@ CREATE TABLE EXPERIMENT_INPUT INPUT_KEY VARCHAR(255) NOT NULL, INPUT_TYPE VARCHAR(255), METADATA VARCHAR(255), - VALUE VARCHAR(255), + VALUE CLOB, PRIMARY KEY(EXPERIMENT_ID,INPUT_KEY), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE ); @@ -173,7 +173,7 @@ CREATE TABLE EXPERIMENT_OUTPUT OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), - VALUE VARCHAR(255), + VALUE CLOB, PRIMARY KEY(EXPERIMENT_ID,OUTPUT_KEY), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE ); @@ -185,6 +185,8 @@ CREATE TABLE WORKFLOW_NODE_DETAIL NODE_INSTANCE_ID VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, NODE_NAME VARCHAR(255) NOT NULL, + EXECUTION_UNIT VARCHAR(255) NOT NULL, + EXECUTION_UNIT_DATA VARCHAR(255), PRIMARY KEY(NODE_INSTANCE_ID), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE ); @@ -196,6 +198,7 @@ CREATE TABLE TASK_DETAIL CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, APPLICATION_ID VARCHAR(255), APPLICATION_VERSION VARCHAR(255), + APPLICATION_DEPLOYMENT_ID VARCHAR(255), PRIMARY KEY(TASK_ID), FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE ); @@ -226,7 +229,7 @@ CREATE TABLE APPLICATION_INPUT INPUT_KEY VARCHAR(255) NOT NULL, INPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), - VALUE VARCHAR(255), + VALUE CLOB, PRIMARY KEY(TASK_ID,INPUT_KEY), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE ); @@ -237,7 +240,7 @@ CREATE TABLE APPLICATION_OUTPUT OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), - VALUE VARCHAR(255), + VALUE CLOB, PRIMARY KEY(TASK_ID,OUTPUT_KEY), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE ); http://git-wip-us.apache.org/repos/asf/airavata/blob/a33dd2a9/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Input.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Input.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Input.java index 007cc1a..5d7bbe6 100644 --- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Input.java +++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Input.java @@ -39,8 +39,9 @@ public class Experiment_Input implements Serializable { @Column(name = "INPUT_KEY") private String ex_key; + @Lob @Column(name = "VALUE") - private String value; + private char[] value; @Column(name = "INPUT_TYPE") private String inputType; @@ -68,11 +69,11 @@ public class Experiment_Input implements Serializable { this.ex_key = ex_key; } - public String getValue() { + public char[] getValue() { return value; } - public void setValue(String value) { + public void setValue(char[] value) { this.value = value; } http://git-wip-us.apache.org/repos/asf/airavata/blob/a33dd2a9/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Output.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Output.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Output.java index 1979aec..d038197 100644 --- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Output.java +++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/model/Experiment_Output.java @@ -38,8 +38,9 @@ public class Experiment_Output implements Serializable { @Id @Column(name = "OUTPUT_KEY") private String ex_key; + @Lob @Column(name = "VALUE") - private String value; + private char[] value; @Column(name = "METADATA") private String metadata; @Column(name = "OUTPUT_KEY_TYPE") @@ -65,11 +66,11 @@ public class Experiment_Output implements Serializable { this.ex_key = ex_key; } - public String getValue() { + public char[] getValue() { return value; } - public void setValue(String value) { + public void setValue(char[] value) { this.value = value; } http://git-wip-us.apache.org/repos/asf/airavata/blob/a33dd2a9/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentInputResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentInputResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentInputResource.java index 186d276..26f7ce5 100644 --- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentInputResource.java +++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentInputResource.java @@ -117,7 +117,9 @@ public class ExperimentInputResource extends AbstractResource { Experiment experiment = em.find(Experiment.class, experimentResource.getExpID()); exInput.setExperiment(experiment); exInput.setExperiment_id(experiment.getExpId()); - exInput.setValue(value); + if (value != null){ + exInput.setValue(value.toCharArray()); + } exInput.setInputType(inputType); exInput.setMetadata(metadata); @@ -125,7 +127,9 @@ public class ExperimentInputResource extends AbstractResource { existingInput.setEx_key(experimentKey); existingInput.setExperiment(experiment); existingInput.setExperiment_id(experiment.getExpId()); - existingInput.setValue(value); + if (value != null){ + existingInput.setValue(value.toCharArray()); + } existingInput.setInputType(inputType); existingInput.setMetadata(metadata); exInput = em.merge(existingInput); http://git-wip-us.apache.org/repos/asf/airavata/blob/a33dd2a9/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentOutputResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentOutputResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentOutputResource.java index b674a35..5b2f0bb 100644 --- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentOutputResource.java +++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/ExperimentOutputResource.java @@ -117,14 +117,18 @@ public class ExperimentOutputResource extends AbstractResource { Experiment experiment = em.find(Experiment.class, experimentResource.getExpID()); exOutput.setExperiment(experiment); exOutput.setExperiment_id(experiment.getExpId()); - exOutput.setValue(value); + if (value != null){ + exOutput.setValue(value.toCharArray()); + } exOutput.setOutputKeyType(outputType); exOutput.setMetadata(metadata); if (existingOutput != null) { existingOutput.setEx_key(experimentKey); existingOutput.setExperiment(experiment); - existingOutput.setValue(value); + if (value != null){ + existingOutput.setValue(value.toCharArray()); + } existingOutput.setExperiment_id(experiment.getExpId()); existingOutput.setOutputKeyType(outputType); existingOutput.setMetadata(metadata); http://git-wip-us.apache.org/repos/asf/airavata/blob/a33dd2a9/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java index 4be0e64..bb6d421 100644 --- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java +++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/Utils.java @@ -597,7 +597,7 @@ public class Utils { eInputResource.setInputType(o.getInputType()); eInputResource.setMetadata(o.getMetadata()); eInputResource.setExperimentKey(o.getEx_key()); - eInputResource.setValue(o.getValue()); + eInputResource.setValue(new String(o.getValue())); } return eInputResource; } @@ -608,7 +608,7 @@ public class Utils { ExperimentResource experimentResource = (ExperimentResource)createExperiment(o.getExperiment()); eOutputResource.setExperimentResource(experimentResource); eOutputResource.setExperimentKey(o.getEx_key()); - eOutputResource.setValue(o.getValue()); + eOutputResource.setValue(new String(o.getValue())); eOutputResource.setOutputType(o.getOutputKeyType()); eOutputResource.setMetadata(o.getMetadata()); } http://git-wip-us.apache.org/repos/asf/airavata/blob/a33dd2a9/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql b/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql index 90ed6f9..05c4667 100644 --- a/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql +++ b/modules/registry/airavata-jpa-registry/src/main/resources/registry-derby.sql @@ -229,7 +229,7 @@ CREATE TABLE APPLICATION_INPUT INPUT_KEY VARCHAR(255) NOT NULL, INPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), - VALUE VARCHAR(255), + VALUE CLOB, PRIMARY KEY(TASK_ID,INPUT_KEY), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE ); @@ -240,7 +240,7 @@ CREATE TABLE APPLICATION_OUTPUT OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), - VALUE VARCHAR(255), + VALUE CLOB, PRIMARY KEY(TASK_ID,OUTPUT_KEY), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE ); http://git-wip-us.apache.org/repos/asf/airavata/blob/a33dd2a9/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql b/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql index 7968ac3..9ada1ee 100644 --- a/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql +++ b/modules/registry/airavata-jpa-registry/src/main/resources/registry-mysql.sql @@ -210,7 +210,7 @@ CREATE TABLE APPLICATION_INPUT INPUT_KEY VARCHAR(255) NOT NULL, INPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), - VALUE VARCHAR(255), + VALUE LONGTEXT, PRIMARY KEY(TASK_ID,INPUT_KEY), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE ); @@ -221,7 +221,7 @@ CREATE TABLE APPLICATION_OUTPUT OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), - VALUE VARCHAR(255), + VALUE LONGTEXT, PRIMARY KEY(TASK_ID,OUTPUT_KEY), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE ); http://git-wip-us.apache.org/repos/asf/airavata/blob/a33dd2a9/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql b/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql index 5bf2c3f..05c4667 100644 --- a/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql +++ b/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql @@ -162,7 +162,7 @@ CREATE TABLE EXPERIMENT_INPUT INPUT_KEY VARCHAR(255) NOT NULL, INPUT_TYPE VARCHAR(255), METADATA VARCHAR(255), - VALUE VARCHAR(255), + VALUE CLOB, PRIMARY KEY(EXPERIMENT_ID,INPUT_KEY), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE ); @@ -173,7 +173,7 @@ CREATE TABLE EXPERIMENT_OUTPUT OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), - VALUE VARCHAR(255), + VALUE CLOB, PRIMARY KEY(EXPERIMENT_ID,OUTPUT_KEY), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE ); @@ -185,6 +185,8 @@ CREATE TABLE WORKFLOW_NODE_DETAIL NODE_INSTANCE_ID VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, NODE_NAME VARCHAR(255) NOT NULL, + EXECUTION_UNIT VARCHAR(255) NOT NULL, + EXECUTION_UNIT_DATA VARCHAR(255), PRIMARY KEY(NODE_INSTANCE_ID), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE ); @@ -196,6 +198,7 @@ CREATE TABLE TASK_DETAIL CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, APPLICATION_ID VARCHAR(255), APPLICATION_VERSION VARCHAR(255), + APPLICATION_DEPLOYMENT_ID VARCHAR(255), PRIMARY KEY(TASK_ID), FOREIGN KEY (NODE_INSTANCE_ID) REFERENCES WORKFLOW_NODE_DETAIL(NODE_INSTANCE_ID) ON DELETE CASCADE ); @@ -226,7 +229,7 @@ CREATE TABLE APPLICATION_INPUT INPUT_KEY VARCHAR(255) NOT NULL, INPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), - VALUE VARCHAR(255), + VALUE CLOB, PRIMARY KEY(TASK_ID,INPUT_KEY), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE ); @@ -237,7 +240,7 @@ CREATE TABLE APPLICATION_OUTPUT OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), - VALUE VARCHAR(255), + VALUE CLOB, PRIMARY KEY(TASK_ID,OUTPUT_KEY), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE );
