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/06/25 21:24:13 UTC
[airavata] branch develop updated (6f19a32 -> 8031658)
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 6f19a32 Adding dev delta gateway
add f9f3b08 AIRAVATA-3326 MariaDB migrations using docker container
add 50ef0d7 AIRAVATA-3326 migration schema logging - removed dependence on test classpath
add a090e3e AIRAVATA-3326 ide-integration using mariadb with migrations
add bff2ee2 AIRAVATA-3326 Remove unused code
add cfe585e AIRAVATA-3326 Removing unused/unnecessary file
add 8f40b24 AIRAVATA-3326 Add support for generating full schema and updated docs
add 6cda1ef AIRAVATA-3326 docs on mysql migration script foreign key/constraint management
add f51fc4e AIRAVATA-3326 docs update
add 57842ba AIRAVATA-3326 updating docs
new 4e85790 Merge remote-tracking branch 'origin/AIRAVATA-3326-improved-database-migration-script-creation' into develop
add 3441f8d AIRAVATA-3326 Removing unnecessary files
new 8031658 Merge remote-tracking branch 'origin/AIRAVATA-3326-improved-database-migration-script-creation' into develop
The 2 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:
.../org/apache/airavata/common/utils/JPAUtils.java | 135 +---
modules/ide-integration/README.md | 6 +
.../META-INF/generate-sql-persistence.xml | 30 -
.../src/main/resources/META-INF/persistence.xml | 141 ----
.../airavataworkflowcatalog-derby.sql | 212 ------
.../database_scripts/appcatalog-derby.sql | 737 ---------------------
.../database_scripts/appcatalog-mysql.sql | 725 --------------------
.../resources/database_scripts/credstore-derby.sql | 27 -
.../resources/database_scripts/credstore-mysql.sql | 27 -
.../resources/database_scripts/dozer_mapping.xml | 26 -
.../database_scripts/expcatalog-derby.sql | 403 -----------
.../database_scripts/expcatalog-mysql.sql | 405 -----------
.../init/02-sharing-registry-migrations.sql | 5 +-
.../init/03-appcatalog-migrations.sql | 13 +-
.../init/04-expcatalog-migrations.sql | 4 +-
.../database_scripts/replicacatalog-derby.sql | 85 ---
.../database_scripts/replicacatalog-mysql.sql | 80 ---
.../database_scripts/sharing-registry-mysql.sql | 149 -----
.../user-profile-catalog-derby.sql | 163 -----
.../user-profile-catalog-mysql.sql | 163 -----
.../database_scripts/workflowcatalog-derby.sql | 128 ----
.../database_scripts/workflowcatalog-mysql.sql | 128 ----
.../src/main/resources/docker-compose.yml | 4 +-
modules/registry/registry-core/README.md | 121 +++-
modules/registry/registry-core/pom.xml | 124 +++-
.../core/utils/JPAUtil/AppCatalogJPAUtils.java | 2 +-
.../core/utils/JPAUtil/ExpCatalogJPAUtils.java | 2 +-
.../core/utils/JPAUtil/RepCatalogJPAUtils.java | 2 +-
.../core/utils/migration/MappingToolRunner.java | 46 ++
.../utils/migration/MigrationSchemaGenerator.java | 100 +++
.../META-INF/generate-sql-persistence.xml | 30 -
.../derby}/airavata-server.properties | 2 +-
.../mysql}/airavata-server.properties | 31 +-
.../migrations-util/mysql/docker-compose.yml | 15 +
.../create_databases.sql} | 20 +-
35 files changed, 416 insertions(+), 3875 deletions(-)
delete mode 100644 modules/ide-integration/src/main/resources/META-INF/generate-sql-persistence.xml
delete mode 100644 modules/ide-integration/src/main/resources/META-INF/persistence.xml
delete mode 100644 modules/ide-integration/src/main/resources/database_scripts/airavataworkflowcatalog-derby.sql
delete mode 100644 modules/ide-integration/src/main/resources/database_scripts/appcatalog-derby.sql
delete mode 100644 modules/ide-integration/src/main/resources/database_scripts/appcatalog-mysql.sql
delete mode 100644 modules/ide-integration/src/main/resources/database_scripts/credstore-derby.sql
delete mode 100644 modules/ide-integration/src/main/resources/database_scripts/credstore-mysql.sql
delete mode 100644 modules/ide-integration/src/main/resources/database_scripts/dozer_mapping.xml
delete mode 100644 modules/ide-integration/src/main/resources/database_scripts/expcatalog-derby.sql
delete mode 100644 modules/ide-integration/src/main/resources/database_scripts/expcatalog-mysql.sql
delete mode 100644 modules/ide-integration/src/main/resources/database_scripts/replicacatalog-derby.sql
delete mode 100644 modules/ide-integration/src/main/resources/database_scripts/replicacatalog-mysql.sql
delete mode 100644 modules/ide-integration/src/main/resources/database_scripts/sharing-registry-mysql.sql
delete mode 100644 modules/ide-integration/src/main/resources/database_scripts/user-profile-catalog-derby.sql
delete mode 100644 modules/ide-integration/src/main/resources/database_scripts/user-profile-catalog-mysql.sql
delete mode 100644 modules/ide-integration/src/main/resources/database_scripts/workflowcatalog-derby.sql
delete mode 100644 modules/ide-integration/src/main/resources/database_scripts/workflowcatalog-mysql.sql
create mode 100644 modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/utils/migration/MappingToolRunner.java
create mode 100644 modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/utils/migration/MigrationSchemaGenerator.java
delete mode 100644 modules/registry/registry-core/src/main/resources/META-INF/generate-sql-persistence.xml
copy modules/registry/registry-core/src/{test/resources => main/resources/migrations-util/derby}/airavata-server.properties (98%)
copy modules/registry/registry-core/src/{test/resources => main/resources/migrations-util/mysql}/airavata-server.properties (65%)
create mode 100644 modules/registry/registry-core/src/main/resources/migrations-util/mysql/docker-compose.yml
copy modules/{airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/CommandOutput.java => registry/registry-core/src/main/resources/migrations-util/mysql/docker-entrypoint-initdb.d/create_databases.sql} (70%)
[airavata] 01/02: Merge remote-tracking branch
'origin/AIRAVATA-3326-improved-database-migration-script-creation' 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 4e8579072875bf3933939efc57613cd6be27c8fe
Merge: 6f19a32 57842ba
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Jun 25 17:09:39 2020 -0400
Merge remote-tracking branch 'origin/AIRAVATA-3326-improved-database-migration-script-creation' into develop
.../org/apache/airavata/common/utils/JPAUtils.java | 135 +--------------------
modules/ide-integration/README.md | 6 +
.../META-INF/generate-sql-persistence.xml | 30 -----
.../init/02-sharing-registry-migrations.sql | 5 +-
.../init/03-appcatalog-migrations.sql | 13 +-
.../init/04-expcatalog-migrations.sql | 4 +-
.../src/main/resources/docker-compose.yml | 4 +-
modules/registry/registry-core/README.md | 121 ++++++++++++++++--
modules/registry/registry-core/pom.xml | 124 +++++++++++++++----
.../core/utils/JPAUtil/AppCatalogJPAUtils.java | 2 +-
.../core/utils/JPAUtil/ExpCatalogJPAUtils.java | 2 +-
.../core/utils/JPAUtil/RepCatalogJPAUtils.java | 2 +-
.../core/utils/migration/MappingToolRunner.java | 46 +++++++
.../utils/migration/MigrationSchemaGenerator.java | 100 +++++++++++++++
.../derby/airavata-server.properties | 72 +++++++++++
.../mysql/airavata-server.properties | 63 ++++++++++
.../migrations-util/mysql/docker-compose.yml | 15 +++
.../create_databases.sql} | 21 ++--
18 files changed, 542 insertions(+), 223 deletions(-)
diff --cc modules/ide-integration/src/main/resources/database_scripts/init/03-appcatalog-migrations.sql
index e4ea6b0,a509fb2..0119ceb
--- a/modules/ide-integration/src/main/resources/database_scripts/init/03-appcatalog-migrations.sql
+++ b/modules/ide-integration/src/main/resources/database_scripts/init/03-appcatalog-migrations.sql
@@@ -8,10 -7,5 +7,10 @@@ CREATE TABLE IF NOT EXISTS COMPUTE_RESO
)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 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 (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID) REFERENCES GROUP_COMPUTE_RESOURCE_PREFERENCE (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID) ON DELETE CASCADE;
+ 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-3327: Remove deprecated reservation fields
- alter table GROUP_COMPUTE_RESOURCE_PREFERENCE drop column RESERVATION;
- alter table GROUP_COMPUTE_RESOURCE_PREFERENCE drop column RESERVATION_START_TIME;
- alter table GROUP_COMPUTE_RESOURCE_PREFERENCE drop column RESERVATION_END_TIME;
++alter table GROUP_COMPUTE_RESOURCE_PREFERENCE drop column IF EXISTS RESERVATION;
++alter table GROUP_COMPUTE_RESOURCE_PREFERENCE drop column IF EXISTS RESERVATION_START_TIME;
++alter table GROUP_COMPUTE_RESOURCE_PREFERENCE drop column IF EXISTS RESERVATION_END_TIME;
diff --cc modules/registry/registry-core/pom.xml
index fd28405,39cd1ad..f718d00
--- a/modules/registry/registry-core/pom.xml
+++ b/modules/registry/registry-core/pom.xml
@@@ -149,28 -151,95 +154,76 @@@
</configuration>
<executions>
<execution>
- <id>enhancer</id>
- <phase>process-classes</phase>
+ <!-- Run with:
+ mvn process-classes docker-compose:up@mysql-up exec:exec@generate-migrations-mysql docker-compose:down@mysql-down
+ -->
+ <id>generate-migrations-mysql</id>
<goals>
- <goal>enhance</goal>
+ <goal>exec</goal>
</goals>
+ <configuration>
+ <arguments>
+ <argument>-Dairavata.config.dir=${project.basedir}/src/main/resources/migrations-util/mysql</argument>
+ <argument>-classpath</argument>
+ <classpath/>
+ <argument>org.apache.airavata.registry.core.utils.migration.MigrationSchemaGenerator</argument>
+ </arguments>
+ </configuration>
</execution>
<execution>
- <!-- execute with `mvn compile openjpa:sql@generate-sql` or `mvn process-classes` -->
- <id>generate-sql</id>
+ <!-- Run with:
+ mvn process-classes docker-compose:up@mysql-up exec:exec@generate-schema-mysql docker-compose:down@mysql-down
+ -->
+ <id>generate-schema-mysql</id>
+ <goals>
+ <goal>exec</goal>
+ </goals>
<configuration>
- <!-- openjpa:sql doesn't work well with multiple persistence-unit's in persistence.xml, so
- use this single persistence-unit persistence.xml to list any classes for which SQL schema
- generation is desired -->
- <persistenceXmlFile>${basedir}/src/main/resources/META-INF/generate-sql-persistence.xml</persistenceXmlFile>
- <sqlAction>build</sqlAction>
- <connectionDriverName>org.apache.derby.jdbc.ClientDriver</connectionDriverName>
+ <arguments>
+ <argument>-Dairavata.config.dir=${project.basedir}/src/main/resources/migrations-util/mysql</argument>
+ <argument>-classpath</argument>
+ <classpath/>
+ <argument>org.apache.airavata.registry.core.utils.migration.MigrationSchemaGenerator</argument>
+ <argument>build</argument>
+ </arguments>
</configuration>
+ </execution>
+ <execution>
+ <!-- Run with:
+ mvn process-classes exec:exec@generate-migrations-derby
+ -->
+ <id>generate-migrations-derby</id>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <arguments>
+ <argument>-Dairavata.config.dir=${project.basedir}/src/main/resources/migrations-util/derby</argument>
+ <argument>-classpath</argument>
+ <classpath/>
+ <argument>org.apache.airavata.registry.core.utils.migration.MigrationSchemaGenerator</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <!-- Run with:
+ mvn process-classes exec:exec@generate-schema-derby
+ -->
+ <id>generate-schema-derby</id>
<goals>
- <goal>sql</goal>
+ <goal>exec</goal>
</goals>
+ <configuration>
+ <arguments>
+ <argument>-Dairavata.config.dir=${project.basedir}/src/main/resources/migrations-util/derby</argument>
+ <argument>-classpath</argument>
+ <classpath/>
+ <argument>org.apache.airavata.registry.core.utils.migration.MigrationSchemaGenerator</argument>
+ <argument>build</argument>
+ </arguments>
+ </configuration>
</execution>
</executions>
- </plugin>
- <plugin>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-maven-plugin</artifactId>
- <version>2.2.0</version>
- <configuration>
- <includes>**/model/*.class</includes>
- <addDefaultConstructor>true</addDefaultConstructor>
- <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
- </configuration>
- <executions>
- <execution>
- <id>enhancer</id>
- <phase>process-classes</phase>
- <goals>
- <goal>enhance</goal>
- </goals>
- </execution>
- </executions>
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
[airavata] 02/02: Merge remote-tracking branch
'origin/AIRAVATA-3326-improved-database-migration-script-creation' 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 80316586e8ede9e389928dcd6b49cc5fed9aab12
Merge: 4e85790 3441f8d
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Jun 25 17:23:24 2020 -0400
Merge remote-tracking branch 'origin/AIRAVATA-3326-improved-database-migration-script-creation' into develop
.../src/main/resources/META-INF/persistence.xml | 141 ----
.../airavataworkflowcatalog-derby.sql | 212 ------
.../database_scripts/appcatalog-derby.sql | 737 ---------------------
.../database_scripts/appcatalog-mysql.sql | 725 --------------------
.../resources/database_scripts/credstore-derby.sql | 27 -
.../resources/database_scripts/credstore-mysql.sql | 27 -
.../resources/database_scripts/dozer_mapping.xml | 26 -
.../database_scripts/expcatalog-derby.sql | 403 -----------
.../database_scripts/expcatalog-mysql.sql | 405 -----------
.../database_scripts/replicacatalog-derby.sql | 85 ---
.../database_scripts/replicacatalog-mysql.sql | 80 ---
.../database_scripts/sharing-registry-mysql.sql | 149 -----
.../user-profile-catalog-derby.sql | 163 -----
.../user-profile-catalog-mysql.sql | 163 -----
.../database_scripts/workflowcatalog-derby.sql | 128 ----
.../database_scripts/workflowcatalog-mysql.sql | 128 ----
16 files changed, 3599 deletions(-)