Repository: falcon Updated Branches: refs/heads/master f37729df0 -> 223ea456e
FALCON-1074 EntityUtil getInstanceSequence is buggy. Contributed by Ajay Yadava Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/223ea456 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/223ea456 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/223ea456 Branch: refs/heads/master Commit: 223ea456e4d69d548901bc4532a6dc243b29c76b Parents: f37729d Author: Suhas Vasu <[email protected]> Authored: Tue Mar 10 19:06:43 2015 +0530 Committer: Suhas Vasu <[email protected]> Committed: Tue Mar 10 19:06:43 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../main/java/org/apache/falcon/entity/EntityUtil.java | 8 ++++---- .../java/org/apache/falcon/entity/EntityUtilTest.java | 11 +++++++++++ 3 files changed, 17 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/223ea456/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 1debcba..bbb63ae 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -10,6 +10,8 @@ Trunk (Unreleased) FALCON-822 Add reverse look up API (Ajay Yadava via Suhas Vasu) IMPROVEMENTS + FALCON-1074 EntityUtil getInstanceSequence is buggy (Ajay Yadava via Suhas vasu) + FALCON-1024 Updating tags and pipeline elements of the feed/process definition resubmits a new Oozie bundle (Pallavi Rao via Suhas Vasu) http://git-wip-us.apache.org/repos/asf/falcon/blob/223ea456/common/src/main/java/org/apache/falcon/entity/EntityUtil.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/falcon/entity/EntityUtil.java b/common/src/main/java/org/apache/falcon/entity/EntityUtil.java index dbeba26..f27bcad 100644 --- a/common/src/main/java/org/apache/falcon/entity/EntityUtil.java +++ b/common/src/main/java/org/apache/falcon/entity/EntityUtil.java @@ -60,10 +60,10 @@ import java.util.*; public final class EntityUtil { public static final Logger LOG = LoggerFactory.getLogger(EntityUtil.class); - private static final long MINUTE_IN_MS = 60000L; - private static final long HOUR_IN_MS = 3600000L; - private static final long DAY_IN_MS = 86400000L; - private static final long MONTH_IN_MS = 2592000000L; + private static final long MINUTE_IN_MS = 60 * 1000L; + private static final long HOUR_IN_MS = 60 * MINUTE_IN_MS; + private static final long DAY_IN_MS = 24 * HOUR_IN_MS; + private static final long MONTH_IN_MS = 31 * DAY_IN_MS; public static final String SUCCEEDED_FILE_NAME = "_SUCCESS"; http://git-wip-us.apache.org/repos/asf/falcon/blob/223ea456/common/src/test/java/org/apache/falcon/entity/EntityUtilTest.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/falcon/entity/EntityUtilTest.java b/common/src/test/java/org/apache/falcon/entity/EntityUtilTest.java index 3d501a7..370be5f 100644 --- a/common/src/test/java/org/apache/falcon/entity/EntityUtilTest.java +++ b/common/src/test/java/org/apache/falcon/entity/EntityUtilTest.java @@ -216,6 +216,17 @@ public class EntityUtilTest extends AbstractTestBase { } @Test + public void testGetNextStartTimeMonthly() throws Exception { + Date startDate = getDate("2012-06-02 10:00 UTC"); + Date nextAfter = getDate("2136-06-02 10:00 UTC"); + Frequency frequency = Frequency.fromString("months(1)"); + TimeZone timeZone = TimeZone.getTimeZone("UTC"); + Date expectedResult = nextAfter; + Date result = EntityUtil.getNextStartTime(startDate, frequency, tz, nextAfter); + Assert.assertEquals(result, expectedResult); + } + + @Test public void testGetEntityStartEndDates() throws Exception { Process process = (Process) EntityType.PROCESS.getUnmarshaller().unmarshal( getClass().getResourceAsStream(PROCESS_XML));
