Repository: oozie Updated Branches: refs/heads/master af825bb06 -> fb6f4305f
OOZIE-1920 Capture Output for SSH Action doesn't work (Richard Williams via rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/fb6f4305 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/fb6f4305 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/fb6f4305 Branch: refs/heads/master Commit: fb6f4305fc133a3ba0b5614ea56263202d38693a Parents: af825bb Author: Robert Kanter <[email protected]> Authored: Fri Aug 8 10:52:34 2014 -0700 Committer: Robert Kanter <[email protected]> Committed: Fri Aug 8 10:52:34 2014 -0700 ---------------------------------------------------------------------- core/src/main/java/org/apache/oozie/WorkflowJobBean.java | 2 +- .../apache/oozie/executor/jpa/WorkflowJobQueryExecutor.java | 9 +++++---- .../oozie/executor/jpa/TestWorkflowJobQueryExecutor.java | 1 + release-log.txt | 1 + 4 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/fb6f4305/core/src/main/java/org/apache/oozie/WorkflowJobBean.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/WorkflowJobBean.java b/core/src/main/java/org/apache/oozie/WorkflowJobBean.java index 36bc4ae..7d3250d 100644 --- a/core/src/main/java/org/apache/oozie/WorkflowJobBean.java +++ b/core/src/main/java/org/apache/oozie/WorkflowJobBean.java @@ -101,7 +101,7 @@ import org.json.simple.JSONObject; @NamedQuery(name = "GET_WORKFLOW_DEFINITION", query = "select w.id, w.user, w.group, w.appName, w.logToken, w.wfInstance from WorkflowJobBean w where w.id = :id"), - @NamedQuery(name = "GET_WORKFLOW_ACTION_OP", query = "select w.id, w.user, w.group, w.appName, w.appPath, w.statusStr, w.parentId, w.logToken, w.wfInstance, w.protoActionConf from WorkflowJobBean w where w.id = :id"), + @NamedQuery(name = "GET_WORKFLOW_ACTION_OP", query = "select w.id, w.user, w.group, w.appName, w.appPath, w.statusStr, w.run, w.parentId, w.logToken, w.wfInstance, w.protoActionConf from WorkflowJobBean w where w.id = :id"), @NamedQuery(name = "GET_WORKFLOW_KILL", query = "select w.id, w.user, w.group, w.appName, w.appPath, w.statusStr, w.parentId, w.startTimestamp, w.endTimestamp, w.logToken, w.wfInstance, w.slaXml from WorkflowJobBean w where w.id = :id"), http://git-wip-us.apache.org/repos/asf/oozie/blob/fb6f4305/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobQueryExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobQueryExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobQueryExecutor.java index 2111501..46d923f 100644 --- a/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobQueryExecutor.java +++ b/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowJobQueryExecutor.java @@ -248,10 +248,11 @@ public class WorkflowJobQueryExecutor extends QueryExecutor<WorkflowJobBean, Wor bean.setAppName((String) arr[3]); bean.setAppPath((String) arr[4]); bean.setStatusStr((String) arr[5]); - bean.setParentId((String) arr[6]); - bean.setLogToken((String) arr[7]); - bean.setWfInstanceBlob((BinaryBlob) (arr[8])); - bean.setProtoActionConfBlob((StringBlob) arr[9]); + bean.setRun((Integer) arr[6]); + bean.setParentId((String) arr[7]); + bean.setLogToken((String) arr[8]); + bean.setWfInstanceBlob((BinaryBlob) (arr[9])); + bean.setProtoActionConfBlob((StringBlob) arr[10]); break; case GET_WORKFLOW_RERUN: bean = new WorkflowJobBean(); http://git-wip-us.apache.org/repos/asf/oozie/blob/fb6f4305/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowJobQueryExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowJobQueryExecutor.java b/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowJobQueryExecutor.java index 02fabd2..9a29691 100644 --- a/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowJobQueryExecutor.java +++ b/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowJobQueryExecutor.java @@ -248,6 +248,7 @@ public class TestWorkflowJobQueryExecutor extends XDataTestCase { assertEquals(bean.getAppName(), retBean.getAppName()); assertEquals(bean.getAppPath(), retBean.getAppPath()); assertEquals(bean.getStatusStr(), retBean.getStatusStr()); + assertEquals(bean.getRun(), retBean.getRun()); assertEquals(bean.getParentId(), retBean.getParentId()); assertEquals(bean.getLogToken(), retBean.getLogToken()); assertEquals(ByteBuffer.wrap(bean.getWfInstanceBlob().getBytes()).getInt(), http://git-wip-us.apache.org/repos/asf/oozie/blob/fb6f4305/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 5643351..80927e9 100644 --- a/release-log.txt +++ b/release-log.txt @@ -4,6 +4,7 @@ OOZIE-1943 Bump up trunk to 4.2.0-SNAPSHOT (bzhang) -- Oozie 4.1.0 release (4.1 - unreleased) +OOZIE-1920 Capture Output for SSH Action doesn't work (Richard Williams via rkanter) OOZIE-1961 Remove requireJavaVersion from enforcer rules (lars_francke via rkanter) OOZIE-1883 hostnameFilter has invalid url-pattern (dvillegas via rkanter) OOZIE-1811 Current test failures in trunk (mona)
