You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2019/08/13 14:22:29 UTC
[ignite] branch master updated: IGNITE-12046 Redundant LongMetric
interface methods are removed
This is an automated email from the ASF dual-hosted git repository.
agura pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new d9fde7e IGNITE-12046 Redundant LongMetric interface methods are removed
d9fde7e is described below
commit d9fde7ee1562a84f26e92cd94dd0ac09738414ff
Author: Andrey Gura <ag...@apache.org>
AuthorDate: Tue Aug 6 16:58:26 2019 +0300
IGNITE-12046 Redundant LongMetric interface methods are removed
---
.../DiskPageCompressionIntegrationTest.java | 8 +-
.../internal/metric/IoStatisticsHolderCache.java | 4 +-
.../internal/metric/IoStatisticsHolderIndex.java | 4 +-
.../processors/cache/CacheGroupMetricsImpl.java | 4 +-
.../processors/cache/CacheMetricsImpl.java | 130 +++++++++++----------
.../cache/persistence/DataRegionMetricsImpl.java | 24 ++--
.../cache/persistence/DataStorageMetricsImpl.java | 2 +-
.../cache/query/GridCacheQueryMetricsAdapter.java | 20 ++--
.../org/apache/ignite/spi/metric/LongMetric.java | 10 --
.../internal/metric/IoStatisticsSelfTest.java | 13 +--
10 files changed, 108 insertions(+), 111 deletions(-)
diff --git a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/DiskPageCompressionIntegrationTest.java b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/DiskPageCompressionIntegrationTest.java
index 9316d00..fb80054 100644
--- a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/DiskPageCompressionIntegrationTest.java
+++ b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/DiskPageCompressionIntegrationTest.java
@@ -143,8 +143,8 @@ public class DiskPageCompressionIntegrationTest extends AbstractPageCompressionI
MetricRegistry mreg = ignite.context().metric().registry(
metricName(CACHE_GROUP_METRICS_PREFIX, cctx.group().cacheOrGroupName()));
- storeSize = mreg.<LongMetric>findMetric("StorageSize").longValue();
- sparseStoreSize = mreg.<LongMetric>findMetric("SparseStorageSize").longValue();
+ storeSize = mreg.<LongMetric>findMetric("StorageSize").value();
+ sparseStoreSize = mreg.<LongMetric>findMetric("SparseStorageSize").value();
assertTrue("storeSize: " + storeSize, storeSize > 0);
@@ -214,8 +214,8 @@ public class DiskPageCompressionIntegrationTest extends AbstractPageCompressionI
if (i % 50_000 == 0) {
dbMgr.forceCheckpoint("test").finishFuture().get();
- long sparse = mreg.<LongMetric>findMetric("SparseStorageSize").longValue();
- long size = mreg.<LongMetric>findMetric("StorageSize").longValue();
+ long sparse = mreg.<LongMetric>findMetric("SparseStorageSize").value();
+ long size = mreg.<LongMetric>findMetric("StorageSize").value();
System.out.println(i + " >> " + sparse + " / " + size + " = " + ((double)sparse / size));
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/metric/IoStatisticsHolderCache.java b/modules/core/src/main/java/org/apache/ignite/internal/metric/IoStatisticsHolderCache.java
index 9bd6fd6..e6e12d9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/metric/IoStatisticsHolderCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/metric/IoStatisticsHolderCache.java
@@ -97,12 +97,12 @@ public class IoStatisticsHolderCache implements IoStatisticsHolder {
/** {@inheritDoc} */
@Override public long logicalReads() {
- return logicalReadCtr.longValue();
+ return logicalReadCtr.value();
}
/** {@inheritDoc} */
@Override public long physicalReads() {
- return physicalReadCtr.longValue();
+ return physicalReadCtr.value();
}
/**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/metric/IoStatisticsHolderIndex.java b/modules/core/src/main/java/org/apache/ignite/internal/metric/IoStatisticsHolderIndex.java
index 6537a7e..a4ec9f6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/metric/IoStatisticsHolderIndex.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/metric/IoStatisticsHolderIndex.java
@@ -139,12 +139,12 @@ public class IoStatisticsHolderIndex implements IoStatisticsHolder {
/** {@inheritDoc} */
@Override public long logicalReads() {
- return logicalReadLeafCtr.longValue() + logicalReadInnerCtr.longValue();
+ return logicalReadLeafCtr.value() + logicalReadInnerCtr.value();
}
/** {@inheritDoc} */
@Override public long physicalReads() {
- return physicalReadLeafCtr.longValue() + physicalReadInnerCtr.longValue();
+ return physicalReadLeafCtr.value() + physicalReadInnerCtr.value();
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupMetricsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupMetricsImpl.java
index 6bece99..8c0af45 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupMetricsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupMetricsImpl.java
@@ -152,7 +152,7 @@ public class CacheGroupMetricsImpl {
/** */
public long getIndexBuildCountPartitionsLeft() {
- return idxBuildCntPartitionsLeft.get();
+ return idxBuildCntPartitionsLeft.value();
}
/** Set number of partitions need processed for finished indexes create or rebuilding. */
@@ -417,7 +417,7 @@ public class CacheGroupMetricsImpl {
/** */
public long getTotalAllocatedPages() {
- return groupPageAllocationTracker.longValue();
+ return groupPageAllocationTracker.value();
}
/** */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
index e1049a5..eefcb19 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java
@@ -327,54 +327,56 @@ public class CacheMetricsImpl implements CacheMetrics {
/** {@inheritDoc} */
@Override public long getOffHeapGets() {
- return offHeapGets.get();
+ return offHeapGets.value();
}
/** {@inheritDoc} */
@Override public long getOffHeapPuts() {
- return offHeapPuts.get();
+ return offHeapPuts.value();
}
/** {@inheritDoc} */
@Override public long getOffHeapRemovals() {
- return offHeapRemoves.get();
+ return offHeapRemoves.value();
}
/** {@inheritDoc} */
@Override public long getOffHeapEvictions() {
- return offHeapEvicts.get();
+ return offHeapEvicts.value();
}
/** {@inheritDoc} */
@Override public long getOffHeapHits() {
- return offHeapHits.get();
+ return offHeapHits.value();
}
/** {@inheritDoc} */
@Override public float getOffHeapHitPercentage() {
- long hits0 = offHeapHits.get();
- long gets0 = offHeapGets.get();
+ long hits0 = offHeapHits.value();
+
+ long gets0 = offHeapGets.value();
if (hits0 == 0)
return 0;
- return (float) hits0 / gets0 * 100.0f;
+ return (float)hits0 / gets0 * 100.0f;
}
/** {@inheritDoc} */
@Override public long getOffHeapMisses() {
- return offHeapMisses.get();
+ return offHeapMisses.value();
}
/** {@inheritDoc} */
@Override public float getOffHeapMissPercentage() {
- long misses0 = offHeapMisses.get();
- long reads0 = offHeapGets.get();
+ long misses0 = offHeapMisses.value();
+
+ long reads0 = offHeapGets.value();
if (misses0 == 0)
return 0;
- return (float) misses0 / reads0 * 100.0f;
+ return (float)misses0 / reads0 * 100.0f;
}
/** {@inheritDoc} */
@@ -546,8 +548,9 @@ public class CacheMetricsImpl implements CacheMetrics {
/** {@inheritDoc} */
@Override public float getAverageTxCommitTime() {
- long timeNanos = commitTimeNanos.get();
- long commitsCnt = txCommits.get();
+ long timeNanos = commitTimeNanos.value();
+
+ long commitsCnt = txCommits.value();
if (timeNanos == 0 || commitsCnt == 0)
return 0;
@@ -557,8 +560,9 @@ public class CacheMetricsImpl implements CacheMetrics {
/** {@inheritDoc} */
@Override public float getAverageTxRollbackTime() {
- long timeNanos = rollbackTimeNanos.get();
- long rollbacksCnt = txRollbacks.get();
+ long timeNanos = rollbackTimeNanos.value();
+
+ long rollbacksCnt = txRollbacks.value();
if (timeNanos == 0 || rollbacksCnt == 0)
return 0;
@@ -568,12 +572,12 @@ public class CacheMetricsImpl implements CacheMetrics {
/** {@inheritDoc} */
@Override public long getCacheTxCommits() {
- return txCommits.get();
+ return txCommits.value();
}
/** {@inheritDoc} */
@Override public long getCacheTxRollbacks() {
- return txRollbacks.get();
+ return txRollbacks.value();
}
/**
@@ -618,102 +622,107 @@ public class CacheMetricsImpl implements CacheMetrics {
/** {@inheritDoc} */
@Override public long getCacheHits() {
- return hits.get();
+ return hits.value();
}
/** {@inheritDoc} */
@Override public float getCacheHitPercentage() {
- long hits0 = hits.get();
- long gets0 = reads.get();
+ long hits0 = hits.value();
+
+ long gets0 = reads.value();
if (hits0 == 0)
return 0;
- return (float) hits0 / gets0 * 100.0f;
+ return (float)hits0 / gets0 * 100.0f;
}
/** {@inheritDoc} */
@Override public long getCacheMisses() {
- return misses.get();
+ return misses.value();
}
/** {@inheritDoc} */
@Override public float getCacheMissPercentage() {
- long misses0 = misses.get();
- long reads0 = reads.get();
+ long misses0 = misses.value();
+
+ long reads0 = reads.value();
if (misses0 == 0)
return 0;
- return (float) misses0 / reads0 * 100.0f;
+ return (float)misses0 / reads0 * 100.0f;
}
/** {@inheritDoc} */
@Override public long getCacheGets() {
- return reads.get();
+ return reads.value();
}
/** {@inheritDoc} */
@Override public long getCachePuts() {
- return writes.get();
+ return writes.value();
}
/** {@inheritDoc} */
@Override public long getEntryProcessorPuts() {
- return entryProcessorPuts.get();
+ return entryProcessorPuts.value();
}
/** {@inheritDoc} */
@Override public long getEntryProcessorRemovals() {
- return entryProcessorRemovals.get();
+ return entryProcessorRemovals.value();
}
/** {@inheritDoc} */
@Override public long getEntryProcessorReadOnlyInvocations() {
- return entryProcessorReadOnlyInvocations.get();
+ return entryProcessorReadOnlyInvocations.value();
}
/** {@inheritDoc} */
@Override public long getEntryProcessorInvocations() {
- return entryProcessorReadOnlyInvocations.get() + entryProcessorPuts.get() + entryProcessorRemovals.get();
+ return entryProcessorReadOnlyInvocations.value() + entryProcessorPuts.value() + entryProcessorRemovals.value();
}
/** {@inheritDoc} */
@Override public long getEntryProcessorHits() {
- return entryProcessorHits.get();
+ return entryProcessorHits.value();
}
/** {@inheritDoc} */
@Override public float getEntryProcessorHitPercentage() {
- long hits = entryProcessorHits.get();
+ long hits = entryProcessorHits.value();
+
long totalInvocations = getEntryProcessorInvocations();
if (hits == 0)
return 0;
- return (float) hits / totalInvocations * 100.0f;
+ return (float)hits / totalInvocations * 100.0f;
}
/** {@inheritDoc} */
@Override public long getEntryProcessorMisses() {
- return entryProcessorMisses.get();
+ return entryProcessorMisses.value();
}
/** {@inheritDoc} */
@Override public float getEntryProcessorMissPercentage() {
- long misses = entryProcessorMisses.get();
+ long misses = entryProcessorMisses.value();
+
long totalInvocations = getEntryProcessorInvocations();
if (misses == 0)
return 0;
- return (float) misses / totalInvocations * 100.0f;
+ return (float)misses / totalInvocations * 100.0f;
}
/** {@inheritDoc} */
@Override public float getEntryProcessorAverageInvocationTime() {
long totalInvokes = getEntryProcessorInvocations();
- long timeNanos = entryProcessorInvokeTimeNanos.get();
+
+ long timeNanos = entryProcessorInvokeTimeNanos.value();
if (timeNanos == 0 || totalInvokes == 0)
return 0;
@@ -723,28 +732,29 @@ public class CacheMetricsImpl implements CacheMetrics {
/** {@inheritDoc} */
@Override public float getEntryProcessorMinInvocationTime() {
- return (1f * entryProcessorMinInvocationTime.get()) / NANOS_IN_MICROSECOND;
+ return (1f * entryProcessorMinInvocationTime.value()) / NANOS_IN_MICROSECOND;
}
/** {@inheritDoc} */
@Override public float getEntryProcessorMaxInvocationTime() {
- return (1f * entryProcessorMaxInvocationTime.get()) / NANOS_IN_MICROSECOND;
+ return (1f * entryProcessorMaxInvocationTime.value()) / NANOS_IN_MICROSECOND;
}
/** {@inheritDoc} */
@Override public long getCacheRemovals() {
- return rmCnt.get();
+ return rmCnt.value();
}
/** {@inheritDoc} */
@Override public long getCacheEvictions() {
- return evictCnt.get();
+ return evictCnt.value();
}
/** {@inheritDoc} */
@Override public float getAverageGetTime() {
- long timeNanos = getTimeNanos.get();
- long readsCnt = reads.get();
+ long timeNanos = getTimeNanos.value();
+
+ long readsCnt = reads.value();
if (timeNanos == 0 || readsCnt == 0)
return 0;
@@ -754,8 +764,9 @@ public class CacheMetricsImpl implements CacheMetrics {
/** {@inheritDoc} */
@Override public float getAveragePutTime() {
- long timeNanos = putTimeNanos.get();
- long putsCnt = writes.get();
+ long timeNanos = putTimeNanos.value();
+
+ long putsCnt = writes.value();
if (timeNanos == 0 || putsCnt == 0)
return 0;
@@ -765,8 +776,9 @@ public class CacheMetricsImpl implements CacheMetrics {
/** {@inheritDoc} */
@Override public float getAverageRemoveTime() {
- long timeNanos = rmvTimeNanos.get();
- long removesCnt = rmCnt.get();
+ long timeNanos = rmvTimeNanos.value();
+
+ long removesCnt = rmCnt.value();
if (timeNanos == 0 || removesCnt == 0)
return 0;
@@ -864,13 +876,13 @@ public class CacheMetricsImpl implements CacheMetrics {
* @param duration Duration.
*/
private void recalculateInvokeMinTimeNanos(long duration){
- long minTime = entryProcessorMinInvocationTime.longValue();
+ long minTime = entryProcessorMinInvocationTime.value();
while (minTime > duration || minTime == 0) {
if (MetricUtils.compareAndSet(entryProcessorMinInvocationTime, minTime, duration))
break;
else
- minTime = entryProcessorMinInvocationTime.longValue();
+ minTime = entryProcessorMinInvocationTime.value();
}
}
@@ -880,13 +892,13 @@ public class CacheMetricsImpl implements CacheMetrics {
* @param duration Duration.
*/
private void recalculateInvokeMaxTimeNanos(long duration){
- long maxTime = entryProcessorMaxInvocationTime.longValue();
+ long maxTime = entryProcessorMaxInvocationTime.value();
while (maxTime < duration) {
if (MetricUtils.compareAndSet(entryProcessorMaxInvocationTime, maxTime, duration))
break;
else
- maxTime = entryProcessorMaxInvocationTime.longValue();
+ maxTime = entryProcessorMaxInvocationTime.value();
}
}
@@ -1191,17 +1203,17 @@ public class CacheMetricsImpl implements CacheMetrics {
/** {@inheritDoc} */
@Override public long getRebalancedKeys() {
- return rebalancedKeys.get();
+ return rebalancedKeys.value();
}
/** {@inheritDoc} */
@Override public long getEstimatedRebalancingKeys() {
- return estimatedRebalancingKeys.get();
+ return estimatedRebalancingKeys.value();
}
/** {@inheritDoc} */
@Override public long getKeysToRebalanceLeft() {
- return Math.max(0, estimatedRebalancingKeys.get() - rebalancedKeys.get());
+ return Math.max(0, estimatedRebalancingKeys.value() - rebalancedKeys.value());
}
/** {@inheritDoc} */
@@ -1245,7 +1257,7 @@ public class CacheMetricsImpl implements CacheMetrics {
/** {@inheritDoc} */
@Override public long rebalancingStartTime() {
- return rebalanceStartTime.get();
+ return rebalanceStartTime.value();
}
/** {@inheritDoc} */
@@ -1258,12 +1270,12 @@ public class CacheMetricsImpl implements CacheMetrics {
/** {@inheritDoc} */
@Override public long getRebalancingStartTime() {
- return rebalanceStartTime.get();
+ return rebalanceStartTime.value();
}
/** {@inheritDoc} */
@Override public long getRebalanceClearingPartitionsLeft() {
- return rebalanceClearingPartitions.get();
+ return rebalanceClearingPartitions.value();
}
/**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataRegionMetricsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataRegionMetricsImpl.java
index 7ee3aed..ff38185 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataRegionMetricsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataRegionMetricsImpl.java
@@ -213,7 +213,7 @@ public class DataRegionMetricsImpl implements DataRegionMetrics {
/** {@inheritDoc} */
@Override public long getTotalAllocatedPages() {
- return totalAllocatedPages.longValue();
+ return totalAllocatedPages.value();
}
/** {@inheritDoc} */
@@ -249,9 +249,7 @@ public class DataRegionMetricsImpl implements DataRegionMetrics {
if (!metricsEnabled)
return 0;
- return totalAllocatedPages.longValue() != 0 ?
- (float) largeEntriesPages.longValue() / totalAllocatedPages.longValue()
- : 0;
+ return totalAllocatedPages.value() != 0 ? (float)largeEntriesPages.value() / totalAllocatedPages.value() : 0;
}
/** {@inheritDoc} */
@@ -261,11 +259,9 @@ public class DataRegionMetricsImpl implements DataRegionMetrics {
long freeSpace = dataRegionMetricsProvider.partiallyFilledPagesFreeSpace();
- long totalAllocated = getPageSize() * totalAllocatedPages.longValue();
+ long totalAllocated = getPageSize() * totalAllocatedPages.value();
- return totalAllocated != 0 ?
- (float) (totalAllocated - freeSpace) / totalAllocated
- : 0f;
+ return totalAllocated != 0 ? (float)(totalAllocated - freeSpace) / totalAllocated : 0f;
}
/** {@inheritDoc} */
@@ -273,7 +269,7 @@ public class DataRegionMetricsImpl implements DataRegionMetrics {
if (!metricsEnabled || !persistenceEnabled)
return 0;
- return dirtyPages.longValue();
+ return dirtyPages.value();
}
/** {@inheritDoc} */
@@ -332,7 +328,7 @@ public class DataRegionMetricsImpl implements DataRegionMetrics {
if (!metricsEnabled || !persistenceEnabled)
return 0;
- return checkpointBufferSize.get();
+ return checkpointBufferSize.value();
}
/** {@inheritDoc} */
@@ -350,7 +346,7 @@ public class DataRegionMetricsImpl implements DataRegionMetrics {
if (!metricsEnabled)
return 0;
- return readPages.longValue();
+ return readPages.value();
}
/** {@inheritDoc} */
@@ -358,7 +354,7 @@ public class DataRegionMetricsImpl implements DataRegionMetrics {
if (!metricsEnabled)
return 0;
- return writtenPages.longValue();
+ return writtenPages.value();
}
/** {@inheritDoc} */
@@ -366,12 +362,12 @@ public class DataRegionMetricsImpl implements DataRegionMetrics {
if (!metricsEnabled)
return 0;
- return replacedPages.longValue();
+ return replacedPages.value();
}
/** {@inheritDoc} */
@Override public long getOffHeapSize() {
- return offHeapSize.get();
+ return offHeapSize.value();
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataStorageMetricsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataStorageMetricsImpl.java
index 576ddcd..def1b90 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataStorageMetricsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataStorageMetricsImpl.java
@@ -353,7 +353,7 @@ public class DataStorageMetricsImpl implements DataStorageMetricsMXBean {
if (!metricsEnabled)
return 0;
- return totalCheckpointTime.get();
+ return totalCheckpointTime.value();
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetricsAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetricsAdapter.java
index 8068fe8..d5df056 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetricsAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryMetricsAdapter.java
@@ -71,31 +71,31 @@ public class GridCacheQueryMetricsAdapter implements QueryMetrics {
/** {@inheritDoc} */
@Override public long minimumTime() {
- long min = minTime.get();
+ long min = minTime.value();
return min == Long.MAX_VALUE ? 0 : min;
}
/** {@inheritDoc} */
@Override public long maximumTime() {
- return maxTime.get();
+ return maxTime.value();
}
/** {@inheritDoc} */
@Override public double averageTime() {
- double val = completed.longValue();
+ double val = completed.value();
- return val > 0 ? sumTime.longValue() / val : 0.0;
+ return val > 0 ? sumTime.value() / val : 0.0;
}
/** {@inheritDoc} */
@Override public int executions() {
- return (int)execs.longValue();
+ return (int)execs.value();
}
/** {@inheritDoc} */
@Override public int fails() {
- return (int)fails.longValue();
+ return (int)fails.value();
}
/**
@@ -122,14 +122,14 @@ public class GridCacheQueryMetricsAdapter implements QueryMetrics {
/** @return Current metrics values. */
public QueryMetrics snapshot() {
- long minTimeVal = minTime.longValue();
+ long minTimeVal = minTime.value();
return new QueryMetricsSnapshot(
minTimeVal == Long.MAX_VALUE ? 0 : minTimeVal,
- maxTime.longValue(),
+ maxTime.value(),
averageTime(),
- (int)execs.longValue(),
- (int)fails.longValue());
+ (int)execs.value(),
+ (int)fails.value());
}
/** Resets query metrics. */
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/metric/LongMetric.java b/modules/core/src/main/java/org/apache/ignite/spi/metric/LongMetric.java
index 2cdf207..de1d94c 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/metric/LongMetric.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/metric/LongMetric.java
@@ -28,14 +28,4 @@ public interface LongMetric extends Metric {
@Override public default String getAsString() {
return Long.toString(value());
}
-
- /** @return Value of the metric. */
- public default long longValue() {
- return value();
- }
-
- /** @return Value of the metric. */
- public default long get() {
- return value();
- }
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/metric/IoStatisticsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/metric/IoStatisticsSelfTest.java
index cc8003b..2195a84 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/metric/IoStatisticsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/metric/IoStatisticsSelfTest.java
@@ -51,7 +51,6 @@ import static org.apache.ignite.internal.processors.metric.impl.MetricUtils.metr
* Tests for IO statistic manager.
*/
public class IoStatisticsSelfTest extends GridCommonAbstractTest {
-
/** */
private static final int RECORD_COUNT = 5000;
@@ -95,20 +94,20 @@ public class IoStatisticsSelfTest extends GridCommonAbstractTest {
if (type == CACHE_GROUP) {
assertEquals(5, Iterators.size(mreg.iterator()));
- assertEquals(0, mreg.<LongMetric>findMetric(LOGICAL_READS).longValue());
+ assertEquals(0, mreg.<LongMetric>findMetric(LOGICAL_READS).value());
- assertEquals(0, mreg.<LongMetric>findMetric(PHYSICAL_READS).longValue());
+ assertEquals(0, mreg.<LongMetric>findMetric(PHYSICAL_READS).value());
}
else {
assertEquals(7, Iterators.size(mreg.iterator()));
- assertEquals(0, mreg.<LongMetric>findMetric(LOGICAL_READS_LEAF).longValue());
+ assertEquals(0, mreg.<LongMetric>findMetric(LOGICAL_READS_LEAF).value());
- assertEquals(0, mreg.<LongMetric>findMetric(LOGICAL_READS_INNER).longValue());
+ assertEquals(0, mreg.<LongMetric>findMetric(LOGICAL_READS_INNER).value());
- assertEquals(0, mreg.<LongMetric>findMetric(PHYSICAL_READS_LEAF).longValue());
+ assertEquals(0, mreg.<LongMetric>findMetric(PHYSICAL_READS_LEAF).value());
- assertEquals(0, mreg.<LongMetric>findMetric(PHYSICAL_READS_INNER).longValue());
+ assertEquals(0, mreg.<LongMetric>findMetric(PHYSICAL_READS_INNER).value());
}
}