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/01/24 08:34:16 UTC
svn commit: r1235153 - in /incubator/oozie/trunk:
core/src/main/java/org/apache/oozie/coord/TimeUnit.java
core/src/test/java/org/apache/oozie/coord/TestCoordELFunctions.java
docs/src/site/twiki/CoordinatorFunctionalSpec.twiki release-log.txt
Author: kamrul
Date: Tue Jan 24 07:34:16 2012
New Revision: 1235153
URL: http://svn.apache.org/viewvc?rev=1235153&view=rev
Log:
OOZIE-642: Year support in dateOffset() El function.(Virag via Mohammad)
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/coord/TimeUnit.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/coord/TestCoordELFunctions.java
incubator/oozie/trunk/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki
incubator/oozie/trunk/release-log.txt
Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/coord/TimeUnit.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/coord/TimeUnit.java?rev=1235153&r1=1235152&r2=1235153&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/coord/TimeUnit.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/coord/TimeUnit.java Tue Jan 24 07:34:16 2012
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,7 @@ package org.apache.oozie.coord;
import java.util.Calendar;
public enum TimeUnit {
- MINUTE(Calendar.MINUTE), HOUR(Calendar.HOUR), DAY(Calendar.DATE), MONTH(Calendar.MONTH), END_OF_DAY(Calendar.DATE), END_OF_MONTH(
+ MINUTE(Calendar.MINUTE), HOUR(Calendar.HOUR), DAY(Calendar.DATE), MONTH(Calendar.MONTH), YEAR(Calendar.YEAR), END_OF_DAY(Calendar.DATE), END_OF_MONTH(
Calendar.MONTH), NONE(-1);
private int calendarUnit;
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/coord/TestCoordELFunctions.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/coord/TestCoordELFunctions.java?rev=1235153&r1=1235152&r2=1235153&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/coord/TestCoordELFunctions.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/coord/TestCoordELFunctions.java Tue Jan 24 07:34:16 2012
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -359,6 +359,9 @@ public class TestCoordELFunctions extend
expr = "${coord:dateOffset(\"2009-09-08T23:59Z\", -1, \"DAY\")}";
assertEquals("2009-09-07T23:59Z", CoordELFunctions.evalAndWrap(eval, expr));
+
+ expr = "${coord:dateOffset(\"2009-09-08T23:59Z\", 1, \"YEAR\")}";
+ assertEquals("2010-09-08T23:59Z", CoordELFunctions.evalAndWrap(eval, expr));
}
public void testCurrent() throws Exception {
Modified: incubator/oozie/trunk/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki?rev=1235153&r1=1235152&r2=1235153&view=diff
==============================================================================
--- incubator/oozie/trunk/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki (original)
+++ incubator/oozie/trunk/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki Tue Jan 24 07:34:16 2012
@@ -2024,7 +2024,7 @@ This section describes the EL functions
The =${coord:dateOffset(String baseDate, int instance, String timeUnit)}= EL function calculates date based on the following equaltion : =newDate = baseDate + instance, * timeUnit=
-For example, if baseDate is '2009-01-01T00:00Z', instance is '2' and timeUnit is 'MONTH', the return date will be' 2009-03-01T00:00Z'.
+For example, if baseDate is '2009-01-01T00:00Z', instance is '2' and timeUnit is 'MONTH', the return date will be '2009-03-01T00:00Z'. If baseDate is '2009-01-01T00:00Z', instance is '1' and timeUnit is 'YEAR', the return date will be '2010-01-01T00:00Z'.
*%GREEN% Example: %ENDCOLOR%*:
Modified: incubator/oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1235153&r1=1235152&r2=1235153&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Tue Jan 24 07:34:16 2012
@@ -1,5 +1,6 @@
-- Oozie 3.2.0 release
+OOZIE-642: Year support in dateOffset() El function.(Virag via Mohammad)
OOZIE-652 Add proxyuser capabilities to Oozie HTTP API. (tucu)
OOZIE-591: Oozie continues to materialize new actions after end date modification (Mohamed Battisha vis Angelo)
OOZIE-639 Hive sharelib POM must exclude hadoop-core. (tucu)