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 2020/04/27 21:58:40 UTC

[airavata] branch develop updated (72bfb61 -> 5544db6)

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.


    from 72bfb61  Merge pull request #247 from isururanawaka/pythonSDK
     add 4bae56c  increased the input file size for Geochemsim
     add ef82e19  Merge branch 'AIRAVATA-3158--Experiment-Statistics-in-Django-portal-doesn't-list-beyond-1000-experiments'
     add 74def4c  AIRAVATA-3303 Moving migration script to correct folders
     add 0ed17d6  Merge branch 'AIRAVATA-3303--404-Not-Found-when-forward-slash-in-experiment-id'
     add fb6c5d9  Update client_truststore.jks with letsencrypt cert
     add fc52011  AIRAVATA-3158 Set query limit high enough to get all of experiments in statistics
     add 04d6dc7  Merge branch 'AIRAVATA-3158--Experiment-Statistics-in-Django-portal-doesn't-list-beyond-1000-experiments'
     add 38e4fac  Ansible: configure Django timeout
     add 1bce4bf  Ansible: remove pga url seagrid django
     add 7e7ed8a  Ansible: update ssl paths for southdakota
     add a88c956  Logging improvements for email monitor
     add 9bebfa0  Fixing possible kafka read thread timeouts when processing post wm job status messages
     add 678be05  Avoiding the job resubmission due to helix bug
     add 8a6820d  Merge branch 'airavata-3276'
     add 6e51d46  Merge remote-tracking branch 'origin/airavata-3281'
     add e78ff86  Merge branch 'airavata-3268'
     add 6f35091  WIP
     add 56b3f0a  Merge branch 'AIRAVATA-3126--Implement-compute-resource-reservation-addition'
     add d0c5843  Adding missing jar to participant distribution
     add efb78bc  Adding new Physicell gateway
     add 3b7e26b  Adding new Physicell gateway
     add 925bbf6  Adding new Physicell gateway
     add 0026d18  Adding new Physicell gateway
     add dbc6115  Adding new Pathogenomics gateway
     add 669d788  Adding new Pathogenomics gateway
     add c367c9b  Adding new Pathogenomics gateway
     add 8476a13  Adding new Pathogenomics gateway
     add 4e10486  Adding new Pathogenomics gateway
     add 11998ee  Adding cilogon ot Physiecll gateway
     add f68c46c  added new email for notifications
     add af250b2  Added cilogon to pathogenomics gateway
     new efd6bd2  AIRAVATA-3126 Move schema migration to correct file
     new bb86096  Merge branch 'AIRAVATA-3126--Implement-compute-resource-reservation-addition'
     new 96994d3  AIRAVATA-3276 Moving data migration scripts to correct file
     new 5544db6  Merge branch 'master' into develop

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../scigap/production/files/client_truststore.jks  | Bin 5312 -> 5398 bytes
 .../host_vars/dreg/files/django-ssl-vhost.conf.j2  |   1 +
 .../scigap/production/host_vars/nexttdb/vars.yml   |   2 +
 .../host_vars/{v4i => pathogenomics}/vars.yml      |  22 +--
 .../production/host_vars/pathogenomics/vault.yml   |  15 ++
 .../host_vars/{smaltr => physicell}/vars.yml       |  22 +--
 .../production/host_vars/physicell/vault.yml       |  15 ++
 .../scigap/production/host_vars/seagrid/vars.yml   |   2 +-
 .../production/host_vars/southdakota/vars.yml      |   8 +-
 .../scigap/production/host_vars/toppic/vars.yml    |   2 +-
 .../ansible/inventories/scigap/production/hosts    |   2 +
 .../scigap/staging/files/client_truststore.jks     | Bin 5312 -> 5398 bytes
 .../task/submission/DefaultJobSubmissionTask.java  |   8 +-
 .../helix/impl/workflow/PostWorkflowManager.java   |  36 +++--
 .../helix/impl/workflow/PreWorkflowManager.java    |   1 -
 .../org/apache/airavata/common/utils/JPAUtils.java | 153 +++++++++++++++++++--
 .../airavata/monitor/email/EmailBasedMonitor.java  |   4 +-
 .../apache/airavata/monitor/AbstractMonitor.java   |   1 +
 .../expcatalog/ExperimentSummaryRepository.java    |   2 +-
 .../core/utils/JPAUtil/AppCatalogJPAUtils.java     |  29 +---
 .../DeltaScripts/appCatalog_schema_delta.sql       |  28 ++++
 .../experimentCatalog_schema_delta.sql             |  13 ++
 .../DeltaScripts/sharingCatalog_schema_delta.sql   |   8 ++
 .../next/DeltaScripts/appCatalog_schema_delta.sql  |  28 ----
 .../experimentCatalog_schema_delta.sql             |  13 --
 .../DeltaScripts/sharingCatalog_schema_delta.sql   |   8 --
 26 files changed, 292 insertions(+), 131 deletions(-)
 copy dev-tools/ansible/inventories/scigap/production/host_vars/{v4i => pathogenomics}/vars.yml (55%)
 create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/pathogenomics/vault.yml
 copy dev-tools/ansible/inventories/scigap/production/host_vars/{smaltr => physicell}/vars.yml (56%)
 create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/physicell/vault.yml


