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 2015/11/03 20:48:04 UTC
[39/51] [abbrv] airavata git commit: make task-dag as CLOB
make task-dag as CLOB
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/53e3d4c4
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/53e3d4c4
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/53e3d4c4
Branch: refs/heads/master
Commit: 53e3d4c4e9bdf38055b757e34fc447903e588f5a
Parents: 83592fb
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Thu Oct 22 10:49:04 2015 -0400
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Thu Oct 22 10:49:04 2015 -0400
----------------------------------------------------------------------
.../core/experiment/catalog/model/Process.java | 1 +
.../src/main/resources/expcatalog-derby.sql | 2 +-
.../src/main/resources/expcatalog-mysql.sql | 4 ++--
.../src/test/resources/expcatalog-derby.sql | 13 ++++++++-----
4 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/53e3d4c4/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Process.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Process.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Process.java
index b765ced..5e429d1 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Process.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Process.java
@@ -107,6 +107,7 @@ public class Process {
this.applicationInterfaceId = applicationInterfaceId;
}
+ @Lob
@Column(name = "TASK_DAG")
public String getTaskDag() {
return taskDag;
http://git-wip-us.apache.org/repos/asf/airavata/blob/53e3d4c4/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql b/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
index 215dd7e..02d02fb 100644
--- a/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
+++ b/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
@@ -182,7 +182,7 @@ CREATE TABLE PROCESS (
LAST_UPDATE_TIME timestamp DEFAULT CURRENT_TIMESTAMP,
PROCESS_DETAIL CLOB,
APPLICATION_INTERFACE_ID varchar(255),
- TASK_DAG varchar(255),
+ TASK_DAG CLOB,
APPLICATION_DEPLOYMENT_ID varchar(255),
COMPUTE_RESOURCE_ID varchar(255),
GATEWAY_EXECUTION_ID varchar(255),
http://git-wip-us.apache.org/repos/asf/airavata/blob/53e3d4c4/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
index 177a3ec..629745d 100644
--- a/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
+++ b/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
@@ -183,12 +183,12 @@ CREATE TABLE PROCESS (
LAST_UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
PROCESS_DETAIL text,
APPLICATION_INTERFACE_ID varchar(255),
- TASK_DAG varchar(255),
+ TASK_DAG TEXT,
APPLICATION_DEPLOYMENT_ID varchar(255),
COMPUTE_RESOURCE_ID varchar(255),
GATEWAY_EXECUTION_ID varchar(255),
ENABLE_EMAIL_NOTIFICATION BOOLEAN,
- EMAIL_ADDRESSES text,
+ EMAIL_ADDRESSES TEXT,
PRIMARY KEY (PROCESS_ID),
FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
);
http://git-wip-us.apache.org/repos/asf/airavata/blob/53e3d4c4/modules/registry/registry-core/src/test/resources/expcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/test/resources/expcatalog-derby.sql b/modules/registry/registry-core/src/test/resources/expcatalog-derby.sql
index 31aa701..02d02fb 100644
--- a/modules/registry/registry-core/src/test/resources/expcatalog-derby.sql
+++ b/modules/registry/registry-core/src/test/resources/expcatalog-derby.sql
@@ -157,6 +157,7 @@ CREATE TABLE USER_CONFIGURATION_DATA (
QUEUE_NAME varchar(255),
WALL_TIME_LIMIT INT,
TOTAL_PHYSICAL_MEMORY INT,
+ STATIC_WORKING_DIR varchar(255),
PRIMARY KEY (EXPERIMENT_ID),
FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
);
@@ -181,7 +182,7 @@ CREATE TABLE PROCESS (
LAST_UPDATE_TIME timestamp DEFAULT CURRENT_TIMESTAMP,
PROCESS_DETAIL CLOB,
APPLICATION_INTERFACE_ID varchar(255),
- TASK_DAG varchar(255),
+ TASK_DAG CLOB,
APPLICATION_DEPLOYMENT_ID varchar(255),
COMPUTE_RESOURCE_ID varchar(255),
GATEWAY_EXECUTION_ID varchar(255),
@@ -258,6 +259,7 @@ CREATE TABLE PROCESS_RESOURCE_SCHEDULE (
QUEUE_NAME varchar(255),
WALL_TIME_LIMIT INT,
TOTAL_PHYSICAL_MEMORY INT,
+ STATIC_WORKING_DIR varchar(255),
PRIMARY KEY (PROCESS_ID),
FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
);
@@ -294,19 +296,20 @@ CREATE TABLE TASK_ERROR (
TRANSIENT_OR_PERSISTENT SMALLINT,
ROOT_CAUSE_ERROR_ID_LIST CLOB,
PRIMARY KEY (ERROR_ID, TASK_ID),
- FOREIGN KEY (TASK_ID) REFERENCES TASK(TASK_ID) ON DELETE CASCADE);
+ FOREIGN KEY (TASK_ID) REFERENCES TASK(TASK_ID) ON DELETE CASCADE
+);
CREATE TABLE JOB (
JOB_ID varchar(255),
TASK_ID varchar(255),
PROCESS_ID varchar(255),
- JOB_DESCRIPTION CLOB,
+ JOB_DESCRIPTION CLOB NOT NULL,
CREATION_TIME timestamp DEFAULT '0000-00-00 00:00:00',
COMPUTE_RESOURCE_CONSUMED varchar(255),
JOB_NAME varchar(255),
WORKING_DIR varchar(255),
- STDOUT CLOB,
- STDERR CLOB,
+ STD_OUT CLOB,
+ STD_ERR CLOB,
EXIT_CODE INT,
PRIMARY KEY (JOB_ID, PROCESS_ID),
FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE