HBASE-23165 [hbtop] Some modifications from HBASE-22988 (apache#987)

Signed-off-by: stack <stack@apache.org>

Author: brfrn169

bin/hbase

@@ -637,7 +637,10 @@ elif [ "$COMMAND" = "hbtop" ] ; then
     done
   fi
 
-  HBASE_OPTS="${HBASE_OPTS} -Dlog4j.configuration=file:${HBASE_HOME}/conf/log4j-hbtop.properties"
+  if [ -f "${HBASE_HOME}/conf/log4j-hbtop.properties" ] ; then
+    HBASE_HBTOP_OPTS="${HBASE_HBTOP_OPTS} -Dlog4j.configuration=file:${HBASE_HOME}/conf/log4j-hbtop.properties"
+  fi
+  HBASE_OPTS="${HBASE_OPTS} ${HBASE_HBTOP_OPTS}"
 else
   CLASS=$COMMAND
 fi

conf/log4j-hbtop.properties

@@ -24,4 +24,4 @@ log4j.appender.console.layout=org.apache.log4j.PatternLayout
 log4j.appender.console.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2}: %m%n
 
 # ZooKeeper will still put stuff at WARN
-log4j.logger.org.apache.zookeeper=ERROR
+log4j.logger.org.apache.zookeeper=ERROR

hbase-hbtop/src/main/java/org/apache/hadoop/hbase/hbtop/RecordFilter.java

@@ -55,6 +55,9 @@ public static RecordFilter parse(String filterString, boolean ignoreCase) {
     return parse(filterString, Arrays.asList(Field.values()), ignoreCase);
   }
 
