From e589cff065e75331534054626d4a104630094a3a Mon Sep 17 00:00:00 2001 From: Sean Busbey Date: Wed, 20 May 2015 15:00:28 -0500 Subject: [PATCH] HBASE-13728 Remove direct use of Hadoop's GenericOptionParser. --- .../java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java index d4394eb..9be144e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java @@ -54,7 +54,6 @@ import org.apache.hadoop.mapreduce.lib.input.FileInputFormat; import org.apache.hadoop.mapreduce.lib.input.TextInputFormat; import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; import org.apache.hadoop.security.Credentials; -import org.apache.hadoop.util.GenericOptionsParser; import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; @@ -649,10 +648,8 @@ public class ImportTsv extends Configured implements Tool { @Override public int run(String[] args) throws Exception { - setConf(HBaseConfiguration.create(getConf())); - String[] otherArgs = new GenericOptionsParser(getConf(), args).getRemainingArgs(); - if (otherArgs.length < 2) { - usage("Wrong number of arguments: " + otherArgs.length); + if (args.length < 2) { + usage("Wrong number of arguments: " + args.length); return -1; } @@ -717,12 +714,12 @@ public class ImportTsv extends Configured implements Tool { // system time getConf().setLong(TIMESTAMP_CONF_KEY, timstamp); - Job job = createSubmittableJob(getConf(), otherArgs); + Job job = createSubmittableJob(getConf(), args); return job.waitForCompletion(true) ? 0 : 1; } public static void main(String[] args) throws Exception { - int status = ToolRunner.run(new ImportTsv(), args); + int status = ToolRunner.run(new Configuration(), new ImportTsv(), args); System.exit(status); } } -- 1.7.10.2 (Apple Git-33)