Repository: oozie Updated Branches: refs/heads/master d8aca11d8 -> 9acaf0431
OOZIE-1889 Convert NamedNativeQueries to JPQL (dvillegas via shwethags) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/9acaf043 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/9acaf043 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/9acaf043 Branch: refs/heads/master Commit: 9acaf0431c748de8fe29f30a1a32b5ef450beea3 Parents: d8aca11 Author: shwethags <[email protected]> Authored: Tue Dec 30 11:50:29 2014 +0530 Committer: shwethags <[email protected]> Committed: Tue Dec 30 11:50:29 2014 +0530 ---------------------------------------------------------------------- .../java/org/apache/oozie/CoordinatorActionBean.java | 11 ++--------- .../jpa/CoordActionsGetReadyGroupbyJobIDJPAExecutor.java | 2 +- .../java/org/apache/oozie/store/CoordinatorStore.java | 2 +- release-log.txt | 1 + 4 files changed, 5 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/9acaf043/core/src/main/java/org/apache/oozie/CoordinatorActionBean.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/CoordinatorActionBean.java b/core/src/main/java/org/apache/oozie/CoordinatorActionBean.java index 25859dd..bd01d14 100644 --- a/core/src/main/java/org/apache/oozie/CoordinatorActionBean.java +++ b/core/src/main/java/org/apache/oozie/CoordinatorActionBean.java @@ -50,11 +50,6 @@ import java.text.MessageFormat; import java.util.Date; import java.util.List; -@SqlResultSetMapping( - name = "CoordActionJobIdLmt", - columns = {@ColumnResult(name = "job_id"), - @ColumnResult(name = "min_lmt")}) - @Entity @NamedQueries({ @@ -166,12 +161,10 @@ import java.util.List; @NamedQuery(name = "GET_COORD_ACTIONS_COUNT_RUNNING_FOR_RANGE", query = "select count(w) from CoordinatorActionBean w where w.statusStr = 'RUNNING' and w.jobId= :jobId and w.id >= :startAction AND w.id <= :endAction"), - @NamedQuery(name = "GET_COORD_ACTIONS_MAX_MODIFIED_DATE_FOR_RANGE", query = "select max(w.lastModifiedTimestamp) from CoordinatorActionBean w where w.jobId= :jobId and w.id >= :startAction AND w.id <= :endAction")}) + @NamedQuery(name = "GET_COORD_ACTIONS_MAX_MODIFIED_DATE_FOR_RANGE", query = "select max(w.lastModifiedTimestamp) from CoordinatorActionBean w where w.jobId= :jobId and w.id >= :startAction AND w.id <= :endAction"), -@NamedNativeQueries({ + @NamedQuery(name = "GET_READY_ACTIONS_GROUP_BY_JOBID", query = "select a.jobId, min(a.lastModifiedTimestamp) from CoordinatorActionBean a where a.statusStr = 'READY' group by a.jobId having min(a.lastModifiedTimestamp) < :lastModifiedTime")}) - @NamedNativeQuery(name = "GET_READY_ACTIONS_GROUP_BY_JOBID", query = "select a.job_id as job_id, MIN(a.last_modified_time) as min_lmt from COORD_ACTIONS a where a.status = 'READY' GROUP BY a.job_id HAVING MIN(a.last_modified_time) < ?", resultSetMapping = "CoordActionJobIdLmt") - }) @Table(name = "COORD_ACTIONS") public class CoordinatorActionBean implements Writable,CoordinatorAction,JsonBean { http://git-wip-us.apache.org/repos/asf/oozie/blob/9acaf043/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsGetReadyGroupbyJobIDJPAExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsGetReadyGroupbyJobIDJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsGetReadyGroupbyJobIDJPAExecutor.java index 01105c1..3a85e5c 100644 --- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsGetReadyGroupbyJobIDJPAExecutor.java +++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordActionsGetReadyGroupbyJobIDJPAExecutor.java @@ -53,7 +53,7 @@ public class CoordActionsGetReadyGroupbyJobIDJPAExecutor implements JPAExecutor< try { Query q = em.createNamedQuery("GET_READY_ACTIONS_GROUP_BY_JOBID"); Timestamp ts = new Timestamp(System.currentTimeMillis() - checkAgeSecs * 1000); - q.setParameter(1, ts); + q.setParameter("lastModifiedTime", ts); List<Object[]> list = q.getResultList(); for (Object[] arr : list) { http://git-wip-us.apache.org/repos/asf/oozie/blob/9acaf043/core/src/main/java/org/apache/oozie/store/CoordinatorStore.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/store/CoordinatorStore.java b/core/src/main/java/org/apache/oozie/store/CoordinatorStore.java index 72d96f1..1bb7860 100644 --- a/core/src/main/java/org/apache/oozie/store/CoordinatorStore.java +++ b/core/src/main/java/org/apache/oozie/store/CoordinatorStore.java @@ -875,7 +875,7 @@ public class CoordinatorStore extends Store { try { Query q = entityManager.createNamedQuery("GET_READY_ACTIONS_GROUP_BY_JOBID"); Timestamp ts = new Timestamp(System.currentTimeMillis() - checkAgeSecs * 1000); - q.setParameter(1, ts); + q.setParameter("lastModifiedTime", ts); List<Object[]> list = q.getResultList(); for (Object[] arr : list) { http://git-wip-us.apache.org/repos/asf/oozie/blob/9acaf043/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index c551ec9..74ef9bc 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.2.0 release (trunk - unreleased) +OOZIE-1889 Convert NamedNativeQueries to JPQL (dvillegas via shwethags) OOZIE-1876 use pom properties rather than specific version numbers in the pom files of hbaselibs, hcataloglibs, sharelib, etc (shwethags) OOZIE-2027 Disable re-runs using the workflow directly if it has a parent (jaydeepvishwakarma via shwethags) OOZIE-2098 Add Apache parent POM to oozie (sureshms via bzhang)