[airavata] 02/04: Merge branch 'AIRAVATA-3126--Implement-compute-resource-reservation-addition'

Posted by ma...@apache.org.
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

commit bb8609673b8e2e21d2ec638613c4f319da1fb4e1
Merge: af250b2 efd6bd2
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Mon Apr 27 17:55:01 2020 -0400

    Merge branch 'AIRAVATA-3126--Implement-compute-resource-reservation-addition'

 .../0.18-0.19/DeltaScripts/appCatalog_schema_delta.sql           | 9 +++++++++
 .../next/DeltaScripts/appCatalog_schema_delta.sql                | 8 --------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --cc modules/registry/release-migration-scripts/0.18-0.19/DeltaScripts/appCatalog_schema_delta.sql
index d88340a,37e5059..a2cc07a
--- a/modules/registry/release-migration-scripts/0.18-0.19/DeltaScripts/appCatalog_schema_delta.sql
+++ b/modules/registry/release-migration-scripts/0.18-0.19/DeltaScripts/appCatalog_schema_delta.sql
@@@ -479,6 -479,11 +479,15 @@@ ALTER TABLE `UNICORE_DATAMOVEMENT` DRO
  -- AIRAVATA-3029: Add METADATA to APPLICATION_OUTPUT
  ALTER TABLE `APPLICATION_OUTPUT` ADD COLUMN IF NOT EXISTS METADATA VARCHAR(4096);
  
 +-- AIRAVATA-3268: add overrideFilename to APPLICATION_INPUT
 +ALTER TABLE APPLICATION_INPUT ADD COLUMN IF NOT EXISTS OVERRIDE_FILENAME VARCHAR(255);
 +update APPLICATION_INPUT set OVERRIDE_FILENAME = INPUT_VALUE where OVERRIDE_FILENAME is null and DATA_TYPE = 'URI' and INPUT_VALUE is not null and INPUT_VALUE != '';
