You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by rk...@apache.org on 2013/06/18 06:15:58 UTC
svn commit: r1494020 - in /oozie/trunk: ./
client/src/main/java/org/apache/oozie/client/
client/src/main/java/org/apache/oozie/client/rest/
client/src/test/java/org/apache/oozie/client/rest/
core/src/main/java/org/apache/oozie/ core/src/main/java/org/a...
Author: rkanter
Date: Tue Jun 18 04:15:58 2013
New Revision: 1494020
URL: http://svn.apache.org/r1494020
Log:
OOZIE-1408 Change column type of "frequency" from int to varchar for coordinators (rkanter)
Modified:
oozie/trunk/client/src/main/java/org/apache/oozie/client/CoordinatorJob.java
oozie/trunk/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java
oozie/trunk/client/src/test/java/org/apache/oozie/client/rest/TestJsonToBean.java
oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorJobBean.java
oozie/trunk/core/src/main/java/org/apache/oozie/client/rest/JsonCoordinatorJob.java
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionMaterializeCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordChangeXCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobInfoGetJPAExecutor.java
oozie/trunk/core/src/main/java/org/apache/oozie/store/CoordinatorStore.java
oozie/trunk/core/src/test/java/org/apache/oozie/TestCoordinatorJobBean.java
oozie/trunk/core/src/test/java/org/apache/oozie/client/rest/TestJsonCoordinatorJob.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionMaterializeCommand.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordChangeXCommand.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordMaterializeTransitionXCommand.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java
oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsGetForPurgeJPAExecutor.java
oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsToBeMaterializedJPAExecutor.java
oozie/trunk/core/src/test/java/org/apache/oozie/service/TestCoordMaterializeTriggerService.java
oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java
oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockCoordinatorEngineService.java
oozie/trunk/core/src/test/java/org/apache/oozie/store/TestCoordinatorStore.java
oozie/trunk/core/src/test/java/org/apache/oozie/test/XDataTestCase.java
oozie/trunk/release-log.txt
oozie/trunk/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java
Modified: oozie/trunk/client/src/main/java/org/apache/oozie/client/CoordinatorJob.java
URL: http://svn.apache.org/viewvc/oozie/trunk/client/src/main/java/org/apache/oozie/client/CoordinatorJob.java?rev=1494020&r1=1494019&r2=1494020&view=diff
==============================================================================
--- oozie/trunk/client/src/main/java/org/apache/oozie/client/CoordinatorJob.java (original)
+++ oozie/trunk/client/src/main/java/org/apache/oozie/client/CoordinatorJob.java Tue Jun 18 04:15:58 2013
@@ -79,7 +79,7 @@ public interface CoordinatorJob extends
*
* @return the frequency for the coord job in unit of minute
*/
- int getFrequency();
+ String getFrequency();
/**
* Return the timeUnit for the coord job, it could be, Timeunit enum, e.g. MINUTE, HOUR, DAY, WEEK or MONTH
Modified: oozie/trunk/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java
URL: http://svn.apache.org/viewvc/oozie/trunk/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java?rev=1494020&r1=1494019&r2=1494020&view=diff
==============================================================================
--- oozie/trunk/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java (original)
+++ oozie/trunk/client/src/main/java/org/apache/oozie/client/rest/JsonToBean.java Tue Jun 18 04:15:58 2013
@@ -143,7 +143,7 @@ public class JsonToBean {
COORD_JOB.put("getStatus", new Property(JsonTags.COORDINATOR_JOB_STATUS, CoordinatorJob.Status.class));
COORD_JOB.put("getExecutionOrder",
new Property(JsonTags.COORDINATOR_JOB_EXECUTIONPOLICY, CoordinatorJob.Execution.class));
- COORD_JOB.put("getFrequency", new Property(JsonTags.COORDINATOR_JOB_FREQUENCY, Integer.TYPE));
+ COORD_JOB.put("getFrequency", new Property(JsonTags.COORDINATOR_JOB_FREQUENCY, String.class));
COORD_JOB.put("getTimeUnit", new Property(JsonTags.COORDINATOR_JOB_TIMEUNIT, CoordinatorJob.Timeunit.class));
COORD_JOB.put("getTimeZone", new Property(JsonTags.COORDINATOR_JOB_TIMEZONE, String.class));
COORD_JOB.put("getConcurrency", new Property(JsonTags.COORDINATOR_JOB_CONCURRENCY, Integer.TYPE));
Modified: oozie/trunk/client/src/test/java/org/apache/oozie/client/rest/TestJsonToBean.java
URL: http://svn.apache.org/viewvc/oozie/trunk/client/src/test/java/org/apache/oozie/client/rest/TestJsonToBean.java?rev=1494020&r1=1494019&r2=1494020&view=diff
==============================================================================
--- oozie/trunk/client/src/test/java/org/apache/oozie/client/rest/TestJsonToBean.java (original)
+++ oozie/trunk/client/src/test/java/org/apache/oozie/client/rest/TestJsonToBean.java Tue Jun 18 04:15:58 2013
@@ -252,7 +252,7 @@ public class TestJsonToBean extends Test
json.put(JsonTags.COORDINATOR_JOB_CONF, "d");
json.put(JsonTags.COORDINATOR_JOB_STATUS, CoordinatorJob.Status.RUNNING.toString());
json.put(JsonTags.COORDINATOR_JOB_EXECUTIONPOLICY, CoordinatorJob.Execution.FIFO.toString());
- json.put(JsonTags.COORDINATOR_JOB_FREQUENCY, (long)1);
+ json.put(JsonTags.COORDINATOR_JOB_FREQUENCY, "1");
json.put(JsonTags.COORDINATOR_JOB_TIMEUNIT, CoordinatorJob.Timeunit.DAY.toString());
json.put(JsonTags.COORDINATOR_JOB_TIMEZONE, "e");
json.put(JsonTags.COORDINATOR_JOB_CONCURRENCY, (long)2);
@@ -291,7 +291,7 @@ public class TestJsonToBean extends Test
assertEquals("d", job.getConf());
assertEquals(CoordinatorJob.Status.RUNNING, job.getStatus());
assertEquals(CoordinatorJob.Execution.FIFO, job.getExecutionOrder());
- assertEquals(1, job.getFrequency());
+ assertEquals("1", job.getFrequency());
assertEquals(CoordinatorJob.Timeunit.DAY, job.getTimeUnit());
assertEquals("e", job.getTimeZone());
assertEquals(2, job.getConcurrency());
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorJobBean.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorJobBean.java?rev=1494020&r1=1494019&r2=1494020&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorJobBean.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/CoordinatorJobBean.java Tue Jun 18 04:15:58 2013
@@ -404,7 +404,7 @@ public class CoordinatorJobBean extends
WritableUtils.writeStr(dataOutput, getId());
WritableUtils.writeStr(dataOutput, getConf());
WritableUtils.writeStr(dataOutput, getStatusStr());
- dataOutput.writeInt(getFrequency());
+ WritableUtils.writeStr(dataOutput, getFrequency());
WritableUtils.writeStr(dataOutput, getTimeUnit().toString());
WritableUtils.writeStr(dataOutput, getTimeZone());
dataOutput.writeInt(getConcurrency());
@@ -443,7 +443,7 @@ public class CoordinatorJobBean extends
setId(WritableUtils.readStr(dataInput));
setConf(WritableUtils.readStr(dataInput));
setStatus(CoordinatorJob.Status.valueOf(WritableUtils.readStr(dataInput)));
- setFrequency(dataInput.readInt());
+ setFrequency(WritableUtils.readStr(dataInput));
setTimeUnit(CoordinatorJob.Timeunit.valueOf(WritableUtils.readStr(dataInput)));
setTimeZone(WritableUtils.readStr(dataInput));
setConcurrency(dataInput.readInt());
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/client/rest/JsonCoordinatorJob.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/client/rest/JsonCoordinatorJob.java?rev=1494020&r1=1494019&r2=1494020&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/client/rest/JsonCoordinatorJob.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/client/rest/JsonCoordinatorJob.java Tue Jun 18 04:15:58 2013
@@ -78,7 +78,7 @@ public class JsonCoordinatorJob implemen
@Basic
@Column(name = "frequency")
- private int frequency = 0;
+ private String frequency = "0";
@Basic
@Column(name = "time_zone")
@@ -223,11 +223,11 @@ public class JsonCoordinatorJob implemen
this.status = status;
}
- public void setFrequency(int frequency) {
+ public void setFrequency(String frequency) {
this.frequency = frequency;
}
- public int getFrequency() {
+ public String getFrequency() {
return frequency;
}
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionMaterializeCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionMaterializeCommand.java?rev=1494020&r1=1494019&r2=1494020&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionMaterializeCommand.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionMaterializeCommand.java Tue Jun 18 04:15:58 2013
@@ -164,7 +164,7 @@ public class CoordActionMaterializeComma
// TODO: always UTC?
TimeZone appTz = DateUtils.getTimeZone(jobBean.getTimeZone());
// TimeZone appTz = DateUtils.getTimeZone("UTC");
- int frequency = jobBean.getFrequency();
+ int frequency = Integer.valueOf(jobBean.getFrequency());
TimeUnit freqTU = TimeUnit.valueOf(eJob.getAttributeValue("freq_timeunit"));
TimeUnit endOfFlag = TimeUnit.valueOf(eJob.getAttributeValue("end_of_duration"));
Calendar start = Calendar.getInstance(appTz);
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordChangeXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordChangeXCommand.java?rev=1494020&r1=1494019&r2=1494020&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordChangeXCommand.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordChangeXCommand.java Tue Jun 18 04:15:58 2013
@@ -160,7 +160,7 @@ public class CoordChangeXCommand extends
Calendar d = Calendar.getInstance(DateUtils.getTimeZone(coordJob.getTimeZone()));
d.setTime(coordJob.getLastActionTime());
TimeUnit timeUnit = TimeUnit.valueOf(coordJob.getTimeUnitStr());
- d.add(timeUnit.getCalendarUnit(), -coordJob.getFrequency());
+ d.add(timeUnit.getCalendarUnit(), -Integer.valueOf(coordJob.getFrequency()));
return d.getTime();
}
@@ -227,7 +227,7 @@ public class CoordChangeXCommand extends
while (true) {
if (!newPauseTime.after(d.getTime())) {
deleteAction(lastActionNumber);
- d.add(timeUnit.getCalendarUnit(), -coordJob.getFrequency());
+ d.add(timeUnit.getCalendarUnit(), -Integer.valueOf(coordJob.getFrequency()));
lastActionNumber = lastActionNumber - 1;
hasChanged = true;
@@ -239,7 +239,7 @@ public class CoordChangeXCommand extends
if (hasChanged == true) {
coordJob.setLastActionNumber(lastActionNumber);
- d.add(timeUnit.getCalendarUnit(), coordJob.getFrequency());
+ d.add(timeUnit.getCalendarUnit(), Integer.valueOf(coordJob.getFrequency()));
Date d1 = d.getTime();
coordJob.setLastActionTime(d1);
coordJob.setNextMaterializedTime(d1);
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java?rev=1494020&r1=1494019&r2=1494020&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordMaterializeTransitionXCommand.java Tue Jun 18 04:15:58 2013
@@ -293,7 +293,7 @@ public class CoordMaterializeTransitionX
String jobXml = coordJob.getJobXml();
Element eJob = XmlUtils.parseXml(jobXml);
TimeZone appTz = DateUtils.getTimeZone(coordJob.getTimeZone());
- int frequency = coordJob.getFrequency();
+ int frequency = Integer.valueOf(coordJob.getFrequency());
TimeUnit freqTU = TimeUnit.valueOf(eJob.getAttributeValue("freq_timeunit"));
TimeUnit endOfFlag = TimeUnit.valueOf(eJob.getAttributeValue("end_of_duration"));
Calendar start = Calendar.getInstance(appTz);
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java?rev=1494020&r1=1494019&r2=1494020&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java Tue Jun 18 04:15:58 2013
@@ -627,7 +627,7 @@ public class CoordSubmitXCommand extends
String val = resolveAttribute("frequency", eAppXml, evalFreq);
int ival = ParamChecker.checkInteger(val, "frequency");
ParamChecker.checkGTZero(ival, "frequency");
- coordJob.setFrequency(ival);
+ coordJob.setFrequency(Integer.toString(ival));
TimeUnit tmp = (evalFreq.getVariable("timeunit") == null) ? TimeUnit.MINUTE : ((TimeUnit) evalFreq
.getVariable("timeunit"));
addAnAttribute("freq_timeunit", eAppXml, tmp.toString());
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobInfoGetJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobInfoGetJPAExecutor.java?rev=1494020&r1=1494019&r2=1494020&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobInfoGetJPAExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobInfoGetJPAExecutor.java Tue Jun 18 04:15:58 2013
@@ -143,7 +143,7 @@ public class CoordJobInfoGetJPAExecutor
bean.setConcurrency(((Integer) arr[8]).intValue());
}
if (arr[9] != null) {
- bean.setFrequency(((Integer) arr[9]).intValue());
+ bean.setFrequency((String) arr[9]);
}
if (arr[10] != null) {
bean.setLastActionTime((Timestamp) arr[10]);
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/store/CoordinatorStore.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/store/CoordinatorStore.java?rev=1494020&r1=1494019&r2=1494020&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/store/CoordinatorStore.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/store/CoordinatorStore.java Tue Jun 18 04:15:58 2013
@@ -625,7 +625,7 @@ public class CoordinatorStore extends St
bean.setConcurrency(((Integer) arr[8]).intValue());
}
if (arr[9] != null) {
- bean.setFrequency(((Integer) arr[9]).intValue());
+ bean.setFrequency((String) arr[9]);
}
if (arr[10] != null) {
bean.setLastActionTime((Timestamp) arr[10]);
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/TestCoordinatorJobBean.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/TestCoordinatorJobBean.java?rev=1494020&r1=1494019&r2=1494020&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/TestCoordinatorJobBean.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/TestCoordinatorJobBean.java Tue Jun 18 04:15:58 2013
@@ -62,7 +62,7 @@ public class TestCoordinatorJobBean exte
bean.setExecution(execution);
bean.setExecutionOrder(execution);
bean.setExternalId("ei");
- bean.setFrequency(3);
+ bean.setFrequency("3");
bean.setGroup("group");
bean.setId("id");
bean.setJobXml("jx");
@@ -122,7 +122,7 @@ public class TestCoordinatorJobBean exte
}
assertEquals(execution, bean.getExecutionOrder());
assertEquals("ei", bean.getExternalId());
- assertEquals(3, bean.getFrequency());
+ assertEquals("3", bean.getFrequency());
assertEquals("group", bean.getGroup());
assertEquals("id", bean.getId());
if (checkDeserialization) {
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/client/rest/TestJsonCoordinatorJob.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/client/rest/TestJsonCoordinatorJob.java?rev=1494020&r1=1494019&r2=1494020&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/client/rest/TestJsonCoordinatorJob.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/client/rest/TestJsonCoordinatorJob.java Tue Jun 18 04:15:58 2013
@@ -36,7 +36,7 @@ public class TestJsonCoordinatorJob exte
app.setId("c");
app.setConf("cc");
app.setStatus(CoordinatorJob.Status.PREP);
- app.setFrequency(100);
+ app.setFrequency("100");
app.setTimeUnit(CoordinatorJob.Timeunit.WEEK);
app.setTimeZone("timeZone");
app.setConcurrency(10);
@@ -59,7 +59,7 @@ public class TestJsonCoordinatorJob exte
assertEquals("c", app.getId());
assertEquals("cc", app.getConf());
assertEquals(CoordinatorJob.Status.PREP, app.getStatus());
- assertEquals(100, app.getFrequency());
+ assertEquals("100", app.getFrequency());
assertEquals(CoordinatorJob.Timeunit.WEEK, app.getTimeUnit());
assertEquals("timeZone", app.getTimeZone());
assertEquals(10, app.getConcurrency());
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java?rev=1494020&r1=1494019&r2=1494020&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java Tue Jun 18 04:15:58 2013
@@ -659,7 +659,7 @@ public class TestCoordActionInputCheckXC
appXml += "</coordinator-app>";
coordJob.setJobXml(appXml);
coordJob.setLastActionNumber(0);
- coordJob.setFrequency(1);
+ coordJob.setFrequency("1");
coordJob.setConcurrency(1);
JPAService jpaService = Services.get().get(JPAService.class);
if (jpaService != null) {
@@ -869,7 +869,7 @@ public class TestCoordActionInputCheckXC
appXml += "</coordinator-app>";
coordJob.setJobXml(appXml);
coordJob.setLastActionNumber(0);
- coordJob.setFrequency(1);
+ coordJob.setFrequency("1");
coordJob.setExecution(Execution.FIFO);
coordJob.setConcurrency(1);
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionMaterializeCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionMaterializeCommand.java?rev=1494020&r1=1494019&r2=1494020&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionMaterializeCommand.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionMaterializeCommand.java Tue Jun 18 04:15:58 2013
@@ -172,7 +172,7 @@ public class TestCoordActionMaterializeC
}*/
coordJob.setJobXml(appXml);
coordJob.setLastActionNumber(0);
- coordJob.setFrequency(1);
+ coordJob.setFrequency("1");
try {
coordJob.setEndTime(DateUtils.parseDateOozieTZ("2009-03-11T10:00Z"));
}
@@ -264,7 +264,7 @@ public class TestCoordActionMaterializeC
coordJob.setJobXml(appXml);
coordJob.setLastActionNumber(0);
- coordJob.setFrequency(5);
+ coordJob.setFrequency("5");
try {
store.beginTrx();
store.insertCoordinatorJob(coordJob);
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordChangeXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordChangeXCommand.java?rev=1494020&r1=1494019&r2=1494020&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordChangeXCommand.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordChangeXCommand.java Tue Jun 18 04:15:58 2013
@@ -368,7 +368,7 @@ public class TestCoordChangeXCommand ext
protected CoordinatorJobBean addRecordToCoordJobTableForPauseTimeTest(CoordinatorJob.Status status, Date start,
Date end, Date lastActionTime, boolean pending, boolean doneMatd, int lastActionNum) throws Exception {
CoordinatorJobBean coordJob = createCoordJob(status, start, end, pending, doneMatd, lastActionNum);
- coordJob.setFrequency(1);
+ coordJob.setFrequency("1");
coordJob.setTimeUnit(Timeunit.HOUR);
coordJob.setLastActionNumber(lastActionNum);
coordJob.setLastActionTime(lastActionTime);
@@ -444,7 +444,7 @@ public class TestCoordChangeXCommand ext
appXml += "</coordinator-app>";
coordJob.setJobXml(appXml);
coordJob.setLastActionNumber(0);
- coordJob.setFrequency(5);
+ coordJob.setFrequency("5");
coordJob.setExecution(Execution.FIFO);
coordJob.setConcurrency(1);
try {
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordMaterializeTransitionXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordMaterializeTransitionXCommand.java?rev=1494020&r1=1494019&r2=1494020&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordMaterializeTransitionXCommand.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordMaterializeTransitionXCommand.java Tue Jun 18 04:15:58 2013
@@ -225,7 +225,7 @@ public class TestCoordMaterializeTransit
coordJob.setStartTime(startTime);
coordJob.setEndTime(endTime);
coordJob.setPauseTime(pauseTime);
- coordJob.setFrequency(5);
+ coordJob.setFrequency("5");
coordJob.setTimeUnit(Timeunit.MINUTE);
coordJob.setTimeout(timeout);
coordJob.setConcurrency(3);
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java?rev=1494020&r1=1494019&r2=1494020&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java Tue Jun 18 04:15:58 2013
@@ -1019,7 +1019,7 @@ public class TestCoordRerunXCommand exte
coordJob.setConf(confStr);
coordJob.setJobXml(appXml);
coordJob.setLastActionNumber(0);
- coordJob.setFrequency(1);
+ coordJob.setFrequency("1");
coordJob.setExecution(Execution.FIFO);
coordJob.setConcurrency(1);
try {
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsGetForPurgeJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsGetForPurgeJPAExecutor.java?rev=1494020&r1=1494019&r2=1494020&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsGetForPurgeJPAExecutor.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsGetForPurgeJPAExecutor.java Tue Jun 18 04:15:58 2013
@@ -128,7 +128,7 @@ public class TestCoordJobsGetForPurgeJPA
coordJob.setConf(confStr);
coordJob.setJobXml(appXml);
coordJob.setLastActionNumber(0);
- coordJob.setFrequency(1);
+ coordJob.setFrequency("1");
coordJob.setExecution(Execution.FIFO);
coordJob.setConcurrency(1);
try {
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsToBeMaterializedJPAExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsToBeMaterializedJPAExecutor.java?rev=1494020&r1=1494019&r2=1494020&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsToBeMaterializedJPAExecutor.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsToBeMaterializedJPAExecutor.java Tue Jun 18 04:15:58 2013
@@ -116,7 +116,7 @@ public class TestCoordJobsToBeMaterializ
coordJob.setConf(confStr);
coordJob.setJobXml(appXml);
coordJob.setLastActionNumber(0);
- coordJob.setFrequency(1);
+ coordJob.setFrequency("1");
coordJob.setExecution(Execution.FIFO);
coordJob.setConcurrency(1);
try {
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/service/TestCoordMaterializeTriggerService.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestCoordMaterializeTriggerService.java?rev=1494020&r1=1494019&r2=1494020&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/service/TestCoordMaterializeTriggerService.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/service/TestCoordMaterializeTriggerService.java Tue Jun 18 04:15:58 2013
@@ -135,7 +135,7 @@ public class TestCoordMaterializeTrigger
coordJob.setConf(XmlUtils.prettyPrint(conf).toString());
coordJob.setJobXml(appXml);
coordJob.setLastActionNumber(0);
- coordJob.setFrequency(1);
+ coordJob.setFrequency("1");
coordJob.setTimeUnit(Timeunit.DAY);
coordJob.setExecution(Execution.FIFO);
coordJob.setConcurrency(1);
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java?rev=1494020&r1=1494019&r2=1494020&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java Tue Jun 18 04:15:58 2013
@@ -716,7 +716,7 @@ public class TestRecoveryService extends
appXml += "</coordinator-app>";
coordJob.setJobXml(appXml);
coordJob.setLastActionNumber(0);
- coordJob.setFrequency(1);
+ coordJob.setFrequency("1");
coordJob.setExecution(Execution.FIFO);
coordJob.setConcurrency(1);
try {
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockCoordinatorEngineService.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockCoordinatorEngineService.java?rev=1494020&r1=1494019&r2=1494020&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockCoordinatorEngineService.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/servlet/MockCoordinatorEngineService.java Tue Jun 18 04:15:58 2013
@@ -219,7 +219,7 @@ public class MockCoordinatorEngineServic
coordJob.setGroup(GROUP);
coordJob.setConf(CONFIGURATION);
coordJob.setLastActionNumber(0);
- coordJob.setFrequency(1);
+ coordJob.setFrequency("1");
coordJob.setExecution(Execution.FIFO);
coordJob.setConcurrency(1);
try {
@@ -251,7 +251,7 @@ public class MockCoordinatorEngineServic
coordJob.setGroup(GROUP);
coordJob.setConf(conf.toString());
coordJob.setLastActionNumber(0);
- coordJob.setFrequency(1);
+ coordJob.setFrequency("1");
coordJob.setExecution(Execution.FIFO);
coordJob.setConcurrency(1);
try {
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/store/TestCoordinatorStore.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/store/TestCoordinatorStore.java?rev=1494020&r1=1494019&r2=1494020&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/store/TestCoordinatorStore.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/store/TestCoordinatorStore.java Tue Jun 18 04:15:58 2013
@@ -247,13 +247,13 @@ public class TestCoordinatorStore extend
store.beginTrx();
try {
CoordinatorJobBean job = store.getCoordinatorJob(jobId, false);
- int newFreq = job.getFrequency() + 1;
- job.setFrequency(newFreq);
+ int newFreq = Integer.valueOf(job.getFrequency()) + 1;
+ job.setFrequency(Integer.toString(newFreq));
store.updateCoordinatorJob(job);
store.getEntityManager().flush();
store.getEntityManager().merge(job);
job = store.getCoordinatorJob(jobId, false);
- assertEquals(newFreq, job.getFrequency());
+ assertEquals(Integer.toString(newFreq), job.getFrequency());
store.commitTrx();
}
catch (Exception ex) {
@@ -371,7 +371,7 @@ public class TestCoordinatorStore extend
appXml += "</coordinator-app>";
coordJob.setJobXml(appXml);
coordJob.setLastActionNumber(0);
- coordJob.setFrequency(1);
+ coordJob.setFrequency("1");
Date curr = new Date();
coordJob.setNextMaterializedTime(curr);
coordJob.setLastModifiedTime(curr);
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/test/XDataTestCase.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/test/XDataTestCase.java?rev=1494020&r1=1494019&r2=1494020&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/test/XDataTestCase.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/test/XDataTestCase.java Tue Jun 18 04:15:58 2013
@@ -341,7 +341,7 @@ public abstract class XDataTestCase exte
coordJob.setConf(XmlUtils.prettyPrint(conf).toString());
coordJob.setJobXml(appXml);
coordJob.setLastActionNumber(0);
- coordJob.setFrequency(1);
+ coordJob.setFrequency("1");
coordJob.setTimeUnit(Timeunit.DAY);
coordJob.setExecution(Execution.FIFO);
coordJob.setConcurrency(1);
@@ -393,7 +393,7 @@ public abstract class XDataTestCase exte
Configuration conf = getCoordConf(appPath);
coordJob.setConf(XmlUtils.prettyPrint(conf).toString());
coordJob.setJobXml(appXml);
- coordJob.setFrequency(1);
+ coordJob.setFrequency("1");
coordJob.setTimeUnit(Timeunit.DAY);
coordJob.setExecution(Execution.FIFO);
coordJob.setConcurrency(1);
@@ -448,7 +448,7 @@ public abstract class XDataTestCase exte
Configuration conf = getCoordConf(appPath);
coordJob.setConf(XmlUtils.prettyPrint(conf).toString());
coordJob.setJobXml(appXml);
- coordJob.setFrequency(1);
+ coordJob.setFrequency("1");
coordJob.setTimeUnit(Timeunit.DAY);
coordJob.setExecution(Execution.FIFO);
coordJob.setConcurrency(1);
Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1494020&r1=1494019&r2=1494020&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Tue Jun 18 04:15:58 2013
@@ -1,5 +1,6 @@
-- Oozie 4.1.0 release (trunk - unreleased)
+OOZIE-1408 Change column type of "frequency" from int to varchar for coordinators (rkanter)
OOZIE-1420 OOZIE-1365 breaks the action popup in the Web UI (michalisk via rkanter)
OOZIE-1418 Fix bugs around ActionKillX not setting end time, V2SLAServlet and exception handling for event threads (mona)
OOZIE-1365 The hive action popup in the web UI is broken when externalChildIDs is empty string (michalisk via rkanter)
Modified: oozie/trunk/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java
URL: http://svn.apache.org/viewvc/oozie/trunk/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java?rev=1494020&r1=1494019&r2=1494020&view=diff
==============================================================================
--- oozie/trunk/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java (original)
+++ oozie/trunk/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java Tue Jun 18 04:15:58 2013
@@ -442,6 +442,18 @@ public class OozieDBCLI {
ddlQueries.add("UPDATE WF_ACTIONS SET data_temp=data");
ddlQueries.add("ALTER TABLE WF_ACTIONS DROP COLUMN data");
ddlQueries.add("RENAME COLUMN WF_ACTIONS.data_temp TO data");
+ // change coord_jobs.frequency from int to varchar(255)
+ // Derby doesn't support INTEGER to VARCHAR, so: INTEGER --> CHAR --> VARCHAR
+ // http://java.dzone.com/articles/derby-casting-madness-â-sequel
+ // Also, max CHAR length is 254 (so can't use 255)
+ // And we have to trim when casting from CHAR to VARCHAR because of the added whitespace in CHAR
+ ddlQueries.add("ALTER TABLE COORD_JOBS ADD COLUMN frequency_temp_a CHAR(254)");
+ ddlQueries.add("UPDATE COORD_JOBS SET frequency_temp_a=CAST(frequency AS CHAR(254))");
+ ddlQueries.add("ALTER TABLE COORD_JOBS ADD COLUMN frequency_temp_b VARCHAR(255)");
+ ddlQueries.add("UPDATE COORD_JOBS SET frequency_temp_b=TRIM(CAST(frequency_temp_a AS VARCHAR(255)))");
+ ddlQueries.add("ALTER TABLE COORD_JOBS DROP COLUMN frequency_temp_a");
+ ddlQueries.add("ALTER TABLE COORD_JOBS DROP COLUMN frequency");
+ ddlQueries.add("RENAME COLUMN COORD_JOBS.frequency_temp_b TO frequency");
}
else
if (dbVendor.equals("oracle")) {
@@ -476,6 +488,11 @@ public class OozieDBCLI {
ddlQueries.add("UPDATE WF_ACTIONS SET data_temp = data");
ddlQueries.add("ALTER TABLE WF_ACTIONS DROP COLUMN data");
ddlQueries.add("ALTER TABLE WF_ACTIONS RENAME COLUMN data_temp TO data");
+ // change coord_jobs.frequency from int to varchar(255)
+ ddlQueries.add("ALTER TABLE COORD_JOBS ADD (frequency_temp VARCHAR2(255))");
+ ddlQueries.add("UPDATE COORD_JOBS SET frequency_temp = CAST(frequency AS VARCHAR(255))");
+ ddlQueries.add("ALTER TABLE COORD_JOBS DROP COLUMN frequency");
+ ddlQueries.add("ALTER TABLE COORD_JOBS RENAME COLUMN frequency_temp TO frequency");
}
else
if (dbVendor.equals("mysql")) {
@@ -486,6 +503,7 @@ public class OozieDBCLI {
ddlQueries.add("ALTER TABLE WF_ACTIONS MODIFY sla_xml VARCHAR(4000)");
ddlQueries.add("ALTER TABLE WF_ACTIONS MODIFY error_message VARCHAR(4000)");
ddlQueries.add("ALTER TABLE WF_ACTIONS MODIFY data VARCHAR(4000)");
+ ddlQueries.add("ALTER TABLE COORD_JOBS MODIFY frequency VARCHAR(255)");
}
else
if (dbVendor.equals("postgresql")) {
@@ -496,6 +514,7 @@ public class OozieDBCLI {
ddlQueries.add("ALTER TABLE WF_ACTIONS ALTER COLUMN sla_xml TYPE VARCHAR(4000)");
ddlQueries.add("ALTER TABLE WF_ACTIONS ALTER COLUMN error_message TYPE VARCHAR(4000)");
ddlQueries.add("ALTER TABLE WF_ACTIONS ALTER COLUMN data TYPE VARCHAR(4000)");
+ ddlQueries.add("ALTER TABLE COORD_JOBS ALTER COLUMN frequency TYPE VARCHAR(255)");
}
Connection conn = (run) ? createConnection() : null;
@@ -503,6 +522,7 @@ public class OozieDBCLI {
System.out.println("Table 'WF_ACTIONS' column 'execution_path', length changed to 1024");
System.out.println("Table 'COORD_JOB/ACTIONS, WF_JOBS/ACTIONS' column 'sla_xml', changed to varchar/varchar2");
System.out.println("Table 'WF_ACTIONS, column 'error_message/data', changed to varchar/varchar2");
+ System.out.println("Table 'COORD_JOB' column 'frequency' changed to varchar/varchar2");
for(String query : ddlQueries){
writer.println(query + ";");
if (run) {