This is an automated email from the ASF dual-hosted git repository.
chinmayskulkarni pushed a commit to branch 4.x-HBase-1.2
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x-HBase-1.2 by this push:
new 2574911 PHOENIX-5182: Deprecate getTotalSum API of the GlobalMetric
interface
2574911 is described below
commit 2574911b2b9c2a4ee71de8530eea69c387bb2ed6
Author: Chinmay Kulkarni <chinmayskulka...@gmail.com>
AuthorDate: Thu Mar 7 18:19:05 2019 -0800
PHOENIX-5182: Deprecate getTotalSum API of the GlobalMetric interface
---
.../apache/phoenix/execute/PartialCommitIT.java | 2 +-
.../phoenix/monitoring/PhoenixMetricsIT.java | 98 +++++++++++-----------
.../apache/phoenix/monitoring/GlobalMetric.java | 1 +
3 files changed, 51 insertions(+), 50 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java
index c6dc312..06f268c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java
@@ -247,7 +247,7 @@ public class PartialCommitIT extends
BaseUniqueNamesOwnClusterIT {
assertArrayEquals(expectedUncommittedStatementIndexes,
uncommittedStatementIndexes);
Map<String, Map<MetricType, Long>> mutationWriteMetrics =
PhoenixRuntime.getWriteMetricInfoForMutationsSinceLastReset(con);
assertEquals(expectedUncommittedStatementIndexes.length,
mutationWriteMetrics.get(bFailureTable).get(MUTATION_BATCH_FAILED_SIZE).intValue());
- assertEquals(expectedUncommittedStatementIndexes.length,
GLOBAL_MUTATION_BATCH_FAILED_COUNT.getMetric().getTotalSum());
+ assertEquals(expectedUncommittedStatementIndexes.length,
GLOBAL_MUTATION_BATCH_FAILED_COUNT.getMetric().getValue());
}
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsIT.java
index 0882cec..9dddece 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/monitoring/PhoenixMetricsIT.java
@@ -91,7 +91,7 @@ public class PhoenixMetricsIT extends BasePhoenixMetricsIT {
public void testResetGlobalPhoenixMetrics() {
resetGlobalMetrics();
for (GlobalMetric m : PhoenixRuntime.getGlobalPhoenixClientMetrics()) {
- assertEquals(0, m.getTotalSum());
+ assertEquals(0, m.getValue());
assertEquals(0, m.getNumberOfSamples());
}
}
@@ -108,42 +108,42 @@ public class PhoenixMetricsIT extends
BasePhoenixMetricsIT {
rs.getString(1);
rs.getString(2);
}
- assertEquals(1, GLOBAL_NUM_PARALLEL_SCANS.getMetric().getTotalSum());
- assertEquals(1, GLOBAL_SELECT_SQL_COUNTER.getMetric().getTotalSum());
- assertEquals(0,
GLOBAL_REJECTED_TASK_COUNTER.getMetric().getTotalSum());
- assertEquals(0,
GLOBAL_QUERY_TIMEOUT_COUNTER.getMetric().getTotalSum());
- assertEquals(0, GLOBAL_FAILED_QUERY_COUNTER.getMetric().getTotalSum());
- assertEquals(0, GLOBAL_SPOOL_FILE_COUNTER.getMetric().getTotalSum());
- assertEquals(0, GLOBAL_MUTATION_BATCH_SIZE.getMetric().getTotalSum());
- assertEquals(0, GLOBAL_MUTATION_BYTES.getMetric().getTotalSum());
- assertEquals(0,
GLOBAL_MUTATION_BATCH_FAILED_COUNT.getMetric().getTotalSum());
-
- assertTrue(GLOBAL_SCAN_BYTES.getMetric().getTotalSum() > 0);
- assertTrue(GLOBAL_QUERY_TIME.getMetric().getTotalSum() > 0);
- assertTrue(GLOBAL_TASK_END_TO_END_TIME.getMetric().getTotalSum() > 0);
- assertTrue(GLOBAL_TASK_EXECUTION_TIME.getMetric().getTotalSum() > 0);
-
- assertTrue(GLOBAL_HBASE_COUNT_RPC_CALLS.getMetric().getTotalSum() > 0);
-
assertTrue(GLOBAL_HBASE_COUNT_MILLS_BETWEEN_NEXTS.getMetric().getTotalSum() >
0);
-
assertTrue(GLOBAL_HBASE_COUNT_BYTES_REGION_SERVER_RESULTS.getMetric().getTotalSum()
> 0);
-
assertTrue(GLOBAL_HBASE_COUNT_SCANNED_REGIONS.getMetric().getTotalSum() > 0);
+ assertEquals(1, GLOBAL_NUM_PARALLEL_SCANS.getMetric().getValue());
+ assertEquals(1, GLOBAL_SELECT_SQL_COUNTER.getMetric().getValue());
+ assertEquals(0, GLOBAL_REJECTED_TASK_COUNTER.getMetric().getValue());
+ assertEquals(0, GLOBAL_QUERY_TIMEOUT_COUNTER.getMetric().getValue());
+ assertEquals(0, GLOBAL_FAILED_QUERY_COUNTER.getMetric().getValue());
+ assertEquals(0, GLOBAL_SPOOL_FILE_COUNTER.getMetric().getValue());
+ assertEquals(0, GLOBAL_MUTATION_BATCH_SIZE.getMetric().getValue());
+ assertEquals(0, GLOBAL_MUTATION_BYTES.getMetric().getValue());
+ assertEquals(0,
GLOBAL_MUTATION_BATCH_FAILED_COUNT.getMetric().getValue());
+
+ assertTrue(GLOBAL_SCAN_BYTES.getMetric().getValue() > 0);
+ assertTrue(GLOBAL_QUERY_TIME.getMetric().getValue() > 0);
+ assertTrue(GLOBAL_TASK_END_TO_END_TIME.getMetric().getValue() > 0);
+ assertTrue(GLOBAL_TASK_EXECUTION_TIME.getMetric().getValue() > 0);
+
+ assertTrue(GLOBAL_HBASE_COUNT_RPC_CALLS.getMetric().getValue() > 0);
+
assertTrue(GLOBAL_HBASE_COUNT_MILLS_BETWEEN_NEXTS.getMetric().getValue() > 0);
+
assertTrue(GLOBAL_HBASE_COUNT_BYTES_REGION_SERVER_RESULTS.getMetric().getValue()
> 0);
+ assertTrue(GLOBAL_HBASE_COUNT_SCANNED_REGIONS.getMetric().getValue() >
0);
}
@Test
public void testGlobalPhoenixMetricsForMutations() throws Exception {
String tableName = generateUniqueName();
createTableAndInsertValues(tableName, true);
- assertEquals(10, GLOBAL_MUTATION_BATCH_SIZE.getMetric().getTotalSum());
- assertEquals(10,
GLOBAL_MUTATION_SQL_COUNTER.getMetric().getTotalSum());
- assertTrue(GLOBAL_MUTATION_BYTES.getMetric().getTotalSum() > 0);
- assertTrue(GLOBAL_MUTATION_COMMIT_TIME.getMetric().getTotalSum() > 0);
- assertEquals(0, GLOBAL_NUM_PARALLEL_SCANS.getMetric().getTotalSum());
- assertEquals(0, GLOBAL_SELECT_SQL_COUNTER.getMetric().getTotalSum());
- assertEquals(0,
GLOBAL_REJECTED_TASK_COUNTER.getMetric().getTotalSum());
- assertEquals(0,
GLOBAL_QUERY_TIMEOUT_COUNTER.getMetric().getTotalSum());
- assertEquals(0, GLOBAL_FAILED_QUERY_COUNTER.getMetric().getTotalSum());
- assertEquals(0, GLOBAL_SPOOL_FILE_COUNTER.getMetric().getTotalSum());
- assertEquals(0,
GLOBAL_MUTATION_BATCH_FAILED_COUNT.getMetric().getTotalSum());
+ assertEquals(10, GLOBAL_MUTATION_BATCH_SIZE.getMetric().getValue());
+ assertEquals(10, GLOBAL_MUTATION_SQL_COUNTER.getMetric().getValue());
+ assertTrue(GLOBAL_MUTATION_BYTES.getMetric().getValue() > 0);
+ assertTrue(GLOBAL_MUTATION_COMMIT_TIME.getMetric().getValue() > 0);
+ assertEquals(0, GLOBAL_NUM_PARALLEL_SCANS.getMetric().getValue());
+ assertEquals(0, GLOBAL_SELECT_SQL_COUNTER.getMetric().getValue());
+ assertEquals(0, GLOBAL_REJECTED_TASK_COUNTER.getMetric().getValue());
+ assertEquals(0, GLOBAL_QUERY_TIMEOUT_COUNTER.getMetric().getValue());
+ assertEquals(0, GLOBAL_FAILED_QUERY_COUNTER.getMetric().getValue());
+ assertEquals(0, GLOBAL_SPOOL_FILE_COUNTER.getMetric().getValue());
+ assertEquals(0,
GLOBAL_MUTATION_BATCH_FAILED_COUNT.getMetric().getValue());
}
@Test
@@ -159,24 +159,24 @@ public class PhoenixMetricsIT extends
BasePhoenixMetricsIT {
String dml = "UPSERT INTO " + tableTo + " (K, V) SELECT K, V FROM " +
tableFrom;
conn.createStatement().executeUpdate(dml);
conn.commit();
- assertEquals(10, GLOBAL_MUTATION_BATCH_SIZE.getMetric().getTotalSum());
- assertEquals(1, GLOBAL_MUTATION_SQL_COUNTER.getMetric().getTotalSum());
- assertEquals(1, GLOBAL_NUM_PARALLEL_SCANS.getMetric().getTotalSum());
- assertEquals(0, GLOBAL_QUERY_TIME.getMetric().getTotalSum());
- assertTrue(GLOBAL_SCAN_BYTES.getMetric().getTotalSum() > 0);
- assertTrue(GLOBAL_MUTATION_BYTES.getMetric().getTotalSum() > 0);
- assertTrue(GLOBAL_MUTATION_COMMIT_TIME.getMetric().getTotalSum() > 0);
- assertEquals(0, GLOBAL_SELECT_SQL_COUNTER.getMetric().getTotalSum());
- assertEquals(0,
GLOBAL_REJECTED_TASK_COUNTER.getMetric().getTotalSum());
- assertEquals(0,
GLOBAL_QUERY_TIMEOUT_COUNTER.getMetric().getTotalSum());
- assertEquals(0, GLOBAL_FAILED_QUERY_COUNTER.getMetric().getTotalSum());
- assertEquals(0, GLOBAL_SPOOL_FILE_COUNTER.getMetric().getTotalSum());
- assertEquals(0,
GLOBAL_MUTATION_BATCH_FAILED_COUNT.getMetric().getTotalSum());
-
- assertTrue(GLOBAL_HBASE_COUNT_RPC_CALLS.getMetric().getTotalSum() > 0);
-
assertTrue(GLOBAL_HBASE_COUNT_MILLS_BETWEEN_NEXTS.getMetric().getTotalSum() >
0);
-
assertTrue(GLOBAL_HBASE_COUNT_BYTES_REGION_SERVER_RESULTS.getMetric().getTotalSum()
> 0);
-
assertTrue(GLOBAL_HBASE_COUNT_SCANNED_REGIONS.getMetric().getTotalSum() > 0);
+ assertEquals(10, GLOBAL_MUTATION_BATCH_SIZE.getMetric().getValue());
+ assertEquals(1, GLOBAL_MUTATION_SQL_COUNTER.getMetric().getValue());
+ assertEquals(1, GLOBAL_NUM_PARALLEL_SCANS.getMetric().getValue());
+ assertEquals(0, GLOBAL_QUERY_TIME.getMetric().getValue());
+ assertTrue(GLOBAL_SCAN_BYTES.getMetric().getValue() > 0);
+ assertTrue(GLOBAL_MUTATION_BYTES.getMetric().getValue() > 0);
+ assertTrue(GLOBAL_MUTATION_COMMIT_TIME.getMetric().getValue() > 0);
+ assertEquals(0, GLOBAL_SELECT_SQL_COUNTER.getMetric().getValue());
+ assertEquals(0, GLOBAL_REJECTED_TASK_COUNTER.getMetric().getValue());
+ assertEquals(0, GLOBAL_QUERY_TIMEOUT_COUNTER.getMetric().getValue());
+ assertEquals(0, GLOBAL_FAILED_QUERY_COUNTER.getMetric().getValue());
+ assertEquals(0, GLOBAL_SPOOL_FILE_COUNTER.getMetric().getValue());
+ assertEquals(0,
GLOBAL_MUTATION_BATCH_FAILED_COUNT.getMetric().getValue());
+
+ assertTrue(GLOBAL_HBASE_COUNT_RPC_CALLS.getMetric().getValue() > 0);
+
assertTrue(GLOBAL_HBASE_COUNT_MILLS_BETWEEN_NEXTS.getMetric().getValue() > 0);
+
assertTrue(GLOBAL_HBASE_COUNT_BYTES_REGION_SERVER_RESULTS.getMetric().getValue()
> 0);
+ assertTrue(GLOBAL_HBASE_COUNT_SCANNED_REGIONS.getMetric().getValue() >
0);
}
private static void resetGlobalMetrics() {
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetric.java
b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetric.java
index f3b562f..2a4af86 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetric.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/monitoring/GlobalMetric.java
@@ -33,5 +33,6 @@ public interface GlobalMetric extends Metric {
/**
* @return Sum of the values of the metric sampled since the last {@link
#reset()} call.
*/
+ @Deprecated
public long getTotalSum();
}
