You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by ka...@apache.org on 2012/03/09 01:49:50 UTC
svn commit: r1298674 - in /incubator/oozie/trunk: ./
client/src/main/java/org/apache/oozie/client/
client/src/main/java/org/apache/oozie/client/rest/
core/src/main/java/org/apache/oozie/
core/src/main/java/org/apache/oozie/executor/jpa/ core/src/test/j...
Author: kamrul
Date: Fri Mar 9 00:49:49 2012
New Revision: 1298674
URL: http://svn.apache.org/viewvc?rev=1298674&view=rev
Log:
OOZIE-742 getJobInfo for workflows should return workflow external id (Shwetha via Mohammad)
Modified:
incubator/oozie/trunk/client/src/main/java/org/apache/oozie/client/WorkflowJob.java
incubator/oozie/trunk/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowJobBean.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowsJobGetJPAExecutor.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowJobGetJPAExecutor.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XDataTestCase.java
incubator/oozie/trunk/release-log.txt
Modified: incubator/oozie/trunk/client/src/main/java/org/apache/oozie/client/WorkflowJob.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/client/src/main/java/org/apache/oozie/client/WorkflowJob.java?rev=1298674&r1=1298673&r2=1298674&view=diff
==============================================================================
--- incubator/oozie/trunk/client/src/main/java/org/apache/oozie/client/WorkflowJob.java (original)
+++ incubator/oozie/trunk/client/src/main/java/org/apache/oozie/client/WorkflowJob.java Fri Mar 9 00:49:49 2012
@@ -149,4 +149,11 @@ public interface WorkflowJob {
*/
List<WorkflowAction> getActions();
+ /**
+ * Returns the external id for the workflow
+ *
+ * @return external id for the workflow
+ */
+ String getExternalId();
+
}
Modified: incubator/oozie/trunk/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java?rev=1298674&r1=1298673&r2=1298674&view=diff
==============================================================================
--- incubator/oozie/trunk/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java (original)
+++ incubator/oozie/trunk/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java Fri Mar 9 00:49:49 2012
@@ -85,6 +85,7 @@ public class JsonToBean {
WF_ACTION.put("getErrorMessage", new Property(JsonTags.WORKFLOW_ACTION_ERROR_MESSAGE, String.class));
WF_ACTION.put("toString", new Property(JsonTags.TO_STRING, String.class));
+ WF_JOB.put("getExternalId", new Property(JsonTags.WORKFLOW_EXTERNAL_ID, String.class));
WF_JOB.put("getAppPath", new Property(JsonTags.WORKFLOW_APP_PATH, String.class));
WF_JOB.put("getAppName", new Property(JsonTags.WORKFLOW_APP_NAME, String.class));
WF_JOB.put("getId", new Property(JsonTags.WORKFLOW_ID, String.class));
Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowJobBean.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowJobBean.java?rev=1298674&r1=1298673&r2=1298674&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowJobBean.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/WorkflowJobBean.java Fri Mar 9 00:49:49 2012
@@ -51,7 +51,7 @@ import org.apache.openjpa.persistence.jd
@NamedQuery(name = "GET_WORKFLOWS", query = "select OBJECT(w) from WorkflowJobBean w order by w.startTimestamp desc"),
@NamedQuery(name = "GET_WORKFLOWS_COLUMNS", query = "select w.id, w.appName, w.status, w.run, w.user, w.group, w.createdTimestamp, "
- + "w.startTimestamp, w.lastModifiedTimestamp, w.endTimestamp from WorkflowJobBean w order by w.createdTimestamp desc"),
+ + "w.startTimestamp, w.lastModifiedTimestamp, w.endTimestamp, w.externalId from WorkflowJobBean w order by w.createdTimestamp desc"),
@NamedQuery(name = "GET_WORKFLOWS_COUNT", query = "select count(w) from WorkflowJobBean w"),
Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowsJobGetJPAExecutor.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowsJobGetJPAExecutor.java?rev=1298674&r1=1298673&r2=1298674&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowsJobGetJPAExecutor.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/WorkflowsJobGetJPAExecutor.java Fri Mar 9 00:49:49 2012
@@ -40,7 +40,7 @@ import org.apache.openjpa.persistence.jd
public class WorkflowsJobGetJPAExecutor implements JPAExecutor<WorkflowsInfo> {
private static final String seletStr = "Select w.id, w.appName, w.status, w.run, w.user, w.group, w.createdTimestamp, "
- + "w.startTimestamp, w.lastModifiedTimestamp, w.endTimestamp from WorkflowJobBean w";
+ + "w.startTimestamp, w.lastModifiedTimestamp, w.endTimestamp, w.externalId from WorkflowJobBean w";
private static final String countStr = "Select count(w) from WorkflowJobBean w";
private final Map<String, List<String>> filter;
@@ -297,6 +297,9 @@ public class WorkflowsJobGetJPAExecutor
if (arr[9] != null) {
wfBean.setEndTime((Timestamp) arr[9]);
}
+ if (arr[10] != null) {
+ wfBean.setExternalId((String) arr[10]);
+ }
return wfBean;
}
}
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowJobGetJPAExecutor.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowJobGetJPAExecutor.java?rev=1298674&r1=1298673&r2=1298674&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowJobGetJPAExecutor.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowJobGetJPAExecutor.java Fri Mar 9 00:49:49 2012
@@ -44,16 +44,17 @@ public class TestWorkflowJobGetJPAExecut
public void testWfJobGet() throws Exception {
WorkflowJobBean job = addRecordToWfJobTable(WorkflowJob.Status.PREP, WorkflowInstance.Status.PREP);
- _testGetJob(job.getId());
+ _testGetJob(job.getId(), job.getExternalId());
}
- private void _testGetJob(String jobId) throws Exception {
+ private void _testGetJob(String jobId, String extId) throws Exception {
JPAService jpaService = Services.get().get(JPAService.class);
assertNotNull(jpaService);
WorkflowJobGetJPAExecutor wfGetCmd = new WorkflowJobGetJPAExecutor(jobId);
WorkflowJobBean ret = jpaService.execute(wfGetCmd);
assertNotNull(ret);
assertEquals(ret.getId(), jobId);
+ assertEquals(extId, ret.getExternalId());
}
}
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XDataTestCase.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XDataTestCase.java?rev=1298674&r1=1298673&r2=1298674&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XDataTestCase.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XDataTestCase.java Fri Mar 9 00:49:49 2012
@@ -916,6 +916,7 @@ public abstract class XDataTestCase exte
((LiteWorkflowInstance) wfInstance).setStatus(instanceStatus);
WorkflowJobBean workflow = new WorkflowJobBean();
workflow.setId(Services.get().get(UUIDService.class).generateId(ApplicationType.WORKFLOW));
+ workflow.setExternalId("extid");
workflow.setAppName(app.getName());
workflow.setAppPath(conf.get(OozieClient.APP_PATH));
workflow.setConf(XmlUtils.prettyPrint(conf).toString());
Modified: incubator/oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1298674&r1=1298673&r2=1298674&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Fri Mar 9 00:49:49 2012
@@ -1,5 +1,6 @@
-- Oozie 3.2.0 release
+OOZIE-742 getJobInfo for workflows should return workflow external id (Shwetha via Mohammad)
OOZIE-750 enhance ooziedb tool not to require manual upgrade steps and not to require the -sqlfile option (tucu)
OOZIE-684 CoordChangeXCommand already used is thrown while executing interrupt commands (Mohamed via Mohammad)
OOZIE-723 Getting rid of the unused Commands classes (mohamed via tucu)