From 05504ef113266b01460e29d4e3afac7202e81589 Mon Sep 17 00:00:00 2001
From: Abhradeep Kundu <abhradeep.kundu@cloudera.com>
Date: Fri, 9 Sep 2022 14:30:31 +0530
Subject: [PATCH 1/2] Rectified the options correctly

---
 .../StoreFileListFilePrettyPrinter.java          | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/storefiletracker/StoreFileListFilePrettyPrinter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/storefiletracker/StoreFileListFilePrettyPrinter.java
index 9338f2f63320..6a24d96e622a 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/storefiletracker/StoreFileListFilePrettyPrinter.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/storefiletracker/StoreFileListFilePrettyPrinter.java
@@ -61,6 +61,9 @@ public class StoreFileListFilePrettyPrinter extends Configured implements Tool {
   private final String regionOption = "r";
   private final String tableNameOption = "t";
 
+  private final String helpMsg = "sft [--f=</path/to/tracker/file> | --t=<namespace:"
+    + "tablename|tablename> --r=<regionname> --cf=<columnfamily> ]";
+
   private String namespace;
   private String regionName;
   private String columnFamily;
@@ -96,9 +99,7 @@ private void init() {
   public boolean parseOptions(String[] args) throws ParseException, IOException {
     HelpFormatter formatter = new HelpFormatter();
     if (args.length == 0) {
-      formatter
-        .printHelp("sft [--file=</path/to/tracker/file> | --table=<namespace:tablename|tablename>"
-          + " --region=<regionname> [--columnFamily=<columnfamily>] ]", options, true);
+      formatter.printHelp(helpMsg, options, true);
       return false;
     }
 
@@ -111,22 +112,19 @@ public boolean parseOptions(String[] args) throws ParseException, IOException {
       regionName = cmd.getOptionValue(regionOption);
       if (StringUtils.isEmpty(regionName)) {
         err.println("Region name is not specified.");
-        formatter.printHelp("sft [--file=</path/to/tracker/file> | --table=<namespace:tablename|"
-          + "tablename> --region=<regionname> [--columnFamily=<columnfamily>] ]", options, true);
+        formatter.printHelp(helpMsg, options, true);
         System.exit(1);
       }
       columnFamily = cmd.getOptionValue(columnFamilyOption);
       if (StringUtils.isEmpty(columnFamily)) {
         err.println("Column family is not specified.");
-        formatter.printHelp("sft [--file=</path/to/tracker/file> | --table=<namespace:tablename|"
-          + "tablename> --region=<regionname> [--columnFamily=<columnfamily>] ]", options, true);
+        formatter.printHelp(helpMsg, options, true);
         System.exit(1);
       }
       String tableNameWtihNS = cmd.getOptionValue(tableNameOption);
       if (StringUtils.isEmpty(tableNameWtihNS)) {
         err.println("Table name is not specified.");
-        formatter.printHelp("sft [--file=</path/to/tracker/file> | --table=<namespace:tablename|"
-          + "tablename> --region=<regionname> [--columnFamily=<columnfamily>] ]", options, true);
+        formatter.printHelp(helpMsg, options, true);
         System.exit(1);
       }
       TableName tn = TableName.valueOf(tableNameWtihNS);

From 29dc04b1db75e3a14766bd3e632e78522d03d35b Mon Sep 17 00:00:00 2001
From: Abhradeep Kundu <abhradeep.kundu@cloudera.com>
Date: Tue, 13 Sep 2022 20:03:06 +0530
Subject: [PATCH 2/2] review comment fixes

---
 .../StoreFileListFilePrettyPrinter.java               | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/storefiletracker/StoreFileListFilePrettyPrinter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/storefiletracker/StoreFileListFilePrettyPrinter.java
index 6a24d96e622a..1025a4759cfb 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/storefiletracker/StoreFileListFilePrettyPrinter.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/storefiletracker/StoreFileListFilePrettyPrinter.java
@@ -61,8 +61,7 @@ public class StoreFileListFilePrettyPrinter extends Configured implements Tool {
   private final String regionOption = "r";
   private final String tableNameOption = "t";
 
-  private final String helpMsg = "sft [--f=</path/to/tracker/file> | --t=<namespace:"
-    + "tablename|tablename> --r=<regionname> --cf=<columnfamily> ]";
+  private final String cmdString = "sft";
 
   private String namespace;
   private String regionName;
@@ -99,7 +98,7 @@ private void init() {
   public boolean parseOptions(String[] args) throws ParseException, IOException {
     HelpFormatter formatter = new HelpFormatter();
     if (args.length == 0) {
-      formatter.printHelp(helpMsg, options, true);
+      formatter.printHelp(cmdString, options, true);
       return false;
     }
 
@@ -112,19 +111,19 @@ public boolean parseOptions(String[] args) throws ParseException, IOException {
       regionName = cmd.getOptionValue(regionOption);
       if (StringUtils.isEmpty(regionName)) {
         err.println("Region name is not specified.");
-        formatter.printHelp(helpMsg, options, true);
+        formatter.printHelp(cmdString, options, true);
         System.exit(1);
       }
       columnFamily = cmd.getOptionValue(columnFamilyOption);
       if (StringUtils.isEmpty(columnFamily)) {
         err.println("Column family is not specified.");
-        formatter.printHelp(helpMsg, options, true);
+        formatter.printHelp(cmdString, options, true);
         System.exit(1);
       }
       String tableNameWtihNS = cmd.getOptionValue(tableNameOption);
       if (StringUtils.isEmpty(tableNameWtihNS)) {
         err.println("Table name is not specified.");
-        formatter.printHelp(helpMsg, options, true);
+        formatter.printHelp(cmdString, options, true);
         System.exit(1);
       }
       TableName tn = TableName.valueOf(tableNameWtihNS);