From 0ae3cb58ee9a88095ac5055e35f3a6fb803ec755 Mon Sep 17 00:00:00 2001 From: Owen O'Malley Date: Tue, 28 Feb 2017 09:37:58 -0800 Subject: [PATCH] ORC-153. Treat no arguments in convert and json-schema as help request. --- .../src/java/org/apache/orc/tools/convert/ConvertTool.java | 2 +- .../src/java/org/apache/orc/tools/json/JsonSchemaFinder.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 81fc2ec638..6211bd80c6 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 @@ static CommandLine parseOptions(String[] args) throws ParseException { 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); 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 40841fcf6b..a426646281 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 @@ static CommandLine parseArguments(String[] args) throws ParseException { 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);