Repository: oozie Updated Branches: refs/heads/master 810390155 -> 6c01dc7ff
OOZIE-3310 SQL error during /v2/sla filtering (asalamon74 via andras.piros) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/6c01dc7f Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/6c01dc7f Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/6c01dc7f Branch: refs/heads/master Commit: 6c01dc7ffbedddbecda2e54b512091d88a414f23 Parents: 8103901 Author: Andras Piros <[email protected]> Authored: Tue Jul 31 13:37:39 2018 +0200 Committer: Andras Piros <[email protected]> Committed: Tue Jul 31 13:37:39 2018 +0200 ---------------------------------------------------------------------- .../jpa/sla/SLASummaryGetForFilterJPAExecutor.java | 7 ++++++- .../org/apache/oozie/servlet/TestV2SLAServlet.java | 17 +++++++++++++++++ release-log.txt | 1 + 3 files changed, 24 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/6c01dc7f/core/src/main/java/org/apache/oozie/executor/jpa/sla/SLASummaryGetForFilterJPAExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/sla/SLASummaryGetForFilterJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/sla/SLASummaryGetForFilterJPAExecutor.java index 3fd4793..b54161e 100644 --- a/core/src/main/java/org/apache/oozie/executor/jpa/sla/SLASummaryGetForFilterJPAExecutor.java +++ b/core/src/main/java/org/apache/oozie/executor/jpa/sla/SLASummaryGetForFilterJPAExecutor.java @@ -87,7 +87,12 @@ public class SLASummaryGetForFilterJPAExecutor implements JPAExecutor<List<SLASu queryParams.put("parentId", filter.getParentId()); } if (filter.getBundleId() != null || filter.getBundleName() != null) { - firstCondition = false; + if (firstCondition) { + firstCondition = false; + } + else { + sb.append(" AND "); + } Query bq; List<Object> returnList; try { http://git-wip-us.apache.org/repos/asf/oozie/blob/6c01dc7f/core/src/test/java/org/apache/oozie/servlet/TestV2SLAServlet.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/servlet/TestV2SLAServlet.java b/core/src/test/java/org/apache/oozie/servlet/TestV2SLAServlet.java index c2bbf1e..aa63322 100644 --- a/core/src/test/java/org/apache/oozie/servlet/TestV2SLAServlet.java +++ b/core/src/test/java/org/apache/oozie/servlet/TestV2SLAServlet.java @@ -204,6 +204,23 @@ public class TestV2SLAServlet extends DagServletTestCase { } } + //test filter id + bundle ID + queryParams.put(RestConstants.TIME_ZONE_PARAM, "GMT"); + queryParams.put(RestConstants.JOBS_FILTER_PARAM, + String.format("id=%s;bundle=%s", cjBean2.getId() + "@1", bundleId)); + array = getSLAJSONResponse(queryParams); + assertEquals("sla filter result size for id + bundleId", 1, array.size()); + for (int i=0; i < array.size(); i++) { + JSONObject json = (JSONObject) array.get(i); + String id = (String)json.get(JsonTags.SLA_SUMMARY_ID); + if (id.equals(cjBean1.getId() + "@1")) { + assertEquals("id + bundleId filter summary start delay", -2L, json.get(JsonTags.SLA_SUMMARY_START_DELAY)); + assertEquals("id + bundleId filter summary duration delay", 0L, + json.get(JsonTags.SLA_SUMMARY_DURATION_DELAY)); + assertEquals("id + bundleId filter summary end delay", -1L, json.get(JsonTags.SLA_SUMMARY_END_DELAY)); + } + } + //test filter bundle Name queryParams.clear(); queryParams.put(RestConstants.TIME_ZONE_PARAM, "GMT"); http://git-wip-us.apache.org/repos/asf/oozie/blob/6c01dc7f/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index bb98c3d..f04eeb2 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.1.0 release (trunk - unreleased) +OOZIE-3310 SQL error during /v2/sla filtering (asalamon74 via andras.piros) OOZIE-2942 [examples] Fix Findbugs warnings (Jan Hentschel, kmarton via andras.piros) OOZIE-2718 Improve -dryrun for bundles (zhengxb2005, asalamon74 via andras.piros) OOZIE-3156 amend Retry SSH action check when cannot connect to remote host (txsing, matijhs via andras.piros)
