You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by vi...@apache.org on 2013/09/10 17:27:41 UTC
svn commit: r1521527 [3/3] - in /oozie/trunk: ./
core/src/main/java/org/apache/oozie/
core/src/main/java/org/apache/oozie/compression/
core/src/main/java/org/apache/oozie/executor/jpa/
core/src/main/java/org/apache/oozie/service/ core/src/main/java/org...
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/event/TestEventGeneration.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/event/TestEventGeneration.java?rev=1521527&r1=1521526&r2=1521527&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/event/TestEventGeneration.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/event/TestEventGeneration.java Tue Sep 10 15:27:39 2013
@@ -199,7 +199,7 @@ public class TestEventGeneration extends
job = _createWorkflowJob();
LiteWorkflowInstance wfInstance = (LiteWorkflowInstance) job.getWorkflowInstance();
wfInstance.start();
- job.setWfInstance(wfInstance);
+ job.setWorkflowInstance(wfInstance);
WorkflowJobQueryExecutor.getInstance().executeUpdate(WorkflowJobQuery.UPDATE_WORKFLOW_STATUS_INSTANCE_MODIFIED, job);
WorkflowActionBean wfAction = jpaService.execute(new WorkflowActionGetJPAExecutor(job.getId() + "@one"));
new SignalXCommand(job.getId(), wfAction.getId()).call();
@@ -293,6 +293,7 @@ public class TestEventGeneration extends
assertEquals(coord.getAppName(), event.getAppName());
// Action Failure
+ wfJob.setStatus(WorkflowJob.Status.FAILED);
action.setStatus(CoordinatorAction.Status.RUNNING);
CoordActionQueryExecutor.getInstance().executeUpdate(CoordActionQuery.UPDATE_COORD_ACTION_STATUS_PENDING_TIME, action);
WorkflowJobQueryExecutor.getInstance().executeUpdate(WorkflowJobQuery.UPDATE_WORKFLOW_STATUS_MODTIME, wfJob);
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobQueryExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobQueryExecutor.java?rev=1521527&r1=1521526&r2=1521527&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobQueryExecutor.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobQueryExecutor.java Tue Sep 10 15:27:39 2013
@@ -55,7 +55,7 @@ public class TestCoordJobQueryExecutor e
assertEquals(query.getParameterValue("appName"), cjBean.getAppName());
assertEquals(query.getParameterValue("appPath"), cjBean.getAppPath());
assertEquals(query.getParameterValue("concurrency"), cjBean.getConcurrency());
- assertEquals(query.getParameterValue("conf"), cjBean.getConf());
+ assertEquals(query.getParameterValue("conf"), cjBean.getConfBlob());
assertEquals(query.getParameterValue("externalId"), cjBean.getExternalId());
assertEquals(query.getParameterValue("frequency"), cjBean.getFrequency());
assertEquals(query.getParameterValue("lastActionNumber"), cjBean.getLastActionNumber());
@@ -64,12 +64,12 @@ public class TestCoordJobQueryExecutor e
assertEquals(query.getParameterValue("createdTime"), cjBean.getCreatedTimestamp());
assertEquals(query.getParameterValue("endTime"), cjBean.getEndTimestamp());
assertEquals(query.getParameterValue("execution"), cjBean.getExecution());
- assertEquals(query.getParameterValue("jobXml"), cjBean.getJobXml());
+ assertEquals(query.getParameterValue("jobXml"), cjBean.getJobXmlBlob());
assertEquals(query.getParameterValue("lastAction"), cjBean.getLastActionTimestamp());
assertEquals(query.getParameterValue("lastModifiedTime"), cjBean.getLastModifiedTimestamp());
assertEquals(query.getParameterValue("nextMaterializedTime"), cjBean.getNextMaterializedTimestamp());
- assertEquals(query.getParameterValue("origJobXml"), cjBean.getOrigJobXml());
- assertEquals(query.getParameterValue("slaXml"), cjBean.getSlaXml());
+ assertEquals(query.getParameterValue("origJobXml"), cjBean.getOrigJobXmlBlob());
+ assertEquals(query.getParameterValue("slaXml"), cjBean.getSlaXmlBlob());
assertEquals(query.getParameterValue("startTime"), cjBean.getStartTimestamp());
assertEquals(query.getParameterValue("status"), cjBean.getStatus().toString());
assertEquals(query.getParameterValue("timeUnit"), cjBean.getTimeUnit().toString());
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowActionQueryExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowActionQueryExecutor.java?rev=1521527&r1=1521526&r2=1521527&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowActionQueryExecutor.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowActionQueryExecutor.java Tue Sep 10 15:27:39 2013
@@ -65,11 +65,11 @@ public class TestWorkflowActionQueryExec
// UPDATE_ACTION
Query query = WorkflowActionQueryExecutor.getInstance().getUpdateQuery(WorkflowActionQuery.UPDATE_ACTION, bean,
em);
- assertEquals(query.getParameterValue("conf"), bean.getConf());
+ assertEquals(query.getParameterValue("conf"), bean.getConfBlob());
assertEquals(query.getParameterValue("consoleUrl"), bean.getConsoleUrl());
- assertEquals(query.getParameterValue("data"), bean.getData());
- assertEquals(query.getParameterValue("stats"), bean.getStats());
- assertEquals(query.getParameterValue("externalChildIDs"), bean.getExternalId());
+ assertEquals(query.getParameterValue("data"), bean.getDataBlob());
+ assertEquals(query.getParameterValue("stats"), bean.getStatsBlob());
+ assertEquals(query.getParameterValue("externalChildIDs"), bean.getExternalChildIDsBlob());
assertEquals(query.getParameterValue("errorCode"), bean.getErrorCode());
assertEquals(query.getParameterValue("errorMessage"), bean.getErrorMessage());
assertEquals(query.getParameterValue("externalId"), bean.getExternalId());
@@ -87,7 +87,7 @@ public class TestWorkflowActionQueryExec
assertEquals(query.getParameterValue("pending"), bean.getPending());
assertEquals(query.getParameterValue("pendingAge"), bean.getPendingAge());
assertEquals(query.getParameterValue("signalValue"), bean.getSignalValue());
- assertEquals(query.getParameterValue("slaXml"), bean.getSlaXml());
+ assertEquals(query.getParameterValue("slaXml"), bean.getSlaXmlBlob());
assertEquals(query.getParameterValue("startTime"), bean.getStartTimestamp());
assertEquals(query.getParameterValue("status"), bean.getStatus().toString());
assertEquals(query.getParameterValue("wfId"), bean.getWfId());
@@ -128,8 +128,8 @@ public class TestWorkflowActionQueryExec
query = WorkflowActionQueryExecutor.getInstance().getUpdateQuery(WorkflowActionQuery.UPDATE_ACTION_START, bean,
em);
assertEquals(query.getParameterValue("startTime"), bean.getStartTimestamp());
- assertEquals(query.getParameterValue("externalChildIDs"), bean.getExternalId());
- assertEquals(query.getParameterValue("conf"), bean.getConf());
+ assertEquals(query.getParameterValue("externalChildIDs"), bean.getExternalChildIDsBlob());
+ assertEquals(query.getParameterValue("conf"), bean.getConfBlob());
assertEquals(query.getParameterValue("errorCode"), bean.getErrorCode());
assertEquals(query.getParameterValue("errorMessage"), bean.getErrorMessage());
assertEquals(query.getParameterValue("externalId"), bean.getExternalId());
@@ -138,7 +138,7 @@ public class TestWorkflowActionQueryExec
assertEquals(query.getParameterValue("lastCheckTime"), bean.getLastCheckTimestamp());
assertEquals(query.getParameterValue("status"), bean.getStatus().toString());
assertEquals(query.getParameterValue("externalStatus"), bean.getExternalStatus());
- assertEquals(query.getParameterValue("data"), bean.getData());
+ assertEquals(query.getParameterValue("data"), bean.getDataBlob());
assertEquals(query.getParameterValue("retries"), bean.getRetries());
assertEquals(query.getParameterValue("pending"), bean.getPending());
assertEquals(query.getParameterValue("pendingAge"), bean.getPendingAgeTimestamp());
@@ -147,10 +147,10 @@ public class TestWorkflowActionQueryExec
// UPDATE_ACTION_CHECK
query = WorkflowActionQueryExecutor.getInstance().getUpdateQuery(WorkflowActionQuery.UPDATE_ACTION_CHECK, bean,
em);
- assertEquals(query.getParameterValue("externalChildIDs"), bean.getExternalId());
+ assertEquals(query.getParameterValue("externalChildIDs"), bean.getExternalChildIDsBlob());
assertEquals(query.getParameterValue("externalStatus"), bean.getExternalStatus());
assertEquals(query.getParameterValue("status"), bean.getStatus().toString());
- assertEquals(query.getParameterValue("data"), bean.getData());
+ assertEquals(query.getParameterValue("data"), bean.getDataBlob());
assertEquals(query.getParameterValue("pending"), bean.getPending());
assertEquals(query.getParameterValue("errorCode"), bean.getErrorCode());
assertEquals(query.getParameterValue("errorMessage"), bean.getErrorMessage());
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowJobQueryExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowJobQueryExecutor.java?rev=1521527&r1=1521526&r2=1521527&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowJobQueryExecutor.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestWorkflowJobQueryExecutor.java Tue Sep 10 15:27:39 2013
@@ -55,7 +55,7 @@ public class TestWorkflowJobQueryExecuto
Query query = WorkflowJobQueryExecutor.getInstance().getUpdateQuery(WorkflowJobQuery.UPDATE_WORKFLOW, bean, em);
assertEquals(query.getParameterValue("appName"), bean.getAppName());
assertEquals(query.getParameterValue("appPath"), bean.getAppPath());
- assertEquals(query.getParameterValue("conf"), bean.getConf());
+ assertEquals(query.getParameterValue("conf"), bean.getConfBlob());
assertEquals(query.getParameterValue("groupName"), bean.getGroup());
assertEquals(query.getParameterValue("run"), bean.getRun());
assertEquals(query.getParameterValue("user"), bean.getUser());
@@ -64,11 +64,11 @@ public class TestWorkflowJobQueryExecuto
assertEquals(query.getParameterValue("externalId"), bean.getExternalId());
assertEquals(query.getParameterValue("lastModTime"), bean.getLastModifiedTimestamp());
assertEquals(query.getParameterValue("logToken"), bean.getLogToken());
- assertEquals(query.getParameterValue("protoActionConf"), bean.getProtoActionConf());
- assertEquals(query.getParameterValue("slaXml"), bean.getSlaXml());
+ assertEquals(query.getParameterValue("protoActionConf"), bean.getProtoActionConfBlob());
+ assertEquals(query.getParameterValue("slaXml"), bean.getSlaXmlBlob());
assertEquals(query.getParameterValue("startTime"), bean.getStartTimestamp());
assertEquals(query.getParameterValue("status"), bean.getStatus().toString());
- assertEquals(query.getParameterValue("wfInstance"), bean.getWfInstance());
+ assertEquals(query.getParameterValue("wfInstance"), bean.getWfInstanceBlob());
assertEquals(query.getParameterValue("id"), bean.getId());
// UPDATE_WORKFLOW_MODTIME
@@ -95,7 +95,7 @@ public class TestWorkflowJobQueryExecuto
query = WorkflowJobQueryExecutor.getInstance().getUpdateQuery(
WorkflowJobQuery.UPDATE_WORKFLOW_STATUS_INSTANCE_MODIFIED, bean, em);
assertEquals(query.getParameterValue("status"), bean.getStatus().toString());
- assertEquals(query.getParameterValue("wfInstance"), bean.getWfInstance());
+ assertEquals(query.getParameterValue("wfInstance"), bean.getWfInstanceBlob());
assertEquals(query.getParameterValue("lastModTime"), bean.getLastModifiedTimestamp());
assertEquals(query.getParameterValue("id"), bean.getId());
@@ -103,7 +103,7 @@ public class TestWorkflowJobQueryExecuto
query = WorkflowJobQueryExecutor.getInstance().getUpdateQuery(
WorkflowJobQuery.UPDATE_WORKFLOW_STATUS_INSTANCE_MOD_END, bean, em);
assertEquals(query.getParameterValue("status"), bean.getStatus().toString());
- assertEquals(query.getParameterValue("wfInstance"), bean.getWfInstance());
+ assertEquals(query.getParameterValue("wfInstance"), bean.getWfInstanceBlob());
assertEquals(query.getParameterValue("lastModTime"), bean.getLastModifiedTimestamp());
assertEquals(query.getParameterValue("endTime"), bean.getEndTimestamp());
assertEquals(query.getParameterValue("id"), bean.getId());
@@ -112,7 +112,7 @@ public class TestWorkflowJobQueryExecuto
query = WorkflowJobQueryExecutor.getInstance().getUpdateQuery(
WorkflowJobQuery.UPDATE_WORKFLOW_STATUS_INSTANCE_MOD_END, bean, em);
assertEquals(query.getParameterValue("status"), bean.getStatus().toString());
- assertEquals(query.getParameterValue("wfInstance"), bean.getWfInstance());
+ assertEquals(query.getParameterValue("wfInstance"), bean.getWfInstanceBlob());
assertEquals(query.getParameterValue("lastModTime"), bean.getLastModifiedTimestamp());
assertEquals(query.getParameterValue("endTime"), bean.getEndTimestamp());
assertEquals(query.getParameterValue("id"), bean.getId());
@@ -121,7 +121,7 @@ public class TestWorkflowJobQueryExecuto
query = WorkflowJobQueryExecutor.getInstance().getUpdateQuery(
WorkflowJobQuery.UPDATE_WORKFLOW_STATUS_INSTANCE_MOD_START_END, bean, em);
assertEquals(query.getParameterValue("status"), bean.getStatus().toString());
- assertEquals(query.getParameterValue("wfInstance"), bean.getWfInstance());
+ assertEquals(query.getParameterValue("wfInstance"), bean.getWfInstanceBlob());
assertEquals(query.getParameterValue("lastModTime"), bean.getLastModifiedTimestamp());
assertEquals(query.getParameterValue("startTime"), bean.getStartTimestamp());
assertEquals(query.getParameterValue("endTime"), bean.getEndTimestamp());
@@ -130,9 +130,9 @@ public class TestWorkflowJobQueryExecuto
// UPDATE_WORKFLOW_RERUN
query = WorkflowJobQueryExecutor.getInstance().getUpdateQuery(WorkflowJobQuery.UPDATE_WORKFLOW_RERUN, bean, em);
assertEquals(query.getParameterValue("appName"), bean.getAppName());
- assertEquals(query.getParameterValue("protoActionConf"), bean.getProtoActionConf());
+ assertEquals(query.getParameterValue("protoActionConf"), bean.getProtoActionConfBlob());
assertEquals(query.getParameterValue("appPath"), bean.getAppPath());
- assertEquals(query.getParameterValue("conf"), bean.getConf());
+ assertEquals(query.getParameterValue("conf"), bean.getConfBlob());
assertEquals(query.getParameterValue("logToken"), bean.getLogToken());
assertEquals(query.getParameterValue("user"), bean.getUser());
assertEquals(query.getParameterValue("group"), bean.getGroup());
@@ -140,7 +140,7 @@ public class TestWorkflowJobQueryExecuto
assertEquals(query.getParameterValue("endTime"), bean.getEndTimestamp());
assertEquals(query.getParameterValue("run"), bean.getRun());
assertEquals(query.getParameterValue("status"), bean.getStatus().toString());
- assertEquals(query.getParameterValue("wfInstance"), bean.getWfInstance());
+ assertEquals(query.getParameterValue("wfInstance"), bean.getWfInstanceBlob());
assertEquals(query.getParameterValue("lastModTime"), bean.getLastModifiedTimestamp());
assertEquals(query.getParameterValue("id"), bean.getId());
Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1521527&r1=1521526&r2=1521527&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Tue Sep 10 15:27:39 2013
@@ -1,5 +1,6 @@
-- Oozie 4.1.0 release (trunk - unreleased)
+OOZIE-1462 Compress lob columns before storing in database (virag)
OOZIE-1499 Update only necessary columns and consolidate JPA Executors (ryota)
OOZIE-1522 SignalX may try to insert transition for a forked node twice (virag)
OOZIE-1461 provide an option to auto-deploy launcher jar onto HDFS system libpath (ryota,virag via virag)