Repository: oozie Updated Branches: refs/heads/master 9ad5416cc -> c69d98c91
OOZIE-1950 Coordinator job info should support timestamp (nominal time) (shwethags) - Part2 Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/c69d98c9 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/c69d98c9 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/c69d98c9 Branch: refs/heads/master Commit: c69d98c912c5d7a034d0a6dc7d27a08dcf0ed7a7 Parents: 9ad5416 Author: Shwetha GS <[email protected]> Authored: Mon Oct 13 15:06:00 2014 +0530 Committer: Shwetha GS <[email protected]> Committed: Mon Oct 13 15:06:00 2014 +0530 ---------------------------------------------------------------------- .../java/org/apache/oozie/cli/OozieCLI.java | 64 ++++++++++---------- docs/src/site/twiki/DG_CommandLineTool.twiki | 12 ++-- 2 files changed, 39 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/c69d98c9/client/src/main/java/org/apache/oozie/cli/OozieCLI.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/oozie/cli/OozieCLI.java b/client/src/main/java/org/apache/oozie/cli/OozieCLI.java index 4f845e8..7f2fb3a 100644 --- a/client/src/main/java/org/apache/oozie/cli/OozieCLI.java +++ b/client/src/main/java/org/apache/oozie/cli/OozieCLI.java @@ -18,33 +18,7 @@ package org.apache.oozie.cli; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.PrintStream; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Properties; -import java.util.TimeZone; -import java.util.concurrent.Callable; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import javax.xml.XMLConstants; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.stream.StreamSource; -import javax.xml.validation.Schema; -import javax.xml.validation.SchemaFactory; -import javax.xml.validation.Validator; - +import com.google.common.annotations.VisibleForTesting; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; import org.apache.commons.cli.OptionBuilder; @@ -72,7 +46,31 @@ import org.w3c.dom.NodeList; import org.w3c.dom.Text; import org.xml.sax.SAXException; -import com.google.common.annotations.VisibleForTesting; +import javax.xml.XMLConstants; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.stream.StreamSource; +import javax.xml.validation.Schema; +import javax.xml.validation.SchemaFactory; +import javax.xml.validation.Validator; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintStream; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Properties; +import java.util.TimeZone; +import java.util.concurrent.Callable; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * Oozie command line utility. @@ -297,10 +295,12 @@ public class OozieCLI { Option offset = new Option(OFFSET_OPTION, true, "job info offset of actions (default '1', requires -info)"); Option len = new Option(LEN_OPTION, true, "number of actions (default TOTAL ACTIONS, requires -info)"); Option filter = new Option(FILTER_OPTION, true, - "status=<S1>[;status=<S2>]* or status!=<S1>[;status!=<S2>]* " - + "(All Coordinator actions satisfying the status filters will be retreived. " - + "Positive filters '=' concatenated with OR and negative filters '!=' with AND. " - + "Currently, only supported for Coordinator job)"); + "<key><comparator><value>[;<key><comparator><value>]*\n" + + "(All Coordinator actions satisfying the filters will be retreived).\n" + + "key: status or nominaltime\n" + + "comparator: =, !=, <, <=, >, >=. = is used as OR and others as AND\n" + + "status: values are valid status like SUCCEEDED, KILLED etc. Only = and != apply for status\n" + + "nominaltime: time of format yyyy-MM-dd'T'HH:mm'Z'"); Option order = new Option(ORDER_OPTION, true, "order to show coord actions (default ascending order, 'desc' for descending order, requires -info)"); Option localtime = new Option(LOCAL_TIME_OPTION, false, "use local time (same as passing your time zone to -" + http://git-wip-us.apache.org/repos/asf/oozie/blob/c69d98c9/docs/src/site/twiki/DG_CommandLineTool.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/DG_CommandLineTool.twiki b/docs/src/site/twiki/DG_CommandLineTool.twiki index 72c88ad..00ae180 100644 --- a/docs/src/site/twiki/DG_CommandLineTool.twiki +++ b/docs/src/site/twiki/DG_CommandLineTool.twiki @@ -46,11 +46,13 @@ usage: -doas <arg> doAs user, impersonates as the specified user -dryrun Dryrun a workflow (since 3.3.2) or coordinator (since 2.0) job without actually executing it - -filter <arg> status=<S1>[;status=<S2>]* or status!=<S1>[;status!=<S2>]* - (All Coordinator actions satisfying the status filters will - be retreived. Positive filters '=' concatenated with OR and - negative filters '!=' with AND. Currently, only supported for - Coordinator job) + -filter <arg> <key><comparator><value>[;<key><comparator><value>]* + (All Coordinator actions satisfying the filters will be retreived). + key: status or nominaltime + comparator: =, !=, <, <=, >, >=. = is used as OR and others as AND + status: values are valid status like SUCCEEDED, KILLED etc. Only = and != apply + for status. + nominaltime: time of format yyyy-MM-dd'T'HH:mm'Z' -ignore <arg> change status of a coordinator job or action to IGNORED (-action required to ignore coord actions) -info <arg> info of a job
