Skip to content

Commit 1b8d949

Browse files
committed
HBASE-27712 Remove unused params in region metrics
1 parent c2b64e7 commit 1b8d949

File tree

5 files changed

+17
-20
lines changed

5 files changed

+17
-20
lines changed

hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSource.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,14 @@ public interface MetricsRegionSource extends Comparable<MetricsRegionSource> {
7373
void updateDelete();
7474

7575
/**
76-
* Update time of gets
77-
* @param mills time for this get operation.
76+
* Update related counts of gets
7877
*/
79-
void updateGet(long mills);
78+
void updateGet();
8079

8180
/**
82-
* Update time used of resultScanner.next().
81+
* Update related counts of resultScanner.next().
8382
*/
84-
void updateScanTime(long mills);
83+
void updateScanCount();
8584

8685
/**
8786
* Update related counts of increments.

hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSourceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,12 @@ public void updateDelete() {
149149
}
150150

151151
@Override
152-
public void updateGet(long mills) {
152+
public void updateGet() {
153153
regionGet.incr();
154154
}
155155

156156
@Override
157-
public void updateScanTime(long mills) {
157+
public void updateScanCount() {
158158
regionScan.incr();
159159
}
160160

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7875,12 +7875,11 @@ private List<Cell> get(Get get, boolean withCoprocessor, long nonceGroup, long n
78757875
private List<Cell> getInternal(Get get, boolean withCoprocessor, long nonceGroup, long nonce)
78767876
throws IOException {
78777877
List<Cell> results = new ArrayList<>();
7878-
long before = EnvironmentEdgeManager.currentTime();
78797878

78807879
// pre-get CP hook
78817880
if (withCoprocessor && (coprocessorHost != null)) {
78827881
if (coprocessorHost.preGet(get, results)) {
7883-
metricsUpdateForGet(results, before);
7882+
metricsUpdateForGet();
78847883
return results;
78857884
}
78867885
}
@@ -7904,14 +7903,14 @@ private List<Cell> getInternal(Get get, boolean withCoprocessor, long nonceGroup
79047903
coprocessorHost.postGet(get, results);
79057904
}
79067905

7907-
metricsUpdateForGet(results, before);
7906+
metricsUpdateForGet();
79087907

79097908
return results;
79107909
}
79117910

7912-
void metricsUpdateForGet(List<Cell> results, long before) {
7911+
void metricsUpdateForGet() {
79137912
if (this.metricsRegion != null) {
7914-
this.metricsRegion.updateGet(EnvironmentEdgeManager.currentTime() - before);
7913+
this.metricsRegion.updateGet();
79157914
}
79167915
if (this.rsServices != null && this.rsServices.getMetrics() != null) {
79177916
rsServices.getMetrics().updateReadQueryMeter(this, 1);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ public void updateDelete() {
5050
source.updateDelete();
5151
}
5252

53-
public void updateGet(final long t) {
54-
source.updateGet(t);
53+
public void updateGet() {
54+
source.updateGet();
5555
}
5656

57-
public void updateScanTime(final long t) {
58-
source.updateScanTime(t);
57+
public void updateScanCount() {
58+
source.updateScanCount();
5959
}
6060

6161
public void updateFilteredRecords() {

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2514,11 +2514,10 @@ private Result get(Get get, HRegion region, RegionScannersCloseCallBack closeCal
25142514

25152515
// This method is almost the same as HRegion#get.
25162516
List<Cell> results = new ArrayList<>();
2517-
long before = EnvironmentEdgeManager.currentTime();
25182517
// pre-get CP hook
25192518
if (region.getCoprocessorHost() != null) {
25202519
if (region.getCoprocessorHost().preGet(get, results)) {
2521-
region.metricsUpdateForGet(results, before);
2520+
region.metricsUpdateForGet();
25222521
return Result.create(results, get.isCheckExistenceOnly() ? !results.isEmpty() : null,
25232522
stale);
25242523
}
@@ -2553,7 +2552,7 @@ private Result get(Get get, HRegion region, RegionScannersCloseCallBack closeCal
25532552
if (region.getCoprocessorHost() != null) {
25542553
region.getCoprocessorHost().postGet(get, results);
25552554
}
2556-
region.metricsUpdateForGet(results, before);
2555+
region.metricsUpdateForGet();
25572556

25582557
return Result.create(results, get.isCheckExistenceOnly() ? !results.isEmpty() : null, stale);
25592558
}
@@ -3449,7 +3448,7 @@ private void scan(HBaseRpcController controller, ScanRequest request, RegionScan
34493448
// Update serverside metrics, even on error.
34503449
long end = EnvironmentEdgeManager.currentTime();
34513450
long responseCellSize = rpcCall != null ? rpcCall.getResponseCellSize() : 0;
3452-
region.getMetrics().updateScanTime(end - before);
3451+
region.getMetrics().updateScanCount();
34533452
final MetricsRegionServer metricsRegionServer = server.getMetrics();
34543453
if (metricsRegionServer != null) {
34553454
metricsRegionServer.updateScanSize(region, responseCellSize);

0 commit comments

Comments
 (0)