IGNITE-4536 one more obsolete cache metric was removed
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/00b7c51b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/00b7c51b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/00b7c51b Branch: refs/heads/ignite-5072 Commit: 00b7c51bc1f94d8a98709d61f48c19c7a4bc060f Parents: 712398e Author: Sergey Chugunov <[email protected]> Authored: Tue Apr 25 12:53:25 2017 +0300 Committer: Sergey Chugunov <[email protected]> Committed: Tue Apr 25 12:53:25 2017 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/cache/CacheMetrics.java | 7 ------- .../cache/CacheClusterMetricsMXBeanImpl.java | 5 ----- .../processors/cache/CacheLocalMetricsMXBeanImpl.java | 5 ----- .../internal/processors/cache/CacheMetricsImpl.java | 5 ----- .../processors/cache/CacheMetricsSnapshot.java | 13 ------------- .../processors/platform/cache/PlatformCache.java | 1 - .../org/apache/ignite/mxbean/CacheMetricsMXBean.java | 4 ---- .../ignite/platform/PlatformCacheWriteMetricsTask.java | 5 ----- 8 files changed, 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/00b7c51b/modules/core/src/main/java/org/apache/ignite/cache/CacheMetrics.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheMetrics.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheMetrics.java index c0eb98e..b34913c 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheMetrics.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheMetrics.java @@ -230,13 +230,6 @@ public interface CacheMetrics { public long getOffHeapAllocatedSize(); /** - * Gets off-heap memory maximum size. - * - * @return Off-heap memory maximum size. - */ - public long getOffHeapMaxSize(); - - /** * Gets number of non-{@code null} values in the cache. * * @return Number of non-{@code null} values in the cache. http://git-wip-us.apache.org/repos/asf/ignite/blob/00b7c51b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheClusterMetricsMXBeanImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheClusterMetricsMXBeanImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheClusterMetricsMXBeanImpl.java index c633fde..deaaac0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheClusterMetricsMXBeanImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheClusterMetricsMXBeanImpl.java @@ -104,11 +104,6 @@ class CacheClusterMetricsMXBeanImpl implements CacheMetricsMXBean { } /** {@inheritDoc} */ - @Override public long getOffHeapMaxSize() { - return cache.clusterMetrics().getOffHeapMaxSize(); - } - - /** {@inheritDoc} */ @Override public int getSize() { return cache.clusterMetrics().getSize(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/00b7c51b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLocalMetricsMXBeanImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLocalMetricsMXBeanImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLocalMetricsMXBeanImpl.java index cdab58a..0fb7568 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLocalMetricsMXBeanImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLocalMetricsMXBeanImpl.java @@ -104,11 +104,6 @@ class CacheLocalMetricsMXBeanImpl implements CacheMetricsMXBean { } /** {@inheritDoc} */ - @Override public long getOffHeapMaxSize() { - return cache.metrics0().getOffHeapMaxSize(); - } - - /** {@inheritDoc} */ @Override public int getSize() { return cache.metrics0().getSize(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/00b7c51b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsImpl.java ---------------------------------------------------------------------- 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 1d03e64..d4ad8e4 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 @@ -220,11 +220,6 @@ public class CacheMetricsImpl implements CacheMetrics { } /** {@inheritDoc} */ - @Override public long getOffHeapMaxSize() { - return 0; - } - - /** {@inheritDoc} */ @Override public int getSize() { GridCacheAdapter<?, ?> cache = cctx.cache(); http://git-wip-us.apache.org/repos/asf/ignite/blob/00b7c51b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsSnapshot.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsSnapshot.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsSnapshot.java index a8d7693..67f646a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsSnapshot.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheMetricsSnapshot.java @@ -104,9 +104,6 @@ public class CacheMetricsSnapshot implements CacheMetrics, Externalizable { /** Memory size allocated in off-heap. */ private long offHeapAllocatedSize; - /** Off-heap memory maximum size*/ - private long offHeapMaxSize; - /** Number of non-{@code null} values in the cache. */ private int size; @@ -249,7 +246,6 @@ public class CacheMetricsSnapshot implements CacheMetrics, Externalizable { offHeapPrimaryEntriesCnt = m.getOffHeapPrimaryEntriesCount(); offHeapBackupEntriesCnt = m.getOffHeapBackupEntriesCount(); offHeapAllocatedSize = m.getOffHeapAllocatedSize(); - offHeapMaxSize = m.getOffHeapMaxSize(); size = m.getSize(); keySize = m.getKeySize(); @@ -314,8 +310,6 @@ public class CacheMetricsSnapshot implements CacheMetrics, Externalizable { isReadThrough = loc.isReadThrough(); isWriteThrough = loc.isWriteThrough(); - offHeapMaxSize = loc.getOffHeapMaxSize(); - for (CacheMetrics e : metrics) { reads += e.getCacheGets(); puts += e.getCachePuts(); @@ -570,11 +564,6 @@ public class CacheMetricsSnapshot implements CacheMetrics, Externalizable { } /** {@inheritDoc} */ - @Override public long getOffHeapMaxSize() { - return offHeapMaxSize; - } - - /** {@inheritDoc} */ @Override public int getSize() { return size; } @@ -776,7 +765,6 @@ public class CacheMetricsSnapshot implements CacheMetrics, Externalizable { out.writeLong(offHeapPrimaryEntriesCnt); out.writeLong(offHeapBackupEntriesCnt); out.writeLong(offHeapAllocatedSize); - out.writeLong(offHeapMaxSize); out.writeInt(dhtEvictQueueCurrSize); out.writeInt(txThreadMapSize); @@ -825,7 +813,6 @@ public class CacheMetricsSnapshot implements CacheMetrics, Externalizable { offHeapPrimaryEntriesCnt = in.readLong(); offHeapBackupEntriesCnt = in.readLong(); offHeapAllocatedSize = in.readLong(); - offHeapMaxSize = in.readLong(); dhtEvictQueueCurrSize = in.readInt(); txThreadMapSize = in.readInt(); http://git-wip-us.apache.org/repos/asf/ignite/blob/00b7c51b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java index 9a08b2b..c61b75e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/PlatformCache.java @@ -1415,7 +1415,6 @@ public class PlatformCache extends PlatformAbstractTarget { writer.writeLong(metrics.getOffHeapPrimaryEntriesCount()); writer.writeLong(metrics.getOffHeapBackupEntriesCount()); writer.writeLong(metrics.getOffHeapAllocatedSize()); - writer.writeLong(metrics.getOffHeapMaxSize()); writer.writeInt(metrics.getSize()); writer.writeInt(metrics.getKeySize()); writer.writeBoolean(metrics.isEmpty()); http://git-wip-us.apache.org/repos/asf/ignite/blob/00b7c51b/modules/core/src/main/java/org/apache/ignite/mxbean/CacheMetricsMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/CacheMetricsMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/CacheMetricsMXBean.java index 61d2984..3d05763 100644 --- a/modules/core/src/main/java/org/apache/ignite/mxbean/CacheMetricsMXBean.java +++ b/modules/core/src/main/java/org/apache/ignite/mxbean/CacheMetricsMXBean.java @@ -144,10 +144,6 @@ public interface CacheMetricsMXBean extends CacheStatisticsMXBean, CacheMXBean, public long getOffHeapAllocatedSize(); /** {@inheritDoc} */ - @MXBeanDescription("Off-heap memory maximum size.") - public long getOffHeapMaxSize(); - - /** {@inheritDoc} */ @MXBeanDescription("Number of non-null values in the cache.") public int getSize(); http://git-wip-us.apache.org/repos/asf/ignite/blob/00b7c51b/modules/core/src/test/java/org/apache/ignite/platform/PlatformCacheWriteMetricsTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/platform/PlatformCacheWriteMetricsTask.java b/modules/core/src/test/java/org/apache/ignite/platform/PlatformCacheWriteMetricsTask.java index da013bd..b99424d 100644 --- a/modules/core/src/test/java/org/apache/ignite/platform/PlatformCacheWriteMetricsTask.java +++ b/modules/core/src/test/java/org/apache/ignite/platform/PlatformCacheWriteMetricsTask.java @@ -235,11 +235,6 @@ public class PlatformCacheWriteMetricsTask extends ComputeTaskAdapter<Long, Obje } /** {@inheritDoc} */ - @Override public long getOffHeapMaxSize() { - return 28; - } - - /** {@inheritDoc} */ @Override public int getSize() { return 29; }
