Updating entities according to expcatalog-mysql.sql
MODIFY
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentEntity.java
@@ -64,15 +64,10 @@ public class ExperimentEntity implements Serializable {
@Column(name = "GATEWAY_EXECUTION_ID")
public String gatewayExecutionId;
- @Column(name = "GATEWAY_INSTANCE_ID")
- public String gatewayInstanceId;
-
@Column(name = "ENABLE_EMAIL_NOTIFICATION")
public boolean enableEmailNotification;
@Lob
- @ElementCollection(fetch = FetchType.EAGER)
- @CollectionTable(name="EXPCAT_EXPERIMENT_EMAIL", joinColumns = @JoinColumn(name="EXPERIMENT_ID"))
@Column(name = "EMAIL_ADDRESSES")
public List<String> emailAddresses;
@@ -183,14 +178,6 @@ public class ExperimentEntity implements Serializable {
this.gatewayExecutionId = gatewayExecutionId;
}
- public String getGatewayInstanceId() {
- return gatewayInstanceId;
- }
-
- public void setGatewayInstanceId(String gatewayInstanceId) {
- this.gatewayInstanceId = gatewayInstanceId;
- }
-
public boolean isEnableEmailNotification() {
return enableEmailNotification;
}

MODIFY
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorEntity.java
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentErrorEntity.java
@@ -57,8 +57,6 @@ public class ExperimentErrorEntity implements Serializable {
private boolean transientOrPersistent;
@Lob
- @ElementCollection
- @CollectionTable(name="EXPERIMENT_ERROR_ROOT_CAUSE_ERROR_ID", joinColumns = @JoinColumn(name="ERROR_ID"))
@Column(name = "ROOT_CAUSE_ERROR_ID_LIST")
private List<String> rootCauseErrorIdList;

MODIFY
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java
@@ -44,7 +44,7 @@ public class ExperimentInputEntity implements Serializable {
@Column(name = "INPUT_VALUE")
private String value;
- @Column(name = "INPUT_TYPE")
+ @Column(name = "DATA_TYPE")
private String type;
@Column(name = "APPLICATION_ARGUMENT")
@@ -62,10 +62,10 @@ public class ExperimentInputEntity implements Serializable {
@Column(name = "INPUT_ORDER")
private int inputOrder;
- @Column(name = "REQUIRED")
+ @Column(name = "IS_REQUIRED")
private boolean isRequired;
- @Column(name = "REQUIRED_TO_ADDED_TO_COMMANDLINE")
+ @Column(name = "REQUIRED_TO_ADDED_TO_CMD")
private boolean requiredToAddedToCommandLine;
@Column(name = "DATA_STAGED")

MODIFY
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentOutputEntity.java
@@ -44,16 +44,16 @@ public class ExperimentOutputEntity implements Serializable {
@Column(name = "OUTPUT_VALUE")
private String value;
- @Column(name = "OUTPUT_TYPE")
+ @Column(name = "DATA_TYPE")
private String type;
@Column(name = "APPLICATION_ARGUMENT")
private String applicationArgument;
- @Column(name = "REQUIRED")
+ @Column(name = "IS_REQUIRED")
private boolean isRequired;
- @Column(name = "REQUIRED_TO_ADDED_TO_COMMANDLINE")
+ @Column(name = "REQUIRED_TO_ADDED_TO_CMD")
private boolean requiredToAddedToCommandLine;
@Column(name = "DATA_MOVEMENT")

MODIFY
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayEntity.java
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/GatewayEntity.java
@@ -59,7 +59,7 @@ public class GatewayEntity implements Serializable {
@Column(name = "GATEWAY_PUBLIC_ABSTRACT")
private String gatewayPublicAbstract;
- @Column(name = "REVIEW_PROPOSAL_DESCRIPTION")
+ @Column(name = "GATEWAY_REVIEW_PROPOSAL_DESCRIPTION")
private String reviewProposalDescription;
@Column(name = "GATEWAY_ADMIN_FIRST_NAME")

MODIFY
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/JobEntity.java
@@ -60,11 +60,11 @@ public class JobEntity implements Serializable {
private String workingDir;
@Lob
- @Column(name = "STDOUT")
+ @Column(name = "STD_OUT")
private String stdOut;
@Lob
- @Column(name = "STDERR")
+ @Column(name = "STD_ERR")
private String stdErr;
@Column(name = "EXIT_CODE")

MODIFY
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessEntity.java
@@ -67,12 +67,13 @@ public class ProcessEntity implements Serializable {
@Column(name = "GATEWAY_EXECUTION_ID")
private String gatewayExecutionId;
+ @Column(name = "GATEWAY_INSTANCE_ID")
+ private String gatewayInstanceId;
+
@Column(name = "ENABLE_EMAIL_NOTIFICATION")
private boolean enableEmailNotification;
@Lob
- @ElementCollection
- @CollectionTable(name="PROCESS_EMAIL", joinColumns = @JoinColumn(name="PROCESS_ID"))
@Column(name = "EMAIL_ADDRESSES")
private List<String> emailAddresses;
@@ -205,6 +206,14 @@ public class ProcessEntity implements Serializable {
this.gatewayExecutionId = gatewayExecutionId;
}
+ public String getGatewayInstanceId() {
+ return gatewayInstanceId;
+ }
+
+ public void setGatewayInstanceId(String gatewayInstanceId) {
+ this.gatewayInstanceId = gatewayInstanceId;
+ }
+
public boolean isEnableEmailNotification() {
return enableEmailNotification;
}

MODIFY
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorEntity.java
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessErrorEntity.java
@@ -57,8 +57,6 @@ public class ProcessErrorEntity implements Serializable {
private boolean transientOrPersistent;
@Lob
- @ElementCollection
- @CollectionTable(name="EXPCAT_EXPERIMENT_ERROR_ROOT_CAUSE_ERROR_ID", joinColumns = @JoinColumn(name="ERROR_ID"))
@Column(name = "ROOT_CAUSE_ERROR_ID_LIST")
private List<String> rootCauseErrorIdList;

MODIFY
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java
@@ -44,7 +44,7 @@ public class ProcessInputEntity implements Serializable {
@Column(name = "INPUT_VALUE")
private String value;
- @Column(name = "INPUT_TYPE")
+ @Column(name = "DATA_TYPE")
private String type;
@Column(name = "APPLICATION_ARGUMENT")

MODIFY
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputEntity.java
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessOutputEntity.java
@@ -44,7 +44,7 @@ public class ProcessOutputEntity implements Serializable {
@Column(name = "OUTPUT_VALUE")
private String value;
- @Column(name = "OUTPUT_TYPE")
+ @Column(name = "DATA_TYPE")
private String type;
@Column(name = "APPLICATION_ARGUMENT")

MODIFY
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessResourceScheduleEntity.java
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessResourceScheduleEntity.java
@@ -56,9 +56,6 @@ public class ProcessResourceScheduleEntity implements Serializable {
@Column(name = "TOTAL_PHYSICAL_MEMORY")
private int totalPhysicalMemory;
- @Column(name = "STATIC_WORKING_DIRECTORY")
- private String staticWorkingDir;
-
@OneToOne(targetEntity = ProcessEntity.class, cascade = CascadeType.ALL)
@PrimaryKeyJoinColumn(name = "PROCESS_ID", referencedColumnName = "PROCESS_ID")
private ProcessEntity process;
@@ -130,14 +127,6 @@ public class ProcessResourceScheduleEntity implements Serializable {
this.totalPhysicalMemory = totalPhysicalMemory;
}
- public String getStaticWorkingDir() {
- return staticWorkingDir;
- }
-
- public void setStaticWorkingDir(String staticWorkingDir) {
- this.staticWorkingDir = staticWorkingDir;
- }
-
public ProcessEntity getProcess() {
return process;
}

MODIFY
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskEntity.java
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskEntity.java
@@ -53,8 +53,8 @@ public class TaskEntity implements Serializable {
@Column(name = "TASK_DETAIL")
private String taskDetail;
- @Column(name = "SUB_TASK_MODEL")
- private ByteBuffer subTaskModel;
+ @Column(name = "TASK_INTERNAL_STORE")
+ private ByteBuffer taskInternalStore;
@OneToMany(targetEntity = TaskStatusEntity.class, cascade = CascadeType.ALL,
mappedBy = "task", fetch = FetchType.EAGER)
@@ -123,12 +123,12 @@ public class TaskEntity implements Serializable {
this.taskDetail = taskDetail;
}
- public ByteBuffer getSubTaskModel() {
- return subTaskModel;
+ public ByteBuffer getTaskInternalStore() {
+ return taskInternalStore;
}
- public void setSubTaskModel(ByteBuffer subTaskModel) {
- this.subTaskModel = subTaskModel;
+ public void setTaskInternalStore(ByteBuffer taskInternalStore) {
+ this.taskInternalStore = taskInternalStore;
}
public List<TaskStatusEntity> getTaskStatuses() {

MODIFY
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskErrorEntity.java
modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/TaskErrorEntity.java
@@ -57,8 +57,7 @@ public class TaskErrorEntity implements Serializable {
private boolean transientOrPersistent;
@Lob
- @ElementCollection
- @CollectionTable(name="EXPCAT_EXPERIMENT_ERROR_ROOT_CAUSE_ERROR_ID", joinColumns = @JoinColumn(name="ERROR_ID"))
+ @Column(name = "ROOT_CAUSE_ERROR_ID_LIST")
private List<String> rootCauseErrorIdList;
@ManyToOne(targetEntity = TaskEntity.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY)

Updating entities according to expcatalog-mysql.sql