From 05362bedfa8a709b615ec929aa020555d897aab9 Mon Sep 17 00:00:00 2001 From: Adrian Muraru Date: Sun, 24 Jan 2016 18:10:35 +0200 Subject: [PATCH] HBASE-14770 RowCounter argument input parse error --- .../org/apache/hadoop/hbase/mapreduce/RowCounter.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/RowCounter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/RowCounter.java index 145b366..e130af2 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/RowCounter.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/RowCounter.java @@ -118,10 +118,7 @@ public class RowCounter extends Configured implements Tool { } startKey = startEnd[0]; endKey = startEnd[1]; - } - if (startTime < endTime) { - printUsage("--endtime=" + endTime + " needs to be greater than --starttime=" + startTime); - return null; + continue; } if (args[i].startsWith(startTimeArgKey)) { startTime = Long.parseLong(args[i].substring(startTimeArgKey.length())); @@ -136,11 +133,13 @@ public class RowCounter extends Configured implements Tool { Long.parseLong(args[i].substring(expectedCountArg.length()))); continue; } - else { - // if no switch, assume column names - sb.append(args[i]); - sb.append(" "); - } + // if no switch, assume column names + sb.append(args[i]); + sb.append(" "); + } + if (startTime < endTime) { + printUsage("--endtime=" + endTime + " needs to be greater than --starttime=" + startTime); + return null; } Job job = Job.getInstance(conf, conf.get(JOB_NAME_CONF_KEY, NAME + "_" + tableName)); -- 2.7.0