You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by sa...@apache.org on 2017/06/16 00:40:21 UTC
phoenix git commit: PHOENIX-3942 Fix failing PhoenixMetricsIT
test(Karan Mehta)
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-1.1 78a41484f -> 7e49d80d0
PHOENIX-3942 Fix failing PhoenixMetricsIT test(Karan Mehta)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/7e49d80d
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/7e49d80d
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/7e49d80d
Branch: refs/heads/4.x-HBase-1.1
Commit: 7e49d80d08299136cbbaa46be113724961f74c72
Parents: 78a4148
Author: Samarth Jain <sa...@apache.org>
Authored: Thu Jun 15 17:40:15 2017 -0700
Committer: Samarth Jain <sa...@apache.org>
Committed: Thu Jun 15 17:40:15 2017 -0700
----------------------------------------------------------------------
.../phoenix/iterate/ScanningResultIterator.java | 42 ++++++++++++++------
.../phoenix/monitoring/ScanMetricsHolder.java | 12 ------
2 files changed, 29 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7e49d80d/phoenix-core/src/main/java/org/apache/phoenix/iterate/ScanningResultIterator.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/iterate/ScanningResultIterator.java b/phoenix-core/src/main/java/org/apache/phoenix/iterate/ScanningResultIterator.java
index 8ee00e9..bb70f8f 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/iterate/ScanningResultIterator.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/iterate/ScanningResultIterator.java
@@ -27,6 +27,7 @@ import java.util.Map;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.ResultScanner;
import org.apache.hadoop.hbase.client.Scan;
+import org.apache.phoenix.monitoring.CombinableMetric;
import org.apache.phoenix.monitoring.ScanMetricsHolder;
import org.apache.phoenix.schema.tuple.ResultTuple;
import org.apache.phoenix.schema.tuple.Tuple;
@@ -50,8 +51,6 @@ public class ScanningResultIterator implements ResultIterator {
static final String REGIONS_SCANNED_METRIC_NAME = "REGIONS_SCANNED";
static final String RPC_RETRIES_METRIC_NAME = "RPC_RETRIES";
static final String REMOTE_RPC_RETRIES_METRIC_NAME = "REMOTE_RPC_RETRIES";
- static final String COUNT_OF_ROWS_SCANNED_KEY_METRIC_NAME = "ROWS_SCANNED";
- static final String COUNT_OF_ROWS_FILTERED_KEY_METRIC_NAME = "ROWS_FILTERED";
static final String GLOBAL_BYTES_IN_RESULTS_METRIC_NAME = "BYTES_IN_RESULTS";
public ScanningResultIterator(ResultScanner scanner, Scan scan, ScanMetricsHolder scanMetricsHolder) {
@@ -68,21 +67,38 @@ public class ScanningResultIterator implements ResultIterator {
scanner.close();
}
+ private static void changeMetric(CombinableMetric metric, Long value) {
+ if(value != null) {
+ metric.change(value);
+ }
+ }
+
private void getScanMetrics() {
if (!scanMetricsUpdated && scanMetricsEnabled) {
Map<String, Long> scanMetricsMap = scan.getScanMetrics().getMetricsMap();
- scanMetricsHolder.getCountOfRPCcalls().change(scanMetricsMap.get(RPC_CALLS_METRIC_NAME));
- scanMetricsHolder.getCountOfRemoteRPCcalls().change(scanMetricsMap.get(REMOTE_RPC_CALLS_METRIC_NAME));
- scanMetricsHolder.getSumOfMillisSecBetweenNexts().change(scanMetricsMap.get(MILLIS_BETWEEN_NEXTS_METRIC_NAME));
- scanMetricsHolder.getCountOfNSRE().change(scanMetricsMap.get(NOT_SERVING_REGION_EXCEPTION_METRIC_NAME));
- scanMetricsHolder.getCountOfBytesInResults().change(scanMetricsMap.get(BYTES_IN_RESULTS_METRIC_NAME));
- scanMetricsHolder.getCountOfBytesInRemoteResults().change(scanMetricsMap.get(BYTES_IN_REMOTE_RESULTS_METRIC_NAME));
- scanMetricsHolder.getCountOfRegions().change(scanMetricsMap.get(REGIONS_SCANNED_METRIC_NAME));
- scanMetricsHolder.getCountOfRPCRetries().change(scanMetricsMap.get(RPC_RETRIES_METRIC_NAME));
- scanMetricsHolder.getCountOfRemoteRPCRetries().change(scanMetricsMap.get(REMOTE_RPC_RETRIES_METRIC_NAME));
- scanMetricsHolder.getCountOfRowsScanned().change(scanMetricsMap.get(COUNT_OF_ROWS_SCANNED_KEY_METRIC_NAME));
- scanMetricsHolder.getCountOfRowsFiltered().change(scanMetricsMap.get(COUNT_OF_ROWS_FILTERED_KEY_METRIC_NAME));
+ if(scanMetricsMap == null) {
+ return;
+ }
+
+ changeMetric(scanMetricsHolder.getCountOfRPCcalls(),
+ scanMetricsMap.get(RPC_CALLS_METRIC_NAME));
+ changeMetric(scanMetricsHolder.getCountOfRemoteRPCcalls(),
+ scanMetricsMap.get(REMOTE_RPC_CALLS_METRIC_NAME));
+ changeMetric(scanMetricsHolder.getSumOfMillisSecBetweenNexts(),
+ scanMetricsMap.get(MILLIS_BETWEEN_NEXTS_METRIC_NAME));
+ changeMetric(scanMetricsHolder.getCountOfNSRE(),
+ scanMetricsMap.get(NOT_SERVING_REGION_EXCEPTION_METRIC_NAME));
+ changeMetric(scanMetricsHolder.getCountOfBytesInResults(),
+ scanMetricsMap.get(BYTES_IN_RESULTS_METRIC_NAME));
+ changeMetric(scanMetricsHolder.getCountOfBytesInRemoteResults(),
+ scanMetricsMap.get(BYTES_IN_REMOTE_RESULTS_METRIC_NAME));
+ changeMetric(scanMetricsHolder.getCountOfRegions(),
+ scanMetricsMap.get(REGIONS_SCANNED_METRIC_NAME));
+ changeMetric(scanMetricsHolder.getCountOfRPCRetries(),
+ scanMetricsMap.get(RPC_RETRIES_METRIC_NAME));
+ changeMetric(scanMetricsHolder.getCountOfRemoteRPCRetries(),
+ scanMetricsMap.get(REMOTE_RPC_RETRIES_METRIC_NAME));
GLOBAL_SCAN_BYTES.update(scanMetricsMap.get(GLOBAL_BYTES_IN_RESULTS_METRIC_NAME));
scanMetricsUpdated = true;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/7e49d80d/phoenix-core/src/main/java/org/apache/phoenix/monitoring/ScanMetricsHolder.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/ScanMetricsHolder.java b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/ScanMetricsHolder.java
index 6bcd402..a87be41 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/ScanMetricsHolder.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/ScanMetricsHolder.java
@@ -43,8 +43,6 @@ public class ScanMetricsHolder {
private final CombinableMetric countOfRegions;
private final CombinableMetric countOfRPCRetries;
private final CombinableMetric countOfRemoteRPCRetries;
- private final CombinableMetric countOfRowsScanned;
- private final CombinableMetric countOfRowsFiltered;
private static final ScanMetricsHolder NO_OP_INSTANCE =
new ScanMetricsHolder(new ReadMetricQueue(false), "");
@@ -70,8 +68,6 @@ public class ScanMetricsHolder {
countOfRegions = readMetrics.allotMetric(COUNT_SCANNED_REGIONS, tableName);
countOfRPCRetries = readMetrics.allotMetric(COUNT_RPC_RETRIES, tableName);
countOfRemoteRPCRetries = readMetrics.allotMetric(COUNT_REMOTE_RPC_RETRIES, tableName);
- countOfRowsScanned = readMetrics.allotMetric(COUNT_ROWS_SCANNED, tableName);
- countOfRowsFiltered = readMetrics.allotMetric(COUNT_ROWS_FILTERED, tableName);
}
public CombinableMetric getCountOfRemoteRPCcalls() {
@@ -102,10 +98,6 @@ public class ScanMetricsHolder {
return countOfRemoteRPCRetries;
}
- public CombinableMetric getCountOfRowsFiltered() {
- return countOfRowsFiltered;
- }
-
public CombinableMetric getCountOfRPCcalls() {
return countOfRPCcalls;
}
@@ -114,8 +106,4 @@ public class ScanMetricsHolder {
return countOfBytesInResults;
}
- public CombinableMetric getCountOfRowsScanned() {
- return countOfRowsScanned;
- }
-
}