+  /*
+   * Parse a filter string and build a RecordFilter instance.
+   */
   public static RecordFilter parse(String filterString, List<Field> fields, boolean ignoreCase) {
     int index = 0;
 

hbase-hbtop/src/main/java/org/apache/hadoop/hbase/hbtop/mode/RequestCountPerSecond.java

@@ -41,13 +41,14 @@ public void refresh(long lastReportTimestamp, long readRequestCount,
       previousFilteredReadRequestCount = filteredReadRequestCount;
       previousWriteRequestCount = writeRequestCount;
     } else if (previousLastReportTimestamp != lastReportTimestamp) {
-      readRequestCountPerSecond = (readRequestCount - previousReadRequestCount) /
-        ((lastReportTimestamp - previousLastReportTimestamp) / 1000);
+      long delta = (lastReportTimestamp - previousLastReportTimestamp) / 1000;
+      if (delta < 1) {
+        delta = 1;
+      }
+      readRequestCountPerSecond = (readRequestCount - previousReadRequestCount) / delta;
       filteredReadRequestCountPerSecond =
-        (filteredReadRequestCount - previousFilteredReadRequestCount) /
-        ((lastReportTimestamp - previousLastReportTimestamp) / 1000);
-      writeRequestCountPerSecond = (writeRequestCount - previousWriteRequestCount) /
-        ((lastReportTimestamp - previousLastReportTimestamp) / 1000);
+        (filteredReadRequestCount - previousFilteredReadRequestCount) / delta;
+      writeRequestCountPerSecond = (writeRequestCount - previousWriteRequestCount) / delta;
 
       previousLastReportTimestamp = lastReportTimestamp;
       previousReadRequestCount = readRequestCount;

hbase-hbtop/src/main/java/org/apache/hadoop/hbase/hbtop/screen/field/FieldScreenView.java

@@ -129,10 +129,10 @@ public void showFieldScreen(String sortFieldHeader, List<Field> fields,
     }
   }
 
-  public void showScreenDescription(String sortKeyHeader) {
+  public void showScreenDescription(String sortFieldHeader) {
     TerminalPrinter printer = getTerminalPrinter(SCREEN_DESCRIPTION_START_ROW);
     printer.startBold().print("Fields Management").stopBold().endOfLine();
-    printer.print("Current Sort Field: ").startBold().print(sortKeyHeader).stopBold().endOfLine();
+    printer.print("Current Sort Field: ").startBold().print(sortFieldHeader).stopBold().endOfLine();
     printer.print("Navigate with up/down, Right selects for move then <Enter> or Left commits,")
       .endOfLine();
     printer.print("'d' or <Space> toggles display, 's' sets sort. Use 'q' or <Esc> to end!")

hbase-hbtop/src/main/java/org/apache/hadoop/hbase/hbtop/screen/top/TopScreenPresenter.java

@@ -233,8 +233,8 @@ public ScreenView transitionToFieldScreen(Screen screen, Terminal terminal) {
     return new FieldScreenView(screen, terminal,
       topScreenModel.getCurrentSortField(), topScreenModel.getFields(),
       fieldDisplayMap,
-      (sortKey, fields, fieldDisplayMap) -> {
-        topScreenModel.setSortFieldAndFields(sortKey, fields);
+      (sortField, fields, fieldDisplayMap) -> {
+        topScreenModel.setSortFieldAndFields(sortField, fields);
         this.fieldDisplayMap.clear();
         this.fieldDisplayMap.putAll(fieldDisplayMap);
       }, topScreenView);

…pache/hadoop/hbase/hbtop/RecordTest.java …pache/hadoop/hbase/hbtop/TestRecord.javahbase-hbtop/src/test/java/org/apache/hadoop/hbase/hbtop/RecordTest.java renamed to hbase-hbtop/src/test/java/org/apache/hadoop/hbase/hbtop/TestRecord.java hbase-hbtop/src/test/java/org/apache/hadoop/hbase/hbtop/RecordTest.java renamed to hbase-hbtop/src/test/java/org/apache/hadoop/hbase/hbtop/TestRecord.java

@@ -30,11 +30,11 @@
 
 
 @Category(SmallTests.class)
-public class RecordTest {
+public class TestRecord {
 
   @ClassRule
   public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(RecordTest.class);
+    HBaseClassTestRule.forClass(TestRecord.class);
 
   @Test
   public void testBuilder() {

…hadoop/hbase/hbtop/RecordFilterTest.java …hadoop/hbase/hbtop/TestRecordFilter.javahbase-hbtop/src/test/java/org/apache/hadoop/hbase/hbtop/RecordFilterTest.java renamed to hbase-hbtop/src/test/java/org/apache/hadoop/hbase/hbtop/TestRecordFilter.java hbase-hbtop/src/test/java/org/apache/hadoop/hbase/hbtop/RecordFilterTest.java renamed to hbase-hbtop/src/test/java/org/apache/hadoop/hbase/hbtop/TestRecordFilter.java

@@ -38,11 +38,11 @@
 
 
 @Category(SmallTests.class)
-public class RecordFilterTest {
+public class TestRecordFilter {
 
   @ClassRule
   public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(RecordFilterTest.class);
+    HBaseClassTestRule.forClass(TestRecordFilter.class);
 
   @Test
   public void testParseAndBuilder() {

hbase-hbtop/src/test/java/org/apache/hadoop/hbase/hbtop/TestUtils.java

@@ -213,7 +213,7 @@ private static void assertRecordInRegionMode(Record record, String namespace, St
     long requestCountPerSecond, long readRequestCountPerSecond,
     long filteredReadRequestCountPerSecond, long writeCountRequestPerSecond,
     Size storeFileSize, Size uncompressedStoreFileSize, int numStoreFiles,
-    Size memStoreSize, float Locality, String startKey, long compactingCellCount,
+    Size memStoreSize, float locality, String startKey, long compactingCellCount,
     long compactedCellCount, float compactionProgress, String lastMajorCompactionTime) {
     assertThat(record.size(), is(22));
     assertThat(record.get(Field.NAMESPACE).asString(), is(namespace));
@@ -236,7 +236,7 @@ private static void assertRecordInRegionMode(Record record, String namespace, St
       is(uncompressedStoreFileSize));
     assertThat(record.get(Field.NUM_STORE_FILES).asInt(), is(numStoreFiles));
     assertThat(record.get(Field.MEM_STORE_SIZE).asSize(), is(memStoreSize));
-    assertThat(record.get(Field.LOCALITY).asFloat(), is(Locality));
+    assertThat(record.get(Field.LOCALITY).asFloat(), is(locality));
     assertThat(record.get(Field.START_KEY).asString(), is(startKey));
     assertThat(record.get(Field.COMPACTING_CELL_COUNT).asLong(), is(compactingCellCount));
     assertThat(record.get(Field.COMPACTED_CELL_COUNT).asLong(), is(compactedCellCount));

…op/hbase/hbtop/field/FieldValueTest.java …op/hbase/hbtop/field/TestFieldValue.javahbase-hbtop/src/test/java/org/apache/hadoop/hbase/hbtop/field/FieldValueTest.java renamed to hbase-hbtop/src/test/java/org/apache/hadoop/hbase/hbtop/field/TestFieldValue.java hbase-hbtop/src/test/java/org/apache/hadoop/hbase/hbtop/field/FieldValueTest.java renamed to hbase-hbtop/src/test/java/org/apache/hadoop/hbase/hbtop/field/TestFieldValue.java

@@ -30,11 +30,11 @@
 
 
 @Category(SmallTests.class)
-public class FieldValueTest {
+public class TestFieldValue {
 
   @ClassRule
   public static final HBaseClassTestRule CLASS_RULE =
-    HBaseClassTestRule.forClass(FieldValueTest.class);
+    HBaseClassTestRule.forClass(TestFieldValue.class);
 
   @Test
   public void testParseAndAsSomethingMethod() {