From 3f810ce5f0d0dd912b93b1d0873b0048511cddf8 Mon Sep 17 00:00:00 2001 From: Abhradeep Kundu Date: Wed, 24 Aug 2022 15:00:47 +0530 Subject: [PATCH 1/4] Rectifying the option for columnfamily as mandatory --- .../storefiletracker/StoreFileListFilePrettyPrinter.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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..6a574801a7cb 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 @@ -98,7 +98,7 @@ public boolean parseOptions(String[] args) throws ParseException, IOException { if (args.length == 0) { formatter .printHelp("sft [--file= | --table=" - + " --region= [--columnFamily=] ]", options, true); + + " --region= --columnFamily= ]", options, true); return false; } @@ -112,21 +112,21 @@ public boolean parseOptions(String[] args) throws ParseException, IOException { if (StringUtils.isEmpty(regionName)) { err.println("Region name is not specified."); formatter.printHelp("sft [--file= | --table= --region= [--columnFamily=] ]", options, true); + + "tablename> --region= --columnFamily= ]", options, true); System.exit(1); } columnFamily = cmd.getOptionValue(columnFamilyOption); if (StringUtils.isEmpty(columnFamily)) { err.println("Column family is not specified."); formatter.printHelp("sft [--file= | --table= --region= [--columnFamily=] ]", options, true); + + "tablename> --region= --columnFamily= ]", 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= | --table= --region= [--columnFamily=] ]", options, true); + + "tablename> --region= --columnFamily= ]", options, true); System.exit(1); } TableName tn = TableName.valueOf(tableNameWtihNS); From 0ae0117ea502172c76159a92111d29a560e8cd48 Mon Sep 17 00:00:00 2001 From: Abhradeep Kundu Date: Fri, 26 Aug 2022 09:18:10 +0530 Subject: [PATCH 2/4] Adding the comment in a string so that we can resuse it --- .../StoreFileListFilePrettyPrinter.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 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 6a574801a7cb..599253bb7430 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 [--file= | --table= --region= --columnFamily= ]"; + private String namespace; private String regionName; private String columnFamily; @@ -97,8 +100,7 @@ public boolean parseOptions(String[] args) throws ParseException, IOException { HelpFormatter formatter = new HelpFormatter(); if (args.length == 0) { formatter - .printHelp("sft [--file= | --table=" - + " --region= --columnFamily= ]", options, true); + .printHelp(helpMsg, options, true); return false; } @@ -111,22 +113,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= | --table= --region= --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= | --table= --region= --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= | --table= --region= --columnFamily= ]", options, true); + formatter.printHelp(helpMsg, options, true); System.exit(1); } TableName tn = TableName.valueOf(tableNameWtihNS); From 202435df1e8ffb1bf484eaca9ca6c1920c3db50f Mon Sep 17 00:00:00 2001 From: Abhradeep Kundu Date: Fri, 26 Aug 2022 20:07:37 +0530 Subject: [PATCH 3/4] spotless check applied --- .../storefiletracker/StoreFileListFilePrettyPrinter.java | 3 +-- 1 file changed, 1 insertion(+), 2 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 599253bb7430..3dabf92d0a55 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 @@ -99,8 +99,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(helpMsg, options, true); return false; } From 557be62eb81d89ac99db14f4755bcd35cbc284df Mon Sep 17 00:00:00 2001 From: Abhradeep Kundu Date: Tue, 6 Sep 2022 10:30:04 +0530 Subject: [PATCH 4/4] Rectified the options correctly --- .../storefiletracker/StoreFileListFilePrettyPrinter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 3dabf92d0a55..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,8 +61,8 @@ public class StoreFileListFilePrettyPrinter extends Configured implements Tool { private final String regionOption = "r"; private final String tableNameOption = "t"; - private final String helpMsg = "sft [--file= | --table= --region= --columnFamily= ]"; + private final String helpMsg = "sft [--f= | --t= --r= --cf= ]"; private String namespace; private String regionName;