This is an automated email from the ASF dual-hosted git repository. dimuthuupe 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 3177042 Updating initialization scripts for parser entities 3177042 is described below commit 31770421ebe8f1fe9d2ca67d42eb9096d48577a9 Author: Dimuthu Wannipurage <dimuthu.wannipur...@datasprouts.com> AuthorDate: Tue Oct 30 00:22:46 2018 -0400 Updating initialization scripts for parser entities --- .../appcatalog/ParsingTemplateInputEntity.java | 48 +++++++++++++++ .../src/main/resources/appcatalog-derby.sql | 72 ++++++++++++++++++++++ .../src/main/resources/appcatalog-mysql.sql | 72 ++++++++++++++++++++++ 3 files changed, 192 insertions(+) diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParsingTemplateInputEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParsingTemplateInputEntity.java index a02775c..44a6ca7 100644 --- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParsingTemplateInputEntity.java +++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ParsingTemplateInputEntity.java @@ -47,4 +47,52 @@ public class ParsingTemplateInputEntity { @ManyToOne(targetEntity = ParsingTemplateEntity.class, cascade = CascadeType.MERGE) @JoinColumn(name = "PARSING_TEMPLATE_ID") private ParsingTemplateEntity parsingTemplate; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInputId() { + return inputId; + } + + public void setInputId(String inputId) { + this.inputId = inputId; + } + + public String getExpression() { + return expression; + } + + public void setExpression(String expression) { + this.expression = expression; + } + + public String getParsingTemplateId() { + return parsingTemplateId; + } + + public void setParsingTemplateId(String parsingTemplateId) { + this.parsingTemplateId = parsingTemplateId; + } + + public ParserInputEntity getInput() { + return input; + } + + public void setInput(ParserInputEntity input) { + this.input = input; + } + + public ParsingTemplateEntity getParsingTemplate() { + return parsingTemplate; + } + + public void setParsingTemplate(ParsingTemplateEntity parsingTemplate) { + this.parsingTemplate = parsingTemplate; + } } diff --git a/modules/registry-refactoring/src/main/resources/appcatalog-derby.sql b/modules/registry-refactoring/src/main/resources/appcatalog-derby.sql index bda7c88..71198c8 100644 --- a/modules/registry-refactoring/src/main/resources/appcatalog-derby.sql +++ b/modules/registry-refactoring/src/main/resources/appcatalog-derby.sql @@ -646,6 +646,78 @@ CREATE TABLE GRP_SSH_ACC_PROV_CONFIG FOREIGN KEY (RESOURCE_ID,GROUP_RESOURCE_PROFILE_ID) REFERENCES GROUP_COMPUTE_RESOURCE_PREFERENCE (RESOURCE_ID,GROUP_RESOURCE_PROFILE_ID) ON DELETE CASCADE ); +CREATE TABLE PARSING_TEMPLATE +( + PARSING_TEMPLATE_ID VARCHAR(255) NOT NULL, + APP_INTERFACE_ID VARCHAR(255) NOT NULL, + PRIMARY KEY (PARSING_TEMPLATE_ID) +); + +CREATE TABLE PARSER_INFO +( + PARSER_INFO_ID VARCHAR(255) NOT NULL, + IMAGE_NAME VARCHAR(255) NOT NULL, + OUTPUT_DIR_PATH VARCHAR(255) NOT NULL, + INPUT_DIR_PATH VARCHAR(255) NOT NULL, + EXECUTION_COMMAND VARCHAR(255) NOT NULL, + PRIMARY KEY (PARSER_INFO_ID) +); + +CREATE TABLE PARSER_OUTPUT +( + PARSER_OUTPUT_ID VARCHAR(255) NOT NULL, + PARSER_OUTPUT_NAME VARCHAR(255) NOT NULL, + PARSER_OUTPUT_REQUIRED TINYINT(1) NOT NULL, + PARSER_INFO_ID VARCHAR(255) NOT NULL, + PRIMARY KEY (PARSER_OUTPUT_ID), + FOREIGN KEY (PARSER_INFO_ID) REFERENCES PARSER_INFO (PARSER_INFO_ID) ON DELETE CASCADE +); + +CREATE TABLE PARSER_INPUT +( + PARSER_INPUT_ID VARCHAR(255) NOT NULL, + PARSER_INPUT_NAME VARCHAR(255) NOT NULL, + PARSER_INPUT_REQUIRED TINYINT(1) NOT NULL, + PARSER_INFO_ID VARCHAR(255) NOT NULL, + PRIMARY KEY (PARSER_INPUT_ID), + FOREIGN KEY (PARSER_INFO_ID) REFERENCES PARSER_INFO (PARSER_INFO_ID) ON DELETE CASCADE +); + +CREATE TABLE PARSING_TEMPLATE_INPUT +( + PARSING_TEMPLATE_INPUT_ID VARCHAR(255) NOT NULL, + PARSER_INPUT_ID VARCHAR(255) NOT NULL, + EXPRESSION VARCHAR(255) NOT NULL, + PARSING_TEMPLATE_ID VARCHAR(255) NOT NULL, + PRIMARY KEY (PARSING_TEMPLATE_INPUT_ID), + FOREIGN KEY (PARSER_INPUT_ID) REFERENCES PARSER_INPUT (PARSER_INPUT_ID) ON DELETE CASCADE, + FOREIGN KEY (PARSING_TEMPLATE_ID) REFERENCES PARSING_TEMPLATE (PARSING_TEMPLATE_ID) ON DELETE CASCADE +); + +CREATE TABLE PARSER_DAG_ELEMENT +( + PARSER_DAG_ELEMENT_ID VARCHAR(255) NOT NULL, + PARENT_PARSER_INFO_ID VARCHAR(255) NOT NULL, + CHILD_PARSER_INFO_ID VARCHAR(255) NOT NULL, + PARSING_TEMPLATE_ID VARCHAR(255) NOT NULL, + PRIMARY KEY (PARSER_DAG_ELEMENT_ID), + FOREIGN KEY (PARENT_PARSER_INFO_ID) REFERENCES PARSER_INFO (PARSER_INFO_ID) ON DELETE CASCADE, + FOREIGN KEY (CHILD_PARSER_INFO_ID) REFERENCES PARSER_INFO (PARSER_INFO_ID) ON DELETE CASCADE, + FOREIGN KEY (PARSING_TEMPLATE_ID) REFERENCES PARSING_TEMPLATE (PARSING_TEMPLATE_ID) ON DELETE CASCADE +); + +CREATE TABLE PARSER_DAG_IO_MAPPING +( + PARSER_DAG_IO_MAPPING_ID VARCHAR(255) NOT NULL, + PARSER_INPUT_ID VARCHAR(255) NOT NULL, + PARSER_OUTPUT_ID VARCHAR(255) NOT NULL, + PARSER_DAG_ELEMENT_ID VARCHAR(255) NOT NULL, + PRIMARY KEY (PARSER_DAG_IO_MAPPING_ID), + FOREIGN KEY (PARSER_INPUT_ID) REFERENCES PARSER_INPUT (PARSER_INPUT_ID) ON DELETE CASCADE, + FOREIGN KEY (PARSER_OUTPUT_ID) REFERENCES PARSER_INPUT (PARSER_INPUT_ID) ON DELETE CASCADE, + FOREIGN KEY (PARSER_DAG_ELEMENT_ID) REFERENCES PARSER_DAG_ELEMENT (PARSER_DAG_ELEMENT_ID) ON DELETE CASCADE +); + CREATE TABLE CONFIGURATION ( CONFIG_KEY VARCHAR(255), diff --git a/modules/registry-refactoring/src/main/resources/appcatalog-mysql.sql b/modules/registry-refactoring/src/main/resources/appcatalog-mysql.sql index 86f1f7b..cede794 100644 --- a/modules/registry-refactoring/src/main/resources/appcatalog-mysql.sql +++ b/modules/registry-refactoring/src/main/resources/appcatalog-mysql.sql @@ -645,6 +645,78 @@ CREATE TABLE GRP_SSH_ACC_PROV_CONFIG FOREIGN KEY (RESOURCE_ID,GROUP_RESOURCE_PROFILE_ID) REFERENCES GROUP_COMPUTE_RESOURCE_PREFERENCE (RESOURCE_ID,GROUP_RESOURCE_PROFILE_ID) ON DELETE CASCADE )ENGINE=InnoDB DEFAULT CHARSET=latin1; +CREATE TABLE PARSING_TEMPLATE +( + PARSING_TEMPLATE_ID VARCHAR(255) NOT NULL, + APP_INTERFACE_ID VARCHAR(255) NOT NULL, + PRIMARY KEY (PARSING_TEMPLATE_ID) +)ENGINE=InnoDB DEFAULT CHARSET=latin1; + +CREATE TABLE PARSER_INFO +( + PARSER_INFO_ID VARCHAR(255) NOT NULL, + IMAGE_NAME VARCHAR(255) NOT NULL, + OUTPUT_DIR_PATH VARCHAR(255) NOT NULL, + INPUT_DIR_PATH VARCHAR(255) NOT NULL, + EXECUTION_COMMAND VARCHAR(255) NOT NULL, + PRIMARY KEY (PARSER_INFO_ID) +)ENGINE=InnoDB DEFAULT CHARSET=latin1; + +CREATE TABLE PARSER_OUTPUT +( + PARSER_OUTPUT_ID VARCHAR(255) NOT NULL, + PARSER_OUTPUT_NAME VARCHAR(255) NOT NULL, + PARSER_OUTPUT_REQUIRED TINYINT(1) NOT NULL, + PARSER_INFO_ID VARCHAR(255) NOT NULL, + PRIMARY KEY (PARSER_OUTPUT_ID), + FOREIGN KEY (PARSER_INFO_ID) REFERENCES PARSER_INFO (PARSER_INFO_ID) ON DELETE CASCADE +)ENGINE=InnoDB DEFAULT CHARSET=latin1; + +CREATE TABLE PARSER_INPUT +( + PARSER_INPUT_ID VARCHAR(255) NOT NULL, + PARSER_INPUT_NAME VARCHAR(255) NOT NULL, + PARSER_INPUT_REQUIRED TINYINT(1) NOT NULL, + PARSER_INFO_ID VARCHAR(255) NOT NULL, + PRIMARY KEY (PARSER_INPUT_ID), + FOREIGN KEY (PARSER_INFO_ID) REFERENCES PARSER_INFO (PARSER_INFO_ID) ON DELETE CASCADE +)ENGINE=InnoDB DEFAULT CHARSET=latin1; + +CREATE TABLE PARSING_TEMPLATE_INPUT +( + PARSING_TEMPLATE_INPUT_ID VARCHAR(255) NOT NULL, + PARSER_INPUT_ID VARCHAR(255) NOT NULL, + EXPRESSION VARCHAR(255) NOT NULL, + PARSING_TEMPLATE_ID VARCHAR(255) NOT NULL, + PRIMARY KEY (PARSING_TEMPLATE_INPUT_ID), + FOREIGN KEY (PARSER_INPUT_ID) REFERENCES PARSER_INPUT (PARSER_INPUT_ID) ON DELETE CASCADE, + FOREIGN KEY (PARSING_TEMPLATE_ID) REFERENCES PARSING_TEMPLATE (PARSING_TEMPLATE_ID) ON DELETE CASCADE +)ENGINE=InnoDB DEFAULT CHARSET=latin1; + +CREATE TABLE PARSER_DAG_ELEMENT +( + PARSER_DAG_ELEMENT_ID VARCHAR(255) NOT NULL, + PARENT_PARSER_INFO_ID VARCHAR(255) NOT NULL, + CHILD_PARSER_INFO_ID VARCHAR(255) NOT NULL, + PARSING_TEMPLATE_ID VARCHAR(255) NOT NULL, + PRIMARY KEY (PARSER_DAG_ELEMENT_ID), + FOREIGN KEY (PARENT_PARSER_INFO_ID) REFERENCES PARSER_INFO (PARSER_INFO_ID) ON DELETE CASCADE, + FOREIGN KEY (CHILD_PARSER_INFO_ID) REFERENCES PARSER_INFO (PARSER_INFO_ID) ON DELETE CASCADE, + FOREIGN KEY (PARSING_TEMPLATE_ID) REFERENCES PARSING_TEMPLATE (PARSING_TEMPLATE_ID) ON DELETE CASCADE +)ENGINE=InnoDB DEFAULT CHARSET=latin1; + +CREATE TABLE PARSER_DAG_IO_MAPPING +( + PARSER_DAG_IO_MAPPING_ID VARCHAR(255) NOT NULL, + PARSER_INPUT_ID VARCHAR(255) NOT NULL, + PARSER_OUTPUT_ID VARCHAR(255) NOT NULL, + PARSER_DAG_ELEMENT_ID VARCHAR(255) NOT NULL, + PRIMARY KEY (PARSER_DAG_IO_MAPPING_ID), + FOREIGN KEY (PARSER_INPUT_ID) REFERENCES PARSER_INPUT (PARSER_INPUT_ID) ON DELETE CASCADE, + FOREIGN KEY (PARSER_OUTPUT_ID) REFERENCES PARSER_INPUT (PARSER_INPUT_ID) ON DELETE CASCADE, + FOREIGN KEY (PARSER_DAG_ELEMENT_ID) REFERENCES PARSER_DAG_ELEMENT (PARSER_DAG_ELEMENT_ID) ON DELETE CASCADE +)ENGINE=InnoDB DEFAULT CHARSET=latin1; + CREATE TABLE CONFIGURATION ( CONFIG_KEY VARCHAR(255),