phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From an...@apache.org
Subject phoenix git commit: PHOENIX-4479 Fix PartialCommitIT failing with NullPointerException due to change metric API
Date Thu, 21 Dec 2017 06:29:28 GMT
Repository: phoenix
Updated Branches:
  refs/heads/5.x-HBase-2.0 d29da2524 -> 55c117ac0


PHOENIX-4479 Fix PartialCommitIT failing with NullPointerException due to change metric API


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/55c117ac
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/55c117ac
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/55c117ac

Branch: refs/heads/5.x-HBase-2.0
Commit: 55c117ac0b534cea10aa7ec85dd7e0b801a97729
Parents: d29da25
Author: Ankit Singhal <ankitsinghal59@gmail.com>
Authored: Thu Dec 21 11:58:50 2017 +0530
Committer: Ankit Singhal <ankitsinghal59@gmail.com>
Committed: Thu Dec 21 11:58:50 2017 +0530

----------------------------------------------------------------------
 .../java/org/apache/phoenix/iterate/ScanningResultIterator.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/55c117ac/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 a64076e..6b7d965 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.hadoop.hbase.client.metrics.ScanMetrics;
 import org.apache.phoenix.monitoring.CombinableMetric;
 import org.apache.phoenix.monitoring.ScanMetricsHolder;
 import org.apache.phoenix.schema.tuple.ResultTuple;
@@ -78,7 +79,8 @@ public class ScanningResultIterator implements ResultIterator {
     private void getScanMetrics() {
 
         if (!scanMetricsUpdated && scanMetricsEnabled) {
-            Map<String, Long> scanMetricsMap = scan.getScanMetrics().getMetricsMap();
+            ScanMetrics scanMetrics = scanner.getScanMetrics();
+            Map<String, Long> scanMetricsMap = scanMetrics.getMetricsMap();
             if(scanMetricsMap == null) {
                 return;
             }


Mime
View raw message