Repository: airavata Updated Branches: refs/heads/master 342065e74 -> 5b1259ce1
unifying the column names Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5b1259ce Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5b1259ce Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5b1259ce Branch: refs/heads/master Commit: 5b1259ce161d9b487b9031b61893c1fcef0ee018 Parents: 342065e Author: Suresh Marru <[email protected]> Authored: Sat Sep 5 12:33:01 2015 -0400 Committer: Suresh Marru <[email protected]> Committed: Sat Sep 5 12:33:01 2015 -0400 ---------------------------------------------------------------------- .../core/experiment/catalog/model/Job.java | 24 ++++++++++---------- .../catalog/resources/JobResource.java | 4 ++-- .../experiment/catalog/resources/Utils.java | 8 +++---- .../src/main/resources/expcatalog-derby.sql | 4 ++-- .../src/main/resources/expcatalog-mysql.sql | 4 ++-- 5 files changed, 22 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/5b1259ce/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Job.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Job.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Job.java index 229f0f6..ea4aa96 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Job.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/model/Job.java @@ -36,8 +36,8 @@ public class Job { private String taskId; private String processId; private char[] jobDescription; - private char[] stdout; - private char[] stderr; + private char[] stdOut; + private char[] stdErr; private int exitCode; private Timestamp creationTime; private String computeResourceConsumed; @@ -87,23 +87,23 @@ public class Job { } @Lob - @Column(name = "STDOUT") - public char[] getStdout() { - return stdout; + @Column(name = "STD_OUT") + public char[] getStdOut() { + return stdOut; } - public void setStdout(char[] stdout) { - this.stdout = stdout; + public void setStdOut(char[] stdOut) { + this.stdOut = stdOut; } @Lob - @Column(name = "STDERR") - public char[] getStderr() { - return stderr; + @Column(name = "STD_ERR") + public char[] getStdErr() { + return stdErr; } - public void setStderr(char[] stderr) { - this.stderr = stderr; + public void setStdErr(char[] stdErr) { + this.stdErr = stdErr; } @Basic http://git-wip-us.apache.org/repos/asf/airavata/blob/5b1259ce/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java index f0e1359..644fef0 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/JobResource.java @@ -289,10 +289,10 @@ public class JobResource extends AbstractExpCatResource { job.setJobDescription(jobDescription.toCharArray()); } if (stdOut != null) { - job.setStdout(stdOut.toCharArray()); + job.setStdOut(stdOut.toCharArray()); } if (stdErr != null) { - job.setStderr(stdErr.toCharArray()); + job.setStdErr(stdErr.toCharArray()); } job.setCreationTime(creationTime); job.setComputeResourceConsumed(computeResourceConsumed); http://git-wip-us.apache.org/repos/asf/airavata/blob/5b1259ce/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java index 97e3976..d3c8e55 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/Utils.java @@ -654,11 +654,11 @@ public class Utils { if (o.getJobDescription() != null){ jobResource.setJobDescription(new String(o.getJobDescription())); } - if (o.getStderr() != null){ - jobResource.setStdErr(new String(o.getStderr())); + if (o.getStdErr() != null){ + jobResource.setStdErr(new String(o.getStdErr())); } - if (o.getStdout() != null){ - jobResource.setStdOut(new String(o.getStdout())); + if (o.getStdOut() != null){ + jobResource.setStdOut(new String(o.getStdOut())); } jobResource.setComputeResourceConsumed(o.getComputeResourceConsumed()); jobResource.setJobName(o.getJobName()); http://git-wip-us.apache.org/repos/asf/airavata/blob/5b1259ce/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql b/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql index 5dd1777..00f47f9 100644 --- a/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql +++ b/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql @@ -306,8 +306,8 @@ CREATE TABLE JOB ( COMPUTE_RESOURCE_CONSUMED varchar(255), JOB_NAME varchar(255), WORKING_DIR varchar(255), - STDOUT CLOB, - STDERR CLOB, + STD_OUT CLOB, + STD_ERR CLOB, EXIT_CODE INT, PRIMARY KEY (JOB_ID, PROCESS_ID), FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE http://git-wip-us.apache.org/repos/asf/airavata/blob/5b1259ce/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql ---------------------------------------------------------------------- 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 b3d05b7..177a3ec 100644 --- a/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql +++ b/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql @@ -308,8 +308,8 @@ CREATE TABLE JOB ( COMPUTE_RESOURCE_CONSUMED varchar(255), JOB_NAME varchar(255), WORKING_DIR varchar(255), - STDOUT LONGTEXT, - STDERR LONGTEXT, + STD_OUT LONGTEXT, + STD_ERR LONGTEXT, EXIT_CODE INT(11), PRIMARY KEY (JOB_ID, PROCESS_ID), FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
