ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [3/6] ignite git commit: GridCacheConcurrentMap: renamed size -> internalSize.
Date Mon, 15 May 2017 10:52:25 GMT
GridCacheConcurrentMap: renamed size -> internalSize.


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

Branch: refs/heads/ignite-5075
Commit: 86622cf79fd2a5f80b5194d3c32d456c0bd808a2
Parents: 330d9ef
Author: sboikov <sboikov@gridgain.com>
Authored: Mon May 15 13:47:02 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon May 15 13:47:02 2017 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCacheConcurrentMap.java | 2 +-
 .../internal/processors/cache/GridCacheConcurrentMapImpl.java    | 2 +-
 .../ignite/internal/processors/cache/GridNoStorageCacheMap.java  | 2 +-
 .../cache/distributed/dht/GridCachePartitionedConcurrentMap.java | 4 ++--
 .../processors/cache/distributed/dht/GridDhtLocalPartition.java  | 4 ++--
 .../cache/distributed/dht/GridDhtPartitionTopologyImpl.java      | 2 +-
 .../ignite/internal/processors/cache/GridCacheLeakTest.java      | 4 ++--
 .../internal/processors/cache/eviction/EvictionAbstractTest.java | 2 +-
 .../cache/expiry/IgniteCacheClientNearCacheExpiryTest.java       | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/86622cf7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
index eb3f28e..9f20d64 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
@@ -63,7 +63,7 @@ public interface GridCacheConcurrentMap {
      *
      * @return the number of key-value mappings in this map.
      */
-    public int size();
+    public int internalSize();
 
     /**
      * Returns the number of publicly available key-value mappings in this map.

http://git-wip-us.apache.org/repos/asf/ignite/blob/86622cf7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
index 45b455c..b02a2b7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java
@@ -287,7 +287,7 @@ public abstract class GridCacheConcurrentMapImpl implements GridCacheConcurrentM
     }
 
     /** {@inheritDoc} */
-    @Override public int size() {
+    @Override public int internalSize() {
         return map.size();
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/86622cf7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridNoStorageCacheMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridNoStorageCacheMap.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridNoStorageCacheMap.java
index 86a573b..5e52c8b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridNoStorageCacheMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridNoStorageCacheMap.java
@@ -61,7 +61,7 @@ public class GridNoStorageCacheMap implements GridCacheConcurrentMap {
     }
 
     /** {@inheritDoc} */
-    @Override public int size() {
+    @Override public int internalSize() {
         return 0;
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/86622cf7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java
index dcc2d8b..76c7a15 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedConcurrentMap.java
@@ -99,11 +99,11 @@ public class GridCachePartitionedConcurrentMap implements GridCacheConcurrentMap
     }
 
     /** {@inheritDoc} */
-    @Override public int size() {
+    @Override public int internalSize() {
         int size = 0;
 
         for (GridDhtLocalPartition part : ctx.topology().currentLocalPartitions())
-            size += part.size();
+            size += part.internalSize();
 
         return size;
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/86622cf7/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 4208a98..6fb557a 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
@@ -236,9 +236,9 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl
implements
      */
     public boolean isEmpty() {
         if (cctx.allowFastEviction())
-            return size() == 0;
+            return internalSize() == 0;
 
-        return store.size() == 0 && size() == 0;
+        return store.size() == 0 && internalSize() == 0;
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/86622cf7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
index 38cbb8c..4e699b3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
@@ -238,7 +238,7 @@ class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology
{
                                     ", cache=" + cctx.name() +
                                     ", part=" + part.id() +
                                     ", partState=" + part.state() +
-                                    ", size=" + part.size() +
+                                    ", size=" + part.internalSize() +
                                     ", reservations=" + part.reservations() +
                                     ", grpReservations=" + part.groupReserved() +
                                     ", node=" + cctx.localNodeId() + "]");

http://git-wip-us.apache.org/repos/asf/ignite/blob/86622cf7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
index b1202a1..a13ad64 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLeakTest.java
@@ -127,10 +127,10 @@ public class GridCacheLeakTest extends GridCommonAbstractTest {
                     for (int g = 0; g < 3; g++) {
                         GridCacheConcurrentMap map = ((IgniteKernal)grid(g)).internalCache(CACHE_NAME).map();
 
-                        info("Map size for cache [g=" + g + ", size=" + map.size() +
+                        info("Map size for cache [g=" + g + ", size=" + map.internalSize()
+
                             ", pubSize=" + map.publicSize() + ']');
 
-                        assertTrue("Wrong map size: " + map.size(), map.size() <= 8192);
+                        assertTrue("Wrong map size: " + map.internalSize(), map.internalSize()
<= 8192);
                     }
                 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/86622cf7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java
index 7fb40a3..ba70232 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java
@@ -780,7 +780,7 @@ public abstract class EvictionAbstractTest<T extends EvictionPolicy<?,
?>>
 
                 if (plcMax > 0) {
                     for (int i = 0; i < gridCnt; i++) {
-                        int actual = colocated(i).map().size();
+                        int actual = colocated(i).map().internalSize();
 
                         assertTrue("Cache size is greater then policy size [expected=" +
endSize + ", actual=" + actual + ']',
                             actual <= endSize + (plcMaxMemSize > 0 ? 1 : plcBatchSize));

http://git-wip-us.apache.org/repos/asf/ignite/blob/86622cf7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheClientNearCacheExpiryTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheClientNearCacheExpiryTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheClientNearCacheExpiryTest.java
index 3acdf9f..f7164a0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheClientNearCacheExpiryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheClientNearCacheExpiryTest.java
@@ -113,7 +113,7 @@ public class IgniteCacheClientNearCacheExpiryTest extends IgniteCacheAbstractTes
             GridCacheAdapter.class,
             "map");
 
-        assertEquals(KEYS_COUNT, map.size());
+        assertEquals(KEYS_COUNT, map.publicSize());
 
         assertEquals(KEYS_COUNT, cache.size());
 


Mime
View raw message