You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by om...@apache.org on 2017/03/01 20:27:10 UTC

orc git commit: ORC-153. Treat no arguments in convert and json-schema as help request.

Repository: orc
Updated Branches:
  refs/heads/master 24612b06c -> 06d88690f


ORC-153. Treat no arguments in convert and json-schema as help request.

Fixes #97

Signed-off-by: Owen O'Malley <om...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/orc/repo
Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/06d88690
Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/06d88690
Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/06d88690

Branch: refs/heads/master
Commit: 06d88690fb1ec2f935714cbfbba4c68cd0c4c83e
Parents: 24612b0
Author: Owen O'Malley <om...@apache.org>
Authored: Tue Feb 28 09:37:58 2017 -0800
Committer: Owen O'Malley <om...@apache.org>
Committed: Wed Mar 1 12:25:59 2017 -0800

----------------------------------------------------------------------
 java/tools/src/java/org/apache/orc/tools/convert/ConvertTool.java  | 2 +-
 .../tools/src/java/org/apache/orc/tools/json/JsonSchemaFinder.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/orc/blob/06d88690/java/tools/src/java/org/apache/orc/tools/convert/ConvertTool.java
----------------------------------------------------------------------
diff --git a/java/tools/src/java/org/apache/orc/tools/convert/ConvertTool.java b/java/tools/src/java/org/apache/orc/tools/convert/ConvertTool.java
index 81fc2ec..6211bd8 100644
--- a/java/tools/src/java/org/apache/orc/tools/convert/ConvertTool.java
+++ b/java/tools/src/java/org/apache/orc/tools/convert/ConvertTool.java
@@ -85,7 +85,7 @@ public class ConvertTool {
         Option.builder("o").longOpt("output").desc("Output filename")
             .hasArg().build());
     CommandLine cli = new GnuParser().parse(options, args);
-    if (cli.hasOption('h')) {
+    if (cli.hasOption('h') || cli.getArgs().length == 0) {
       HelpFormatter formatter = new HelpFormatter();
       formatter.printHelp("convert", options);
       System.exit(1);

http://git-wip-us.apache.org/repos/asf/orc/blob/06d88690/java/tools/src/java/org/apache/orc/tools/json/JsonSchemaFinder.java
----------------------------------------------------------------------
diff --git a/java/tools/src/java/org/apache/orc/tools/json/JsonSchemaFinder.java b/java/tools/src/java/org/apache/orc/tools/json/JsonSchemaFinder.java
index 40841fc..a426646 100644
--- a/java/tools/src/java/org/apache/orc/tools/json/JsonSchemaFinder.java
+++ b/java/tools/src/java/org/apache/orc/tools/json/JsonSchemaFinder.java
@@ -286,7 +286,7 @@ public class JsonSchemaFinder {
     options.addOption(Option.builder("t").longOpt("table")
         .desc("Print types as Hive table declaration").build());
     CommandLine cli = new GnuParser().parse(options, args);
-    if (cli.hasOption('h')) {
+    if (cli.hasOption('h') || cli.getArgs().length == 0) {
       HelpFormatter formatter = new HelpFormatter();
       formatter.printHelp("json-schema", options);
       System.exit(1);