You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2019/01/10 15:46:32 UTC
[airavata] branch develop updated: AIRAVATA-2827 Backport
TINYINT(1) fix to registry-core db scripts
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/develop by this push:
new b24f1ce AIRAVATA-2827 Backport TINYINT(1) fix to registry-core db scripts
b24f1ce is described below
commit b24f1cebe0eec2fd77430b4e714cb0abdbddb2a5
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Jan 10 10:44:00 2019 -0500
AIRAVATA-2827 Backport TINYINT(1) fix to registry-core db scripts
---
.../registry/registry-core/src/main/resources/appcatalog-mysql.sql | 7 ++++---
.../registry/registry-core/src/main/resources/expcatalog-mysql.sql | 3 ++-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
index 7f37e37..5668c19 100644
--- a/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
+++ b/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
@@ -31,7 +31,7 @@ CREATE TABLE COMPUTE_RESOURCE
DEFAULT_CPU_COUNT INTEGER,
DEFAULT_WALLTIME INTEGER,
ENABLED SMALLINT,
- GATEWAY_USAGE_REPORTING SMALLINT,
+ GATEWAY_USAGE_REPORTING TINYINT(1),
GATEWAY_USAGE_MODULE_LOAD_CMD VARCHAR(500),
GATEWAY_USAGE_EXECUTABLE VARCHAR(255),
PRIMARY KEY (RESOURCE_ID)
@@ -276,7 +276,8 @@ CREATE TABLE APPLICATION_INTERFACE
APPLICATION_NAME VARCHAR(255),
APPLICATION_DESCRIPTION VARCHAR(500),
GATEWAY_ID VARCHAR(255),
- ARCHIVE_WORKING_DIRECTORY SMALLINT,
+ ARCHIVE_WORKING_DIRECTORY TINYINT(1),
+ HAS_OPTIONAL_FILE_INPUTS TINYINT(1),
CREATION_TIME TIMESTAMP DEFAULT NOW(),
UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY(INTERFACE_ID)
@@ -322,7 +323,7 @@ CREATE TABLE APPLICATION_OUTPUT
DATA_NAME_LOCATION VARCHAR(255),
SEARCH_QUERY VARCHAR(255),
APP_ARGUMENT VARCHAR(255),
- OUTPUT_STREAMING SMALLINT,
+ OUTPUT_STREAMING TINYINT(1),
PRIMARY KEY(INTERFACE_ID,OUTPUT_KEY),
FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE CASCADE
);
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 80643dc..b6160be 100644
--- a/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
+++ b/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
@@ -237,6 +237,7 @@ CREATE TABLE PROCESS (
EXPERIMENT_DATA_DIR VARCHAR (512),
USERNAME VARCHAR (255),
GROUP_RESOURCE_PROFILE_ID VARCHAR (255) DEFAULT NULL,
+ USE_USER_CR_PREF TINYINT(1),
PRIMARY KEY (PROCESS_ID),
FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
);
@@ -382,7 +383,7 @@ CREATE TABLE QUEUE_STATUS(
HOST_NAME VARCHAR(255),
QUEUE_NAME VARCHAR(255),
CREATED_TIME BIGINT(20),
- QUEUE_UP BIT(1),
+ QUEUE_UP TINYINT(1),
RUNNING_JOBS INT(11),
QUEUED_JOBS INT(11),
PRIMARY KEY (HOST_NAME, QUEUE_NAME, CREATED_TIME)