#ignite-286: wip
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/56923917 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/56923917 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/56923917 Branch: refs/heads/ignite-286 Commit: 5692391799fdb944e2aa7e0c5b040a7c2c669623 Parents: 87f382f Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Apr 24 18:17:13 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Apr 24 18:17:13 2015 +0300 ---------------------------------------------------------------------- .../transactions/IgniteTxLocalAdapter.java | 3 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 78 ++++++++++---------- ...achePartitionedMultiNodeFullApiSelfTest.java | 6 +- .../IgniteCacheFullApiSelfTestSuite.java | 8 +- 4 files changed, 44 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/56923917/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java index 5f5fca9..d5d781b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java @@ -2939,8 +2939,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter assert loadFut.isDone(); return nonInterruptable(commitAsync().chain(new CX1<IgniteInternalFuture<IgniteInternalTx>, GridCacheReturn>() { - @Override - public GridCacheReturn applyx(IgniteInternalFuture<IgniteInternalTx> txFut) + @Override public GridCacheReturn applyx(IgniteInternalFuture<IgniteInternalTx> txFut) throws IgniteCheckedException { txFut.get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/56923917/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 432609e..9d5a1e8 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 @@ -22,7 +22,6 @@ import junit.framework.*; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.cache.query.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; @@ -290,20 +289,20 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract if (ctx.affinity().localNode(key, new AffinityTopologyVersion(ctx.discovery().topologyVersion()))) sum++; - assertEquals("Incorrect key size on cache #" + i, sum, jcache(i).localSize(CachePeekMode.ALL)); + assertEquals("Incorrect key size on cache #" + i, sum, jcache(i).localSize(ALL)); } for (int i = 0; i < gridCount(); i++) { Collection<String> keysCol = mapped.get(grid(i).localNode()); assertEquals("Failed check for grid: " + i, !F.isEmpty(keysCol) ? keysCol.size() : 0, - jcache(i).localSize(CachePeekMode.PRIMARY)); + jcache(i).localSize(PRIMARY)); } int globalPrimarySize = map.size(); for (int i = 0; i < gridCount(); i++) - assertEquals(globalPrimarySize, jcache(i).size(CachePeekMode.PRIMARY)); + assertEquals(globalPrimarySize, jcache(i).size(PRIMARY)); int times = 1; @@ -315,7 +314,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract int globalSize = globalPrimarySize * times; for (int i = 0; i < gridCount(); i++) - assertEquals(globalSize, jcache(i).size(CachePeekMode.ALL)); + assertEquals(globalSize, jcache(i).size(ALL)); } /** @@ -2910,7 +2909,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract Ignite ignite = primaryIgnite("key"); IgniteCache<String, Integer> cache = ignite.cache(null); - assert cache.localPeek("key", ONHEAP) == null; + assert peek(cache, "key") == null; cache.put("key", 1); @@ -3416,7 +3415,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract Collection<String> locKeys = new HashSet<>(); if (grid(0).context().cache().cache(null).context().affinityNode()) { - Iterable<Cache.Entry<String, Integer>> entries = cache.localEntries(CachePeekMode.PRIMARY, CachePeekMode.BACKUP); + Iterable<Cache.Entry<String, Integer>> entries = cache.localEntries(PRIMARY, BACKUP); for (Cache.Entry<String, Integer> entry : entries) locKeys.add(entry.getKey()); @@ -3448,14 +3447,14 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract cache.localEvict(F.asList(k2, k3)); if (memoryMode() == OFFHEAP_TIERED) { - assertNotNull(cache.localPeek(k1, ONHEAP, CachePeekMode.OFFHEAP)); - assertNotNull(cache.localPeek(k2, ONHEAP, CachePeekMode.OFFHEAP)); - assertNotNull(cache.localPeek(k3, ONHEAP, CachePeekMode.OFFHEAP)); + assertNotNull(cache.localPeek(k1, ONHEAP, OFFHEAP)); + assertNotNull(cache.localPeek(k2, ONHEAP, OFFHEAP)); + assertNotNull(cache.localPeek(k3, ONHEAP, OFFHEAP)); } else { - assertNotNull(cache.localPeek(k1, ONHEAP, CachePeekMode.OFFHEAP)); - assertNull(cache.localPeek(k2, ONHEAP, CachePeekMode.OFFHEAP)); - assertNull(cache.localPeek(k3, ONHEAP, CachePeekMode.OFFHEAP)); + assertNotNull(cache.localPeek(k1, ONHEAP, OFFHEAP)); + assertNull(cache.localPeek(k2, ONHEAP, OFFHEAP)); + assertNull(cache.localPeek(k3, ONHEAP, OFFHEAP)); } int cnt = 0; @@ -3521,14 +3520,14 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract cache.localEvict(Collections.singleton(k3)); if (memoryMode() == OFFHEAP_TIERED) { - assertNotNull(cache.localPeek(k1, ONHEAP, CachePeekMode.OFFHEAP)); - assertNotNull(cache.localPeek(k2, ONHEAP, CachePeekMode.OFFHEAP)); - assertNotNull(cache.localPeek(k3, ONHEAP, CachePeekMode.OFFHEAP)); + assertNotNull(cache.localPeek(k1, ONHEAP, OFFHEAP)); + assertNotNull(cache.localPeek(k2, ONHEAP, OFFHEAP)); + assertNotNull(cache.localPeek(k3, ONHEAP, OFFHEAP)); } else { - assertNotNull(cache.localPeek(k1, ONHEAP, CachePeekMode.OFFHEAP)); - assertNull(cache.localPeek(k2, ONHEAP, CachePeekMode.OFFHEAP)); - assertNull(cache.localPeek(k3, ONHEAP, CachePeekMode.OFFHEAP)); + assertNotNull(cache.localPeek(k1, ONHEAP, OFFHEAP)); + assertNull(cache.localPeek(k2, ONHEAP, OFFHEAP)); + assertNull(cache.localPeek(k3, ONHEAP, OFFHEAP)); } cache.localPromote(F.asSet(k2, k3)); @@ -3652,7 +3651,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract */ private void checkRemovexInTx(TransactionConcurrency concurrency, TransactionIsolation isolation) throws Exception { if (txEnabled()) { - final int cnt = 1; + final int cnt = 10; CU.inTx(ignite(0), jcache(), concurrency, isolation, new CIX1<IgniteCache<String, Integer>>() { @Override public void applyx(IgniteCache<String, Integer> cache) { @@ -3798,7 +3797,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract } } - assertEquals("Incorrect size on cache #" + i, size, jcache(i).localSize(CachePeekMode.ALL)); + assertEquals("Incorrect size on cache #" + i, size, jcache(i).localSize(ALL)); } } } @@ -3809,8 +3808,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract */ protected void checkKeySize(Collection<String> keys) throws Exception { if (nearEnabled()) - assertEquals("Invalid key size: " + jcache().localSize(CachePeekMode.ALL), - keys.size(), jcache().localSize(CachePeekMode.ALL)); + assertEquals("Invalid key size: " + jcache().localSize(ALL), + keys.size(), jcache().localSize(ALL)); else { for (int i = 0; i < gridCount(); i++) { GridCacheContext<String, Integer> ctx = context(i); @@ -3821,7 +3820,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract if (ctx.affinity().localNode(key, ctx.discovery().topologyVersionEx())) size++; - assertEquals("Incorrect key size on cache #" + i, size, jcache(i).localSize(CachePeekMode.ALL)); + assertEquals("Incorrect key size on cache #" + i, size, jcache(i).localSize(ALL)); } } } @@ -3998,8 +3997,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract iter.remove(); GridTestUtils.assertThrows(log, new Callable<Object>() { - @Override - public Void call() throws Exception { + @Override public Void call() throws Exception { iter.remove(); return null; @@ -4341,7 +4339,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract for (String key : keys) assertNull(cache.get(key)); - final int KEYS = 1; + final int KEYS = 250; // Put/remove data from multiple nodes. @@ -4421,7 +4419,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertFalse(cacheSkipStore.iterator().hasNext()); assertTrue(map.size() == 0); - assertTrue(cache.size(CachePeekMode.ALL) == 0); + assertTrue(cache.size(ALL) == 0); // putAll/removeAll from multiple nodes. @@ -4510,8 +4508,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertTrue(map.containsKey(rmvKey)); - assertTrue(cache.size(CachePeekMode.ALL) == 0); - assertTrue(cacheSkipStore.size(CachePeekMode.ALL) == 0); + assertTrue(cache.size(ALL) == 0); + assertTrue(cacheSkipStore.size(ALL) == 0); cache.remove(rmvKey); @@ -4568,7 +4566,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract IgniteCache<String, Integer> cacheSkipStore = cache.withSkipStore(); - final int KEYS = 50; + final int KEYS = 250; // Put/remove data from multiple nodes. @@ -4582,17 +4580,17 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract for (int i = 0; i < keys.size(); i++) data.put(keys.get(i), i); - /* checkSkipStoreWithTransaction(cache, cacheSkipStore, data, keys, OPTIMISTIC, READ_COMMITTED); + checkSkipStoreWithTransaction(cache, cacheSkipStore, data, keys, OPTIMISTIC, READ_COMMITTED); checkSkipStoreWithTransaction(cache, cacheSkipStore, data, keys, OPTIMISTIC, REPEATABLE_READ); - checkSkipStoreWithTransaction(cache, cacheSkipStore, data, keys, OPTIMISTIC, SERIALIZABLE);*/ + checkSkipStoreWithTransaction(cache, cacheSkipStore, data, keys, OPTIMISTIC, SERIALIZABLE); + + //checkSkipStoreWithTransaction(cache, cacheSkipStore, data, keys, PESSIMISTIC, READ_COMMITTED); - checkSkipStoreWithTransaction(cache, cacheSkipStore, data, keys, PESSIMISTIC, READ_COMMITTED); -/* checkSkipStoreWithTransaction(cache, cacheSkipStore, data, keys, PESSIMISTIC, REPEATABLE_READ); - checkSkipStoreWithTransaction(cache, cacheSkipStore, data, keys, PESSIMISTIC, SERIALIZABLE);*/ + checkSkipStoreWithTransaction(cache, cacheSkipStore, data, keys, PESSIMISTIC, SERIALIZABLE); } } @@ -4754,8 +4752,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract for (int i = 0; i < keys.size(); i++) putToStore(keys.get(i), i); - assertTrue(cacheSkipStore.size(CachePeekMode.ALL) == 0); - assertTrue(cache.size(CachePeekMode.ALL) == 0); + assertTrue(cacheSkipStore.size(ALL) == 0); + assertTrue(cache.size(ALL) == 0); assertTrue(map.size() != 0); try (Transaction tx = txs.txStart(txConcurrency, txIsolation)) { @@ -4844,8 +4842,8 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract */ private void checkEmpty(IgniteCache<String, Integer> cache, IgniteCache<String, Integer> cacheSkipStore) throws Exception { - assertTrue(cache.size(CachePeekMode.ALL) == 0); - assertTrue(cacheSkipStore.size(CachePeekMode.ALL) == 0); + assertTrue(cache.size(ALL) == 0); + assertTrue(cacheSkipStore.size(ALL) == 0); assertTrue(map.size() == 0); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/56923917/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java index 3f85204..ad4106a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java @@ -175,9 +175,6 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti * @throws Exception If failed. */ public void testUnswapShort() throws Exception { - if (memoryMode() == CacheMemoryMode.OFFHEAP_TIERED) - return; - final AtomicInteger swapEvts = new AtomicInteger(0); final AtomicInteger unswapEvts = new AtomicInteger(0); @@ -330,8 +327,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti assertEquals(0, cache1.localSize(NEAR)); assertEquals(5, cache1.localSize(CachePeekMode.ALL) - cache1.localSize(NEAR)); - assertEquals(nearEnabled() && memoryMode() != CacheMemoryMode.OFFHEAP_TIERED - ? 2 : 0, cache2.localSize(NEAR)); + assertEquals(nearEnabled() ? 2 : 0, cache2.localSize(NEAR)); assertEquals(0, cache2.localSize(CachePeekMode.ALL) - cache2.localSize(NEAR)); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/56923917/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java index 85bffee..5c2b77f 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java @@ -34,7 +34,7 @@ public class IgniteCacheFullApiSelfTestSuite extends TestSuite { public static TestSuite suite() throws Exception { TestSuite suite = new TestSuite("Cache Full API Test Suite"); - /* // One node. + // One node. suite.addTestSuite(GridCacheLocalFullApiSelfTest.class); suite.addTestSuite(GridCacheLocalAtomicFullApiSelfTest.class); suite.addTestSuite(GridCacheReplicatedFullApiSelfTest.class); @@ -119,7 +119,7 @@ public class IgniteCacheFullApiSelfTestSuite extends TestSuite { suite.addTestSuite(GridCachePartitionedOffHeapMultiNodeFullApiSelfTest.class); suite.addTestSuite(GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.class); suite.addTestSuite(GridCacheAtomicPrimaryWrityOrderOffHeapMultiNodeFullApiSelfTest.class); - suite.addTestSuite(GridCachePartitionedNearDisabledOffHeapMultiNodeFullApiSelfTest.class);*/ + suite.addTestSuite(GridCachePartitionedNearDisabledOffHeapMultiNodeFullApiSelfTest.class); // Multi-node with off-heap tiered mode. suite.addTestSuite(GridCacheReplicatedOffHeapTieredMultiNodeFullApiSelfTest.class); @@ -127,12 +127,12 @@ public class IgniteCacheFullApiSelfTestSuite extends TestSuite { suite.addTestSuite(GridCacheAtomicOffHeapTieredMultiNodeFullApiSelfTest.class); suite.addTestSuite(GridCacheAtomicPrimaryWrityOrderOffHeapTieredMultiNodeFullApiSelfTest.class); suite.addTestSuite(GridCachePartitionedNearDisabledOffHeapTieredMultiNodeFullApiSelfTest.class); -/* + // Private cache API. suite.addTestSuite(GridCacheExLocalFullApiSelfTest.class); suite.addTestSuite(GridCacheExReplicatedFullApiSelfTest.class); suite.addTestSuite(GridCacheExNearFullApiSelfTest.class); - suite.addTestSuite(GridCacheExColocatedFullApiSelfTest.class);*/ + suite.addTestSuite(GridCacheExColocatedFullApiSelfTest.class); // Multithreaded // TODO: GG-708 // suite.addTestSuite(GridCacheLocalFullApiMultithreadedSelfTest.class);
