Updated Branches: refs/heads/master 244fe4295 -> 694e2a565
OOZIE-1662 Correct some used and unused Workflow Action SELECT queries (mona) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/694e2a56 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/694e2a56 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/694e2a56 Branch: refs/heads/master Commit: 694e2a565985b48e53be0341dbf1500364a9e70f Parents: 244fe42 Author: Mona Chitnis <[email protected]> Authored: Tue Jan 7 16:08:39 2014 -0800 Committer: Mona Chitnis <[email protected]> Committed: Tue Jan 7 16:08:39 2014 -0800 ---------------------------------------------------------------------- .../org/apache/oozie/WorkflowActionBean.java | 4 +- .../oozie/command/wf/ActionEndXCommand.java | 3 +- .../oozie/command/wf/ActionStartXCommand.java | 2 +- .../jpa/WorkflowActionQueryExecutor.java | 46 ++++++++++---------- .../jpa/TestWorkflowActionQueryExecutor.java | 30 +++++++------ 5 files changed, 45 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/694e2a56/core/src/main/java/org/apache/oozie/WorkflowActionBean.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/WorkflowActionBean.java b/core/src/main/java/org/apache/oozie/WorkflowActionBean.java index 2b1f044..6861995 100644 --- a/core/src/main/java/org/apache/oozie/WorkflowActionBean.java +++ b/core/src/main/java/org/apache/oozie/WorkflowActionBean.java @@ -89,10 +89,10 @@ import org.json.simple.JSONObject; @NamedQuery(name = "GET_ACTION_SIGNAL", query = "select a.id, a.wfId, a.name, a.statusStr, a.pending, a.pendingAgeTimestamp, a.type, a.logToken, a.transition, a.errorCode, a.errorMessage, a.executionPath, a.signalValue, a.slaXml from WorkflowActionBean a where a.id = :id"), - @NamedQuery(name = "GET_ACTION_START", query = "select a.id, a.wfId, a.name, a.statusStr, a.pending, a.pendingAgeTimestamp, a.type, a.logToken, a.transition, a.retries, a.userRetryCount, a.userRetryMax, a.userRetryInterval, a.startTimestamp, a.endTimestamp, a.errorCode, a.errorMessage, a.cred, a.externalId, a.externalStatus, a.conf, a.slaXml from WorkflowActionBean a where a.id = :id"), - @NamedQuery(name = "GET_ACTION_CHECK", query = "select a.id, a.wfId, a.name, a.statusStr, a.pending, a.pendingAgeTimestamp, a.type, a.logToken, a.transition, a.retries, a.userRetryCount, a.userRetryMax, a.userRetryInterval, a.trackerUri, a.startTimestamp, a.endTimestamp, a.lastCheckTimestamp, a.errorCode, a.errorMessage, a.externalId, a.externalStatus, a.externalChildIDs, a.conf from WorkflowActionBean a where a.id = :id"), + @NamedQuery(name = "GET_ACTION_END", query = "select a.id, a.wfId, a.name, a.statusStr, a.pending, a.pendingAgeTimestamp, a.type, a.logToken, a.transition, a.retries, a.trackerUri, a.userRetryCount, a.userRetryMax, a.userRetryInterval, a.startTimestamp, a.endTimestamp, a.errorCode, a.errorMessage, a.externalId, a.externalStatus, a.externalChildIDs, a.conf, a.data, a.stats from WorkflowActionBean a where a.id = :id"), + @NamedQuery(name = "GET_ACTION_COMPLETED", query = "select a.id, a.wfId, a.statusStr, a.type, a.logToken from WorkflowActionBean a where a.id = :id"), @NamedQuery(name = "GET_ACTION_FOR_UPDATE", query = "select OBJECT(a) from WorkflowActionBean a where a.id = :id"), http://git-wip-us.apache.org/repos/asf/oozie/blob/694e2a56/core/src/main/java/org/apache/oozie/command/wf/ActionEndXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/command/wf/ActionEndXCommand.java b/core/src/main/java/org/apache/oozie/command/wf/ActionEndXCommand.java index ac2408f..137ea5a 100644 --- a/core/src/main/java/org/apache/oozie/command/wf/ActionEndXCommand.java +++ b/core/src/main/java/org/apache/oozie/command/wf/ActionEndXCommand.java @@ -99,7 +99,8 @@ public class ActionEndXCommand extends ActionXCommand<Void> { if (jpaService != null) { this.wfJob = WorkflowJobQueryExecutor.getInstance().get(WorkflowJobQuery.GET_WORKFLOW_ACTION_OP, jobId); - this.wfAction = WorkflowActionQueryExecutor.getInstance().get(WorkflowActionQuery.GET_ACTION, actionId); + this.wfAction = WorkflowActionQueryExecutor.getInstance().get(WorkflowActionQuery.GET_ACTION_END, + actionId); LogUtils.setLogInfo(wfJob, logInfo); LogUtils.setLogInfo(wfAction, logInfo); } http://git-wip-us.apache.org/repos/asf/oozie/blob/694e2a56/core/src/main/java/org/apache/oozie/command/wf/ActionStartXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/command/wf/ActionStartXCommand.java b/core/src/main/java/org/apache/oozie/command/wf/ActionStartXCommand.java index 7e9415a..d8ef520 100644 --- a/core/src/main/java/org/apache/oozie/command/wf/ActionStartXCommand.java +++ b/core/src/main/java/org/apache/oozie/command/wf/ActionStartXCommand.java @@ -98,7 +98,7 @@ public class ActionStartXCommand extends ActionXCommand<Void> { jpaService = Services.get().get(JPAService.class); if (jpaService != null) { this.wfJob = WorkflowJobQueryExecutor.getInstance().get(WorkflowJobQuery.GET_WORKFLOW, jobId); - this.wfAction = WorkflowActionQueryExecutor.getInstance().get(WorkflowActionQuery.GET_ACTION_START, actionId); + this.wfAction = WorkflowActionQueryExecutor.getInstance().get(WorkflowActionQuery.GET_ACTION, actionId); LogUtils.setLogInfo(wfJob, logInfo); LogUtils.setLogInfo(wfAction, logInfo); } http://git-wip-us.apache.org/repos/asf/oozie/blob/694e2a56/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionQueryExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionQueryExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionQueryExecutor.java index d95ff08..9156a27 100644 --- a/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionQueryExecutor.java +++ b/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowActionQueryExecutor.java @@ -52,8 +52,8 @@ public class WorkflowActionQueryExecutor extends GET_ACTION_ID_TYPE_LASTCHECK, GET_ACTION_FAIL, GET_ACTION_SIGNAL, - GET_ACTION_START, GET_ACTION_CHECK, + GET_ACTION_END, GET_ACTION_COMPLETED, GET_RUNNING_ACTIONS, GET_PENDING_ACTIONS, @@ -207,8 +207,8 @@ public class WorkflowActionQueryExecutor extends case GET_ACTION_ID_TYPE_LASTCHECK: case GET_ACTION_FAIL: case GET_ACTION_SIGNAL: - case GET_ACTION_START: case GET_ACTION_CHECK: + case GET_ACTION_END: case GET_ACTION_COMPLETED: query.setParameter("id", parameters[0]); break; @@ -283,7 +283,7 @@ public class WorkflowActionQueryExecutor extends bean.setSignalValue((String) arr[12]); bean.setSlaXmlBlob((StringBlob) arr[13]); break; - case GET_ACTION_START: + case GET_ACTION_CHECK: bean = new WorkflowActionBean(); arr = (Object[]) ret; bean.setId((String) arr[0]); @@ -299,16 +299,17 @@ public class WorkflowActionQueryExecutor extends bean.setUserRetryCount((Integer) arr[10]); bean.setUserRetryMax((Integer) arr[11]); bean.setUserRetryInterval((Integer) arr[12]); - bean.setStartTime(DateUtils.toDate((Timestamp) arr[13])); - bean.setEndTime(DateUtils.toDate((Timestamp) arr[14])); - bean.setErrorInfo((String) arr[15], (String) arr[16]); - bean.setCred((String) arr[17]); - bean.setExternalId((String) arr[18]); - bean.setExternalStatus((String) arr[19]); - bean.setConfBlob((StringBlob) arr[20]); - bean.setSlaXmlBlob((StringBlob) arr[21]); + bean.setTrackerUri((String) arr[13]); + bean.setStartTime(DateUtils.toDate((Timestamp) arr[14])); + bean.setEndTime(DateUtils.toDate((Timestamp) arr[15])); + bean.setLastCheckTime(DateUtils.toDate((Timestamp) arr[16])); + bean.setErrorInfo((String) arr[17], (String) arr[18]); + bean.setExternalId((String) arr[19]); + bean.setExternalStatus((String) arr[20]); + bean.setExternalChildIDsBlob((StringBlob) arr[21]); + bean.setConfBlob((StringBlob) arr[22]); break; - case GET_ACTION_CHECK: + case GET_ACTION_END: bean = new WorkflowActionBean(); arr = (Object[]) ret; bean.setId((String) arr[0]); @@ -321,18 +322,19 @@ public class WorkflowActionQueryExecutor extends bean.setLogToken((String) arr[7]); bean.setTransition((String) arr[8]); bean.setRetries((Integer) arr[9]); - bean.setUserRetryCount((Integer) arr[10]); - bean.setUserRetryMax((Integer) arr[11]); - bean.setUserRetryInterval((Integer) arr[12]); - bean.setTrackerUri((String) arr[13]); + bean.setTrackerUri((String) arr[10]); + bean.setUserRetryCount((Integer) arr[11]); + bean.setUserRetryMax((Integer) arr[12]); + bean.setUserRetryInterval((Integer) arr[13]); bean.setStartTime(DateUtils.toDate((Timestamp) arr[14])); bean.setEndTime(DateUtils.toDate((Timestamp) arr[15])); - bean.setLastCheckTime(DateUtils.toDate((Timestamp) arr[16])); - bean.setErrorInfo((String) arr[17], (String) arr[18]); - bean.setExternalId((String) arr[19]); - bean.setExternalStatus((String) arr[20]); - bean.setExternalChildIDsBlob((StringBlob) arr[21]); - bean.setConfBlob((StringBlob) arr[22]); + bean.setErrorInfo((String) arr[16], (String) arr[17]); + bean.setExternalId((String) arr[18]); + bean.setExternalStatus((String) arr[19]); + bean.setExternalChildIDsBlob((StringBlob) arr[20]); + bean.setConfBlob((StringBlob) arr[21]); + bean.setDataBlob((StringBlob) arr[22]); + bean.setStatsBlob((StringBlob) arr[23]); break; case GET_ACTION_COMPLETED: bean = new WorkflowActionBean(); http://git-wip-us.apache.org/repos/asf/oozie/blob/694e2a56/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowActionQueryExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowActionQueryExecutor.java b/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowActionQueryExecutor.java index a6275e1..0a7de95 100644 --- a/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowActionQueryExecutor.java +++ b/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowActionQueryExecutor.java @@ -240,34 +240,37 @@ public class TestWorkflowActionQueryExecutor extends XDataTestCase { assertNull(retBean.getStats()); assertNull(retBean.getExternalChildIDs()); - // GET_WORKFLOW_START - retBean = WorkflowActionQueryExecutor.getInstance().get(WorkflowActionQuery.GET_ACTION_START, bean.getId()); + // GET_ACTION_CHECK + retBean = WorkflowActionQueryExecutor.getInstance().get(WorkflowActionQuery.GET_ACTION_CHECK, bean.getId()); assertEquals(bean.getId(), retBean.getId()); assertEquals(bean.getJobId(), retBean.getJobId()); assertEquals(bean.getName(), retBean.getName()); assertEquals(bean.getStatusStr(), retBean.getStatusStr()); assertEquals(bean.getPending(), retBean.getPending()); + assertEquals(bean.getPendingAge().getTime(), retBean.getPendingAge().getTime()); assertEquals(bean.getType(), retBean.getType()); assertEquals(bean.getLogToken(), retBean.getLogToken()); assertEquals(bean.getTransition(), retBean.getTransition()); + assertEquals(bean.getRetries(), retBean.getRetries()); assertEquals(bean.getUserRetryCount(), retBean.getUserRetryCount()); assertEquals(bean.getUserRetryMax(), retBean.getUserRetryMax()); assertEquals(bean.getUserRetryInterval(), retBean.getUserRetryInterval()); + assertEquals(bean.getTrackerUri(), retBean.getTrackerUri()); assertEquals(bean.getStartTime().getTime(), retBean.getStartTime().getTime()); assertEquals(bean.getEndTime().getTime(), retBean.getEndTime().getTime()); + assertEquals(bean.getLastCheckTime().getTime(), retBean.getLastCheckTime().getTime()); assertEquals(bean.getErrorCode(), retBean.getErrorCode()); assertEquals(bean.getErrorMessage(), retBean.getErrorMessage()); - assertEquals(bean.getCred(), retBean.getCred()); assertEquals(bean.getExternalId(), retBean.getExternalId()); assertEquals(bean.getExternalStatus(), retBean.getExternalStatus()); + assertEquals(bean.getExternalChildIDs(), retBean.getExternalChildIDs()); assertEquals(bean.getConf(), retBean.getConf()); - assertEquals(bean.getSlaXml(), retBean.getSlaXml()); assertNull(retBean.getData()); assertNull(retBean.getStats()); - assertNull(retBean.getExternalChildIDs()); + assertNull(retBean.getSlaXml()); - // GET_ACTION_CHECK - retBean = WorkflowActionQueryExecutor.getInstance().get(WorkflowActionQuery.GET_ACTION_CHECK, bean.getId()); + // GET_ACTION_END + retBean = WorkflowActionQueryExecutor.getInstance().get(WorkflowActionQuery.GET_ACTION_END, bean.getId()); assertEquals(bean.getId(), retBean.getId()); assertEquals(bean.getJobId(), retBean.getJobId()); assertEquals(bean.getName(), retBean.getName()); @@ -278,21 +281,20 @@ public class TestWorkflowActionQueryExecutor extends XDataTestCase { assertEquals(bean.getLogToken(), retBean.getLogToken()); assertEquals(bean.getTransition(), retBean.getTransition()); assertEquals(bean.getRetries(), retBean.getRetries()); + assertEquals(bean.getTrackerUri(), retBean.getTrackerUri()); assertEquals(bean.getUserRetryCount(), retBean.getUserRetryCount()); assertEquals(bean.getUserRetryMax(), retBean.getUserRetryMax()); assertEquals(bean.getUserRetryInterval(), retBean.getUserRetryInterval()); - assertEquals(bean.getTrackerUri(), retBean.getTrackerUri()); + assertEquals(bean.getExternalId(), retBean.getExternalId()); + assertEquals(bean.getExternalStatus(), retBean.getExternalStatus()); + assertEquals(bean.getExternalChildIDs(), retBean.getExternalChildIDs()); assertEquals(bean.getStartTime().getTime(), retBean.getStartTime().getTime()); assertEquals(bean.getEndTime().getTime(), retBean.getEndTime().getTime()); - assertEquals(bean.getLastCheckTime().getTime(), retBean.getLastCheckTime().getTime()); assertEquals(bean.getErrorCode(), retBean.getErrorCode()); assertEquals(bean.getErrorMessage(), retBean.getErrorMessage()); - assertEquals(bean.getExternalId(), retBean.getExternalId()); - assertEquals(bean.getExternalStatus(), retBean.getExternalStatus()); - assertEquals(bean.getExternalChildIDs(), retBean.getExternalChildIDs()); assertEquals(bean.getConf(), retBean.getConf()); - assertNull(retBean.getData()); - assertNull(retBean.getStats()); + assertEquals(bean.getData(), retBean.getData()); + assertEquals(bean.getStats(), retBean.getStats()); assertNull(retBean.getSlaXml()); //GET_ACTION_COMPLETED