++
+ -- AIRAVATA-3126
+ CREATE TABLE IF NOT EXISTS COMPUTE_RESOURCE_RESERVATION -- ComputeResourceReservationEntity
+     (RESERVATION_ID VARCHAR(255) NOT NULL, END_TIME TIMESTAMP NOT NULL DEFAULT 0, RESERVATION_NAME VARCHAR(255) NOT NULL, START_TIME TIMESTAMP NOT NULL DEFAULT 0, RESOURCE_ID VARCHAR(255) NOT NULL, GROUP_RESOURCE_PROFILE_ID VARCHAR(255) NOT NULL, PRIMARY KEY (RESERVATION_ID)
+ )ENGINE=InnoDB DEFAULT CHARSET=latin1;
+ CREATE TABLE IF NOT EXISTS COMPUTE_RESOURCE_RESERVATION_QUEUE (RESERVATION_ID VARCHAR(255), QUEUE_NAME VARCHAR(255) NOT NULL
+ )ENGINE=InnoDB DEFAULT CHARSET=latin1;
+ CREATE INDEX IF NOT EXISTS I_CMPTN_Q_RESERVATION_ID ON COMPUTE_RESOURCE_RESERVATION_QUEUE (RESERVATION_ID);
+ ALTER TABLE COMPUTE_RESOURCE_RESERVATION ADD CONSTRAINT FK_COMPUTE_RESOURCE_RESERVATION FOREIGN KEY IF NOT EXISTS (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID) REFERENCES GROUP_COMPUTE_RESOURCE_PREFERENCE (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID) ON DELETE CASCADE;
diff --cc modules/registry/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql
index 6dacaa4,839c2e1..b9f4385
--- a/modules/registry/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql
+++ b/modules/registry/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql
@@@ -19,30 -19,3 +19,22 @@@
  --
  
  use app_catalog;
 +
 +-- AIRAVATA-3276 Replace JSON configuration: "toggle": ["isRequired"] ->
 +-- "isRequired": true. Toggling requiredToAddedToCommandLine no longer needed.
 +
 +-- replace toggle with is isRequired
 +update APPLICATION_INPUT
 +set METADATA = REGEXP_REPLACE(METADATA, '"toggle": \\[[^}]+\\]', CONCAT('"isRequired": ', IF(IS_REQUIRED=1, 'true', 'false')))
 +-- showOptions has "toggle" but not "isRequired"
 +where METADATA rlike '"showOptions": {"toggle": \\[[^}]+\\]'
 +  and NOT METADATA rlike '"showOptions": {.*"isRequired": (true|false)'
 +;
 +
 +-- remove toggle since isRequired is already there
 +update APPLICATION_INPUT
 +set METADATA = REGEXP_REPLACE(METADATA, '(, )?"toggle": \\[[^}]+\\](, )?', '')
 +-- showOptions has BOTH "toggle" and "isRequired"
 +where METADATA rlike '"showOptions": {"toggle": \\[[^}]+\\]'
 +  and METADATA rlike '"showOptions": {.*"isRequired": (true|false)'
 +;
- -- AIRAVATA-3126
- CREATE TABLE IF NOT EXISTS COMPUTE_RESOURCE_RESERVATION -- ComputeResourceReservationEntity
-     (RESERVATION_ID VARCHAR(255) NOT NULL, END_TIME TIMESTAMP NOT NULL DEFAULT 0, RESERVATION_NAME VARCHAR(255) NOT NULL, START_TIME TIMESTAMP NOT NULL DEFAULT 0, RESOURCE_ID VARCHAR(255) NOT NULL, GROUP_RESOURCE_PROFILE_ID VARCHAR(255) NOT NULL, PRIMARY KEY (RESERVATION_ID)
- )ENGINE=InnoDB DEFAULT CHARSET=latin1;
- CREATE TABLE IF NOT EXISTS COMPUTE_RESOURCE_RESERVATION_QUEUE (RESERVATION_ID VARCHAR(255), QUEUE_NAME VARCHAR(255) NOT NULL
- )ENGINE=InnoDB DEFAULT CHARSET=latin1;
- CREATE INDEX IF NOT EXISTS I_CMPTN_Q_RESERVATION_ID ON COMPUTE_RESOURCE_RESERVATION_QUEUE (RESERVATION_ID);
- ALTER TABLE COMPUTE_RESOURCE_RESERVATION ADD CONSTRAINT FK_COMPUTE_RESOURCE_RESERVATION FOREIGN KEY IF NOT EXISTS (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID) REFERENCES GROUP_COMPUTE_RESOURCE_PREFERENCE (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID) ON DELETE CASCADE;


