ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [1/4] ignite git commit: ignite-db-x fix ttl tests
Date Mon, 06 Mar 2017 10:26:46 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-3477 76cd44d6f -> 13c3cfc1a


ignite-db-x fix ttl tests


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

Branch: refs/heads/ignite-3477
Commit: 65c0d1b6c8c12fd7d17a47da5682f357a6868c01
Parents: c6df060
Author: Dmitriy Govorukhin <dgovorukhin@gridgain.com>
Authored: Thu Mar 2 12:19:48 2017 +0300
Committer: Dmitriy Govorukhin <dgovorukhin@gridgain.com>
Committed: Thu Mar 2 12:19:48 2017 +0300

----------------------------------------------------------------------
 .../cache/ttl/CacheTtlAbstractSelfTest.java         | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/65c0d1b6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
index 6a94c72..1067ccf 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ttl/CacheTtlAbstractSelfTest.java
@@ -329,21 +329,9 @@ public abstract class CacheTtlAbstractSelfTest extends GridCommonAbstractTest
{
         for (int i = 0; i < gridCnt; ++i) {
             IgniteCache<Integer, Integer> cache = jcache(i);
 
-            log.info("Size [node=" + i +
-                ", heap=" + cache.localSize(PRIMARY, BACKUP, NEAR, ONHEAP) +
-                ", offheap=" + cache.localSize(PRIMARY, BACKUP, NEAR, OFFHEAP) + ']');
-
-            if (memoryMode() == CacheMemoryMode.OFFHEAP_TIERED) {
-                assertEquals("Unexpected size, node: " + i, 0, cache.localSize(PRIMARY, BACKUP,
NEAR, ONHEAP));
-                assertEquals("Unexpected size, node: " + i, size, cache.localSize(PRIMARY,
BACKUP, NEAR, OFFHEAP));
-            }
-            else {
-                assertEquals("Unexpected size, node: " + i, size > MAX_CACHE_SIZE ? MAX_CACHE_SIZE
: size,
-                    cache.localSize(PRIMARY, BACKUP, NEAR, ONHEAP));
+            log.info("Size [node=" + i + ", " + cache.localSize(PRIMARY, BACKUP, NEAR) +
']');
 
-                assertEquals("Unexpected size, node: " + i,
-                    size > MAX_CACHE_SIZE ? size - MAX_CACHE_SIZE : 0, cache.localSize(PRIMARY,
BACKUP, NEAR, OFFHEAP));
-            }
+            assertEquals("Unexpected size, node: " + i, size, cache.localSize(PRIMARY, BACKUP,
NEAR));
 
             for (int key = 0; key < size; key++)
                 assertNotNull(cache.localPeek(key));


Mime
View raw message