ignite-96 minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fc0eceb3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fc0eceb3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fc0eceb3 Branch: refs/heads/ignite-96 Commit: fc0eceb323acd57efc527177801d3974a75cf9f3 Parents: 876ccb0 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Mon Feb 9 01:27:40 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Mon Feb 9 01:27:40 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheMapEntry.java | 2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 306 ++++++++----------- .../GridCacheAbstractIteratorsSelfTest.java | 2 - .../cache/GridCacheAbstractMetricsSelfTest.java | 125 ++++---- .../cache/GridCacheAbstractSelfTest.java | 1 + .../cache/GridCacheAbstractTxReadTest.java | 1 - .../cache/GridCacheEntryMemorySizeSelfTest.java | 86 +++--- .../IgniteCacheEntryListenerAbstractTest.java | 1 - ...dCachePartitionedQueueEntryMoveSelfTest.java | 2 +- ...heExpiredEntriesPreloadAbstractSelfTest.java | 1 - .../distributed/GridCacheLockAbstractTest.java | 2 +- .../GridCacheMultiNodeLockAbstractTest.java | 1 - .../IgniteTxTimeoutAbstractTest.java | 1 - .../dht/GridCacheDhtInternalEntrySelfTest.java | 2 +- ...cheGroupLockPartitionedAbstractSelfTest.java | 2 +- .../GridCachePartitionedAffinitySelfTest.java | 1 - ...iteCacheNoLoadPreviousValueAbstractTest.java | 1 - .../IgniteCacheNoReadThroughAbstractTest.java | 1 - .../IgniteCacheNoWriteThroughAbstractTest.java | 1 - .../GridCacheSwapScanQueryAbstractSelfTest.java | 1 - .../cacheget/GridBenchmarkCacheGetLoadTest.java | 1 - 21 files changed, 226 insertions(+), 315 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0eceb3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index 9fe352d..fe24d96 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -3838,7 +3838,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> try { if (!hasReaders() && markObsolete0(obsoleteVer, false)) { - if (!isStartVersion()) { + if (!isStartVersion() && hasValueUnlocked()) { boolean plain = val instanceof byte[]; IgniteUuid valClsLdrId = null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0eceb3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index 464dcec..ff660a5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -27,6 +27,7 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.query.*; +import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; @@ -36,10 +37,12 @@ import org.apache.ignite.transactions.*; import org.jetbrains.annotations.*; import javax.cache.*; +import javax.cache.Cache.*; import javax.cache.expiry.*; import javax.cache.processor.*; import java.util.*; import java.util.concurrent.*; +import java.util.concurrent.atomic.*; import java.util.concurrent.locks.*; import static java.util.concurrent.TimeUnit.*; @@ -2716,139 +2719,85 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception In case of error. */ public void testPeekMode() throws Exception { - assert false : "ignite-96"; -// String key = "testPeekMode"; -// -// GridCache<String, Integer> cache = primaryIgnite(key).cache(null); -// -// cache.put(key, 1); -// -// Entry<String, Integer> entry = cache.entry(key); -// -// assert entry.primary(); -// -// assert cache.peek(key, F.asList(TX)) == null; -// assert cache.peek(key, F.asList(SWAP)) == null; -// assert cache.peek(key, F.asList(DB)) == 1; -// assert cache.peek(key, F.asList(TX, GLOBAL)) == 1; -// -// if (cacheMode() == LOCAL) { -// assert cache.peek(key, F.asList(TX, NEAR_ONLY)) == 1; -// assert cache.peek(key, F.asList(TX, PARTITIONED_ONLY)) == 1; -// } -// -// assert cache.peek(key, F.asList(SMART)) == 1; -// -// assert entry.peek(F.asList(TX)) == null; -// assert entry.peek(F.asList(SWAP)) == null; -// assert entry.peek(F.asList(DB)) == 1; -// assert entry.peek(F.asList(TX, GLOBAL)) == 1; -// -// if (cacheMode() == LOCAL) { -// assert entry.peek(F.asList(TX, NEAR_ONLY)) == 1; -// assert entry.peek(F.asList(TX, PARTITIONED_ONLY)) == 1; -// } -// -// assert entry.peek(F.asList(SMART)) == 1; -// -// Entry<String, Integer> ew = cache.entry("wrongKey"); -// -// assert cache.peek("wrongKey", F.asList(TX, GLOBAL, SWAP, DB)) == null; -// -// if (cacheMode() == LOCAL) { -// assert cache.peek("wrongKey", F.asList(TX, NEAR_ONLY, SWAP, DB)) == null; -// assert cache.peek("wrongKey", F.asList(TX, PARTITIONED_ONLY, SWAP, DB)) == null; -// } -// -// assert ew.peek(F.asList(TX, GLOBAL, SWAP, DB)) == null; -// -// if (cacheMode() != PARTITIONED) { -// assert ew.peek(F.asList(TX, NEAR_ONLY, SWAP, DB)) == null; -// assert ew.peek(F.asList(TX, PARTITIONED_ONLY, SWAP, DB)) == null; -// } -// -// if (txEnabled()) { -// IgniteTx tx = cache.txStart(); -// -// cache.replace(key, 2); -// -// assert cache.peek(key, F.asList(GLOBAL)) == 1; -// -// if (cacheMode() == LOCAL) { -// assert cache.peek(key, F.asList(NEAR_ONLY)) == 1; -// assert cache.peek(key, F.asList(PARTITIONED_ONLY)) == 1; -// } -// -// assert cache.peek(key, F.asList(TX)) == 2; -// assert cache.peek(key, F.asList(SMART)) == 2; -// assert cache.peek(key, F.asList(SWAP)) == null; -// assert cache.peek(key, F.asList(DB)) == 1; -// -// assertEquals((Integer)1, entry.peek(F.asList(GLOBAL))); -// -// if (cacheMode() == LOCAL) { -// assertEquals((Integer)1, entry.peek(F.asList(NEAR_ONLY))); -// assertEquals((Integer)1, entry.peek(F.asList(PARTITIONED_ONLY))); -// } -// -// assertEquals((Integer)2, entry.peek(F.asList(TX))); -// assertEquals((Integer)2, entry.peek(F.asList(SMART))); -// assertNull(entry.peek(F.asList(SWAP))); -// assertEquals((Integer)1, entry.peek(F.asList(DB))); -// -// tx.commit(); -// } -// else -// cache.replace(key, 2); -// -// assertEquals((Integer)2, cache.peek(key, F.asList(GLOBAL))); -// -// if (cacheMode() == LOCAL) { -// assertEquals((Integer)2, cache.peek(key, F.asList(NEAR_ONLY))); -// assertEquals((Integer)2, cache.peek(key, F.asList(PARTITIONED_ONLY))); -// } -// -// assertNull(cache.peek(key, F.asList(TX))); -// assertNull(cache.peek(key, F.asList(SWAP))); -// assertEquals((Integer)2, cache.peek(key, F.asList(DB))); -// -// assertEquals((Integer)2, entry.peek(F.asList(GLOBAL))); -// -// if (cacheMode() == LOCAL) { -// assertEquals((Integer)2, entry.peek(F.asList(NEAR_ONLY))); -// assertEquals((Integer)2, entry.peek(F.asList(PARTITIONED_ONLY))); -// } -// -// assertNull(entry.peek(F.asList(TX))); -// assertNull(entry.peek(F.asList(SWAP))); -// assertEquals((Integer)2, entry.peek(F.asList(DB))); -// -// assertTrue(cache.evict(key)); -// -// assertNull(cache.peek(key, F.asList(SMART))); -// assertNull(cache.peek(key, F.asList(TX, GLOBAL))); -// -// if (cacheMode() == LOCAL) { -// assertNull(cache.peek(key, F.asList(TX, NEAR_ONLY))); -// assertNull(cache.peek(key, F.asList(TX, PARTITIONED_ONLY))); -// } -// -// assertEquals((Integer)2, cache.peek(key, F.asList(SWAP))); -// assertEquals((Integer)2, cache.peek(key, F.asList(DB))); -// assertEquals((Integer)2, cache.peek(key, F.asList(SMART, SWAP, DB))); -// -// assertNull(entry.peek(F.asList(SMART))); -// assertNull(entry.peek(F.asList(TX, GLOBAL))); -// -// if (cacheMode() == LOCAL) { -// assertNull(entry.peek(F.asList(TX, NEAR_ONLY))); -// assertNull(entry.peek(F.asList(TX, PARTITIONED_ONLY))); -// } -// -// assertEquals((Integer)2, cache.peek(key, F.asList(SWAP))); -// -// assertEquals((Integer)2, entry.peek(F.asList(DB))); -// assertEquals((Integer)2, entry.peek(F.asList(SMART, SWAP, DB))); + String key = "testPeekMode"; + + GridCache<String, Integer> cache = primaryIgnite(key).cache(null); + + cache.put(key, 1); + + Cache.Entry<String, Integer> entry = cache.entry(key); + + // assert entry.primary(); + + assert cache.peek(key, F.asList(TX)) == null; + assert cache.peek(key, F.asList(SWAP)) == null; + assert cache.peek(key, F.asList(DB)) == 1; + assert cache.peek(key, F.asList(TX, GLOBAL)) == 1; + + if (cacheMode() == LOCAL) { + assert cache.peek(key, F.asList(TX, NEAR_ONLY)) == 1; + assert cache.peek(key, F.asList(TX, PARTITIONED_ONLY)) == 1; + } + + assert cache.peek(key, F.asList(SMART)) == 1; + + Entry<String, Integer> ew = cache.entry("wrongKey"); + + assert cache.peek("wrongKey", F.asList(TX, GLOBAL, SWAP, DB)) == null; + + if (cacheMode() == LOCAL) { + assert cache.peek("wrongKey", F.asList(TX, NEAR_ONLY, SWAP, DB)) == null; + assert cache.peek("wrongKey", F.asList(TX, PARTITIONED_ONLY, SWAP, DB)) == null; + } + + if (txEnabled()) { + IgniteTx tx = cache.txStart(); + + cache.replace(key, 2); + + assert cache.peek(key, F.asList(GLOBAL)) == 1; + + if (cacheMode() == LOCAL) { + assert cache.peek(key, F.asList(NEAR_ONLY)) == 1; + assert cache.peek(key, F.asList(PARTITIONED_ONLY)) == 1; + } + + assert cache.peek(key, F.asList(TX)) == 2; + assert cache.peek(key, F.asList(SMART)) == 2; + assert cache.peek(key, F.asList(SWAP)) == null; + assert cache.peek(key, F.asList(DB)) == 1; + + tx.commit(); + } + else + cache.replace(key, 2); + + assertEquals((Integer)2, cache.peek(key, F.asList(GLOBAL))); + + if (cacheMode() == LOCAL) { + assertEquals((Integer)2, cache.peek(key, F.asList(NEAR_ONLY))); + assertEquals((Integer)2, cache.peek(key, F.asList(PARTITIONED_ONLY))); + } + + assertNull(cache.peek(key, F.asList(TX))); + assertNull(cache.peek(key, F.asList(SWAP))); + assertEquals((Integer)2, cache.peek(key, F.asList(DB))); + + assertTrue(cache.evict(key)); + + assertNull(cache.peek(key, F.asList(SMART))); + assertNull(cache.peek(key, F.asList(TX, GLOBAL))); + + if (cacheMode() == LOCAL) { + assertNull(cache.peek(key, F.asList(TX, NEAR_ONLY))); + assertNull(cache.peek(key, F.asList(TX, PARTITIONED_ONLY))); + } + + assertEquals((Integer)2, cache.peek(key, F.asList(SWAP))); + assertEquals((Integer)2, cache.peek(key, F.asList(DB))); + assertEquals((Integer)2, cache.peek(key, F.asList(SMART, SWAP, DB))); + + assertEquals((Integer)2, cache.peek(key, F.asList(SWAP))); } /** @@ -2990,12 +2939,12 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract if (oldEntry) c.put(key, 1); - CacheEntry<String, Integer> entry = c.entry(key); + GridCacheEntryEx entry = ((IgniteKernal)grid(0)).internalCache().peekEx(key); assert entry != null; - assertEquals(0, entry.timeToLive()); - assertEquals(0, entry.expirationTime()); + assertEquals(0, entry.ttl()); + assertEquals(0, entry.expireTime()); long startTime = System.currentTimeMillis(); @@ -3010,8 +2959,10 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract tx.rollback(); } - assertEquals(0, entry.timeToLive()); - assertEquals(0, entry.expirationTime()); + entry = ((IgniteKernal)grid(0)).internalCache().peekEx(key); + + assertEquals(0, entry.ttl()); + assertEquals(0, entry.expireTime()); } // Now commit transaction and check that ttl and expire time have been saved. @@ -3028,14 +2979,15 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract long[] expireTimes = new long[gridCount()]; for (int i = 0; i < gridCount(); i++) { - CacheEntry<String, Integer> curEntry = cache(i).entry(key); + if (grid(i).affinity(null).isPrimaryOrBackup(grid(i).localNode(), key)) { + GridCacheEntryEx<Object, Object> curEntry = + ((IgniteKernal)grid(0)).internalCache().peekEx(key); - if (curEntry.primary() || curEntry.backup()) { - assertEquals(ttl, curEntry.timeToLive()); + assertEquals(ttl, curEntry.ttl()); - assert curEntry.expirationTime() > startTime; + assert curEntry.expireTime() > startTime; - expireTimes[i] = curEntry.expirationTime(); + expireTimes[i] = curEntry.expireTime(); } } @@ -3053,14 +3005,15 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract } for (int i = 0; i < gridCount(); i++) { - CacheEntry<String, Integer> curEntry = cache(i).entry(key); + if (grid(i).affinity(null).isPrimaryOrBackup(grid(i).localNode(), key)) { + GridCacheEntryEx<Object, Object> curEntry = + ((IgniteKernal)grid(0)).internalCache().peekEx(key); - if (curEntry.primary() || curEntry.backup()) { - assertEquals(ttl, curEntry.timeToLive()); + assertEquals(ttl, curEntry.ttl()); - assert curEntry.expirationTime() > expireTimes[i]; + assert curEntry.expireTime() > startTime; - expireTimes[i] = curEntry.expirationTime(); + expireTimes[i] = curEntry.expireTime(); } } @@ -3078,14 +3031,15 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract } for (int i = 0; i < gridCount(); i++) { - CacheEntry<String, Integer> curEntry = cache(i).entry(key); + if (grid(i).affinity(null).isPrimaryOrBackup(grid(i).localNode(), key)) { + GridCacheEntryEx<Object, Object> curEntry = + ((IgniteKernal)grid(0)).internalCache().peekEx(key); - if (curEntry.primary() || curEntry.backup()) { - assertEquals(ttl, curEntry.timeToLive()); + assertEquals(ttl, curEntry.ttl()); - assert curEntry.expirationTime() > expireTimes[i]; + assert curEntry.expireTime() > startTime; - expireTimes[i] = curEntry.expirationTime(); + expireTimes[i] = curEntry.expireTime(); } } @@ -3107,11 +3061,12 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract log.info("Put 4 done"); for (int i = 0; i < gridCount(); i++) { - CacheEntry<String, Integer> curEntry = cache(i).entry(key); + if (grid(i).affinity(null).isPrimaryOrBackup(grid(i).localNode(), key)) { + GridCacheEntryEx<Object, Object> curEntry = + ((IgniteKernal)grid(0)).internalCache().peekEx(key); - if (curEntry.primary() || curEntry.backup()) { - assertEquals(ttl, curEntry.timeToLive()); - assertEquals(expireTimes[i], curEntry.expirationTime()); + assertEquals(ttl, curEntry.ttl()); + assertEquals(expireTimes[i], curEntry.expireTime()); } } @@ -3143,33 +3098,12 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract }, Math.min(ttl * 10, getTestTimeout()))); // Ensure that old TTL and expire time are not longer "visible". - entry = c.entry(key); - - assert entry.get() == null; - - assertEquals(0, entry.timeToLive()); - assertEquals(0, entry.expirationTime()); + entry = ((IgniteKernal)grid(0)).internalCache().peekEx(key); - // Ensure that next update will not pick old expire time. + assert c.entry(key).getValue() == null; - tx = inTx ? c.txStart() : null; - - try { - entry.set(10); - } - finally { - if (tx != null) - tx.commit(); - } - - U.sleep(2000); - - entry = c.entry(key); - - assertEquals((Integer)10, entry.get()); - - assertEquals(0, entry.timeToLive()); - assertEquals(0, entry.expirationTime()); + assertEquals(0, entry.ttl()); + assertEquals(0, entry.expireTime()); } /** @@ -3227,11 +3161,15 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract Collection<String> locKeys = new HashSet<>(); if (CU.isAffinityNode(cache.configuration())) { - locKeys.addAll(cache.projection(F.<String, Integer>cachePrimary()).keySet()); + locKeys.addAll(cache.primaryKeySet()); info("Local keys (primary): " + locKeys); - locKeys.addAll(cache.projection(F.<String, Integer>cacheBackup()).keySet()); + locKeys.addAll(cache.keySet(new IgnitePredicate<Cache.Entry<String, Integer>>() { + @Override public boolean apply(Cache.Entry<String, Integer> e) { + return grid(0).affinity(null).isBackup(grid(0).localNode(), e.getKey()); + } + })); info("Local keys (primary + backup): " + locKeys); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0eceb3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java index 502194f..46d053b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractIteratorsSelfTest.java @@ -17,13 +17,11 @@ package org.apache.ignite.internal.processors.cache; -import org.apache.ignite.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.testframework.*; import javax.cache.*; -import java.util.*; /** * Tests for cache iterators. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0eceb3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java index 6238b62..f11c716 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java @@ -20,10 +20,17 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.util.lang.*; +import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.testframework.*; +import org.apache.ignite.transactions.*; +import javax.cache.expiry.*; import java.util.*; import java.util.concurrent.*; +import static java.util.concurrent.TimeUnit.*; + /** * Cache metrics test. */ @@ -675,7 +682,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract private void checkTtl(boolean inTx) throws Exception { int ttl = 1000; - final ExpiryPolicy expiry = new TouchedExpiryPolicy(new Duration(TimeUnit.MILLISECONDS, ttl)); + final ExpiryPolicy expiry = new TouchedExpiryPolicy(new Duration(MILLISECONDS, ttl)); final GridCache<Integer, Integer> c = grid(0).cache(null); @@ -683,13 +690,12 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract c.put(key, 1); - CacheEntry<Integer, Integer> entry = c.entry(key); + GridCacheEntryEx entry = ((IgniteKernal)grid(0)).internalCache().peekEx(key); assert entry != null; - assertEquals(0, entry.timeToLive()); - assertEquals(0, entry.expirationTime()); - assertEquals(0, grid(0).cache(null).metrics().getCacheEvictions()); + assertEquals(0, entry.ttl()); + assertEquals(0, entry.expireTime()); long startTime = System.currentTimeMillis(); @@ -704,12 +710,14 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract tx.rollback(); } - assertEquals(0, entry.timeToLive()); - assertEquals(0, entry.expirationTime()); + entry = ((IgniteKernal)grid(0)).internalCache().peekEx(key); + + assertEquals(0, entry.ttl()); + assertEquals(0, entry.expireTime()); } // Now commit transaction and check that ttl and expire time have been saved. - IgniteTx tx = inTx ? c.txStart() : null; + IgniteTx tx = inTx ? grid(0).transactions().txStart() : null; try { grid(0).jcache(null).withExpiryPolicy(expiry).put(key, 1); @@ -722,21 +730,22 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract long[] expireTimes = new long[gridCount()]; for (int i = 0; i < gridCount(); i++) { - CacheEntry<Object, Object> curEntry = grid(i).cache(null).entry(key); + if (grid(i).affinity(null).isPrimaryOrBackup(grid(i).localNode(), key)) { + GridCacheEntryEx<Object, Object> curEntry = + ((IgniteKernal)grid(0)).internalCache().peekEx(key); - if (curEntry.primary() || curEntry.backup()) { - assertEquals(ttl, curEntry.timeToLive()); + assertEquals(ttl, curEntry.ttl()); - assert curEntry.expirationTime() > startTime; + assert curEntry.expireTime() > startTime; - expireTimes[i] = curEntry.expirationTime(); + expireTimes[i] = curEntry.expireTime(); } } // One more update from the same cache entry to ensure that expire time is shifted forward. - IgniteUtils.sleep(100); + U.sleep(100); - tx = inTx ? c.txStart() : null; + tx = inTx ? grid(0).transactions().txStart() : null; try { grid(0).jcache(null).withExpiryPolicy(expiry).put(key, 2); @@ -747,23 +756,22 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract } for (int i = 0; i < gridCount(); i++) { - CacheEntry<Object, Object> curEntry = grid(i).cache(null).entry(key); + if (grid(i).affinity(null).isPrimaryOrBackup(grid(i).localNode(), key)) { + GridCacheEntryEx<Object, Object> curEntry = + ((IgniteKernal)grid(0)).internalCache().peekEx(key); - if (curEntry.primary() || curEntry.backup()) { - assertEquals(ttl, curEntry.timeToLive()); + assertEquals(ttl, curEntry.ttl()); - assert curEntry.expirationTime() > expireTimes[i]; + assert curEntry.expireTime() > startTime; - expireTimes[i] = curEntry.expirationTime(); + expireTimes[i] = curEntry.expireTime(); } } // And one more direct update to ensure that expire time is shifted forward. - IgniteUtils.sleep(100); - - assertEquals(0, grid(0).cache(null).metrics().getCacheEvictions()); + U.sleep(100); - tx = inTx ? c.txStart() : null; + tx = inTx ? grid(0).transactions().txStart() : null; try { grid(0).jcache(null).withExpiryPolicy(expiry).put(key, 3); @@ -774,28 +782,27 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract } for (int i = 0; i < gridCount(); i++) { - CacheEntry<Object, Object> curEntry = grid(i).cache(null).entry(key); + if (grid(i).affinity(null).isPrimaryOrBackup(grid(i).localNode(), key)) { + GridCacheEntryEx<Object, Object> curEntry = + ((IgniteKernal)grid(0)).internalCache().peekEx(key); - if (curEntry.primary() || curEntry.backup()) { - assertEquals(ttl, curEntry.timeToLive()); + assertEquals(ttl, curEntry.ttl()); - assert curEntry.expirationTime() > expireTimes[i]; + assert curEntry.expireTime() > startTime; - expireTimes[i] = curEntry.expirationTime(); + expireTimes[i] = curEntry.expireTime(); } } // And one more update to ensure that ttl is not changed and expire time is not shifted forward. - IgniteUtils.sleep(100); - - assertEquals(0, grid(0).cache(null).metrics().getCacheEvictions()); + U.sleep(100); log.info("Put 4"); - tx = inTx ? c.txStart() : null; + tx = inTx ? grid(0).transactions().txStart() : null; try { - grid(0).jcache(null).put(key, 4); + c.put(key, 4); } finally { if (tx != null) @@ -805,23 +812,21 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract log.info("Put 4 done"); for (int i = 0; i < gridCount(); i++) { - CacheEntry<Object, Object> curEntry = grid(i).cache(null).entry(key); + if (grid(i).affinity(null).isPrimaryOrBackup(grid(i).localNode(), key)) { + GridCacheEntryEx<Object, Object> curEntry = + ((IgniteKernal)grid(0)).internalCache().peekEx(key); - if (curEntry.primary() || curEntry.backup()) { - assertEquals(ttl, curEntry.timeToLive()); - assertEquals(expireTimes[i], curEntry.expirationTime()); + assertEquals(ttl, curEntry.ttl()); + assertEquals(expireTimes[i], curEntry.expireTime()); } } - assertEquals(0, grid(0).cache(null).metrics().getCacheEvictions()); - // Avoid reloading from store. map.remove(key); assertTrue(GridTestUtils.waitForCondition(new GridAbsPredicateX() { @SuppressWarnings("unchecked") - @Override - public boolean applyx() throws IgniteCheckedException { + @Override public boolean applyx() throws IgniteCheckedException { try { if (c.get(key) != null) return false; @@ -833,42 +838,22 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract GridCacheEntryEx e0 = c0.peekEx(key); return e0 == null || (e0.rawGet() == null && e0.valueBytes() == null); - } else + } + else return true; - } catch (GridCacheEntryRemovedException e) { + } + catch (GridCacheEntryRemovedException e) { throw new RuntimeException(e); } } }, Math.min(ttl * 10, getTestTimeout()))); // Ensure that old TTL and expire time are not longer "visible". - entry = c.entry(key); - - assertEquals(0, entry.timeToLive()); - assertEquals(0, entry.expirationTime()); - - // Ensure that next update will not pick old expire time. - - tx = inTx ? c.txStart() : null; - - try { - entry.set(10); - } - finally { - if (tx != null) - tx.commit(); - } - - IgniteUtils.sleep(2000); - - entry = c.entry(key); - - assertEquals((Integer)10, entry.get()); + entry = ((IgniteKernal)grid(0)).internalCache().peekEx(key); - assertEquals(0, entry.timeToLive()); - assertEquals(0, entry.expirationTime()); + assert c.entry(key).getValue() == null; - if (c.configuration().getCacheMode() != CacheMode.PARTITIONED && inTx) - assertEquals(1, grid(0).cache(null).metrics().getCacheEvictions()); + assertEquals(0, entry.ttl()); + assertEquals(0, entry.expireTime()); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0eceb3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java index 91f3b5e..bc6780c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java @@ -37,6 +37,7 @@ import org.apache.ignite.transactions.*; import org.jdk8.backport.*; import org.jetbrains.annotations.*; +import javax.cache.*; import javax.cache.configuration.*; import java.util.*; import java.util.concurrent.atomic.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0eceb3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java index fb1acac..ce62474 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractTxReadTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.transactions.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0eceb3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java index 91d6be3..be397f8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java @@ -175,49 +175,49 @@ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest { public void testPartitionedNearEnabled() throws Exception { assert false : "ignite-96"; - try { - startGridsMultiThreaded(2); - - int[] keys = new int[3]; - - int key = 0; - - for (int i = 0; i < keys.length; i++) { - while (true) { - key++; - - if (grid(0).mapKeyToNode(null, key).equals(grid(0).localNode())) { - if (i > 0) - jcache(0).put(key, new Value(new byte[i * 1024])); - - keys[i] = key; - - break; - } - } - } - - // Create near entries. - assertNotNull(jcache(1).get(keys[1])); - assertNotNull(jcache(1).get(keys[2])); - - assertEquals(KEY_SIZE + NULL_REF_SIZE + ENTRY_OVERHEAD + DHT_ENTRY_OVERHEAD + - extrasSize(cache(0).entry(keys[0])), cache(0).entry(keys[0]).memorySize()); - assertEquals(KEY_SIZE + ONE_KB_VAL_SIZE + ENTRY_OVERHEAD + DHT_ENTRY_OVERHEAD + READER_SIZE + - extrasSize(cache(0).entry(keys[1])), cache(0).entry(keys[1]).memorySize()); - assertEquals(KEY_SIZE + TWO_KB_VAL_SIZE + ENTRY_OVERHEAD + DHT_ENTRY_OVERHEAD + READER_SIZE + - extrasSize(cache(0).entry(keys[2])), cache(0).entry(keys[2]).memorySize()); - - assertEquals(KEY_SIZE + NULL_REF_SIZE + ENTRY_OVERHEAD + NEAR_ENTRY_OVERHEAD + - extrasSize(cache(1).entry(keys[0])), cache(1).entry(keys[0]).memorySize()); - assertEquals(KEY_SIZE + ONE_KB_VAL_SIZE + ENTRY_OVERHEAD + NEAR_ENTRY_OVERHEAD + - extrasSize(cache(1).entry(keys[1])), cache(1).entry(keys[1]).memorySize()); - assertEquals(KEY_SIZE + TWO_KB_VAL_SIZE + ENTRY_OVERHEAD + NEAR_ENTRY_OVERHEAD + - extrasSize(cache(1).entry(keys[2])), cache(1).entry(keys[2]).memorySize()); - } - finally { - stopAllGrids(); - } +// try { +// startGridsMultiThreaded(2); +// +// int[] keys = new int[3]; +// +// int key = 0; +// +// for (int i = 0; i < keys.length; i++) { +// while (true) { +// key++; +// +// if (grid(0).mapKeyToNode(null, key).equals(grid(0).localNode())) { +// if (i > 0) +// jcache(0).put(key, new Value(new byte[i * 1024])); +// +// keys[i] = key; +// +// break; +// } +// } +// } +// +// // Create near entries. +// assertNotNull(jcache(1).get(keys[1])); +// assertNotNull(jcache(1).get(keys[2])); +// +// assertEquals(KEY_SIZE + NULL_REF_SIZE + ENTRY_OVERHEAD + DHT_ENTRY_OVERHEAD + +// extrasSize(cache(0).entry(keys[0])), cache(0).entry(keys[0]).memorySize()); +// assertEquals(KEY_SIZE + ONE_KB_VAL_SIZE + ENTRY_OVERHEAD + DHT_ENTRY_OVERHEAD + READER_SIZE + +// extrasSize(cache(0).entry(keys[1])), cache(0).entry(keys[1]).memorySize()); +// assertEquals(KEY_SIZE + TWO_KB_VAL_SIZE + ENTRY_OVERHEAD + DHT_ENTRY_OVERHEAD + READER_SIZE + +// extrasSize(cache(0).entry(keys[2])), cache(0).entry(keys[2]).memorySize()); +// +// assertEquals(KEY_SIZE + NULL_REF_SIZE + ENTRY_OVERHEAD + NEAR_ENTRY_OVERHEAD + +// extrasSize(cache(1).entry(keys[0])), cache(1).entry(keys[0]).memorySize()); +// assertEquals(KEY_SIZE + ONE_KB_VAL_SIZE + ENTRY_OVERHEAD + NEAR_ENTRY_OVERHEAD + +// extrasSize(cache(1).entry(keys[1])), cache(1).entry(keys[1]).memorySize()); +// assertEquals(KEY_SIZE + TWO_KB_VAL_SIZE + ENTRY_OVERHEAD + NEAR_ENTRY_OVERHEAD + +// extrasSize(cache(1).entry(keys[2])), cache(1).entry(keys[2]).memorySize()); +// } +// finally { +// stopAllGrids(); +// } } /** @throws Exception If failed. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0eceb3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java index ee0e3ea..0c2cb0c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.continuous.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0eceb3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java index 8118d06..8f6f066 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java @@ -22,9 +22,9 @@ import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; -import org.apache.ignite.internal.processors.cache.datastructures.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.affinity.*; +import org.apache.ignite.internal.processors.cache.datastructures.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0eceb3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java index d2b868c..073381c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheExpiredEntriesPreloadAbstractSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0eceb3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java index 6103f49..e4d4e5c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java @@ -28,7 +28,7 @@ import org.apache.ignite.testframework.*; import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; -import javax.cache.Cache; +import javax.cache.*; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.locks.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0eceb3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java index 37d7e0c..1bd7d22 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0eceb3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java index 1e570ac..b59b5df 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache.distributed; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.internal.transactions.*; import org.apache.ignite.testframework.junits.common.*; import org.apache.ignite.transactions.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0eceb3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java index 0a0f6f6..e3d1d12 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java @@ -25,8 +25,8 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.datastructures.*; -import org.apache.ignite.lang.*; import org.apache.ignite.internal.util.typedef.*; +import org.apache.ignite.lang.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0eceb3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java index 79cfe1c..ff4b259 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheGroupLockPartitionedAbstractSelfTest.java @@ -85,7 +85,7 @@ public abstract class GridCacheGroupLockPartitionedAbstractSelfTest extends Grid for (int i = 0; i < 3; i++) { try (IgniteTx tx = ignite(0).transactions().txStartAffinity(null, affinityKey, concurrency, isolation, 0, 10)) { - Set<CacheEntry<CacheAffinityKey<Integer>, Integer>> set = + Set<Cache.Entry<CacheAffinityKey<Integer>, Integer>> set = cache.entrySet(ignite(0).affinity(null).partition(affinityKey)); for (Cache.Entry<CacheAffinityKey<Integer>, Integer> entry : set) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0eceb3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java index f6b1deb..46eca5d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java @@ -34,7 +34,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.*; import org.apache.ignite.testframework.junits.common.*; -import java.io.*; import java.util.*; import java.util.concurrent.atomic.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0eceb3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoLoadPreviousValueAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoLoadPreviousValueAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoLoadPreviousValueAbstractTest.java index d0c1640..eed058a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoLoadPreviousValueAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoLoadPreviousValueAbstractTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0eceb3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java index 1700824..c5897d9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0eceb3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java index 6080cd0..6c11d61 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.integration; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0eceb3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java index 37a6d24..1f26666 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java @@ -30,7 +30,6 @@ import org.apache.ignite.spi.swapspace.file.*; import org.apache.ignite.testframework.*; import org.apache.ignite.testframework.junits.common.*; -import javax.cache.*; import java.util.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0eceb3/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java index e292672..b53203a 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.loadtests.dsi.cacheget; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import java.util.concurrent.atomic.*;