[airavata] 03/04: AIRAVATA-3276 Moving data migration scripts to correct file

Posted by ma...@apache.org.
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

commit 96994d3c6ecff90a9e32fce429b277fa2e7a878f
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Mon Apr 27 17:56:18 2020 -0400

    AIRAVATA-3276 Moving data migration scripts to correct file
---
 .../DeltaScripts/appCatalog_schema_delta.sql          | 19 +++++++++++++++++++
 .../next/DeltaScripts/appCatalog_schema_delta.sql     | 19 -------------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/modules/registry/release-migration-scripts/0.18-0.19/DeltaScripts/appCatalog_schema_delta.sql b/modules/registry/release-migration-scripts/0.18-0.19/DeltaScripts/appCatalog_schema_delta.sql
index a2cc07a..1548106 100644
--- a/modules/registry/release-migration-scripts/0.18-0.19/DeltaScripts/appCatalog_schema_delta.sql
+++ b/modules/registry/release-migration-scripts/0.18-0.19/DeltaScripts/appCatalog_schema_delta.sql
@@ -491,3 +491,22 @@ CREATE TABLE IF NOT EXISTS COMPUTE_RESOURCE_RESERVATION_QUEUE (RESERVATION_ID VA
 )ENGINE=InnoDB DEFAULT CHARSET=latin1;
 CREATE INDEX IF NOT EXISTS I_CMPTN_Q_RESERVATION_ID ON COMPUTE_RESOURCE_RESERVATION_QUEUE (RESERVATION_ID);
 ALTER TABLE COMPUTE_RESOURCE_RESERVATION ADD CONSTRAINT FK_COMPUTE_RESOURCE_RESERVATION FOREIGN KEY IF NOT EXISTS (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID) REFERENCES GROUP_COMPUTE_RESOURCE_PREFERENCE (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID) ON DELETE CASCADE;
+
+-- AIRAVATA-3276 Replace JSON configuration: "toggle": ["isRequired"] ->
+-- "isRequired": true. Toggling requiredToAddedToCommandLine no longer needed.
+
+-- replace toggle with is isRequired
+update APPLICATION_INPUT
+set METADATA = REGEXP_REPLACE(METADATA, '"toggle": \\[[^}]+\\]', CONCAT('"isRequired": ', IF(IS_REQUIRED=1, 'true', 'false')))
+-- showOptions has "toggle" but not "isRequired"
+where METADATA rlike '"showOptions": {"toggle": \\[[^}]+\\]'
+  and NOT METADATA rlike '"showOptions": {.*"isRequired": (true|false)'
+;
+
+-- remove toggle since isRequired is already there
+update APPLICATION_INPUT
+set METADATA = REGEXP_REPLACE(METADATA, '(, )?"toggle": \\[[^}]+\\](, )?', '')
+-- showOptions has BOTH "toggle" and "isRequired"
+where METADATA rlike '"showOptions": {"toggle": \\[[^}]+\\]'
+  and METADATA rlike '"showOptions": {.*"isRequired": (true|false)'
+;
diff --git a/modules/registry/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql b/modules/registry/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql
index b9f4385..839c2e1 100644
--- a/modules/registry/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql
+++ b/modules/registry/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql
@@ -19,22 +19,3 @@
 --
 
 use app_catalog;
