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/07/02 20:09:23 UTC
airavata git commit: issues with experiment catalog mysql script
Repository: airavata
Updated Branches:
refs/heads/master 80589baad -> f1d49fb58
issues with experiment catalog mysql script
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f1d49fb5
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f1d49fb5
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f1d49fb5
Branch: refs/heads/master
Commit: f1d49fb584422861d54248c100f8a5108dce69f4
Parents: 80589ba
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Thu Jul 2 14:09:14 2015 -0400
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Thu Jul 2 14:09:14 2015 -0400
----------------------------------------------------------------------
.../apache/airavata/gfac/server/GfacServer.java | 1 -
.../src/main/resources/expcatalog-mysql.sql | 30 ++++++++++----------
2 files changed, 15 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/f1d49fb5/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServer.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServer.java b/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServer.java
index 53e687a..db65e28 100644
--- a/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServer.java
+++ b/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServer.java
@@ -20,7 +20,6 @@
*/
package org.apache.airavata.gfac.server;
-import org.apache.airavata.common.utils.Constants;
import org.apache.airavata.common.utils.IServer;
import org.apache.airavata.common.utils.ServerSettings;
import org.apache.airavata.gfac.core.GFacThreadPoolExecutor;
http://git-wip-us.apache.org/repos/asf/airavata/blob/f1d49fb5/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 f9bafae..ffb5d16 100644
--- a/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
+++ b/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
@@ -50,7 +50,7 @@ CREATE TABLE PROJECT
PROJECT_NAME VARCHAR(255),
PROJECT_ID VARCHAR(255),
DESCRIPTION VARCHAR(255),
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ CREATION_TIME TIMESTAMP DEFAULT NOW(),
PRIMARY KEY (PROJECT_ID),
FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID) ON DELETE CASCADE,
FOREIGN KEY (USER_NAME) REFERENCES USERS(USER_NAME) ON DELETE CASCADE
@@ -72,7 +72,7 @@ CREATE TABLE EXPERIMENT (
EXPERIMENT_TYPE varchar(255),
USER_NAME varchar(255),
EXPERIMENT_NAME varchar(255),
- CREATION_TIME timestamp DEFAULT CURRENT_TIMESTAMP,
+ CREATION_TIME timestamp DEFAULT NOW(),
DESCRIPTION varchar(255),
EXECUTION_ID varchar(255),
GATEWAY_EXECUTION_ID varchar(255),
@@ -123,7 +123,7 @@ CREATE TABLE EXPERIMENT_STATUS (
STATUS_ID varchar(255),
EXPERIMENT_ID varchar(255),
STATE varchar(255),
- TIME_OF_STATE_CHANGE timestamp DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
+ TIME_OF_STATE_CHANGE timestamp DEFAULT '0000-00-00 00:00:00',
REASON LONGTEXT,
PRIMARY KEY (STATUS_ID, EXPERIMENT_ID),
FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
@@ -133,7 +133,7 @@ CREATE TABLE EXPERIMENT_STATUS (
CREATE TABLE EXPERIMENT_ERROR (
ERROR_ID varchar(255),
EXPERIMENT_ID varchar(255),
- CREATION_TIME timestamp DEFAULT CURRENT_TIMESTAMP,
+ CREATION_TIME timestamp DEFAULT NOW(),
ACTUAL_ERROR_MESSAGE text,
USER_FRIENDLY_MESSAGE text,
TRANSIENT_OR_PERSISTENT tinyint(1),
@@ -179,8 +179,8 @@ CREATE VIEW EXPERIMENT_SUMMARY AS
CREATE TABLE PROCESS (
PROCESS_ID varchar(255),
EXPERIMENT_ID varchar(255),
- CREATION_TIME timestamp DEFAULT CURRENT_TIMESTAMP,
- LAST_UPDATE_TIME timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ CREATION_TIME TIMESTAMP DEFAULT NOW(),
+ LAST_UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
PROCESS_DETAIL text,
APPLICATION_INTERFACE_ID varchar(255),
TASK_DAG varchar(255),
@@ -232,7 +232,7 @@ CREATE TABLE PROCESS_STATUS (
STATUS_ID varchar(255),
PROCESS_ID varchar(255),
STATE varchar(255),
- TIME_OF_STATE_CHANGE timestamp DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
+ TIME_OF_STATE_CHANGE timestamp DEFAULT '0000-00-00 00:00:00',
REASON LONGTEXT,
PRIMARY KEY (STATUS_ID, PROCESS_ID),
FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
@@ -242,7 +242,7 @@ CREATE TABLE PROCESS_STATUS (
CREATE TABLE PROCESS_ERROR (
ERROR_ID varchar(255),
PROCESS_ID varchar(255),
- CREATION_TIME timestamp DEFAULT CURRENT_TIMESTAMP,
+ CREATION_TIME timestamp DEFAULT NOW(),
ACTUAL_ERROR_MESSAGE text,
USER_FRIENDLY_MESSAGE text,
TRANSIENT_OR_PERSISTENT tinyint(1),
@@ -268,8 +268,8 @@ CREATE TABLE TASK (
TASK_ID varchar(255),
TASK_TYPE varchar(255),
PARENT_PROCESS_ID varchar(255),
- CREATION_TIME timestamp DEFAULT CURRENT_TIMESTAMP,
- LAST_UPDATE_TIME timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ CREATION_TIME timestamp DEFAULT NOW(),
+ LAST_UPDATE_TIME timestamp DEFAULT '0000-00-00 00:00:00',
TASK_DETAIL text,
TASK_INTERNAL_STORE tinyint(4),
PRIMARY KEY (TASK_ID),
@@ -280,7 +280,7 @@ CREATE TABLE TASK_STATUS (
STATUS_ID varchar(255),
TASK_ID varchar(255),
STATE varchar(255),
- TIME_OF_STATE_CHANGE timestamp DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
+ TIME_OF_STATE_CHANGE timestamp DEFAULT '0000-00-00 00:00:00',
REASON LONGTEXT,
PRIMARY KEY (STATUS_ID, TASK_ID),
FOREIGN KEY (TASK_ID) REFERENCES TASK(TASK_ID) ON DELETE CASCADE
@@ -290,7 +290,7 @@ CREATE TABLE TASK_STATUS (
CREATE TABLE TASK_ERROR (
ERROR_ID varchar(255),
TASK_ID varchar(255),
- CREATION_TIME timestamp DEFAULT CURRENT_TIMESTAMP,
+ CREATION_TIME timestamp DEFAULT NOW(),
ACTUAL_ERROR_MESSAGE text,
USER_FRIENDLY_MESSAGE text,
TRANSIENT_OR_PERSISTENT tinyint(1),
@@ -303,7 +303,7 @@ CREATE TABLE JOB (
JOB_ID varchar(255),
TASK_ID varchar(255),
JOB_DESCRIPTION varchar(255),
- CREATION_TIME timestamp DEFAULT CURRENT_TIMESTAMP,
+ CREATION_TIME timestamp DEFAULT NOW(),
COMPUTE_RESOURCE_CONSUMED varchar(255),
JOB_NAME varchar(255),
WORKING_DIR varchar(255),
@@ -316,7 +316,7 @@ CREATE TABLE JOB_STATUS (
JOB_ID varchar(255),
TASK_ID varchar(255),
STATE varchar(255),
- TIME_OF_STATE_CHANGE timestamp DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
+ TIME_OF_STATE_CHANGE timestamp DEFAULT '0000-00-00 00:00:00',
REASON LONGTEXT,
PRIMARY KEY (STATUS_ID, JOB_ID, TASK_ID),
FOREIGN KEY (JOB_ID, TASK_ID) REFERENCES JOB(JOB_ID, TASK_ID) ON DELETE CASCADE
@@ -332,4 +332,4 @@ CREATE TABLE CONFIGURATION
PRIMARY KEY(CONFIG_KEY, CONFIG_VAL, CATEGORY_ID)
);
-INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL, EXPIRE_DATE, CATEGORY_ID) VALUES('registry.version', '0.15', CURRENT_TIMESTAMP ,'SYSTEM');
\ No newline at end of file
+INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL, EXPIRE_DATE, CATEGORY_ID) VALUES('registry.version', '0.15', NOW() ,'SYSTEM');
\ No newline at end of file