http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/cache/store/GridGeneratingTestStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/cache/store/GridGeneratingTestStore.java b/modules/core/src/test/java/org/gridgain/grid/cache/store/GridGeneratingTestStore.java index d2bbd3c..1103b29 100644 --- a/modules/core/src/test/java/org/gridgain/grid/cache/store/GridGeneratingTestStore.java +++ b/modules/core/src/test/java/org/gridgain/grid/cache/store/GridGeneratingTestStore.java @@ -30,7 +30,7 @@ public class GridGeneratingTestStore implements GridCacheStore<String, String> { private String cacheName; /** {@inheritDoc} */ - @Override public String load(@Nullable GridCacheTx tx, String key) + @Override public String load(@Nullable IgniteTx tx, String key) throws IgniteCheckedException { return null; } @@ -59,38 +59,38 @@ public class GridGeneratingTestStore implements GridCacheStore<String, String> { } /** {@inheritDoc} */ - @Override public void loadAll(@Nullable GridCacheTx tx, + @Override public void loadAll(@Nullable IgniteTx tx, @Nullable Collection<? extends String> keys, IgniteBiInClosure<String, String> c) throws IgniteCheckedException { for (String key : keys) c.apply(key, "val" + key); } /** {@inheritDoc} */ - @Override public void put(@Nullable GridCacheTx tx, String key, @Nullable String val) + @Override public void put(@Nullable IgniteTx tx, String key, @Nullable String val) throws IgniteCheckedException { // No-op. } /** {@inheritDoc} */ - @Override public void putAll(@Nullable GridCacheTx tx, + @Override public void putAll(@Nullable IgniteTx tx, @Nullable Map<? extends String, ? extends String> map) throws IgniteCheckedException { // No-op. } /** {@inheritDoc} */ - @Override public void remove(@Nullable GridCacheTx tx, String key) + @Override public void remove(@Nullable IgniteTx tx, String key) throws IgniteCheckedException { // No-op. } /** {@inheritDoc} */ - @Override public void removeAll(@Nullable GridCacheTx tx, + @Override public void removeAll(@Nullable IgniteTx tx, @Nullable Collection<? extends String> keys) throws IgniteCheckedException { // No-op. } /** {@inheritDoc} */ - @Override public void txEnd(GridCacheTx tx, boolean commit) throws IgniteCheckedException { + @Override public void txEnd(IgniteTx tx, boolean commit) throws IgniteCheckedException { // No-op. } }
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java index c52f744..aa606a2 100644 --- a/modules/core/src/test/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStoreMultithreadedSelfTest.java @@ -185,7 +185,7 @@ public class GridCacheJdbcBlobStoreMultithreadedSelfTest extends GridCommonAbstr for (int i = 0; i < TX_CNT; i++) { GridCache<Integer, String> cache = cache(rnd.nextInt(GRID_CNT)); - try (GridCacheTx tx = cache.txStart()) { + try (IgniteTx tx = cache.txStart()) { cache.put(1, "value"); cache.put(2, "value"); cache.put(3, "value"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java index eb372e7..152125c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStartStopSelfTest.java @@ -95,7 +95,7 @@ public class GridStartStopSelfTest extends GridCommonAbstractTest { Thread stopper = new Thread(new Runnable() { @Override public void run() { try { - try (GridCacheTx ignored = g0.cache(null).txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (IgniteTx ignored = g0.cache(null).txStart(PESSIMISTIC, REPEATABLE_READ)) { g0.cache(null).get(1); latch.countDown(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java index 4cdebae..5368195 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -429,7 +429,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception In case of error. */ public void testGetAll() throws Exception { - GridCacheTx tx = txEnabled() ? cache().txStart() : null; + IgniteTx tx = txEnabled() ? cache().txStart() : null; cache().put("key1", 1); cache().put("key2", 2); @@ -517,7 +517,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract */ public void testGetAllDuplicatesTx() throws Exception { if (txEnabled()) { - try (GridCacheTx ignored = cache().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (IgniteTx ignored = cache().txStart(PESSIMISTIC, REPEATABLE_READ)) { cache().getAll(F.asList("key1", "key1", "key1")); } } @@ -528,7 +528,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract */ public void testGetTxNonExistingKey() throws Exception { if (txEnabled()) { - try (GridCacheTx ignored = cache().txStart()) { + try (IgniteTx ignored = cache().txStart()) { cache().get("key999123"); } } @@ -539,7 +539,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract */ public void testGetAllFilteredTx() throws Exception { if (txEnabled()) { - GridCacheTx tx = cache().txStart(); + IgniteTx tx = cache().txStart(); cache().put("key1", 100); cache().put("key2", 101); @@ -701,7 +701,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract */ public void testPutTx() throws Exception { if (txEnabled()) { - GridCacheTx tx = cache().txStart(); + IgniteTx tx = cache().txStart(); assert cache().put("key1", 1) == null; assert cache().put("key2", 2) == null; @@ -776,7 +776,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract cache.put("key3", 3); - GridCacheTx tx = txEnabled() ? cache.txStart(concurrency, isolation) : null; + IgniteTx tx = txEnabled() ? cache.txStart(concurrency, isolation) : null; try { cache.transform("key1", INCR_CLOS); @@ -983,7 +983,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract throws Exception { GridCacheProjection<String, Integer> cache = cache(); - GridCacheTx tx = txEnabled() ? cache.txStart(concurrency, READ_COMMITTED) : null; + IgniteTx tx = txEnabled() ? cache.txStart(concurrency, READ_COMMITTED) : null; try { if (startVal) @@ -1034,7 +1034,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract cache.put("key", 4); - GridCacheTx tx = txEnabled() ? cache.txStart(concurrency, READ_COMMITTED) : null; + IgniteTx tx = txEnabled() ? cache.txStart(concurrency, READ_COMMITTED) : null; try { cache.remove("key"); @@ -1102,7 +1102,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract if (!put) cache.put("key", 1); - GridCacheTx tx = txEnabled() ? cache.txStart(concurrency, isolation) : null; + IgniteTx tx = txEnabled() ? cache.txStart(concurrency, isolation) : null; try { if (put) @@ -1129,7 +1129,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testPutFiltered() throws Exception { - GridCacheTx tx = txEnabled() ? cache().txStart() : null; + IgniteTx tx = txEnabled() ? cache().txStart() : null; cache().put("key1", 1, F.<String, Integer>cacheNoPeekValue()); cache().put("key2", 100, gte100); @@ -1267,7 +1267,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception In case of error. */ public void testPutAsyncFiltered() throws Exception { - GridCacheTx tx = txEnabled() ? cache().txStart() : null; + IgniteTx tx = txEnabled() ? cache().txStart() : null; assert cache().putAsync("key1", 1, gte100).get() == null; assert cache().putAsync("key2", 101, F.<String, Integer>cacheNoPeekValue()).get() == null; @@ -1314,7 +1314,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception If failed. */ private void checkPutx(boolean inTx) throws Exception { - GridCacheTx tx = inTx ? cache().txStart() : null; + IgniteTx tx = inTx ? cache().txStart() : null; assert cache().putx("key1", 1); assert cache().putx("key2", 2); @@ -1412,7 +1412,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract private void checkFilters1(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) throws Exception { cache().putx("key1", 0); - GridCacheTx tx = txEnabled() ? cache().txStart(concurrency, isolation) : null; + IgniteTx tx = txEnabled() ? cache().txStart(concurrency, isolation) : null; try { assert cache().putx("key1", 100); @@ -1451,7 +1451,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract private void checkFilters2(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) throws Exception { cache().putx("key1", 100); - GridCacheTx tx = txEnabled() ? cache().txStart(concurrency, isolation) : null; + IgniteTx tx = txEnabled() ? cache().txStart(concurrency, isolation) : null; try { cache().put("key1", 101, F.<GridCacheEntry<String, Integer>>alwaysFalse()); @@ -1489,7 +1489,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract private void checkFilters3(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) throws Exception { cache().putx("key1", 100); - GridCacheTx tx = txEnabled() ? cache().txStart(concurrency, isolation) : null; + IgniteTx tx = txEnabled() ? cache().txStart(concurrency, isolation) : null; try { assertEquals((Integer)100, cache().put("key1", 101, F.<GridCacheEntry<String, Integer>>alwaysTrue())); @@ -1524,7 +1524,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testPutxFiltered() throws Exception { - GridCacheTx tx = txEnabled() ? cache().txStart() : null; + IgniteTx tx = txEnabled() ? cache().txStart() : null; try { cache().putx("key1", 1, F.<String, Integer>cacheHasPeekValue()); @@ -1548,14 +1548,14 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testPutxAsync() throws Exception { - GridCacheTx tx = txEnabled() ? cache().txStart() : null; + IgniteTx tx = txEnabled() ? cache().txStart() : null; cache().put("key2", 1); IgniteFuture<Boolean> fut1 = cache().putxAsync("key1", 10); IgniteFuture<Boolean> fut2 = cache().putxAsync("key2", 11); - IgniteFuture<GridCacheTx> f = tx == null ? null : tx.commitAsync(); + IgniteFuture<IgniteTx> f = tx == null ? null : tx.commitAsync(); assert fut1.get(); assert fut2.get(); @@ -1732,7 +1732,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception In case of error. */ public void testPutIfAbsent() throws Exception { - GridCacheTx tx = txEnabled() ? cache().txStart() : null; + IgniteTx tx = txEnabled() ? cache().txStart() : null; try { assert cache().putIfAbsent("key", 1) == null; @@ -1807,7 +1807,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testPutIfAbsentAsync() throws Exception { - GridCacheTx tx = txEnabled() ? cache().txStart() : null; + IgniteTx tx = txEnabled() ? cache().txStart() : null; try { IgniteFuture<Integer> fut1 = cache().putIfAbsentAsync("key", 1); @@ -1888,7 +1888,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract cache().clear("key3"); // Same checks inside tx. - GridCacheTx tx = txEnabled() ? cache().txStart() : null; + IgniteTx tx = txEnabled() ? cache().txStart() : null; try { assertFalse(cache().putxIfAbsent("key2", 3)); @@ -1952,7 +1952,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract cache().clear("key3"); // Same checks inside tx. - GridCacheTx tx = inTx ? cache().txStart() : null; + IgniteTx tx = inTx ? cache().txStart() : null; try { assertFalse(cache().putxIfAbsentAsync("key2", 3).get()); @@ -2046,7 +2046,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract cache().evict("key"); cache().clear("key2"); - GridCacheTx tx = txEnabled() ? cache().txStart() : null; + IgniteTx tx = txEnabled() ? cache().txStart() : null; try { assert cache().replace("key", 4, 5); @@ -2093,7 +2093,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract cache().evict("key"); cache().clear("key2"); - GridCacheTx tx = txEnabled() ? cache().txStart() : null; + IgniteTx tx = txEnabled() ? cache().txStart() : null; try { assert cache().replacex("key", 5); @@ -2154,7 +2154,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract cache().evict("key"); cache().clear("key2"); - GridCacheTx tx = txEnabled() ? cache().txStart() : null; + IgniteTx tx = txEnabled() ? cache().txStart() : null; try { assert cache().replaceAsync("key", 4, 5).get(); @@ -2203,7 +2203,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract cache().evict("key"); cache().clear("key2"); - GridCacheTx tx = txEnabled() ? cache().txStart() : null; + IgniteTx tx = txEnabled() ? cache().txStart() : null; try { assert cache().replacexAsync("key", 5).get(); @@ -2445,7 +2445,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract */ public void testRemoveAllDuplicatesTx() throws Exception { if (txEnabled()) { - try (GridCacheTx tx = cache().txStart()) { + try (IgniteTx tx = cache().txStart()) { cache().removeAll(Arrays.asList("key1", "key1", "key1")); tx.commit(); @@ -3862,7 +3862,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract cache.put("key", 1); - GridCacheTx tx = txEnabled() ? cache.txStart() : null; + IgniteTx tx = txEnabled() ? cache.txStart() : null; try { cache.replace("key", 2); @@ -3899,7 +3899,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract cache.put("key", 1); - try (GridCacheTx tx = cache.txStart(concurrency, READ_COMMITTED)) { + try (IgniteTx tx = cache.txStart(concurrency, READ_COMMITTED)) { cache.remove("key"); assertNull(cache.peek("key")); @@ -3975,7 +3975,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract } if (txEnabled()) { - GridCacheTx tx = cache.txStart(); + IgniteTx tx = cache.txStart(); cache.replace(key, 2); @@ -4072,7 +4072,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertEquals((Integer)100, peek(cache2.projection(gte100), "key2")); if (txEnabled()) { - GridCacheTx tx = cache().txStart(); + IgniteTx tx = cache().txStart(); assertEquals((Integer)1, cache1.replace("key1", 101)); assertEquals((Integer)100, cache2.replace("key2", 2)); @@ -4217,7 +4217,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract String key = "1"; int ttl = 500; - try (GridCacheTx tx = c.txStart()) { + try (IgniteTx tx = c.txStart()) { GridCacheEntry<String, Integer> entry = c.entry(key); entry.timeToLive(ttl); @@ -4283,7 +4283,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract if (inTx) { // Rollback transaction for the first time. - GridCacheTx tx = c.txStart(); + IgniteTx tx = c.txStart(); try { entry.timeToLive(ttl); @@ -4302,7 +4302,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract } // Now commit transaction and check that ttl and expire time have been saved. - GridCacheTx tx = inTx ? c.txStart() : null; + IgniteTx tx = inTx ? c.txStart() : null; try { entry.timeToLive(ttl); @@ -4676,7 +4676,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract public void testOptimisticTxMissingKey() throws Exception { if (txEnabled()) { - try (GridCacheTx tx = cache().txStart(OPTIMISTIC, READ_COMMITTED)) { + try (IgniteTx tx = cache().txStart(OPTIMISTIC, READ_COMMITTED)) { // Remove missing key. assertTrue(cache().removex(UUID.randomUUID().toString())); @@ -4693,7 +4693,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract public void testOptimisticTxMissingKeyNoCommit() throws Exception { if (txEnabled()) { - try (GridCacheTx tx = cache().txStart(OPTIMISTIC, READ_COMMITTED)) { + try (IgniteTx tx = cache().txStart(OPTIMISTIC, READ_COMMITTED)) { // Remove missing key. assertTrue(cache().removex(UUID.randomUUID().toString())); @@ -4772,7 +4772,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract */ public void testPessimisticTxMissingKey() throws Exception { if (txEnabled()) { - try (GridCacheTx tx = cache().txStart(PESSIMISTIC, READ_COMMITTED)) { + try (IgniteTx tx = cache().txStart(PESSIMISTIC, READ_COMMITTED)) { // Remove missing key. assertFalse(cache().removex(UUID.randomUUID().toString())); @@ -4788,7 +4788,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract */ public void testPessimisticTxMissingKeyNoCommit() throws Exception { if (txEnabled()) { - try (GridCacheTx tx = cache().txStart(PESSIMISTIC, READ_COMMITTED)) { + try (IgniteTx tx = cache().txStart(PESSIMISTIC, READ_COMMITTED)) { // Remove missing key. assertFalse(cache().removex(UUID.randomUUID().toString())); @@ -4802,7 +4802,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract */ public void testPessimisticTxRepeatableRead() throws Exception { if (txEnabled()) { - try (GridCacheTx ignored = cache().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (IgniteTx ignored = cache().txStart(PESSIMISTIC, REPEATABLE_READ)) { cache().putx("key", 1); assert cache().get("key") == 1; @@ -4815,7 +4815,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract */ public void testPessimisticTxRepeatableReadOnUpdate() throws Exception { if (txEnabled()) { - try (GridCacheTx ignored = cache().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (IgniteTx ignored = cache().txStart(PESSIMISTIC, REPEATABLE_READ)) { cache().put("key", 1); assert cache().put("key", 2) == 1; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractProjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractProjectionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractProjectionSelfTest.java index a964433..db54883 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractProjectionSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractProjectionSelfTest.java @@ -185,7 +185,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr int size = 10; if (atomicityMode() == TRANSACTIONAL) { - GridCacheTx tx = prj.txStart(); + IgniteTx tx = prj.txStart(); for (int i = 0; i < size; i++) prj.put("key" + i, i); @@ -735,7 +735,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr if (atomicityMode() == ATOMIC) return; - GridCacheTx tx = cache().txStart(); + IgniteTx tx = cache().txStart(); GridCacheProjection<String, Integer> typePrj = cache().projection(String.class, Integer.class); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java index 5b246c4..314df0b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java @@ -86,7 +86,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - GridCacheTx tx = cache().tx(); + IgniteTx tx = cache().tx(); if (tx != null) { tx.close(); @@ -274,15 +274,15 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { clo.apply(e.getKey(), e.getValue()); } - @Override public Object load(GridCacheTx tx, Object key) { + @Override public Object load(IgniteTx tx, Object key) { return map.get(key); } - @Override public void put(GridCacheTx tx, Object key, @Nullable Object val) { + @Override public void put(IgniteTx tx, Object key, @Nullable Object val) { map.put(key, val); } - @Override public void remove(GridCacheTx tx, Object key) { + @Override public void remove(IgniteTx tx, Object key) { map.remove(key); } }; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTtlSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTtlSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTtlSelfTest.java index f05fc8a..50f272c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTtlSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTtlSelfTest.java @@ -58,7 +58,7 @@ public abstract class GridCacheAbstractTtlSelfTest extends GridCacheAbstractSelf String key = "1"; int ttl = 500; - try (GridCacheTx tx = c.txStart()) { + try (IgniteTx tx = c.txStart()) { GridCacheEntry<String, Integer> entry = c.entry(key); entry.timeToLive(ttl); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTxReadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTxReadTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTxReadTest.java index 0ab26fe..544a1ad 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTxReadTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractTxReadTest.java @@ -94,7 +94,7 @@ public abstract class GridCacheAbstractTxReadTest extends GridCacheAbstractSelfT cache.clearAll(); - GridCacheTx tx = cache.txStart(concurrency, isolation); + IgniteTx tx = cache.txStart(concurrency, isolation); try { cache.put("key", 1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java index 96bab24..b52ac94 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreAbstractTest.java @@ -136,7 +136,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract assert map.isEmpty(); if (atomicityMode() == TRANSACTIONAL) { - try (GridCacheTx tx = cache.txStart(OPTIMISTIC, REPEATABLE_READ)) { + try (IgniteTx tx = cache.txStart(OPTIMISTIC, REPEATABLE_READ)) { for (int i = 1; i <= 10; i++) { cache.putx(i, Integer.toString(i)); @@ -169,7 +169,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract store.resetLastMethod(); if (atomicityMode() == TRANSACTIONAL) { - try (GridCacheTx tx = cache.txStart()) { + try (IgniteTx tx = cache.txStart()) { for (int i = 1; i <= 10; i++) { String val = cache.remove(i); @@ -207,7 +207,7 @@ public abstract class GridCacheBasicStoreAbstractTest extends GridCommonAbstract assert map.isEmpty(); if (atomicityMode() == TRANSACTIONAL) { - try (GridCacheTx tx = cache.txStart(OPTIMISTIC, REPEATABLE_READ)) { + try (IgniteTx tx = cache.txStart(OPTIMISTIC, REPEATABLE_READ)) { for (int i = 1; i <= 10; i++) cache.putx(i, Integer.toString(i)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java index 536c69a..b3b326f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreMultithreadedAbstractTest.java @@ -82,17 +82,17 @@ public abstract class GridCacheBasicStoreMultithreadedAbstractTest extends GridC final AtomicInteger cntr = new AtomicInteger(); store = new GridCacheStoreAdapter<Integer, Integer>() { - @Override public Integer load(@Nullable GridCacheTx tx, Integer key) { + @Override public Integer load(@Nullable IgniteTx tx, Integer key) { return cntr.incrementAndGet(); } /** {@inheritDoc} */ - @Override public void put(GridCacheTx tx, Integer key, @Nullable Integer val) { + @Override public void put(IgniteTx tx, Integer key, @Nullable Integer val) { assert false; } /** {@inheritDoc} */ - @Override public void remove(GridCacheTx tx, Integer key) { + @Override public void remove(IgniteTx tx, Integer key) { assert false; } }; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllSelfTest.java index 8fede87..5a3fa25 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllSelfTest.java @@ -288,7 +288,7 @@ public class GridCacheClearAllSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ private void fillCache(GridCache<Integer, Integer> cache, int keysCnt) throws Exception { - try (GridCacheTx tx = cache.txStart()) { + try (IgniteTx tx = cache.txStart()) { for (int i = 0; i < keysCnt; i++) cache.put(i, i); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheColocatedTxStoreExceptionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheColocatedTxStoreExceptionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheColocatedTxStoreExceptionSelfTest.java index 8364247..95bd38c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheColocatedTxStoreExceptionSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheColocatedTxStoreExceptionSelfTest.java @@ -17,7 +17,7 @@ import static org.gridgain.grid.cache.GridCacheMode.*; /** * */ -public class GridCacheColocatedTxStoreExceptionSelfTest extends GridCacheTxStoreExceptionAbstractSelfTest { +public class GridCacheColocatedTxStoreExceptionSelfTest extends IgniteTxStoreExceptionAbstractSelfTest { /** {@inheritDoc} */ @Override protected GridCacheMode cacheMode() { return PARTITIONED; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java index 01ce0af..8d3860f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java @@ -608,7 +608,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest { Session ses = new Session(terminalId()); try { - try (GridCacheTx tx = cache.txStart()) { + try (IgniteTx tx = cache.txStart()) { Request req = new Request(getId()); req.setMessageId(getId()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationConsistencySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationConsistencySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationConsistencySelfTest.java index 640667e..1ccece7 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationConsistencySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheConfigurationConsistencySelfTest.java @@ -985,7 +985,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac /** */ private static class TestStore implements GridCacheStore<Object,Object> { /** {@inheritDoc} */ - @Nullable @Override public Object load(@Nullable GridCacheTx tx, Object key) + @Nullable @Override public Object load(@Nullable IgniteTx tx, Object key) throws IgniteCheckedException { return null; } @@ -997,37 +997,37 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac } /** {@inheritDoc} */ - @Override public void loadAll(@Nullable GridCacheTx tx, + @Override public void loadAll(@Nullable IgniteTx tx, @Nullable Collection<?> keys, IgniteBiInClosure<Object, Object> c) throws IgniteCheckedException { // No-op. } /** {@inheritDoc} */ - @Override public void put(@Nullable GridCacheTx tx, Object key, + @Override public void put(@Nullable IgniteTx tx, Object key, @Nullable Object val) throws IgniteCheckedException { // No-op. } /** {@inheritDoc} */ - @Override public void putAll(@Nullable GridCacheTx tx, @Nullable Map<?, ?> map) + @Override public void putAll(@Nullable IgniteTx tx, @Nullable Map<?, ?> map) throws IgniteCheckedException { // No-op. } /** {@inheritDoc} */ - @Override public void remove(@Nullable GridCacheTx tx, Object key) + @Override public void remove(@Nullable IgniteTx tx, Object key) throws IgniteCheckedException { // No-op. } /** {@inheritDoc} */ - @Override public void removeAll(@Nullable GridCacheTx tx, + @Override public void removeAll(@Nullable IgniteTx tx, @Nullable Collection<?> keys) throws IgniteCheckedException { // No-op. } /** {@inheritDoc} */ - @Override public void txEnd(GridCacheTx tx, boolean commit) throws IgniteCheckedException { + @Override public void txEnd(IgniteTx tx, boolean commit) throws IgniteCheckedException { // No-op. } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java index 06ff089..6173193 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java @@ -121,7 +121,7 @@ public abstract class GridCacheDaemonNodeAbstractSelfTest extends GridCommonAbst GridCache<Integer, Integer> cache = grid(0).cache(null); for (int i = 0; i < 30; i++) { - try (GridCacheTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { cache.put(i, i); tx.commit(); @@ -133,7 +133,7 @@ public abstract class GridCacheDaemonNodeAbstractSelfTest extends GridCommonAbst for (int i = 30; i < 60; i++) batch.put(i, i); - try (GridCacheTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { cache.putAll(batch); tx.commit(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java index 3fef406..5b5e372 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java @@ -432,7 +432,7 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest { GridCache<Object, Object> cache = g1.cache(null); - try (GridCacheTx tx = cache.txStartAffinity(affKey, PESSIMISTIC, REPEATABLE_READ, 0, 1)) { + try (IgniteTx tx = cache.txStartAffinity(affKey, PESSIMISTIC, REPEATABLE_READ, 0, 1)) { cache.put(new GridCacheAffinityKey<>("key1", affKey), "val1"); tx.commit(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheExAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheExAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheExAbstractFullApiSelfTest.java index 1f7b2c5..efe3a80 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheExAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheExAbstractFullApiSelfTest.java @@ -56,7 +56,7 @@ public abstract class GridCacheExAbstractFullApiSelfTest extends GridCacheAbstra GridCache<String, Integer> cache = cache(); - try (GridCacheTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { int key = 0; for (int i = 0; i < 1000; i++) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFinishPartitionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFinishPartitionsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFinishPartitionsSelfTest.java index da92960..c7db6b0 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFinishPartitionsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheFinishPartitionsSelfTest.java @@ -120,7 +120,7 @@ public class GridCacheFinishPartitionsSelfTest extends GridCacheAbstractSelfTest GridCache<String, String> cache = grid(0).cache(null); - GridCacheTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ); + IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ); cache.get(key); @@ -180,7 +180,7 @@ public class GridCacheFinishPartitionsSelfTest extends GridCacheAbstractSelfTest public void testMvccFinishKeys() throws Exception { GridCache<String, Integer> cache = grid(0).cache(null); - try (GridCacheTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { final String key = "key"; cache.get(key); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGenericTestStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGenericTestStore.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGenericTestStore.java index 5402c41..d960d7b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGenericTestStore.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGenericTestStore.java @@ -34,16 +34,16 @@ public class GridCacheGenericTestStore<K, V> implements GridCacheStore<K, V> { /** */ private long ts = System.currentTimeMillis(); - /** {@link #put(GridCacheTx, Object, Object)} method call counter .*/ + /** {@link #put(IgniteTx, Object, Object)} method call counter .*/ private AtomicInteger putCnt = new AtomicInteger(); - /** {@link #putAll(GridCacheTx, Map)} method call counter .*/ + /** {@link #putAll(IgniteTx, Map)} method call counter .*/ private AtomicInteger putAllCnt = new AtomicInteger(); - /** {@link #remove(GridCacheTx, Object)} method call counter. */ + /** {@link #remove(IgniteTx, Object)} method call counter. */ private AtomicInteger rmvCnt = new AtomicInteger(); - /** {@link #removeAll(GridCacheTx, Collection)} method call counter. */ + /** {@link #removeAll(IgniteTx, Collection)} method call counter. */ private AtomicInteger rmvAllCnt = new AtomicInteger(); /** Flag indicating if methods of this store should fail. */ @@ -133,35 +133,35 @@ public class GridCacheGenericTestStore<K, V> implements GridCacheStore<K, V> { } /** - * @return Count of {@link #put(GridCacheTx, Object, Object)} method calls since last reset. + * @return Count of {@link #put(IgniteTx, Object, Object)} method calls since last reset. */ public int getPutCount() { return putCnt.get(); } /** - * @return Count of {@link #putAll(GridCacheTx, Map)} method calls since last reset. + * @return Count of {@link #putAll(IgniteTx, Map)} method calls since last reset. */ public int getPutAllCount() { return putAllCnt.get(); } /** - * @return Number of {@link #remove(GridCacheTx, Object)} method calls since last reset. + * @return Number of {@link #remove(IgniteTx, Object)} method calls since last reset. */ public int getRemoveCount() { return rmvCnt.get(); } /** - * @return Number of {@link #removeAll(GridCacheTx, Collection)} method calls since last reset. + * @return Number of {@link #removeAll(IgniteTx, Collection)} method calls since last reset. */ public int getRemoveAllCount() { return rmvAllCnt.get(); } /** {@inheritDoc} */ - @Override public V load(GridCacheTx tx, K key) throws IgniteCheckedException { + @Override public V load(IgniteTx tx, K key) throws IgniteCheckedException { lastMtd = "load"; checkOperation(); @@ -178,7 +178,7 @@ public class GridCacheGenericTestStore<K, V> implements GridCacheStore<K, V> { } /** {@inheritDoc} */ - @Override public void loadAll(GridCacheTx tx, Collection<? extends K> keys, + @Override public void loadAll(IgniteTx tx, Collection<? extends K> keys, IgniteBiInClosure<K, V> c) throws IgniteCheckedException { lastMtd = "loadAll"; @@ -193,7 +193,7 @@ public class GridCacheGenericTestStore<K, V> implements GridCacheStore<K, V> { } /** {@inheritDoc} */ - @Override public void put(@Nullable GridCacheTx tx, K key, V val) + @Override public void put(@Nullable IgniteTx tx, K key, V val) throws IgniteCheckedException { lastMtd = "put"; @@ -205,7 +205,7 @@ public class GridCacheGenericTestStore<K, V> implements GridCacheStore<K, V> { } /** {@inheritDoc} */ - @Override public void putAll(GridCacheTx tx, Map<? extends K, ? extends V> map) + @Override public void putAll(IgniteTx tx, Map<? extends K, ? extends V> map) throws IgniteCheckedException { lastMtd = "putAll"; @@ -217,7 +217,7 @@ public class GridCacheGenericTestStore<K, V> implements GridCacheStore<K, V> { } /** {@inheritDoc} */ - @Override public void remove(GridCacheTx tx, K key) throws IgniteCheckedException { + @Override public void remove(IgniteTx tx, K key) throws IgniteCheckedException { lastMtd = "remove"; checkOperation(); @@ -228,7 +228,7 @@ public class GridCacheGenericTestStore<K, V> implements GridCacheStore<K, V> { } /** {@inheritDoc} */ - @Override public void removeAll(GridCacheTx tx, Collection<? extends K> keys) + @Override public void removeAll(IgniteTx tx, Collection<? extends K> keys) throws IgniteCheckedException { lastMtd = "removeAll"; @@ -241,7 +241,7 @@ public class GridCacheGenericTestStore<K, V> implements GridCacheStore<K, V> { } /** {@inheritDoc} */ - @Override public void txEnd(GridCacheTx tx, boolean commit) { + @Override public void txEnd(IgniteTx tx, boolean commit) { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java index f8d095f..5a4fb1f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java @@ -144,7 +144,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr GridCacheAffinityKey<String> key1; GridCacheAffinityKey<String> key2; - try (GridCacheTx tx = cache.txStartAffinity(affinityKey, concurrency, READ_COMMITTED, 0, 2)) { + try (IgniteTx tx = cache.txStartAffinity(affinityKey, concurrency, READ_COMMITTED, 0, 2)) { if (concurrency == PESSIMISTIC) assertTrue("Failed to wait for lock events: " + affinityKey, locks.awaitKeys(WAIT_TIMEOUT, affinityKey)); else @@ -229,7 +229,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr grid(0).events().localListen(locks, EVT_CACHE_OBJECT_LOCKED); grid(0).events().localListen(unlocks, EVT_CACHE_OBJECT_UNLOCKED); - try (GridCacheTx tx = cache.txStartAffinity(affinityKey, concurrency, READ_COMMITTED, 0, 2)) { + try (IgniteTx tx = cache.txStartAffinity(affinityKey, concurrency, READ_COMMITTED, 0, 2)) { if (concurrency == PESSIMISTIC) assertTrue("Failed to wait for lock events: " + affinityKey, locks.awaitKeys(WAIT_TIMEOUT, affinityKey)); else @@ -309,7 +309,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr grid(0).events().localListen(locks, EVT_CACHE_OBJECT_LOCKED); grid(0).events().localListen(unlocks, EVT_CACHE_OBJECT_UNLOCKED); - try (GridCacheTx tx = cache.txStartAffinity(affinityKey, concurrency, READ_COMMITTED, 0, 2)) { + try (IgniteTx tx = cache.txStartAffinity(affinityKey, concurrency, READ_COMMITTED, 0, 2)) { if (concurrency == PESSIMISTIC) assertTrue("Failed to wait for lock events: " + affinityKey, locks.awaitKeys(WAIT_TIMEOUT, affinityKey)); else @@ -391,7 +391,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { - try (GridCacheTx tx = cache.txStartAffinity(affinityKey, concurrency, READ_COMMITTED, 0, 1)) { + try (IgniteTx tx = cache.txStartAffinity(affinityKey, concurrency, READ_COMMITTED, 0, 1)) { cache.put(key1, "val01"); tx.commit(); @@ -449,7 +449,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr assertTrue(cache.lock(key1, 0)); try { - try (GridCacheTx tx = cache.txStartAffinity(affinityKey, concurrency, READ_COMMITTED, 0, 1)) { + try (IgniteTx tx = cache.txStartAffinity(affinityKey, concurrency, READ_COMMITTED, 0, 1)) { cache.put(key1, "val01"); tx.commit(); @@ -500,7 +500,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr UUID key1; UUID key2; - try (GridCacheTx tx = cache.txStartPartition(cache.affinity().partition(affinityKey), concurrency, + try (IgniteTx tx = cache.txStartPartition(cache.affinity().partition(affinityKey), concurrency, READ_COMMITTED, 0, 2)) { // Note that events are not generated for internal keys. assertEquals("Unexpected number of lock events: " + locks.affectedKeys(), 0, locks.affectedKeys().size()); @@ -642,7 +642,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr grid(0).events().localListen(locks, EVT_CACHE_OBJECT_LOCKED); grid(0).events().localListen(unlocks, EVT_CACHE_OBJECT_UNLOCKED); - try (GridCacheTx tx = cache.txStartAffinity(affinityKey, concurrency, isolation, 0, 2)) { + try (IgniteTx tx = cache.txStartAffinity(affinityKey, concurrency, isolation, 0, 2)) { if (concurrency == PESSIMISTIC) assertTrue("Failed to wait for lock events: " + affinityKey, locks.awaitKeys(WAIT_TIMEOUT, affinityKey)); else @@ -683,7 +683,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr grid(0).events().localListen(locks, EVT_CACHE_OBJECT_LOCKED); grid(0).events().localListen(unlocks, EVT_CACHE_OBJECT_UNLOCKED); - try (GridCacheTx tx = cache.txStartAffinity(affinityKey, concurrency, isolation, 0, 2)) { + try (IgniteTx tx = cache.txStartAffinity(affinityKey, concurrency, isolation, 0, 2)) { if (concurrency == PESSIMISTIC) assertTrue("Failed to wait for lock events: " + affinityKey, locks.awaitKeys(WAIT_TIMEOUT, affinityKey)); else @@ -782,7 +782,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr grid(0).events().localListen(locks, EVT_CACHE_OBJECT_LOCKED); grid(0).events().localListen(unlocks, EVT_CACHE_OBJECT_UNLOCKED); - try (GridCacheTx tx = cache.txStartAffinity(affinityKey, concurrency, isolation, 0, 2)) { + try (IgniteTx tx = cache.txStartAffinity(affinityKey, concurrency, isolation, 0, 2)) { if (concurrency == PESSIMISTIC) assertTrue("Failed to wait for lock events: " + affinityKey, locks.awaitKeys(WAIT_TIMEOUT, affinityKey)); else @@ -862,7 +862,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr grid(0).events().localListen(locks, EVT_CACHE_OBJECT_LOCKED); grid(0).events().localListen(unlocks, EVT_CACHE_OBJECT_UNLOCKED); - try (GridCacheTx tx = cache.txStartAffinity(affinityKey, concurrency, READ_COMMITTED, 0, 2)) { + try (IgniteTx tx = cache.txStartAffinity(affinityKey, concurrency, READ_COMMITTED, 0, 2)) { if (concurrency == PESSIMISTIC) assertTrue("Failed to wait for lock events: " + affinityKey, locks.awaitKeys(WAIT_TIMEOUT, affinityKey)); else @@ -916,7 +916,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr cache(0).put(key, "val"); - try (GridCacheTx ignored = cache(0).txStartPartition(cache(0).affinity().partition(key), concurrency, + try (IgniteTx ignored = cache(0).txStartPartition(cache(0).affinity().partition(key), concurrency, REPEATABLE_READ, 0, 1)) { assertEquals("val", cache(0).get(key)); } @@ -944,7 +944,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr final GridCache<GridCacheAffinityKey<String>, String> cache = grid(0).cache(null); - try (GridCacheTx ignored = cache.txStartAffinity(affinityKey, concurrency, READ_COMMITTED, 0, 1)) { + try (IgniteTx ignored = cache.txStartAffinity(affinityKey, concurrency, READ_COMMITTED, 0, 1)) { // Key with affinity key different from enlisted on tx start should raise exception. cache.put(new GridCacheAffinityKey<>("key1", UUID.randomUUID()), "val1"); @@ -983,7 +983,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr cache.put(key, "val"); - try (GridCacheTx ignored = cache.txStartAffinity(affinityKey, concurrency, READ_COMMITTED, 0, 1)) { + try (IgniteTx ignored = cache.txStartAffinity(affinityKey, concurrency, READ_COMMITTED, 0, 1)) { // Key with affinity key different from enlisted on tx start should raise exception. cache.remove(key); @@ -1042,7 +1042,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr cache.put(key1, "0"); cache.put(key2, "0"); - try (GridCacheTx tx = cache.txStartAffinity(affinityKey, concurrency, isolation, 0, 3)) { + try (IgniteTx tx = cache.txStartAffinity(affinityKey, concurrency, isolation, 0, 3)) { assertEquals("0", cache.get(affinityKey)); assertEquals("0", cache.get(key1)); assertEquals("0", cache.get(key2)); @@ -1096,7 +1096,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr key3, "val3", key4, "val4"); - try (GridCacheTx tx = cache.txStartAffinity(affinityKey, concurrency, READ_COMMITTED, 0, 4)) { + try (IgniteTx tx = cache.txStartAffinity(affinityKey, concurrency, READ_COMMITTED, 0, 4)) { cache.put(key1, "val1"); cache.put(key2, "val2"); cache.put(key3, "val3"); @@ -1247,13 +1247,13 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr private AtomicInteger putCnt = new AtomicInteger(); /** {@inheritDoc} */ - @Override public Object load(@Nullable GridCacheTx tx, Object key) + @Override public Object load(@Nullable IgniteTx tx, Object key) throws IgniteCheckedException { return null; } /** {@inheritDoc} */ - @Override public void putAll(GridCacheTx tx, + @Override public void putAll(IgniteTx tx, Map<?, ?> map) throws IgniteCheckedException { storeMap.putAll(map); @@ -1261,7 +1261,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr } /** {@inheritDoc} */ - @Override public void put(@Nullable GridCacheTx tx, Object key, + @Override public void put(@Nullable IgniteTx tx, Object key, @Nullable Object val) throws IgniteCheckedException { storeMap.put(key, val); @@ -1269,7 +1269,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr } /** {@inheritDoc} */ - @Override public void remove(@Nullable GridCacheTx tx, Object key) + @Override public void remove(@Nullable IgniteTx tx, Object key) throws IgniteCheckedException { storeMap.remove(key); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockPutTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockPutTask.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockPutTask.java index 2d636d6..d6f6e47 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockPutTask.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockPutTask.java @@ -97,7 +97,7 @@ class GridCacheGroupLockPutTask extends ComputeTaskAdapter<Collection<Integer>, Object affKey = pair.get1(); // Group lock partition. - try (GridCacheTx tx = cache.txStartPartition(cache.affinity().partition(affKey), + try (IgniteTx tx = cache.txStartPartition(cache.affinity().partition(affKey), optimistic ? OPTIMISTIC : PESSIMISTIC, REPEATABLE_READ, 0, pair.get2().size())) { for (Integer val : pair.get2()) cache.put(val, val); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAbstractSelfTest.java index 349e803..c97379a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheInterceptorAbstractSelfTest.java @@ -866,7 +866,7 @@ public abstract class GridCacheInterceptorAbstractSelfTest extends GridCacheAbst assertNotNull(txIsolation); assertNotNull(op); - try (GridCacheTx tx = cache(0).txStart(txConcurrency, txIsolation)) { + try (IgniteTx tx = cache(0).txStart(txConcurrency, txIsolation)) { update(0, op, key1, 100, 1); update(0, op, key2, 200, 2); update(0, op, key3, 300, 3); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLifecycleAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLifecycleAwareSelfTest.java index 9b81b88..08682ee 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLifecycleAwareSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLifecycleAwareSelfTest.java @@ -51,7 +51,7 @@ public class GridCacheLifecycleAwareSelfTest extends GridAbstractLifecycleAwareS } /** {@inheritDoc} */ - @Nullable @Override public Object load(@Nullable GridCacheTx tx, Object key) { + @Nullable @Override public Object load(@Nullable IgniteTx tx, Object key) { return null; } @@ -61,35 +61,35 @@ public class GridCacheLifecycleAwareSelfTest extends GridAbstractLifecycleAwareS } /** {@inheritDoc} */ - @Override public void loadAll(@Nullable GridCacheTx tx, @Nullable Collection keys, + @Override public void loadAll(@Nullable IgniteTx tx, @Nullable Collection keys, IgniteBiInClosure c) { // No-op. } /** {@inheritDoc} */ - @Override public void put(@Nullable GridCacheTx tx, Object key, + @Override public void put(@Nullable IgniteTx tx, Object key, @Nullable Object val) { // No-op. } /** {@inheritDoc} */ - @Override public void putAll(@Nullable GridCacheTx tx, @Nullable Map map) { + @Override public void putAll(@Nullable IgniteTx tx, @Nullable Map map) { // No-op. } /** {@inheritDoc} */ - @Override public void remove(@Nullable GridCacheTx tx, Object key) { + @Override public void remove(@Nullable IgniteTx tx, Object key) { // No-op. } /** {@inheritDoc} */ - @Override public void removeAll(@Nullable GridCacheTx tx, + @Override public void removeAll(@Nullable IgniteTx tx, @Nullable Collection keys) { // No-op. } /** {@inheritDoc} */ - @Override public void txEnd(GridCacheTx tx, boolean commit) { + @Override public void txEnd(IgniteTx tx, boolean commit) { // No-op. } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLocalTxStoreExceptionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLocalTxStoreExceptionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLocalTxStoreExceptionSelfTest.java index 6277dae..1807acb 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLocalTxStoreExceptionSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLocalTxStoreExceptionSelfTest.java @@ -16,7 +16,7 @@ import static org.gridgain.grid.cache.GridCacheMode.*; /** * */ -public class GridCacheLocalTxStoreExceptionSelfTest extends GridCacheTxStoreExceptionAbstractSelfTest { +public class GridCacheLocalTxStoreExceptionSelfTest extends IgniteTxStoreExceptionAbstractSelfTest { /** {@inheritDoc} */ @Override protected int gridCount() { return 1; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMarshallerTxAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMarshallerTxAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMarshallerTxAbstractTest.java index 6ed7ff3..03b400e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMarshallerTxAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMarshallerTxAbstractTest.java @@ -83,7 +83,7 @@ public abstract class GridCacheMarshallerTxAbstractTest extends GridCommonAbstra String key2 = UUID.randomUUID().toString(); GridCacheWrongValue1 wrongValue = new GridCacheWrongValue1(); - GridCacheTx tx = grid().cache(null).txStart(PESSIMISTIC, REPEATABLE_READ); + IgniteTx tx = grid().cache(null).txStart(PESSIMISTIC, REPEATABLE_READ); try { grid().cache(null).put(key, value); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java index d938916..b1217a6 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java @@ -85,7 +85,7 @@ public class GridCacheMixedPartitionExchangeSelfTest extends GridCommonAbstractT GridCache<Integer, Integer> prj = grid(g).cache(null); - try (GridCacheTx tx = prj.txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (IgniteTx tx = prj.txStart(PESSIMISTIC, REPEATABLE_READ)) { Integer val = prj.get(key); val = val == null ? 1 : val + 1; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiUpdateLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiUpdateLockSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiUpdateLockSelfTest.java index f2b4525..152602e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiUpdateLockSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiUpdateLockSelfTest.java @@ -127,7 +127,7 @@ public class GridCacheMultiUpdateLockSelfTest extends GridCommonAbstractTest { info(">>>> Checking tx in new grid."); - try (GridCacheTx tx = c.txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (IgniteTx tx = c.txStart(PESSIMISTIC, REPEATABLE_READ)) { assertEquals(2, c.get("a")); assertEquals(4, c.get("b")); assertEquals(6, c.get("c")); @@ -148,7 +148,7 @@ public class GridCacheMultiUpdateLockSelfTest extends GridCommonAbstractTest { info(">>>> Checking tx commit."); - GridCacheTx tx = cache0.txStart(PESSIMISTIC, REPEATABLE_READ); + IgniteTx tx = cache0.txStart(PESSIMISTIC, REPEATABLE_READ); try { cache0.put("a", 1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManagerSelfTest.java index 7ac0470..0b46081 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManagerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManagerSelfTest.java @@ -89,7 +89,7 @@ public class GridCacheMvccManagerSelfTest extends GridCommonAbstractTest { GridCache<Integer, Integer> cache = ignite.cache(null); - GridCacheTx tx = cache.txStart(); + IgniteTx tx = cache.txStart(); cache.put(1, 1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheNearTxStoreExceptionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheNearTxStoreExceptionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheNearTxStoreExceptionSelfTest.java index 9210f45..e547591 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheNearTxStoreExceptionSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheNearTxStoreExceptionSelfTest.java @@ -16,7 +16,7 @@ import static org.gridgain.grid.cache.GridCacheMode.*; /** * */ -public class GridCacheNearTxStoreExceptionSelfTest extends GridCacheTxStoreExceptionAbstractSelfTest { +public class GridCacheNearTxStoreExceptionSelfTest extends IgniteTxStoreExceptionAbstractSelfTest { /** {@inheritDoc} */ @Override protected GridCacheMode cacheMode() { return PARTITIONED; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheNestedTxAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheNestedTxAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheNestedTxAbstractTest.java index 1b1dc9b..7d9be00 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheNestedTxAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheNestedTxAbstractTest.java @@ -104,7 +104,7 @@ public class GridCacheNestedTxAbstractTest extends GridCommonAbstractTest { c.put(CNTR_KEY, 0); for (int i = 0; i < 10; i++) { - try (GridCacheTx tx = c.txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (IgniteTx tx = c.txStart(PESSIMISTIC, REPEATABLE_READ)) { c.get(CNTR_KEY); ctx.closure().callLocalSafe((new Callable<Boolean>() { @@ -139,7 +139,7 @@ public class GridCacheNestedTxAbstractTest extends GridCommonAbstractTest { threads.add(new Thread(new Runnable() { @Override public void run() { - GridCacheTx tx = c.txStart(PESSIMISTIC, REPEATABLE_READ); + IgniteTx tx = c.txStart(PESSIMISTIC, REPEATABLE_READ); try { int cntr = c.get(CNTR_KEY); @@ -228,7 +228,7 @@ public class GridCacheNestedTxAbstractTest extends GridCommonAbstractTest { info("*** Cntr in lock thread: " + cntr); - GridCacheTx tx = c.txStart(OPTIMISTIC, READ_COMMITTED); + IgniteTx tx = c.txStart(OPTIMISTIC, READ_COMMITTED); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheObjectToStringSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheObjectToStringSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheObjectToStringSelfTest.java index b6b8a48..3a60003 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheObjectToStringSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheObjectToStringSelfTest.java @@ -163,7 +163,7 @@ public class GridCacheObjectToStringSelfTest extends GridCommonAbstractTest { assertNotNull(entries); assertFalse(entries.toString().isEmpty()); - try (GridCacheTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) { assertEquals(1, cache.get(1)); cache.put(2, 22); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java index 614eed8..1a9b121 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java @@ -61,7 +61,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea if (i % 500 == 0) log.info("Iteration " + i); - try (GridCacheTx tx = cache.txStart(txConcurrency, REPEATABLE_READ)) { + try (IgniteTx tx = cache.txStart(txConcurrency, REPEATABLE_READ)) { cache.transform(key, new IncClosure()); tx.commit(); @@ -125,7 +125,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea if (i % 500 == 0) log.info("Iteration " + i); - try (GridCacheTx tx = cache.txStart(txConcurrency, REPEATABLE_READ)) { + try (IgniteTx tx = cache.txStart(txConcurrency, REPEATABLE_READ)) { Integer val = cache.put(key, i); assertNotNull(val); @@ -181,7 +181,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea if (i % 500 == 0) log.info("Iteration " + i); - try (GridCacheTx tx = cache.txStart(txConcurrency, REPEATABLE_READ)) { + try (IgniteTx tx = cache.txStart(txConcurrency, REPEATABLE_READ)) { cache.putx(key, i, new TestFilter()); tx.commit(); @@ -237,7 +237,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea if (i % 500 == 0) log.info("Iteration " + i); - try (GridCacheTx tx = cache.txStart(txConcurrency, REPEATABLE_READ)) { + try (IgniteTx tx = cache.txStart(txConcurrency, REPEATABLE_READ)) { assertFalse(cache.putxIfAbsent(key, 100)); tx.commit(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java index d3c185f..7ae9e9d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java @@ -226,7 +226,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb private void checkPutGetRemoveTx(Integer key, GridCacheTxConcurrency txConcurrency) throws Exception { GridCache<Integer, Integer> c = grid(0).cache(null); - GridCacheTx tx = c.txStart(txConcurrency, REPEATABLE_READ); + IgniteTx tx = c.txStart(txConcurrency, REPEATABLE_READ); assertNull(c.put(key, key)); @@ -251,7 +251,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb private void checkPutGetRemoveTxByteArray(Integer key, GridCacheTxConcurrency txConcurrency) throws Exception { GridCache<Integer, byte[]> c = grid(0).cache(null); - GridCacheTx tx = c.txStart(txConcurrency, REPEATABLE_READ); + IgniteTx tx = c.txStart(txConcurrency, REPEATABLE_READ); byte[] val = new byte[] {key.byteValue()}; @@ -370,7 +370,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb assertTrue(map0.isEmpty()); - try (GridCacheTx tx = c.txStart(txConcurrency, REPEATABLE_READ)) { + try (IgniteTx tx = c.txStart(txConcurrency, REPEATABLE_READ)) { c.putAll(map); tx.commit(); @@ -383,7 +383,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb for (Map.Entry<Integer, Integer> e : map.entrySet()) checkValue(e.getKey(), e.getValue()); - try (GridCacheTx tx = c.txStart(txConcurrency, REPEATABLE_READ)) { + try (IgniteTx tx = c.txStart(txConcurrency, REPEATABLE_READ)) { c.removeAll(map.keySet()); tx.commit(); @@ -458,7 +458,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb TestValue val = new TestValue(new byte[10]); - GridCacheTx tx = c.txStart(txConcurrency, REPEATABLE_READ); + IgniteTx tx = c.txStart(txConcurrency, REPEATABLE_READ); assertNull(c.put(key, val)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffheapUpdateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffheapUpdateSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffheapUpdateSelfTest.java index 4d4453e..7adacd7 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffheapUpdateSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffheapUpdateSelfTest.java @@ -58,13 +58,13 @@ public class GridCacheOffheapUpdateSelfTest extends GridCommonAbstractTest { GridCache<Object, Object> locCache = grid(1).cache(null); - try (GridCacheTx tx = locCache.txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (IgniteTx tx = locCache.txStart(PESSIMISTIC, REPEATABLE_READ)) { locCache.putxIfAbsent(key, 0); tx.commit(); } - try (GridCacheTx tx = rmtCache.txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (IgniteTx tx = rmtCache.txStart(PESSIMISTIC, REPEATABLE_READ)) { assertEquals(0, rmtCache.get(key)); rmtCache.putx(key, 1); @@ -72,7 +72,7 @@ public class GridCacheOffheapUpdateSelfTest extends GridCommonAbstractTest { tx.commit(); } - try (GridCacheTx tx = rmtCache.txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (IgniteTx tx = rmtCache.txStart(PESSIMISTIC, REPEATABLE_READ)) { assertEquals(1, rmtCache.get(key)); rmtCache.putx(key, 2); @@ -116,11 +116,11 @@ public class GridCacheOffheapUpdateSelfTest extends GridCommonAbstractTest { assertEquals(10, cache.get(key)); - try (GridCacheTx ignored = cache.txStart(OPTIMISTIC, REPEATABLE_READ)) { + try (IgniteTx ignored = cache.txStart(OPTIMISTIC, REPEATABLE_READ)) { assertEquals(10, cache.get(key)); } - try (GridCacheTx ignored = cache.txStart(PESSIMISTIC, READ_COMMITTED)) { + try (IgniteTx ignored = cache.txStart(PESSIMISTIC, READ_COMMITTED)) { assertEquals(10, cache.get(key)); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedWritesTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedWritesTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedWritesTest.java index eca8e0e..6f07b76 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedWritesTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedWritesTest.java @@ -70,18 +70,18 @@ public class GridCachePartitionedWritesTest extends GridCommonAbstractTest { final AtomicInteger rmvCnt = new AtomicInteger(); store = new GridCacheStoreAdapter() { - @Override public Object load(@Nullable GridCacheTx tx, Object key) { + @Override public Object load(@Nullable IgniteTx tx, Object key) { info(">>> Get [key=" + key + ']'); return null; } - @Override public void put(@Nullable GridCacheTx tx, Object key, + @Override public void put(@Nullable IgniteTx tx, Object key, @Nullable Object val) { putCnt.incrementAndGet(); } - @Override public void remove(@Nullable GridCacheTx tx, Object key) { + @Override public void remove(@Nullable IgniteTx tx, Object key) { rmvCnt.incrementAndGet(); } }; @@ -93,7 +93,7 @@ public class GridCachePartitionedWritesTest extends GridCommonAbstractTest { try { cache.get(1); - GridCacheTx tx = cache.txStart(); + IgniteTx tx = cache.txStart(); try { for (int i = 1; i <= 10; i++) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java index 9946949..603de12 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java @@ -422,7 +422,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest { refs.add(new WeakReference<Object>(cacheContext(cache))); - GridCacheTx tx = cache.txStart(); + IgniteTx tx = cache.txStart(); TestValue val = new TestValue(0); @@ -459,7 +459,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest { refs.add(new WeakReference<Object>(cacheContext(cache))); - GridCacheTx tx = cache.txStart(); + IgniteTx tx = cache.txStart(); for (int i = 0; i < 1000; i++) { TestValue val = new TestValue(i); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheRefreshAheadAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheRefreshAheadAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheRefreshAheadAbstractSelfTest.java index 0872b12..5c9a557 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheRefreshAheadAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheRefreshAheadAbstractSelfTest.java @@ -122,7 +122,7 @@ public abstract class GridCacheRefreshAheadAbstractSelfTest extends GridCommonAb } /** {@inheritDoc} */ - @Nullable @Override public Object load(GridCacheTx tx, Object key) throws IgniteCheckedException { + @Nullable @Override public Object load(IgniteTx tx, Object key) throws IgniteCheckedException { if (trackLoads) { wasAsyncLoad = wasAsyncLoad || !testThread.equals(Thread.currentThread()); @@ -138,12 +138,12 @@ public abstract class GridCacheRefreshAheadAbstractSelfTest extends GridCommonAb } /** {@inheritDoc} */ - @Override public void put(GridCacheTx tx, Object key, Object val) throws IgniteCheckedException { + @Override public void put(IgniteTx tx, Object key, Object val) throws IgniteCheckedException { /* No-op. */ } /** {@inheritDoc} */ - @Override public void remove(GridCacheTx tx, Object key) throws IgniteCheckedException { + @Override public void remove(IgniteTx tx, Object key) throws IgniteCheckedException { /* No-op. */ }