-
--- AIRAVATA-3276 Replace JSON configuration: "toggle": ["isRequired"] ->
--- "isRequired": true. Toggling requiredToAddedToCommandLine no longer needed.
-
--- replace toggle with is isRequired
-update APPLICATION_INPUT
-set METADATA = REGEXP_REPLACE(METADATA, '"toggle": \\[[^}]+\\]', CONCAT('"isRequired": ', IF(IS_REQUIRED=1, 'true', 'false')))
--- showOptions has "toggle" but not "isRequired"
-where METADATA rlike '"showOptions": {"toggle": \\[[^}]+\\]'
-  and NOT METADATA rlike '"showOptions": {.*"isRequired": (true|false)'
-;
-
--- remove toggle since isRequired is already there
-update APPLICATION_INPUT
-set METADATA = REGEXP_REPLACE(METADATA, '(, )?"toggle": \\[[^}]+\\](, )?', '')
--- showOptions has BOTH "toggle" and "isRequired"
-where METADATA rlike '"showOptions": {"toggle": \\[[^}]+\\]'
-  and METADATA rlike '"showOptions": {.*"isRequired": (true|false)'
-;


[airavata] 04/04: Merge branch 'master' into develop

Posted by ma...@apache.org.
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

commit 5544db6bc910de24d01ce2a390c75ad6c277856e
Merge: 72bfb61 96994d3
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Mon Apr 27 17:58:04 2020 -0400

    Merge branch 'master' into develop

 .../scigap/production/files/client_truststore.jks  | Bin 5312 -> 5398 bytes
 .../host_vars/dreg/files/django-ssl-vhost.conf.j2  |   1 +
 .../scigap/production/host_vars/nexttdb/vars.yml   |   2 +
 .../host_vars/{toppic => pathogenomics}/vars.yml   |  24 ++--
 .../production/host_vars/pathogenomics/vault.yml   |  15 ++
 .../host_vars/{toppic => physicell}/vars.yml       |  24 ++--
 .../production/host_vars/physicell/vault.yml       |  15 ++
 .../scigap/production/host_vars/seagrid/vars.yml   |   2 +-
 .../production/host_vars/southdakota/vars.yml      |   8 +-
 .../scigap/production/host_vars/toppic/vars.yml    |   2 +-
 .../ansible/inventories/scigap/production/hosts    |   2 +
 .../scigap/staging/files/client_truststore.jks     | Bin 5312 -> 5398 bytes
 .../task/submission/DefaultJobSubmissionTask.java  |   8 +-
 .../helix/impl/workflow/PostWorkflowManager.java   |  36 +++--
 .../helix/impl/workflow/PreWorkflowManager.java    |   1 -
 .../org/apache/airavata/common/utils/JPAUtils.java | 153 +++++++++++++++++++--
 .../airavata/monitor/email/EmailBasedMonitor.java  |   4 +-
 .../apache/airavata/monitor/AbstractMonitor.java   |   1 +
 .../expcatalog/ExperimentSummaryRepository.java    |   2 +-
 .../core/utils/JPAUtil/AppCatalogJPAUtils.java     |  29 +---
 .../DeltaScripts/appCatalog_schema_delta.sql       |  28 ++++
 .../experimentCatalog_schema_delta.sql             |  13 ++
 .../DeltaScripts/sharingCatalog_schema_delta.sql   |   8 ++
 .../next/DeltaScripts/appCatalog_schema_delta.sql  |  28 ----
 .../experimentCatalog_schema_delta.sql             |  13 --
 .../DeltaScripts/sharingCatalog_schema_delta.sql   |   8 --
 26 files changed, 292 insertions(+), 135 deletions(-)



[airavata] 01/04: AIRAVATA-3126 Move schema migration to correct file

Posted by ma...@apache.org.
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

commit efd6bd25fc480c644590e23dfb29f80a1ed66cdc
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Mon Apr 27 17:52:55 2020 -0400

    AIRAVATA-3126 Move schema migration to correct file
---
 .../0.18-0.19/DeltaScripts/appCatalog_schema_delta.sql           | 9 +++++++++
 .../next/DeltaScripts/appCatalog_schema_delta.sql                | 9 ---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/registry/release-migration-scripts/0.18-0.19/DeltaScripts/appCatalog_schema_delta.sql b/modules/registry/release-migration-scripts/0.18-0.19/DeltaScripts/appCatalog_schema_delta.sql
