From commits-return-3677-apmail-oozie-commits-archive=oozie.apache.org@oozie.apache.org Fri Aug 1 17:07:24 2014 Return-Path: X-Original-To: apmail-oozie-commits-archive@www.apache.org Delivered-To: apmail-oozie-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 901CA111FA for ; Fri, 1 Aug 2014 17:07:24 +0000 (UTC) Received: (qmail 13868 invoked by uid 500); 1 Aug 2014 17:07:22 -0000 Delivered-To: apmail-oozie-commits-archive@oozie.apache.org Received: (qmail 13734 invoked by uid 500); 1 Aug 2014 17:07:22 -0000 Mailing-List: contact commits-help@oozie.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@oozie.apache.org Delivered-To: mailing list commits@oozie.apache.org Received: (qmail 13604 invoked by uid 99); 1 Aug 2014 17:07:22 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Aug 2014 17:07:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0C3579BDA78; Fri, 1 Aug 2014 17:07:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bzhang@apache.org To: commits@oozie.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: OOZIE-1930 oozie coordinator "-info desc" returns earliest instead of latest actions when specifying "len" after oozie-1532 (bzhang) Date: Fri, 1 Aug 2014 17:07:22 +0000 (UTC) Repository: oozie Updated Branches: refs/heads/branch-4.1 2a9a585e2 -> e1b8d97e7 OOZIE-1930 oozie coordinator "-info desc" returns earliest instead of latest actions when specifying "len" after oozie-1532 (bzhang) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/e1b8d97e Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/e1b8d97e Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/e1b8d97e Branch: refs/heads/branch-4.1 Commit: e1b8d97e7d38345f45163a1e6fdfe8b3b30d9909 Parents: 2a9a585 Author: Bowen Zhang Authored: Fri Aug 1 10:05:50 2014 -0700 Committer: Bowen Zhang Committed: Fri Aug 1 10:06:59 2014 -0700 ---------------------------------------------------------------------- .../org/apache/oozie/CoordinatorEngine.java | 4 +-- .../oozie/command/coord/CoordJobXCommand.java | 14 ++++----- .../CoordJobGetActionsSubsetJPAExecutor.java | 33 ++++---------------- .../org/apache/oozie/servlet/V1JobServlet.java | 6 ++-- release-log.txt | 1 + 5 files changed, 19 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/e1b8d97e/core/src/main/java/org/apache/oozie/CoordinatorEngine.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/CoordinatorEngine.java b/core/src/main/java/org/apache/oozie/CoordinatorEngine.java index 1011b9e..dd5c703 100644 --- a/core/src/main/java/org/apache/oozie/CoordinatorEngine.java +++ b/core/src/main/java/org/apache/oozie/CoordinatorEngine.java @@ -158,11 +158,11 @@ public class CoordinatorEngine extends BaseEngine { * @see org.apache.oozie.BaseEngine#getCoordJob(java.lang.String, java.lang.String, int, int) */ @Override - public CoordinatorJobBean getCoordJob(String jobId, String filter, int start, int length, boolean desc) + public CoordinatorJobBean getCoordJob(String jobId, String filter, int offset, int length, boolean desc) throws BaseEngineException { Map> filterMap = parseStatusFilter(filter); try { - return new CoordJobXCommand(jobId, filterMap, start, length, desc) + return new CoordJobXCommand(jobId, filterMap, offset, length, desc) .call(); } catch (CommandException ex) { http://git-wip-us.apache.org/repos/asf/oozie/blob/e1b8d97e/core/src/main/java/org/apache/oozie/command/coord/CoordJobXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordJobXCommand.java b/core/src/main/java/org/apache/oozie/command/coord/CoordJobXCommand.java index c872c48..5eaf062 100644 --- a/core/src/main/java/org/apache/oozie/command/coord/CoordJobXCommand.java +++ b/core/src/main/java/org/apache/oozie/command/coord/CoordJobXCommand.java @@ -18,7 +18,6 @@ package org.apache.oozie.command.coord; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Map; @@ -41,7 +40,7 @@ import org.apache.oozie.util.ParamChecker; public class CoordJobXCommand extends CoordinatorXCommand { private final String id; private final boolean getActionInfo; - private int start = 1; + private int offset = 1; private int len = Integer.MAX_VALUE; private boolean desc = false; private Map> filterMap; @@ -59,16 +58,17 @@ public class CoordJobXCommand extends CoordinatorXCommand { * Constructor for loading a coordinator job information * * @param id coord jobId - * @param start starting index in the list of actions belonging to the job + * @param offset starting index in the list of actions belonging to the job * @param length number of actions to be returned - * @param filetrList + * @param filterMap + * @param desc boolean for whether the actions returned are in descending order */ - public CoordJobXCommand(String id, Map> filterMap, int start, int length, boolean desc) { + public CoordJobXCommand(String id, Map> filterMap, int offset, int length, boolean desc) { super("job.info", "job.info", 1); this.id = ParamChecker.notEmpty(id, "id"); this.getActionInfo = true; this.filterMap = filterMap; - this.start = start; + this.offset = offset; this.len = length; this.desc = desc; } @@ -132,7 +132,7 @@ public class CoordJobXCommand extends CoordinatorXCommand { coordActions = new ArrayList(); } else { - coordActions = jpaService.execute(new CoordJobGetActionsSubsetJPAExecutor(id, filterMap, start, + coordActions = jpaService.execute(new CoordJobGetActionsSubsetJPAExecutor(id, filterMap, offset, len, desc)); } coordJob.setActions(coordActions); http://git-wip-us.apache.org/repos/asf/oozie/blob/e1b8d97e/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsSubsetJPAExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsSubsetJPAExecutor.java b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsSubsetJPAExecutor.java index 420a466..a531798 100644 --- a/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsSubsetJPAExecutor.java +++ b/core/src/main/java/org/apache/oozie/executor/jpa/CoordJobGetActionsSubsetJPAExecutor.java @@ -35,12 +35,12 @@ import org.apache.oozie.util.DateUtils; import org.apache.oozie.util.ParamChecker; /** - * Load coordinator actions by start and len (a subset) for a coordinator job. + * Load coordinator actions by offset and len (a subset) for a coordinator job. */ public class CoordJobGetActionsSubsetJPAExecutor implements JPAExecutor> { private String coordJobId = null; - private int start = 1; + private int offset = 1; private int len = 50; private boolean desc = false; private Map> filterMap; @@ -51,10 +51,10 @@ public class CoordJobGetActionsSubsetJPAExecutor implements JPAExecutor> filterMap, - int start, int len, boolean desc) { + int offset, int len, boolean desc) { this(coordJobId); this.filterMap = filterMap; - this.start = start; + this.offset = offset; this.len = len; this.desc = desc; } @@ -101,7 +101,6 @@ public class CoordJobGetActionsSubsetJPAExecutor implements JPAExecutor