Repository: airavata Updated Branches: refs/heads/master a2307f936 -> bca756a48
adding unkonwn status to most of the possible places Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/bca756a4 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/bca756a4 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/bca756a4 Branch: refs/heads/master Commit: bca756a48b934afb1ce9f7001a8d60c7445e898b Parents: a2307f9 Author: Chathuri Wimalasena <[email protected]> Authored: Mon Apr 28 13:47:54 2014 -0400 Committer: Chathuri Wimalasena <[email protected]> Committed: Mon Apr 28 13:47:54 2014 -0400 ---------------------------------------------------------------------- .../src/main/resources/registry-derby.sql | 32 ++++++++--------- .../src/main/resources/registry-mysql.sql | 32 ++++++++--------- .../src/test/resources/registry-derby.sql | 32 ++++++++--------- .../src/test/resources/registry-derby.sql | 32 ++++++++--------- .../registry/jpa/impl/ExperimentRegistry.java | 36 ++++++++++++++++---- .../src/main/resources/registry-derby.sql | 32 ++++++++--------- .../src/main/resources/registry-mysql.sql | 32 ++++++++--------- .../src/test/resources/registry-derby.sql | 32 ++++++++--------- 8 files changed, 142 insertions(+), 118 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/bca756a4/airavata-api/airavata-api-server/src/main/resources/registry-derby.sql ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/main/resources/registry-derby.sql b/airavata-api/airavata-api-server/src/main/resources/registry-derby.sql index e1bf9e6..a30b540 100644 --- a/airavata-api/airavata-api-server/src/main/resources/registry-derby.sql +++ b/airavata-api/airavata-api-server/src/main/resources/registry-derby.sql @@ -21,7 +21,7 @@ CREATE TABLE GATEWAY ( GATEWAY_NAME VARCHAR(255), - OWNER VARCHAR(255), + OWNER VARCHAR(255), PRIMARY KEY (GATEWAY_NAME) ); @@ -55,7 +55,7 @@ CREATE TABLE GATEWAY_WORKER CREATE TABLE PROJECT ( GATEWAY_NAME VARCHAR(255), - USER_NAME VARCHAR(255), + USER_NAME VARCHAR(255) NOT NULL, PROJECT_NAME VARCHAR(255), DESCRIPTION VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, @@ -139,8 +139,8 @@ CREATE TABLE EXPERIMENT ( EXPERIMENT_ID VARCHAR(255), GATEWAY_NAME VARCHAR(255), - EXECUTION_USER VARCHAR(255), - PROJECT_NAME VARCHAR(255), + EXECUTION_USER VARCHAR(255) NOT NULL, + PROJECT_NAME VARCHAR(255) NOT NULL, CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, EXPERIMENT_NAME VARCHAR(255) NOT NULL, EXPERIMENT_DESCRIPTION VARCHAR(255), @@ -157,7 +157,7 @@ CREATE TABLE EXPERIMENT CREATE TABLE EXPERIMENT_INPUT ( EXPERIMENT_ID VARCHAR(255), - INPUT_KEY VARCHAR(255), + INPUT_KEY VARCHAR(255) NOT NULL, INPUT_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -168,7 +168,7 @@ CREATE TABLE EXPERIMENT_INPUT CREATE TABLE EXPERIMENT_OUTPUT ( EXPERIMENT_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255), + OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -179,10 +179,10 @@ CREATE TABLE EXPERIMENT_OUTPUT CREATE TABLE WORKFLOW_NODE_DETAIL ( - EXPERIMENT_ID VARCHAR(255), + EXPERIMENT_ID VARCHAR(255) NOT NULL, NODE_INSTANCE_ID VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - NODE_NAME VARCHAR(255), + NODE_NAME VARCHAR(255) NOT NULL, PRIMARY KEY(NODE_INSTANCE_ID), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE ); @@ -221,7 +221,7 @@ CREATE TABLE ERROR_DETAIL CREATE TABLE APPLICATION_INPUT ( TASK_ID VARCHAR(255), - INPUT_KEY VARCHAR(255), + INPUT_KEY VARCHAR(255) NOT NULL, INPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -232,7 +232,7 @@ CREATE TABLE APPLICATION_INPUT CREATE TABLE APPLICATION_OUTPUT ( TASK_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255), + OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -243,7 +243,7 @@ CREATE TABLE APPLICATION_OUTPUT CREATE TABLE NODE_INPUT ( NODE_INSTANCE_ID VARCHAR(255), - INPUT_KEY VARCHAR(255), + INPUT_KEY VARCHAR(255) NOT NULL, INPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -254,7 +254,7 @@ CREATE TABLE NODE_INPUT CREATE TABLE NODE_OUTPUT ( NODE_INSTANCE_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255), + OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -266,7 +266,7 @@ CREATE TABLE JOB_DETAIL ( JOB_ID VARCHAR(255), TASK_ID VARCHAR(255), - JOB_DESCRIPTION CLOB, + JOB_DESCRIPTION CLOB NOT NULL, CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, COMPUTE_RESOURCE_CONSUMED VARCHAR(255), PRIMARY KEY (TASK_ID, JOB_ID), @@ -278,7 +278,7 @@ CREATE TABLE DATA_TRANSFER_DETAIL TRANSFER_ID VARCHAR(255), TASK_ID VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - TRANSFER_DESC CLOB, + TRANSFER_DESC CLOB NOT NULL, PRIMARY KEY(TRANSFER_ID), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE ); @@ -304,8 +304,8 @@ CREATE TABLE STATUS CREATE TABLE CONFIG_DATA ( EXPERIMENT_ID VARCHAR(255), - AIRAVATA_AUTO_SCHEDULE SMALLINT, - OVERRIDE_MANUAL_SCHEDULE_PARAMS SMALLINT, + AIRAVATA_AUTO_SCHEDULE SMALLINT NOT NULL, + OVERRIDE_MANUAL_SCHEDULE_PARAMS SMALLINT NOT NULL, SHARE_EXPERIMENT SMALLINT, PRIMARY KEY(EXPERIMENT_ID) ); http://git-wip-us.apache.org/repos/asf/airavata/blob/bca756a4/airavata-api/airavata-api-server/src/main/resources/registry-mysql.sql ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/main/resources/registry-mysql.sql b/airavata-api/airavata-api-server/src/main/resources/registry-mysql.sql index b16c651..0e32f0b 100644 --- a/airavata-api/airavata-api-server/src/main/resources/registry-mysql.sql +++ b/airavata-api/airavata-api-server/src/main/resources/registry-mysql.sql @@ -21,7 +21,7 @@ CREATE TABLE GATEWAY ( GATEWAY_NAME VARCHAR(255), - OWNER VARCHAR(255), + OWNER VARCHAR(255), PRIMARY KEY (GATEWAY_NAME) ); @@ -56,7 +56,7 @@ CREATE TABLE PROJECT ( GATEWAY_NAME VARCHAR(255), USER_NAME VARCHAR(255), - PROJECT_NAME VARCHAR(255), + PROJECT_NAME VARCHAR(255) NOT NULL, DESCRIPTION VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT NOW(), PRIMARY KEY (PROJECT_NAME), @@ -139,8 +139,8 @@ CREATE TABLE EXPERIMENT ( EXPERIMENT_ID VARCHAR(255), GATEWAY_NAME VARCHAR(255), - EXECUTION_USER VARCHAR(255), - PROJECT_NAME VARCHAR(255), + EXECUTION_USER VARCHAR(255) NOT NULL, + PROJECT_NAME VARCHAR(255) NOT NULL, CREATION_TIME TIMESTAMP DEFAULT NOW(), EXPERIMENT_NAME VARCHAR(255) NOT NULL, EXPERIMENT_DESCRIPTION VARCHAR(255), @@ -158,7 +158,7 @@ CREATE TABLE EXPERIMENT CREATE TABLE EXPERIMENT_INPUT ( EXPERIMENT_ID VARCHAR(255), - INPUT_KEY VARCHAR(255), + INPUT_KEY VARCHAR(255) NOT NULL, INPUT_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -169,7 +169,7 @@ CREATE TABLE EXPERIMENT_INPUT CREATE TABLE EXPERIMENT_OUTPUT ( EXPERIMENT_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255), + OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -179,10 +179,10 @@ CREATE TABLE EXPERIMENT_OUTPUT CREATE TABLE WORKFLOW_NODE_DETAIL ( - EXPERIMENT_ID VARCHAR(255), + EXPERIMENT_ID VARCHAR(255) NOT NULL, NODE_INSTANCE_ID VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT NOW(), - NODE_NAME VARCHAR(255), + NODE_NAME VARCHAR(255) NOT NULL, PRIMARY KEY(NODE_INSTANCE_ID), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE ); @@ -203,7 +203,7 @@ CREATE TABLE TASK_DETAIL CREATE TABLE APPLICATION_INPUT ( TASK_ID VARCHAR(255), - INPUT_KEY VARCHAR(255), + INPUT_KEY VARCHAR(255) NOT NULL, INPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -214,7 +214,7 @@ CREATE TABLE APPLICATION_INPUT CREATE TABLE APPLICATION_OUTPUT ( TASK_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255), + OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -225,7 +225,7 @@ CREATE TABLE APPLICATION_OUTPUT CREATE TABLE NODE_INPUT ( NODE_INSTANCE_ID VARCHAR(255), - INPUT_KEY VARCHAR(255), + INPUT_KEY VARCHAR(255) NOT NULL, INPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -236,7 +236,7 @@ CREATE TABLE NODE_INPUT CREATE TABLE NODE_OUTPUT ( NODE_INSTANCE_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255), + OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -248,7 +248,7 @@ CREATE TABLE JOB_DETAIL ( JOB_ID VARCHAR(255), TASK_ID VARCHAR(255), - JOB_DESCRIPTION LONGTEXT, + JOB_DESCRIPTION LONGTEXT NOT NULL, CREATION_TIME TIMESTAMP DEFAULT NOW(), COMPUTE_RESOURCE_CONSUMED VARCHAR(255), PRIMARY KEY (TASK_ID, JOB_ID), @@ -260,7 +260,7 @@ CREATE TABLE DATA_TRANSFER_DETAIL TRANSFER_ID VARCHAR(255), TASK_ID VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT NOW(), - TRANSFER_DESC LONGTEXT, + TRANSFER_DESC LONGTEXT NOT NULL, PRIMARY KEY(TRANSFER_ID), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE ); @@ -306,8 +306,8 @@ CREATE TABLE STATUS CREATE TABLE CONFIG_DATA ( EXPERIMENT_ID VARCHAR(255), - AIRAVATA_AUTO_SCHEDULE SMALLINT, - OVERRIDE_MANUAL_SCHEDULE_PARAMS SMALLINT, + AIRAVATA_AUTO_SCHEDULE SMALLINT NOT NULL, + OVERRIDE_MANUAL_SCHEDULE_PARAMS SMALLINT NOT NULL, SHARE_EXPERIMENT SMALLINT, PRIMARY KEY(EXPERIMENT_ID), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE http://git-wip-us.apache.org/repos/asf/airavata/blob/bca756a4/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 e1bf9e6..a30b540 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 @@ -21,7 +21,7 @@ CREATE TABLE GATEWAY ( GATEWAY_NAME VARCHAR(255), - OWNER VARCHAR(255), + OWNER VARCHAR(255), PRIMARY KEY (GATEWAY_NAME) ); @@ -55,7 +55,7 @@ CREATE TABLE GATEWAY_WORKER CREATE TABLE PROJECT ( GATEWAY_NAME VARCHAR(255), - USER_NAME VARCHAR(255), + USER_NAME VARCHAR(255) NOT NULL, PROJECT_NAME VARCHAR(255), DESCRIPTION VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, @@ -139,8 +139,8 @@ CREATE TABLE EXPERIMENT ( EXPERIMENT_ID VARCHAR(255), GATEWAY_NAME VARCHAR(255), - EXECUTION_USER VARCHAR(255), - PROJECT_NAME VARCHAR(255), + EXECUTION_USER VARCHAR(255) NOT NULL, + PROJECT_NAME VARCHAR(255) NOT NULL, CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, EXPERIMENT_NAME VARCHAR(255) NOT NULL, EXPERIMENT_DESCRIPTION VARCHAR(255), @@ -157,7 +157,7 @@ CREATE TABLE EXPERIMENT CREATE TABLE EXPERIMENT_INPUT ( EXPERIMENT_ID VARCHAR(255), - INPUT_KEY VARCHAR(255), + INPUT_KEY VARCHAR(255) NOT NULL, INPUT_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -168,7 +168,7 @@ CREATE TABLE EXPERIMENT_INPUT CREATE TABLE EXPERIMENT_OUTPUT ( EXPERIMENT_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255), + OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -179,10 +179,10 @@ CREATE TABLE EXPERIMENT_OUTPUT CREATE TABLE WORKFLOW_NODE_DETAIL ( - EXPERIMENT_ID VARCHAR(255), + EXPERIMENT_ID VARCHAR(255) NOT NULL, NODE_INSTANCE_ID VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - NODE_NAME VARCHAR(255), + NODE_NAME VARCHAR(255) NOT NULL, PRIMARY KEY(NODE_INSTANCE_ID), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE ); @@ -221,7 +221,7 @@ CREATE TABLE ERROR_DETAIL CREATE TABLE APPLICATION_INPUT ( TASK_ID VARCHAR(255), - INPUT_KEY VARCHAR(255), + INPUT_KEY VARCHAR(255) NOT NULL, INPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -232,7 +232,7 @@ CREATE TABLE APPLICATION_INPUT CREATE TABLE APPLICATION_OUTPUT ( TASK_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255), + OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -243,7 +243,7 @@ CREATE TABLE APPLICATION_OUTPUT CREATE TABLE NODE_INPUT ( NODE_INSTANCE_ID VARCHAR(255), - INPUT_KEY VARCHAR(255), + INPUT_KEY VARCHAR(255) NOT NULL, INPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -254,7 +254,7 @@ CREATE TABLE NODE_INPUT CREATE TABLE NODE_OUTPUT ( NODE_INSTANCE_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255), + OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -266,7 +266,7 @@ CREATE TABLE JOB_DETAIL ( JOB_ID VARCHAR(255), TASK_ID VARCHAR(255), - JOB_DESCRIPTION CLOB, + JOB_DESCRIPTION CLOB NOT NULL, CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, COMPUTE_RESOURCE_CONSUMED VARCHAR(255), PRIMARY KEY (TASK_ID, JOB_ID), @@ -278,7 +278,7 @@ CREATE TABLE DATA_TRANSFER_DETAIL TRANSFER_ID VARCHAR(255), TASK_ID VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - TRANSFER_DESC CLOB, + TRANSFER_DESC CLOB NOT NULL, PRIMARY KEY(TRANSFER_ID), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE ); @@ -304,8 +304,8 @@ CREATE TABLE STATUS CREATE TABLE CONFIG_DATA ( EXPERIMENT_ID VARCHAR(255), - AIRAVATA_AUTO_SCHEDULE SMALLINT, - OVERRIDE_MANUAL_SCHEDULE_PARAMS SMALLINT, + AIRAVATA_AUTO_SCHEDULE SMALLINT NOT NULL, + OVERRIDE_MANUAL_SCHEDULE_PARAMS SMALLINT NOT NULL, SHARE_EXPERIMENT SMALLINT, PRIMARY KEY(EXPERIMENT_ID) ); http://git-wip-us.apache.org/repos/asf/airavata/blob/bca756a4/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 e1bf9e6..a30b540 100644 --- a/modules/orchestrator/orchestrator-core/src/test/resources/registry-derby.sql +++ b/modules/orchestrator/orchestrator-core/src/test/resources/registry-derby.sql @@ -21,7 +21,7 @@ CREATE TABLE GATEWAY ( GATEWAY_NAME VARCHAR(255), - OWNER VARCHAR(255), + OWNER VARCHAR(255), PRIMARY KEY (GATEWAY_NAME) ); @@ -55,7 +55,7 @@ CREATE TABLE GATEWAY_WORKER CREATE TABLE PROJECT ( GATEWAY_NAME VARCHAR(255), - USER_NAME VARCHAR(255), + USER_NAME VARCHAR(255) NOT NULL, PROJECT_NAME VARCHAR(255), DESCRIPTION VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, @@ -139,8 +139,8 @@ CREATE TABLE EXPERIMENT ( EXPERIMENT_ID VARCHAR(255), GATEWAY_NAME VARCHAR(255), - EXECUTION_USER VARCHAR(255), - PROJECT_NAME VARCHAR(255), + EXECUTION_USER VARCHAR(255) NOT NULL, + PROJECT_NAME VARCHAR(255) NOT NULL, CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, EXPERIMENT_NAME VARCHAR(255) NOT NULL, EXPERIMENT_DESCRIPTION VARCHAR(255), @@ -157,7 +157,7 @@ CREATE TABLE EXPERIMENT CREATE TABLE EXPERIMENT_INPUT ( EXPERIMENT_ID VARCHAR(255), - INPUT_KEY VARCHAR(255), + INPUT_KEY VARCHAR(255) NOT NULL, INPUT_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -168,7 +168,7 @@ CREATE TABLE EXPERIMENT_INPUT CREATE TABLE EXPERIMENT_OUTPUT ( EXPERIMENT_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255), + OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -179,10 +179,10 @@ CREATE TABLE EXPERIMENT_OUTPUT CREATE TABLE WORKFLOW_NODE_DETAIL ( - EXPERIMENT_ID VARCHAR(255), + EXPERIMENT_ID VARCHAR(255) NOT NULL, NODE_INSTANCE_ID VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - NODE_NAME VARCHAR(255), + NODE_NAME VARCHAR(255) NOT NULL, PRIMARY KEY(NODE_INSTANCE_ID), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE ); @@ -221,7 +221,7 @@ CREATE TABLE ERROR_DETAIL CREATE TABLE APPLICATION_INPUT ( TASK_ID VARCHAR(255), - INPUT_KEY VARCHAR(255), + INPUT_KEY VARCHAR(255) NOT NULL, INPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -232,7 +232,7 @@ CREATE TABLE APPLICATION_INPUT CREATE TABLE APPLICATION_OUTPUT ( TASK_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255), + OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -243,7 +243,7 @@ CREATE TABLE APPLICATION_OUTPUT CREATE TABLE NODE_INPUT ( NODE_INSTANCE_ID VARCHAR(255), - INPUT_KEY VARCHAR(255), + INPUT_KEY VARCHAR(255) NOT NULL, INPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -254,7 +254,7 @@ CREATE TABLE NODE_INPUT CREATE TABLE NODE_OUTPUT ( NODE_INSTANCE_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255), + OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -266,7 +266,7 @@ CREATE TABLE JOB_DETAIL ( JOB_ID VARCHAR(255), TASK_ID VARCHAR(255), - JOB_DESCRIPTION CLOB, + JOB_DESCRIPTION CLOB NOT NULL, CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, COMPUTE_RESOURCE_CONSUMED VARCHAR(255), PRIMARY KEY (TASK_ID, JOB_ID), @@ -278,7 +278,7 @@ CREATE TABLE DATA_TRANSFER_DETAIL TRANSFER_ID VARCHAR(255), TASK_ID VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - TRANSFER_DESC CLOB, + TRANSFER_DESC CLOB NOT NULL, PRIMARY KEY(TRANSFER_ID), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE ); @@ -304,8 +304,8 @@ CREATE TABLE STATUS CREATE TABLE CONFIG_DATA ( EXPERIMENT_ID VARCHAR(255), - AIRAVATA_AUTO_SCHEDULE SMALLINT, - OVERRIDE_MANUAL_SCHEDULE_PARAMS SMALLINT, + AIRAVATA_AUTO_SCHEDULE SMALLINT NOT NULL, + OVERRIDE_MANUAL_SCHEDULE_PARAMS SMALLINT NOT NULL, SHARE_EXPERIMENT SMALLINT, PRIMARY KEY(EXPERIMENT_ID) ); http://git-wip-us.apache.org/repos/asf/airavata/blob/bca756a4/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java index 89ca8c2..9a1906c 100644 --- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java +++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java @@ -406,7 +406,11 @@ public class ExperimentRegistry { } status.setExperimentResource(experiment); status.setStatusUpdateTime(AiravataUtils.getTime(experimentStatus.getTimeOfStateChange())); - status.setState(experimentStatus.getExperimentState().toString()); + if (experimentStatus.getExperimentState() == null){ + status.setState(ExperimentState.UNKNOWN.toString()); + } else { + status.setState(experimentStatus.getExperimentState().toString()); + } status.setStatusType(StatusType.EXPERIMENT.toString()); status.save(); } catch (Exception e) { @@ -425,7 +429,11 @@ public class ExperimentRegistry { statusResource.setWorkflowNodeDetail(workflowNode); statusResource.setStatusType(StatusType.WORKFLOW_NODE.toString()); statusResource.setStatusUpdateTime(AiravataUtils.getTime(status.getTimeOfStateChange())); - statusResource.setState(status.getWorkflowNodeState().toString()); + if (status.getWorkflowNodeState() == null){ + statusResource.setState(WorkflowNodeState.UNKNOWN.toString()); + } else { + statusResource.setState(status.getWorkflowNodeState().toString()); + } statusResource.save(); return String.valueOf(statusResource.getStatusId()); } catch (Exception e) { @@ -463,7 +471,11 @@ public class ExperimentRegistry { statusResource.setTaskDetailResource(taskDetail); statusResource.setStatusType(StatusType.TASK.toString()); statusResource.setStatusUpdateTime(AiravataUtils.getTime(status.getTimeOfStateChange())); - statusResource.setState(status.getExecutionState().toString()); + if (status.getExecutionState() == null){ + statusResource.setState(TaskState.UNKNOWN.toString()); + } else { + statusResource.setState(status.getExecutionState().toString()); + } statusResource.save(); return String.valueOf(statusResource.getStatusId()); } catch (Exception e) { @@ -513,7 +525,11 @@ public class ExperimentRegistry { statusResource.setTaskDetailResource(taskDetail); statusResource.setStatusType(StatusType.JOB.toString()); statusResource.setStatusUpdateTime(AiravataUtils.getTime(status.getTimeOfStateChange())); - statusResource.setState(status.getJobState().toString()); + if (status.getJobState() == null){ + statusResource.setState(JobState.UNKNOWN.toString()); + } else { + statusResource.setState(status.getJobState().toString()); + } statusResource.save(); return String.valueOf(statusResource.getStatusId()); } catch (Exception e) { @@ -562,7 +578,11 @@ public class ExperimentRegistry { statusResource.setTaskDetailResource(taskDetail); statusResource.setStatusType(StatusType.APPLICATION.toString()); statusResource.setStatusUpdateTime(AiravataUtils.getTime(status.getTimeOfStateChange())); - statusResource.setState(status.getApplicationState()); + if (status.getApplicationState() == null){ + statusResource.setState("UNKNOWN"); + } else { + statusResource.setState(status.getApplicationState()); + } statusResource.save(); return String.valueOf(statusResource.getStatusId()); } catch (Exception e) { @@ -610,7 +630,11 @@ public class ExperimentRegistry { statusResource.setDataTransferDetail(dataTransferDetail); statusResource.setStatusType(StatusType.DATA_TRANSFER.toString()); statusResource.setStatusUpdateTime(AiravataUtils.getTime(status.getTimeOfStateChange())); - statusResource.setState(status.getTransferState().toString()); + if (status.getTransferState() == null){ + statusResource.setState(TransferState.UNKNOWN.toString()); + } else { + statusResource.setState(status.getTransferState().toString()); + } statusResource.save(); return String.valueOf(statusResource.getStatusId()); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/airavata/blob/bca756a4/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 e1bf9e6..a30b540 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 @@ -21,7 +21,7 @@ CREATE TABLE GATEWAY ( GATEWAY_NAME VARCHAR(255), - OWNER VARCHAR(255), + OWNER VARCHAR(255), PRIMARY KEY (GATEWAY_NAME) ); @@ -55,7 +55,7 @@ CREATE TABLE GATEWAY_WORKER CREATE TABLE PROJECT ( GATEWAY_NAME VARCHAR(255), - USER_NAME VARCHAR(255), + USER_NAME VARCHAR(255) NOT NULL, PROJECT_NAME VARCHAR(255), DESCRIPTION VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, @@ -139,8 +139,8 @@ CREATE TABLE EXPERIMENT ( EXPERIMENT_ID VARCHAR(255), GATEWAY_NAME VARCHAR(255), - EXECUTION_USER VARCHAR(255), - PROJECT_NAME VARCHAR(255), + EXECUTION_USER VARCHAR(255) NOT NULL, + PROJECT_NAME VARCHAR(255) NOT NULL, CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, EXPERIMENT_NAME VARCHAR(255) NOT NULL, EXPERIMENT_DESCRIPTION VARCHAR(255), @@ -157,7 +157,7 @@ CREATE TABLE EXPERIMENT CREATE TABLE EXPERIMENT_INPUT ( EXPERIMENT_ID VARCHAR(255), - INPUT_KEY VARCHAR(255), + INPUT_KEY VARCHAR(255) NOT NULL, INPUT_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -168,7 +168,7 @@ CREATE TABLE EXPERIMENT_INPUT CREATE TABLE EXPERIMENT_OUTPUT ( EXPERIMENT_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255), + OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -179,10 +179,10 @@ CREATE TABLE EXPERIMENT_OUTPUT CREATE TABLE WORKFLOW_NODE_DETAIL ( - EXPERIMENT_ID VARCHAR(255), + EXPERIMENT_ID VARCHAR(255) NOT NULL, NODE_INSTANCE_ID VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - NODE_NAME VARCHAR(255), + NODE_NAME VARCHAR(255) NOT NULL, PRIMARY KEY(NODE_INSTANCE_ID), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE ); @@ -221,7 +221,7 @@ CREATE TABLE ERROR_DETAIL CREATE TABLE APPLICATION_INPUT ( TASK_ID VARCHAR(255), - INPUT_KEY VARCHAR(255), + INPUT_KEY VARCHAR(255) NOT NULL, INPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -232,7 +232,7 @@ CREATE TABLE APPLICATION_INPUT CREATE TABLE APPLICATION_OUTPUT ( TASK_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255), + OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -243,7 +243,7 @@ CREATE TABLE APPLICATION_OUTPUT CREATE TABLE NODE_INPUT ( NODE_INSTANCE_ID VARCHAR(255), - INPUT_KEY VARCHAR(255), + INPUT_KEY VARCHAR(255) NOT NULL, INPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -254,7 +254,7 @@ CREATE TABLE NODE_INPUT CREATE TABLE NODE_OUTPUT ( NODE_INSTANCE_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255), + OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -266,7 +266,7 @@ CREATE TABLE JOB_DETAIL ( JOB_ID VARCHAR(255), TASK_ID VARCHAR(255), - JOB_DESCRIPTION CLOB, + JOB_DESCRIPTION CLOB NOT NULL, CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, COMPUTE_RESOURCE_CONSUMED VARCHAR(255), PRIMARY KEY (TASK_ID, JOB_ID), @@ -278,7 +278,7 @@ CREATE TABLE DATA_TRANSFER_DETAIL TRANSFER_ID VARCHAR(255), TASK_ID VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - TRANSFER_DESC CLOB, + TRANSFER_DESC CLOB NOT NULL, PRIMARY KEY(TRANSFER_ID), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE ); @@ -304,8 +304,8 @@ CREATE TABLE STATUS CREATE TABLE CONFIG_DATA ( EXPERIMENT_ID VARCHAR(255), - AIRAVATA_AUTO_SCHEDULE SMALLINT, - OVERRIDE_MANUAL_SCHEDULE_PARAMS SMALLINT, + AIRAVATA_AUTO_SCHEDULE SMALLINT NOT NULL, + OVERRIDE_MANUAL_SCHEDULE_PARAMS SMALLINT NOT NULL, SHARE_EXPERIMENT SMALLINT, PRIMARY KEY(EXPERIMENT_ID) ); http://git-wip-us.apache.org/repos/asf/airavata/blob/bca756a4/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 b16c651..0e32f0b 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 @@ -21,7 +21,7 @@ CREATE TABLE GATEWAY ( GATEWAY_NAME VARCHAR(255), - OWNER VARCHAR(255), + OWNER VARCHAR(255), PRIMARY KEY (GATEWAY_NAME) ); @@ -56,7 +56,7 @@ CREATE TABLE PROJECT ( GATEWAY_NAME VARCHAR(255), USER_NAME VARCHAR(255), - PROJECT_NAME VARCHAR(255), + PROJECT_NAME VARCHAR(255) NOT NULL, DESCRIPTION VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT NOW(), PRIMARY KEY (PROJECT_NAME), @@ -139,8 +139,8 @@ CREATE TABLE EXPERIMENT ( EXPERIMENT_ID VARCHAR(255), GATEWAY_NAME VARCHAR(255), - EXECUTION_USER VARCHAR(255), - PROJECT_NAME VARCHAR(255), + EXECUTION_USER VARCHAR(255) NOT NULL, + PROJECT_NAME VARCHAR(255) NOT NULL, CREATION_TIME TIMESTAMP DEFAULT NOW(), EXPERIMENT_NAME VARCHAR(255) NOT NULL, EXPERIMENT_DESCRIPTION VARCHAR(255), @@ -158,7 +158,7 @@ CREATE TABLE EXPERIMENT CREATE TABLE EXPERIMENT_INPUT ( EXPERIMENT_ID VARCHAR(255), - INPUT_KEY VARCHAR(255), + INPUT_KEY VARCHAR(255) NOT NULL, INPUT_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -169,7 +169,7 @@ CREATE TABLE EXPERIMENT_INPUT CREATE TABLE EXPERIMENT_OUTPUT ( EXPERIMENT_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255), + OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -179,10 +179,10 @@ CREATE TABLE EXPERIMENT_OUTPUT CREATE TABLE WORKFLOW_NODE_DETAIL ( - EXPERIMENT_ID VARCHAR(255), + EXPERIMENT_ID VARCHAR(255) NOT NULL, NODE_INSTANCE_ID VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT NOW(), - NODE_NAME VARCHAR(255), + NODE_NAME VARCHAR(255) NOT NULL, PRIMARY KEY(NODE_INSTANCE_ID), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE ); @@ -203,7 +203,7 @@ CREATE TABLE TASK_DETAIL CREATE TABLE APPLICATION_INPUT ( TASK_ID VARCHAR(255), - INPUT_KEY VARCHAR(255), + INPUT_KEY VARCHAR(255) NOT NULL, INPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -214,7 +214,7 @@ CREATE TABLE APPLICATION_INPUT CREATE TABLE APPLICATION_OUTPUT ( TASK_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255), + OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -225,7 +225,7 @@ CREATE TABLE APPLICATION_OUTPUT CREATE TABLE NODE_INPUT ( NODE_INSTANCE_ID VARCHAR(255), - INPUT_KEY VARCHAR(255), + INPUT_KEY VARCHAR(255) NOT NULL, INPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -236,7 +236,7 @@ CREATE TABLE NODE_INPUT CREATE TABLE NODE_OUTPUT ( NODE_INSTANCE_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255), + OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -248,7 +248,7 @@ CREATE TABLE JOB_DETAIL ( JOB_ID VARCHAR(255), TASK_ID VARCHAR(255), - JOB_DESCRIPTION LONGTEXT, + JOB_DESCRIPTION LONGTEXT NOT NULL, CREATION_TIME TIMESTAMP DEFAULT NOW(), COMPUTE_RESOURCE_CONSUMED VARCHAR(255), PRIMARY KEY (TASK_ID, JOB_ID), @@ -260,7 +260,7 @@ CREATE TABLE DATA_TRANSFER_DETAIL TRANSFER_ID VARCHAR(255), TASK_ID VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT NOW(), - TRANSFER_DESC LONGTEXT, + TRANSFER_DESC LONGTEXT NOT NULL, PRIMARY KEY(TRANSFER_ID), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE ); @@ -306,8 +306,8 @@ CREATE TABLE STATUS CREATE TABLE CONFIG_DATA ( EXPERIMENT_ID VARCHAR(255), - AIRAVATA_AUTO_SCHEDULE SMALLINT, - OVERRIDE_MANUAL_SCHEDULE_PARAMS SMALLINT, + AIRAVATA_AUTO_SCHEDULE SMALLINT NOT NULL, + OVERRIDE_MANUAL_SCHEDULE_PARAMS SMALLINT NOT NULL, SHARE_EXPERIMENT SMALLINT, PRIMARY KEY(EXPERIMENT_ID), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE http://git-wip-us.apache.org/repos/asf/airavata/blob/bca756a4/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 e1bf9e6..a30b540 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 @@ -21,7 +21,7 @@ CREATE TABLE GATEWAY ( GATEWAY_NAME VARCHAR(255), - OWNER VARCHAR(255), + OWNER VARCHAR(255), PRIMARY KEY (GATEWAY_NAME) ); @@ -55,7 +55,7 @@ CREATE TABLE GATEWAY_WORKER CREATE TABLE PROJECT ( GATEWAY_NAME VARCHAR(255), - USER_NAME VARCHAR(255), + USER_NAME VARCHAR(255) NOT NULL, PROJECT_NAME VARCHAR(255), DESCRIPTION VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, @@ -139,8 +139,8 @@ CREATE TABLE EXPERIMENT ( EXPERIMENT_ID VARCHAR(255), GATEWAY_NAME VARCHAR(255), - EXECUTION_USER VARCHAR(255), - PROJECT_NAME VARCHAR(255), + EXECUTION_USER VARCHAR(255) NOT NULL, + PROJECT_NAME VARCHAR(255) NOT NULL, CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, EXPERIMENT_NAME VARCHAR(255) NOT NULL, EXPERIMENT_DESCRIPTION VARCHAR(255), @@ -157,7 +157,7 @@ CREATE TABLE EXPERIMENT CREATE TABLE EXPERIMENT_INPUT ( EXPERIMENT_ID VARCHAR(255), - INPUT_KEY VARCHAR(255), + INPUT_KEY VARCHAR(255) NOT NULL, INPUT_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -168,7 +168,7 @@ CREATE TABLE EXPERIMENT_INPUT CREATE TABLE EXPERIMENT_OUTPUT ( EXPERIMENT_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255), + OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -179,10 +179,10 @@ CREATE TABLE EXPERIMENT_OUTPUT CREATE TABLE WORKFLOW_NODE_DETAIL ( - EXPERIMENT_ID VARCHAR(255), + EXPERIMENT_ID VARCHAR(255) NOT NULL, NODE_INSTANCE_ID VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - NODE_NAME VARCHAR(255), + NODE_NAME VARCHAR(255) NOT NULL, PRIMARY KEY(NODE_INSTANCE_ID), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE ); @@ -221,7 +221,7 @@ CREATE TABLE ERROR_DETAIL CREATE TABLE APPLICATION_INPUT ( TASK_ID VARCHAR(255), - INPUT_KEY VARCHAR(255), + INPUT_KEY VARCHAR(255) NOT NULL, INPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -232,7 +232,7 @@ CREATE TABLE APPLICATION_INPUT CREATE TABLE APPLICATION_OUTPUT ( TASK_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255), + OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -243,7 +243,7 @@ CREATE TABLE APPLICATION_OUTPUT CREATE TABLE NODE_INPUT ( NODE_INSTANCE_ID VARCHAR(255), - INPUT_KEY VARCHAR(255), + INPUT_KEY VARCHAR(255) NOT NULL, INPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -254,7 +254,7 @@ CREATE TABLE NODE_INPUT CREATE TABLE NODE_OUTPUT ( NODE_INSTANCE_ID VARCHAR(255), - OUTPUT_KEY VARCHAR(255), + OUTPUT_KEY VARCHAR(255) NOT NULL, OUTPUT_KEY_TYPE VARCHAR(255), METADATA VARCHAR(255), VALUE VARCHAR(255), @@ -266,7 +266,7 @@ CREATE TABLE JOB_DETAIL ( JOB_ID VARCHAR(255), TASK_ID VARCHAR(255), - JOB_DESCRIPTION CLOB, + JOB_DESCRIPTION CLOB NOT NULL, CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, COMPUTE_RESOURCE_CONSUMED VARCHAR(255), PRIMARY KEY (TASK_ID, JOB_ID), @@ -278,7 +278,7 @@ CREATE TABLE DATA_TRANSFER_DETAIL TRANSFER_ID VARCHAR(255), TASK_ID VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - TRANSFER_DESC CLOB, + TRANSFER_DESC CLOB NOT NULL, PRIMARY KEY(TRANSFER_ID), FOREIGN KEY (TASK_ID) REFERENCES TASK_DETAIL(TASK_ID) ON DELETE CASCADE ); @@ -304,8 +304,8 @@ CREATE TABLE STATUS CREATE TABLE CONFIG_DATA ( EXPERIMENT_ID VARCHAR(255), - AIRAVATA_AUTO_SCHEDULE SMALLINT, - OVERRIDE_MANUAL_SCHEDULE_PARAMS SMALLINT, + AIRAVATA_AUTO_SCHEDULE SMALLINT NOT NULL, + OVERRIDE_MANUAL_SCHEDULE_PARAMS SMALLINT NOT NULL, SHARE_EXPERIMENT SMALLINT, PRIMARY KEY(EXPERIMENT_ID) );