index 438df23..37e5059 100644
--- a/modules/registry/release-migration-scripts/0.18-0.19/DeltaScripts/appCatalog_schema_delta.sql
+++ b/modules/registry/release-migration-scripts/0.18-0.19/DeltaScripts/appCatalog_schema_delta.sql
@@ -478,3 +478,12 @@ ALTER TABLE `UNICORE_DATAMOVEMENT` DROP IF EXISTS `SECURITY_PROTOCOL`;
 
 -- AIRAVATA-3029: Add METADATA to APPLICATION_OUTPUT
 ALTER TABLE `APPLICATION_OUTPUT` ADD COLUMN IF NOT EXISTS METADATA VARCHAR(4096);
+
+-- AIRAVATA-3126
+CREATE TABLE IF NOT EXISTS COMPUTE_RESOURCE_RESERVATION -- ComputeResourceReservationEntity
+    (RESERVATION_ID VARCHAR(255) NOT NULL, END_TIME TIMESTAMP NOT NULL DEFAULT 0, RESERVATION_NAME VARCHAR(255) NOT NULL, START_TIME TIMESTAMP NOT NULL DEFAULT 0, RESOURCE_ID VARCHAR(255) NOT NULL, GROUP_RESOURCE_PROFILE_ID VARCHAR(255) NOT NULL, PRIMARY KEY (RESERVATION_ID)
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
+CREATE TABLE IF NOT EXISTS COMPUTE_RESOURCE_RESERVATION_QUEUE (RESERVATION_ID VARCHAR(255), QUEUE_NAME VARCHAR(255) NOT NULL
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
+CREATE INDEX IF NOT EXISTS I_CMPTN_Q_RESERVATION_ID ON COMPUTE_RESOURCE_RESERVATION_QUEUE (RESERVATION_ID);
+ALTER TABLE COMPUTE_RESOURCE_RESERVATION ADD CONSTRAINT FK_COMPUTE_RESOURCE_RESERVATION FOREIGN KEY IF NOT EXISTS (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID) REFERENCES GROUP_COMPUTE_RESOURCE_PREFERENCE (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID) ON DELETE CASCADE;
diff --git a/modules/registry/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql b/modules/registry/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql
index c25b3b1..839c2e1 100644
--- a/modules/registry/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql
+++ b/modules/registry/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql
@@ -19,12 +19,3 @@
 --
 
 use app_catalog;
-
--- AIRAVATA-3126
-CREATE TABLE IF NOT EXISTS COMPUTE_RESOURCE_RESERVATION -- ComputeResourceReservationEntity
-    (RESERVATION_ID VARCHAR(255) NOT NULL, END_TIME TIMESTAMP NOT NULL DEFAULT 0, RESERVATION_NAME VARCHAR(255) NOT NULL, START_TIME TIMESTAMP NOT NULL DEFAULT 0, RESOURCE_ID VARCHAR(255) NOT NULL, GROUP_RESOURCE_PROFILE_ID VARCHAR(255) NOT NULL, PRIMARY KEY (RESERVATION_ID)
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-CREATE TABLE IF NOT EXISTS COMPUTE_RESOURCE_RESERVATION_QUEUE (RESERVATION_ID VARCHAR(255), QUEUE_NAME VARCHAR(255) NOT NULL
-)ENGINE=InnoDB DEFAULT CHARSET=latin1;
-CREATE INDEX IF NOT EXISTS I_CMPTN_Q_RESERVATION_ID ON COMPUTE_RESOURCE_RESERVATION_QUEUE (RESERVATION_ID);
-ALTER TABLE COMPUTE_RESOURCE_RESERVATION ADD CONSTRAINT FK_COMPUTE_RESOURCE_RESERVATION FOREIGN KEY IF NOT EXISTS (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID) REFERENCES GROUP_COMPUTE_RESOURCE_PREFERENCE (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID) ON DELETE CASCADE;