Removed deprecated code. Updated VisorCache metrics.

modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java

@@ -72,7 +72,6 @@
 import org.apache.ignite.internal.visor.cache.VisorCacheResetMetricsTask;
 import org.apache.ignite.internal.visor.cache.VisorCacheStartTask;
 import org.apache.ignite.internal.visor.cache.VisorCacheStopTask;
-import org.apache.ignite.internal.visor.cache.VisorCacheSwapBackupsTask;
 import org.apache.ignite.internal.visor.compute.VisorComputeCancelSessionsTask;
 import org.apache.ignite.internal.visor.compute.VisorComputeResetMetricsTask;
 import org.apache.ignite.internal.visor.compute.VisorComputeToggleMonitoringTask;
@@ -1286,14 +1285,6 @@ public void testVisorGateway() throws Exception {
 
         jsonTaskResult(ret);
 
-        ret = content(new VisorGatewayArgument(VisorCacheSwapBackupsTask.class)
-            .forNode(locNode)
-            .set(String.class, "person"));
-
-        info("VisorCacheSwapBackupsTask result: " + ret);
-
-        jsonTaskResult(ret);
-
         ret = content(new VisorGatewayArgument(VisorCacheRebalanceTask.class)
             .forNode(locNode)
             .set(String.class, "person"));
@@ -1522,7 +1513,7 @@ public void testVisorGateway() throws Exception {
 
         jsonTaskResult(ret);
 
-        /** Spring XML to start cache via Visor task. */
+        // Spring XML to start cache via Visor task.
         final String START_CACHE =
             "<beans xmlns=\"http://www.springframework.org/schema/beans\"\n" +
                     "    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +

modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java

@@ -67,28 +67,19 @@ public class VisorCache implements Serializable, LessNamingBean {
     private long indexesSize;
 
     /** Number of all entries in cache. */
-    private int size;
+    private long size;
 
     /** Number of all entries in near cache. */
     private int nearSize;
 
-    /** Number of all entries in DHT cache. */
-    private int dhtSize;
-
     /** Number of primary entries in cache. */
-    private int primarySize;
-
-    /** Memory size allocated in off-heap. */
-    private long offHeapAllocatedSize;
+    private long primarySize;
 
-    /** Number of cache entries stored in off-heap memory. */
-    private long offHeapEntriesCnt;
+    /** Number of backup entries in cache. */
+    private long backupSize;
 
-    /** Size in bytes for swap space. */
-    private long swapSize;
-
-    /** Number of cache entries stored in swap space. */
-    private long swapKeys;
+    /** Number of cache entries stored in heap memory. */
+    private long onHeapEntriesCnt;
 
     /** Number of partitions. */
     private int partitions;
@@ -140,19 +131,17 @@ else if (ca instanceof GridDhtCacheAdapter)
             if (dca != null) {
                 GridDhtPartitionTopology top = dca.topology();
 
-                if (cfg.getCacheMode() != CacheMode.LOCAL && cfg.getBackups() > 0) {
+                if (cfg.getCacheMode() != CacheMode.LOCAL && cfg.getBackups() > 0)
                     partitionsMap = top.localPartitionMap();
-                }
             }
         }
 
         dynamicDeploymentId = cctx.dynamicDeploymentId();
-        size = ca.localSize(PEEK_NO_NEAR);
-        primarySize = ca.primarySize();
-        dhtSize = size - nearSize; // This is backup size.
+        size = ca.localSizeLong(PEEK_NO_NEAR);
+        primarySize = ca.primarySizeLong();
+        backupSize = size - primarySize; // This is backup size.
         nearSize = ca.nearSize();
-        offHeapAllocatedSize = 0; // Memory is allocated globally.
-        offHeapEntriesCnt = 0; // Need to rename on ON-heap entries count, see GG-11148
+        onHeapEntriesCnt = 0; // TODO GG-11148 Need to rename on ON-heap entries count, see
         partitions = ca.affinity().partitions();
         metrics = new VisorCacheMetrics().from(ignite, cacheName);
         near = cctx.isNear();
@@ -171,6 +160,7 @@ else if (ca instanceof GridDhtCacheAdapter)
      * @throws IgniteCheckedException If estimation failed.
      */
     protected void estimateMemorySize(IgniteEx ignite, GridCacheAdapter ca, int sample) throws IgniteCheckedException {
+        /* TODO Fix after GG-11739 implemented.
         int size = ca.size();
 
         Iterable<GridCacheEntryEx> set = ca.context().isNear()
@@ -195,6 +185,8 @@ protected void estimateMemorySize(IgniteEx ignite, GridCacheAdapter ca, int samp
             memSz = (long)((double)memSz / cnt * size);
 
         memorySize = memSz;
+        */
+        memorySize = 0;
     }
 
     /**
@@ -209,12 +201,9 @@ public VisorCache history() {
         c.indexesSize = indexesSize;
         c.size = size;
         c.nearSize = nearSize;
-        c.dhtSize = dhtSize;
+        c.backupSize = backupSize;
         c.primarySize = primarySize;
-        c.offHeapAllocatedSize = offHeapAllocatedSize;
-        c.offHeapEntriesCnt = offHeapEntriesCnt;
-        c.swapSize = swapSize;
-        c.swapKeys = swapKeys;
+        c.onHeapEntriesCnt = onHeapEntriesCnt;
         c.partitions = partitions;
         c.metrics = metrics;
         c.near = near;
@@ -269,7 +258,7 @@ public long indexesSize() {
     /**
      * @return Number of all entries in cache.
      */
-    public int size() {
+    public long size() {
         return size;
     }
 
@@ -281,45 +270,24 @@ public int nearSize() {
     }
 
     /**
-     * @return Number of all entries in DHT cache.
+     * @return Number of backup entries in cache.
      */
-    public int dhtSize() {
-        return dhtSize;
+    public long backupSize() {
+        return backupSize;
     }
 
     /**
      * @return Number of primary entries in cache.
      */
-    public int primarySize() {
+    public long primarySize() {
         return primarySize;
     }
 
     /**
-     * @return Memory size allocated in off-heap.
-     */
-    public long offHeapAllocatedSize() {
-        return offHeapAllocatedSize;
-    }
-
-    /**
-     * @return Number of cache entries stored in off-heap memory.
-     */
-    public long offHeapEntriesCount() {
-        return offHeapEntriesCnt;
-    }
-
-    /**
-     * @return Size in bytes for swap space.
-     */
-    public long swapSize() {
-        return swapSize;
-    }
-
-    /**
-     * @return Number of cache entries stored in swap space.
+     * @return Number of cache entries stored in heap memory.
      */
-    public long swapKeys() {
-        return swapKeys;
+    public long onHeapEntriesCount() {
+        return onHeapEntriesCnt;
     }
 
     /**

modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePartition.java

@@ -37,22 +37,17 @@ public class VisorCachePartition implements Serializable, LessNamingBean {
     /** */
     private long offheap;
 
-    /** */
-    private long swap;
-
     /**
      * Full constructor.
      *
      * @param part Partition id.
      * @param heap Number of keys in heap.
      * @param offheap Number of keys in offheap.
-     * @param swap Number of keys in swap.
      */
-    public VisorCachePartition(int part, int heap, long offheap, long swap) {
+    public VisorCachePartition(int part, int heap, long offheap) {
         this.part = part;
         this.heap = heap;
         this.offheap = offheap;
-        this.swap = swap;
     }
 
     /**
@@ -76,13 +71,6 @@ public long offheap() {
         return offheap;
     }
 
-    /**
-     * @return Number of keys in swap.
-     */
-    public long swap() {
-        return swap;
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(VisorCachePartition.class, this);

modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePartitions.java

@@ -50,10 +50,9 @@ public VisorCachePartitions() {
      * @param part Partition id.
      * @param heap Number of primary keys in heap.
      * @param offheap Number of primary keys in offheap.
-     * @param swap Number of primary keys in swap.
      */
-    public void addPrimary(int part, int heap, long offheap, long swap) {
-       primary.add(new VisorCachePartition(part, heap, offheap, swap));
+    public void addPrimary(int part, int heap, long offheap) {
+       primary.add(new VisorCachePartition(part, heap, offheap));
     }
 
     /**
@@ -62,10 +61,9 @@ public void addPrimary(int part, int heap, long offheap, long swap) {
      * @param part Partition id.
      * @param heap Number of backup keys in heap.
      * @param offheap Number of backup keys in offheap.
-     * @param swap Number of backup keys in swap.
      */
-    public void addBackup(int part, int heap, long offheap, long swap) {
-       backup.add(new VisorCachePartition(part, heap, offheap, swap));
+    public void addBackup(int part, int heap, long offheap) {
+       backup.add(new VisorCachePartition(part, heap, offheap));
     }
 
     /**

modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCachePartitionsTask.java

@@ -125,9 +125,9 @@ else if (ca instanceof GridDhtCacheAdapter)
 
                         // Pass -1 as topology version in order not to wait for topology version.
                         if (part.primary(AffinityTopologyVersion.NONE))
-                            parts.addPrimary(p, sz, 0, 0);
+                            parts.addPrimary(p, sz, 0);
                         else if (part.state() == GridDhtPartitionState.OWNING && part.backup(AffinityTopologyVersion.NONE))
-                            parts.addBackup(p, sz, 0, 0);
+                            parts.addBackup(p, sz, 0);
                     }
                 }
             }

modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala

@@ -64,7 +64,6 @@ class VisorConsole {
         org.apache.ignite.visor.commands.cache.VisorCacheClearCommand
         org.apache.ignite.visor.commands.cache.VisorCacheResetCommand
         org.apache.ignite.visor.commands.cache.VisorCacheCommand
-        org.apache.ignite.visor.commands.cache.VisorCacheSwapCommand
         org.apache.ignite.visor.commands.config.VisorConfigurationCommand
         org.apache.ignite.visor.commands.deploy.VisorDeployCommand
         org.apache.ignite.visor.commands.disco.VisorDiscoveryCommand