phoenix git commit: ScanningResultIterator metric RowsScanned not set. PHOENIX-5051

2018-12-05 Thread tdsilva 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.3 8a3295894 -> 7380c74d3


ScanningResultIterator metric RowsScanned not set. PHOENIX-5051


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

Branch: refs/heads/4.x-HBase-1.3
Commit: 7380c74d3fc9a7ec0699b0a1de418bd80aaf2e34
Parents: 8a32958
Author: chfeng 
Authored: Wed Dec 5 10:40:29 2018 +0800
Committer: Thomas D'Silva 
Committed: Wed Dec 5 10:05:14 2018 -0800

--
 .../java/org/apache/phoenix/iterate/ScanningResultIterator.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/7380c74d/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 f02e9d3..893eaa2 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
@@ -117,7 +117,7 @@ public class ScanningResultIterator implements 
ResultIterator {
 scanMetricsMap.get(RPC_RETRIES_METRIC_NAME));
 changeMetric(scanMetricsHolder.getCountOfRemoteRPCRetries(),
 scanMetricsMap.get(REMOTE_RPC_RETRIES_METRIC_NAME));
-changeMetric(scanMetricsHolder.getCountOfRowsFiltered(),
+changeMetric(scanMetricsHolder.getCountOfRowsScanned(),
 scanMetricsMap.get(COUNT_OF_ROWS_SCANNED_KEY_METRIC_NAME));
 changeMetric(scanMetricsHolder.getCountOfRowsFiltered(),
 
scanMetricsMap.get(COUNT_OF_ROWS_FILTERED_KEY_METRIC_NAME));

phoenix git commit: ScanningResultIterator metric RowsScanned not set. PHOENIX-5051

2018-12-05 Thread tdsilva 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.4 9d8bdd687 -> fd0bcc8a6


ScanningResultIterator metric RowsScanned not set. PHOENIX-5051


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

Branch: refs/heads/4.x-HBase-1.4
Commit: fd0bcc8a6db701f02e0f38ca07b2e4e7fc7be65b
Parents: 9d8bdd6
Author: chfeng 
Authored: Wed Dec 5 10:40:29 2018 +0800
Committer: Thomas D'Silva 
Committed: Wed Dec 5 10:05:22 2018 -0800

--
 .../java/org/apache/phoenix/iterate/ScanningResultIterator.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/fd0bcc8a/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 f02e9d3..893eaa2 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
@@ -117,7 +117,7 @@ public class ScanningResultIterator implements 
ResultIterator {
 scanMetricsMap.get(RPC_RETRIES_METRIC_NAME));
 changeMetric(scanMetricsHolder.getCountOfRemoteRPCRetries(),
 scanMetricsMap.get(REMOTE_RPC_RETRIES_METRIC_NAME));
-changeMetric(scanMetricsHolder.getCountOfRowsFiltered(),
+changeMetric(scanMetricsHolder.getCountOfRowsScanned(),
 scanMetricsMap.get(COUNT_OF_ROWS_SCANNED_KEY_METRIC_NAME));
 changeMetric(scanMetricsHolder.getCountOfRowsFiltered(),
 
scanMetricsMap.get(COUNT_OF_ROWS_FILTERED_KEY_METRIC_NAME));

phoenix git commit: ScanningResultIterator metric RowsScanned not set. PHOENIX-5051

2018-12-05 Thread tdsilva 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.2 932dbe7aa -> 81c3f346a


ScanningResultIterator metric RowsScanned not set. PHOENIX-5051


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

Branch: refs/heads/4.x-HBase-1.2
Commit: 81c3f346a683700fef6dcb2d49486e58cb514c15
Parents: 932dbe7
Author: chfeng 
Authored: Wed Dec 5 10:40:29 2018 +0800
Committer: Thomas D'Silva 
Committed: Wed Dec 5 10:06:42 2018 -0800

--
 .../java/org/apache/phoenix/iterate/ScanningResultIterator.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/81c3f346/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 f02e9d3..893eaa2 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
@@ -117,7 +117,7 @@ public class ScanningResultIterator implements 
ResultIterator {
 scanMetricsMap.get(RPC_RETRIES_METRIC_NAME));
 changeMetric(scanMetricsHolder.getCountOfRemoteRPCRetries(),
 scanMetricsMap.get(REMOTE_RPC_RETRIES_METRIC_NAME));
-changeMetric(scanMetricsHolder.getCountOfRowsFiltered(),
+changeMetric(scanMetricsHolder.getCountOfRowsScanned(),
 scanMetricsMap.get(COUNT_OF_ROWS_SCANNED_KEY_METRIC_NAME));
 changeMetric(scanMetricsHolder.getCountOfRowsFiltered(),
 
scanMetricsMap.get(COUNT_OF_ROWS_FILTERED_KEY_METRIC_NAME));

phoenix git commit: ScanningResultIterator metric RowsScanned not set. PHOENIX-5051

2018-12-05 Thread tdsilva 
Repository: phoenix
Updated Branches:
  refs/heads/master 1ab08c726 -> aa276bfd2


ScanningResultIterator metric RowsScanned not set. PHOENIX-5051


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

Branch: refs/heads/master
Commit: aa276bfd2ef856f9da24c32710c616c9d195463b
Parents: 1ab08c7
Author: chfeng 
Authored: Wed Dec 5 10:40:29 2018 +0800
Committer: Thomas D'Silva 
Committed: Wed Dec 5 10:05:34 2018 -0800

--
 .../java/org/apache/phoenix/iterate/ScanningResultIterator.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/aa276bfd/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 f02e9d3..893eaa2 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
@@ -117,7 +117,7 @@ public class ScanningResultIterator implements 
ResultIterator {
 scanMetricsMap.get(RPC_RETRIES_METRIC_NAME));
 changeMetric(scanMetricsHolder.getCountOfRemoteRPCRetries(),
 scanMetricsMap.get(REMOTE_RPC_RETRIES_METRIC_NAME));
-changeMetric(scanMetricsHolder.getCountOfRowsFiltered(),
+changeMetric(scanMetricsHolder.getCountOfRowsScanned(),
 scanMetricsMap.get(COUNT_OF_ROWS_SCANNED_KEY_METRIC_NAME));
 changeMetric(scanMetricsHolder.getCountOfRowsFiltered(),
 
scanMetricsMap.get(COUNT_OF_ROWS_FILTERED_KEY_METRIC_NAME));