HBASE-27681 Refactor Table Latency Metrics

Author: thangTang

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

@@ -374,8 +374,8 @@ public void setRestoredRegion(boolean restoredRegion) {
     isRestoredRegion = restoredRegion;
   }
 
-  public MetricsTableRequests getMetricsTableRequests() {
-    return metricsTableRequests;
+  public Optional<MetricsTableRequests> getMetricsTableRequests() {
+    return Optional.ofNullable(metricsTableRequests);
   }
 
   // Handle table latency metrics

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

@@ -20,6 +20,7 @@
 import java.util.Optional;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.CompatibilitySingletonFactory;
+import org.apache.hadoop.hbase.client.RegionInfo;
 import org.apache.hadoop.hbase.metrics.Meter;
 import org.apache.hadoop.hbase.metrics.MetricRegistries;
 import org.apache.hadoop.hbase.metrics.MetricRegistry;
@@ -102,14 +103,14 @@ public MetricsRegionServerWrapper getRegionServerWrapper() {
   }
 
   public void updatePutBatch(HRegion region, long t) {
-    Optional.ofNullable(region).ifPresent(r -> Optional.ofNullable(r.getMetricsTableRequests())
-      .ifPresent(metrics -> metrics.updatePutBatch(t)));
+    Optional.ofNullable(region).flatMap(r -> r.getMetricsTableRequests())
+      .ifPresent(metrics -> metrics.updatePutBatch(t));
     serverSource.updatePutBatch(t);
   }
 
   public void updatePut(HRegion region, long t) {
-    Optional.ofNullable(region).ifPresent(r -> Optional.ofNullable(r.getMetricsTableRequests())
-      .ifPresent(metrics -> metrics.updatePut(t)));
+    Optional.ofNullable(region).flatMap(r -> r.getMetricsTableRequests())
+      .ifPresent(metrics -> metrics.updatePut(t));
     if (t > slowMetricTime) {
       serverSource.incrSlowPut();
     }
@@ -118,8 +119,8 @@ public void updatePut(HRegion region, long t) {
   }
 
   public void updateDelete(HRegion region, long t) {
-    Optional.ofNullable(region).ifPresent(r -> Optional.ofNullable(r.getMetricsTableRequests())
-      .ifPresent(metrics -> metrics.updateDelete(t)));
+    Optional.ofNullable(region).flatMap(r -> r.getMetricsTableRequests())
+      .ifPresent(metrics -> metrics.updateDelete(t));
     if (t > slowMetricTime) {
       serverSource.incrSlowDelete();
     }
@@ -128,32 +129,32 @@ public void updateDelete(HRegion region, long t) {
   }
 
   public void updateDeleteBatch(HRegion region, long t) {
-    Optional.ofNullable(region).ifPresent(r -> Optional.ofNullable(r.getMetricsTableRequests())
-      .ifPresent(metrics -> metrics.updateDeleteBatch(t)));
+    Optional.ofNullable(region).flatMap(r -> r.getMetricsTableRequests())
+      .ifPresent(metrics -> metrics.updateDeleteBatch(t));
     serverSource.updateDeleteBatch(t);
   }
 
   public void updateCheckAndDelete(HRegion region, long t) {
-    Optional.ofNullable(region).ifPresent(r -> Optional.ofNullable(r.getMetricsTableRequests())
-      .ifPresent(metrics -> metrics.updateCheckAndDelete(t)));
+    Optional.ofNullable(region).flatMap(r -> r.getMetricsTableRequests())
+      .ifPresent(metrics -> metrics.updateCheckAndDelete(t));
     serverSource.updateCheckAndDelete(t);
   }
 
   public void updateCheckAndPut(HRegion region, long t) {
-    Optional.ofNullable(region).ifPresent(r -> Optional.ofNullable(r.getMetricsTableRequests())
-      .ifPresent(metrics -> metrics.updateCheckAndPut(t)));
+    Optional.ofNullable(region).flatMap(r -> r.getMetricsTableRequests())
+      .ifPresent(metrics -> metrics.updateCheckAndPut(t));
     serverSource.updateCheckAndPut(t);
   }
 
   public void updateCheckAndMutate(HRegion region, long t) {
-    Optional.ofNullable(region).ifPresent(r -> Optional.ofNullable(r.getMetricsTableRequests())
-      .ifPresent(metrics -> metrics.updateCheckAndMutate(t)));
+    Optional.ofNullable(region).flatMap(r -> r.getMetricsTableRequests())
+      .ifPresent(metrics -> metrics.updateCheckAndMutate(t));
     serverSource.updateCheckAndMutate(t);
   }
 
   public void updateGet(HRegion region, long t) {
-    Optional.ofNullable(region).ifPresent(r -> Optional.ofNullable(r.getMetricsTableRequests())
-      .ifPresent(metrics -> metrics.updateGet(t)));
+    Optional.ofNullable(region).flatMap(r -> r.getMetricsTableRequests())
+      .ifPresent(metrics -> metrics.updateGet(t));
     if (t > slowMetricTime) {
       serverSource.incrSlowGet();
     }
@@ -162,8 +163,8 @@ public void updateGet(HRegion region, long t) {
   }
 
   public void updateIncrement(HRegion region, long t) {
-    Optional.ofNullable(region).ifPresent(r -> Optional.ofNullable(r.getMetricsTableRequests())
-      .ifPresent(metrics -> metrics.updateIncrement(t)));
+    Optional.ofNullable(region).flatMap(r -> r.getMetricsTableRequests())
+      .ifPresent(metrics -> metrics.updateIncrement(t));
     if (t > slowMetricTime) {
       serverSource.incrSlowIncrement();
     }
@@ -172,8 +173,8 @@ public void updateIncrement(HRegion region, long t) {
   }
 
   public void updateAppend(HRegion region, long t) {
-    Optional.ofNullable(region).ifPresent(r -> Optional.ofNullable(r.getMetricsTableRequests())
-      .ifPresent(metrics -> metrics.updateAppend(t)));
+    Optional.ofNullable(region).flatMap(r -> r.getMetricsTableRequests())
+      .ifPresent(metrics -> metrics.updateAppend(t));
     if (t > slowMetricTime) {
       serverSource.incrSlowAppend();
     }
@@ -187,14 +188,14 @@ public void updateReplay(long t) {
   }
 
   public void updateScanSize(HRegion region, long scanSize) {
-    Optional.ofNullable(region).ifPresent(r -> Optional.ofNullable(r.getMetricsTableRequests())
-      .ifPresent(metrics -> metrics.updateScanSize(scanSize)));
+    Optional.ofNullable(region).flatMap(r -> r.getMetricsTableRequests())
+      .ifPresent(metrics -> metrics.updateScanSize(scanSize));
     serverSource.updateScanSize(scanSize);
   }
 
   public void updateScanTime(HRegion region, long t) {
-    Optional.ofNullable(region).ifPresent(r -> Optional.ofNullable(r.getMetricsTableRequests())
-      .ifPresent(metrics -> metrics.updateScanTime(t)));
+    Optional.ofNullable(region).flatMap(r -> r.getMetricsTableRequests())
+      .ifPresent(metrics -> metrics.updateScanTime(t));
     serverSource.updateScanTime(t);
     userAggregate.updateScanTime(t);
   }
@@ -260,24 +261,24 @@ public void incrementRegionSizeReportingChoreTime(long time) {
   }
 
   public void updateReadQueryMeter(HRegion region, long count) {
-    Optional.ofNullable(region).ifPresent(r -> Optional.ofNullable(r.getMetricsTableRequests())
-      .ifPresent(metrics -> metrics.updateTableReadQueryMeter(count)));
+    Optional.ofNullable(region).flatMap(r -> r.getMetricsTableRequests())
+      .ifPresent(metrics -> metrics.updateTableReadQueryMeter(count));
     if (serverReadQueryMeter != null) {
       serverReadQueryMeter.mark(count);
     }
   }
 
   public void updateWriteQueryMeter(HRegion region, long count) {
-    Optional.ofNullable(region).ifPresent(r -> Optional.ofNullable(r.getMetricsTableRequests())
-      .ifPresent(metrics -> metrics.updateTableWriteQueryMeter(count)));
+    Optional.ofNullable(region).flatMap(r -> r.getMetricsTableRequests())
+      .ifPresent(metrics -> metrics.updateTableWriteQueryMeter(count));
     if (serverWriteQueryMeter != null) {
       serverWriteQueryMeter.mark(count);
     }
   }
 
   public void updateWriteQueryMeter(HRegion region) {
-    Optional.ofNullable(region).ifPresent(r -> Optional.ofNullable(r.getMetricsTableRequests())
-      .ifPresent(metrics -> metrics.updateTableWriteQueryMeter()));
+    Optional.ofNullable(region).flatMap(r -> r.getMetricsTableRequests())
+      .ifPresent(metrics -> metrics.updateTableWriteQueryMeter());
     if (serverWriteQueryMeter != null) {
       serverWriteQueryMeter.mark();
     }