Skip to content

Commit a303a9f

Browse files
abhradeepkundupetersomogyi
authored andcommitted
HBASE-27317 Rectifying the option for columnfamily as mandatory (#4773)
Signed-off-by: Peter Somogyi <psomogyi@apache.org>
1 parent 74126ea commit a303a9f

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/storefiletracker/StoreFileListFilePrettyPrinter.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ public class StoreFileListFilePrettyPrinter extends Configured implements Tool {
6161
private final String regionOption = "r";
6262
private final String tableNameOption = "t";
6363

64+
private final String cmdString = "sft";
65+
6466
private String namespace;
6567
private String regionName;
6668
private String columnFamily;
@@ -96,9 +98,7 @@ private void init() {
9698
public boolean parseOptions(String[] args) throws ParseException, IOException {
9799
HelpFormatter formatter = new HelpFormatter();
98100
if (args.length == 0) {
99-
formatter
100-
.printHelp("sft [--file=</path/to/tracker/file> | --table=<namespace:tablename|tablename>"
101-
+ " --region=<regionname> [--columnFamily=<columnfamily>] ]", options, true);
101+
formatter.printHelp(cmdString, options, true);
102102
return false;
103103
}
104104

@@ -111,22 +111,19 @@ public boolean parseOptions(String[] args) throws ParseException, IOException {
111111
regionName = cmd.getOptionValue(regionOption);
112112
if (StringUtils.isEmpty(regionName)) {
113113
err.println("Region name is not specified.");
114-
formatter.printHelp("sft [--file=</path/to/tracker/file> | --table=<namespace:tablename|"
115-
+ "tablename> --region=<regionname> [--columnFamily=<columnfamily>] ]", options, true);
114+
formatter.printHelp(cmdString, options, true);
116115
System.exit(1);
117116
}
118117
columnFamily = cmd.getOptionValue(columnFamilyOption);
119118
if (StringUtils.isEmpty(columnFamily)) {
120119
err.println("Column family is not specified.");
121-
formatter.printHelp("sft [--file=</path/to/tracker/file> | --table=<namespace:tablename|"
122-
+ "tablename> --region=<regionname> [--columnFamily=<columnfamily>] ]", options, true);
120+
formatter.printHelp(cmdString, options, true);
123121
System.exit(1);
124122
}
125123
String tableNameWtihNS = cmd.getOptionValue(tableNameOption);
126124
if (StringUtils.isEmpty(tableNameWtihNS)) {
127125
err.println("Table name is not specified.");
128-
formatter.printHelp("sft [--file=</path/to/tracker/file> | --table=<namespace:tablename|"
129-
+ "tablename> --region=<regionname> [--columnFamily=<columnfamily>] ]", options, true);
126+
formatter.printHelp(cmdString, options, true);
130127
System.exit(1);
131128
}
132129
TableName tn = TableName.valueOf(tableNameWtihNS);

0 commit comments

Comments
 (0)