Repository: oozie Updated Branches: refs/heads/master bdd4914fa -> 31dbb1bff
OOZIE-2120 Many JPAExecutor names are wrong (rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/31dbb1bf Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/31dbb1bf Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/31dbb1bf Branch: refs/heads/master Commit: 31dbb1bff8876a04d5a43a7c249aac0538b614dc Parents: bdd4914 Author: Robert Kanter <[email protected]> Authored: Sun Jan 25 23:20:06 2015 -0800 Committer: Robert Kanter <[email protected]> Committed: Sun Jan 25 23:20:06 2015 -0800 ---------------------------------------------------------------------- .../apache/oozie/executor/jpa/BundleJobsDeleteJPAExecutor.java | 2 +- .../oozie/executor/jpa/CoordActionGetForStartJPAExecutor.java | 2 +- .../jpa/CoordJobGetActionModifiedDateForRangeJPAExecutor.java | 2 +- .../jpa/CoordJobGetActionRunningCountForRangeJPAExecutor.java | 2 +- .../org/apache/oozie/executor/jpa/CoordJobInfoGetJPAExecutor.java | 2 +- .../jpa/CoordJobsCountNotForPurgeFromParentIdJPAExecutor.java | 2 +- .../oozie/executor/jpa/CoordJobsGetFromParentIdJPAExecutor.java | 2 +- .../executor/jpa/CoordinatorJobGetForUserAppnameJPAExecutor.java | 3 ++- .../oozie/executor/jpa/SLAEventsGetForFilterJPAExecutor.java | 2 +- release-log.txt | 1 + 10 files changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/31dbb1bf/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsDeleteJPAExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsDeleteJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsDeleteJPAExecutor.java index 9f173e0..c651d85 100644 --- a/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsDeleteJPAExecutor.java +++ b/core/src/main/java/org/apache/oozie/executor/jpa/BundleJobsDeleteJPAExecutor.java @@ -59,7 +59,7 @@ public class BundleJobsDeleteJPAExecutor implements JPAExecutor<Integer> { */ @Override public String getName() { - return "CoordJobsDeleteJPAExecutor"; + return "BundleJobsDeleteJPAExecutor"; } /* http://git-wip-us.apache.org/repos/asf/oozie/blob/31dbb1bf/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForStartJPAExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForStartJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForStartJPAExecutor.java index 83faed4..a2a846e 100644 --- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForStartJPAExecutor.java +++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionGetForStartJPAExecutor.java @@ -47,7 +47,7 @@ public class CoordActionGetForStartJPAExecutor implements JPAExecutor<Coordinato */ @Override public String getName() { - return "CoordActionGetForStartExecutor"; + return "CoordActionGetForStartJPAExecutor"; } /* (non-Javadoc) http://git-wip-us.apache.org/repos/asf/oozie/blob/31dbb1bf/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionModifiedDateForRangeJPAExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionModifiedDateForRangeJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionModifiedDateForRangeJPAExecutor.java index 3b9c53b..2177514 100644 --- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionModifiedDateForRangeJPAExecutor.java +++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionModifiedDateForRangeJPAExecutor.java @@ -44,7 +44,7 @@ public class CoordJobGetActionModifiedDateForRangeJPAExecutor implements JPAExec @Override public String getName() { - return "CoordJobGetActionIdsForDateRangeJPAExecutor"; + return "CoordJobGetActionModifiedDateForRangeJPAExecutor"; } @Override http://git-wip-us.apache.org/repos/asf/oozie/blob/31dbb1bf/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionRunningCountForRangeJPAExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionRunningCountForRangeJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionRunningCountForRangeJPAExecutor.java index c3934d9..34223bb 100644 --- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionRunningCountForRangeJPAExecutor.java +++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionRunningCountForRangeJPAExecutor.java @@ -37,7 +37,7 @@ public class CoordJobGetActionRunningCountForRangeJPAExecutor implements JPAExec @Override public String getName() { - return "CoordJobGetActionIdsForDateRangeJPAExecutor"; + return "CoordJobGetActionRunningCountForRangeJPAExecutor"; } @Override http://git-wip-us.apache.org/repos/asf/oozie/blob/31dbb1bf/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobInfoGetJPAExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobInfoGetJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobInfoGetJPAExecutor.java index be912dd..c924f44 100644 --- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobInfoGetJPAExecutor.java +++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobInfoGetJPAExecutor.java @@ -57,7 +57,7 @@ public class CoordJobInfoGetJPAExecutor implements JPAExecutor<CoordinatorJobInf @Override public String getName() { - return "CoordInfoGetJPAExecutor"; + return "CoordJobInfoGetJPAExecutor"; } @Override http://git-wip-us.apache.org/repos/asf/oozie/blob/31dbb1bf/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsCountNotForPurgeFromParentIdJPAExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsCountNotForPurgeFromParentIdJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsCountNotForPurgeFromParentIdJPAExecutor.java index 928d402..15d56f9 100644 --- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsCountNotForPurgeFromParentIdJPAExecutor.java +++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsCountNotForPurgeFromParentIdJPAExecutor.java @@ -44,7 +44,7 @@ public class CoordJobsCountNotForPurgeFromParentIdJPAExecutor implements JPAExec */ @Override public String getName() { - return "CoordChildrenCountNotForPurgeJPAExecutor"; + return "CoordJobsCountNotForPurgeFromParentIdJPAExecutor"; } /* (non-Javadoc) http://git-wip-us.apache.org/repos/asf/oozie/blob/31dbb1bf/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsGetFromParentIdJPAExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsGetFromParentIdJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsGetFromParentIdJPAExecutor.java index e47f799..13e270b 100644 --- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsGetFromParentIdJPAExecutor.java +++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobsGetFromParentIdJPAExecutor.java @@ -49,7 +49,7 @@ public class CoordJobsGetFromParentIdJPAExecutor implements JPAExecutor<List<Str */ @Override public String getName() { - return "CoordinatorJobsGetFromParentIdJPAExecutor"; + return "CoordJobsGetFromParentIdJPAExecutor"; } /* (non-Javadoc) http://git-wip-us.apache.org/repos/asf/oozie/blob/31dbb1bf/core/src/main/java/org/apache/oozie/executor/jpa/CoordinatorJobGetForUserAppnameJPAExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordinatorJobGetForUserAppnameJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordinatorJobGetForUserAppnameJPAExecutor.java index 1d2c058..3bb2f88 100644 --- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordinatorJobGetForUserAppnameJPAExecutor.java +++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordinatorJobGetForUserAppnameJPAExecutor.java @@ -42,8 +42,9 @@ public class CoordinatorJobGetForUserAppnameJPAExecutor implements JPAExecutor<C * * @see org.apache.oozie.executor.jpa.JPAExecutor#getName() */ + @Override public String getName() { - return "CoordJobGetForUserAppnameJPAExecutor"; + return "CoordinatorJobGetForUserAppnameJPAExecutor"; } /* http://git-wip-us.apache.org/repos/asf/oozie/blob/31dbb1bf/core/src/main/java/org/apache/oozie/executor/jpa/SLAEventsGetForFilterJPAExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/SLAEventsGetForFilterJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/SLAEventsGetForFilterJPAExecutor.java index 1247646..7797ff5 100644 --- a/core/src/main/java/org/apache/oozie/executor/jpa/SLAEventsGetForFilterJPAExecutor.java +++ b/core/src/main/java/org/apache/oozie/executor/jpa/SLAEventsGetForFilterJPAExecutor.java @@ -51,7 +51,7 @@ public class SLAEventsGetForFilterJPAExecutor implements JPAExecutor<List<SLAEve @Override public String getName() { - return "SLAEventsGetForJobIdJPAExecutor"; + return "SLAEventsGetForFilterJPAExecutor"; } @Override http://git-wip-us.apache.org/repos/asf/oozie/blob/31dbb1bf/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index b834cbc..4c60c64 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.2.0 release (trunk - unreleased) +OOZIE-2120 Many JPAExecutor names are wrong (rkanter) OOZIE-1722 Add support to Hadoop-2 for AM restarts of the launcher job (jaydeepvishwakarma via rkanter) OOZIE-2107 Schema config properties should be consistent with ActionExecutor config properties (rkanter) OOZIE-1730 Change hadoop-2 profile to use 2.4.0 (jaydeepvishwakarma via rkanter)
