ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [09/53] [abbrv] ignite git commit: ignite-4535 : Fixed size calculation.
Date Mon, 10 Apr 2017 15:55:16 GMT
ignite-4535 : Fixed size calculation.

(cherry picked from commit 531a449)


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

Branch: refs/heads/ignite-3477-master
Commit: 141064ed9e0c392ca0c5bb51bf848945bec1c1d1
Parents: c89c563
Author: Ilya Lantukh <ilantukh@gridgain.com>
Authored: Tue Mar 21 17:29:05 2017 +0300
Committer: Ilya Lantukh <ilantukh@gridgain.com>
Committed: Thu Mar 30 16:20:29 2017 +0300

----------------------------------------------------------------------
 .../cache/distributed/GridDistributedCacheAdapter.java          | 2 +-
 .../processors/cache/distributed/dht/GridDhtLocalPartition.java | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/141064ed/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
index b1afc69..dbe267d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
@@ -283,7 +283,7 @@ public abstract class GridDistributedCacheAdapter<K, V> extends
GridCacheAdapter
             else if (modes.heap) {
                 for (GridDhtLocalPartition locPart : ctx.topology().currentLocalPartitions())
{
                     if ((modes.primary && locPart.primary(topVer)) || (modes.backup
&& locPart.backup(topVer)))
-                        size += locPart.heapSize();
+                        size += locPart.entrySet().size();
                 }
             }
         }

http://git-wip-us.apache.org/repos/asf/ignite/blob/141064ed/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index 4aff5f4..05bfdfe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -305,11 +305,6 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>,
     }
 
     /** {@inheritDoc} */
-    public int heapSize() {
-        return map.size();
-    }
-
-    /** {@inheritDoc} */
     @Override public void incrementPublicSize(GridCacheEntryEx e) {
         map.incrementPublicSize(e);
     }


Mime
View raw message