Repository: oozie Updated Branches: refs/heads/master d5cd976a8 -> 87fbc8404
OOZIE-1997 Oozie cannot materialize coordinator job with sqlserver in windows (bzhang) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/87fbc840 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/87fbc840 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/87fbc840 Branch: refs/heads/master Commit: 87fbc840431bab393bdec68df78cb5828efe146d Parents: d5cd976 Author: Bowen Zhang <[email protected]> Authored: Wed Sep 10 13:39:33 2014 -0700 Committer: Bowen Zhang <[email protected]> Committed: Thu Sep 11 09:55:45 2014 -0700 ---------------------------------------------------------------------- core/src/main/java/org/apache/oozie/CoordinatorJobBean.java | 2 +- release-log.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/87fbc840/core/src/main/java/org/apache/oozie/CoordinatorJobBean.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/CoordinatorJobBean.java b/core/src/main/java/org/apache/oozie/CoordinatorJobBean.java index 3dc7450..71a9ab4 100644 --- a/core/src/main/java/org/apache/oozie/CoordinatorJobBean.java +++ b/core/src/main/java/org/apache/oozie/CoordinatorJobBean.java @@ -109,7 +109,7 @@ import org.json.simple.JSONObject; //TODO need to remove. @NamedQuery(name = "GET_COORD_JOBS_OLDER_THAN", query = "select OBJECT(w) from CoordinatorJobBean w where w.startTimestamp <= :matTime AND (w.statusStr = 'PREP' OR w.statusStr = 'RUNNING' or w.statusStr = 'RUNNINGWITHERROR') AND (w.nextMaterializedTimestamp < :matTime OR w.nextMaterializedTimestamp IS NULL) AND (w.nextMaterializedTimestamp IS NULL OR (w.endTimestamp > w.nextMaterializedTimestamp AND (w.pauseTimestamp IS NULL OR w.pauseTimestamp > w.nextMaterializedTimestamp))) order by w.lastModifiedTimestamp"), - @NamedQuery(name = "GET_COORD_JOBS_OLDER_FOR_MATERILZATION", query = "select w.id from CoordinatorJobBean w where w.startTimestamp <= :matTime AND (w.statusStr = 'PREP' OR w.statusStr = 'RUNNING' or w.statusStr = 'RUNNINGWITHERROR') AND (w.nextMaterializedTimestamp < :matTime OR w.nextMaterializedTimestamp IS NULL) AND (w.nextMaterializedTimestamp IS NULL OR (w.endTimestamp > w.nextMaterializedTimestamp AND (w.pauseTimestamp IS NULL OR w.pauseTimestamp > w.nextMaterializedTimestamp))) and w.matThrottling > ( select count(w.id) from CoordinatorActionBean a where a.jobId = w.id and a.statusStr = 'WAITING') order by w.lastModifiedTimestamp"), + @NamedQuery(name = "GET_COORD_JOBS_OLDER_FOR_MATERILZATION", query = "select w.id from CoordinatorJobBean w where w.startTimestamp <= :matTime AND (w.statusStr = 'PREP' OR w.statusStr = 'RUNNING' or w.statusStr = 'RUNNINGWITHERROR') AND (w.nextMaterializedTimestamp < :matTime OR w.nextMaterializedTimestamp IS NULL) AND (w.nextMaterializedTimestamp IS NULL OR (w.endTimestamp > w.nextMaterializedTimestamp AND (w.pauseTimestamp IS NULL OR w.pauseTimestamp > w.nextMaterializedTimestamp))) and w.matThrottling > ( select count(a.jobId) from CoordinatorActionBean a where a.jobId = w.id and a.statusStr = 'WAITING') order by w.lastModifiedTimestamp"), @NamedQuery(name = "GET_COORD_JOBS_OLDER_THAN_STATUS", query = "select OBJECT(w) from CoordinatorJobBean w where w.statusStr = :status AND w.lastModifiedTimestamp <= :lastModTime order by w.lastModifiedTimestamp"), http://git-wip-us.apache.org/repos/asf/oozie/blob/87fbc840/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 4b33e0a..8e7dd03 100644 --- a/release-log.txt +++ b/release-log.txt @@ -20,6 +20,7 @@ OOZIE-1943 Bump up trunk to 4.2.0-SNAPSHOT (bzhang) -- Oozie 4.1.0 release (4.1 - unreleased) +OOZIE-1997 Oozie cannot materialize coordinator job with sqlserver in windows (bzhang) OOZIE-1989 NPE during a rerun with forks (rkanter) OOZIE-1945 NPE in JaveActionExecutor#check() (sree2k via rkanter) OOZIE-1984 SLACalculator in HA mode performs duplicate operations on records with completed jobs (mona)
