http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java index a8a4b50..d6cbfda 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMixedPartitionExchangeSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.typedef.internal.*; @@ -33,8 +32,8 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Test case checks partition exchange when non-cache node joins topology (partition @@ -94,7 +93,7 @@ public class GridCacheMixedPartitionExchangeSelfTest extends GridCommonAbstractT IgniteCache<Integer, Integer> prj = grid(g).jcache(null); - try (IgniteTx tx = grid(g).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = grid(g).transactions().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/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java index 224ed36..750daef 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultiUpdateLockSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.distributed.dht.*; @@ -37,8 +36,8 @@ import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Tests multi-update locks. @@ -134,7 +133,7 @@ public class GridCacheMultiUpdateLockSelfTest extends GridCommonAbstractTest { info(">>>> Checking tx in new grid."); - try (IgniteTx tx = g4.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = g4.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { assertEquals(2, c.get("a")); assertEquals(4, c.get("b")); assertEquals(6, c.get("c")); @@ -155,7 +154,7 @@ public class GridCacheMultiUpdateLockSelfTest extends GridCommonAbstractTest { info(">>>> Checking tx commit."); - IgniteTx tx = g.transactions().txStart(PESSIMISTIC, REPEATABLE_READ); + Transaction tx = g.transactions().txStart(PESSIMISTIC, REPEATABLE_READ); try { cache0.put("a", 1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java index 0d43891..83166af 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java @@ -97,7 +97,7 @@ public class GridCacheMvccManagerSelfTest extends GridCommonAbstractTest { IgniteCache<Integer, Integer> cache = ignite.jcache(null); - IgniteTx tx = ignite.transactions().txStart(); + Transaction tx = ignite.transactions().txStart(); cache.put(1, 1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java index cec2b2d..6e578e2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java @@ -31,8 +31,8 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import java.util.concurrent.locks.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Nested transaction emulation. @@ -112,7 +112,7 @@ public class GridCacheNestedTxAbstractTest extends GridCommonAbstractTest { c.put(CNTR_KEY, 0); for (int i = 0; i < 10; i++) { - try (IgniteTx tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { c.get(CNTR_KEY); ctx.closure().callLocalSafe((new Callable<Boolean>() { @@ -147,7 +147,7 @@ public class GridCacheNestedTxAbstractTest extends GridCommonAbstractTest { threads.add(new Thread(new Runnable() { @Override public void run() { - IgniteTx tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ); + Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ); try { int cntr = c.get(CNTR_KEY); @@ -235,7 +235,7 @@ public class GridCacheNestedTxAbstractTest extends GridCommonAbstractTest { info("*** Cntr in lock thread: " + cntr); - IgniteTx tx = grid(0).transactions().txStart(OPTIMISTIC, READ_COMMITTED); + Transaction tx = grid(0).transactions().txStart(OPTIMISTIC, READ_COMMITTED); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java index 9e26e5f..67b77d6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java @@ -33,8 +33,8 @@ import org.apache.ignite.transactions.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Tests that common cache objects' toString() methods do not lead to stack overflow. @@ -167,7 +167,7 @@ public class GridCacheObjectToStringSelfTest extends GridCommonAbstractTest { assertFalse(cache.toString().isEmpty()); assertFalse(cache.iterator().toString().isEmpty()); - try (IgniteTx tx = g.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = g.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { assertEquals(1, cache.get(1)); cache.put(2, 22); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java index 6984d27..60fed05 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateSelfTest.java @@ -18,14 +18,13 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.testframework.*; import org.apache.ignite.transactions.*; import java.util.concurrent.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Multithreaded update test with off heap enabled. @@ -56,7 +55,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea * @param txConcurrency Transaction concurrency. * @throws Exception If failed. */ - private void testTransformTx(final Integer key, final IgniteTxConcurrency txConcurrency) throws Exception { + private void testTransformTx(final Integer key, final TransactionConcurrency txConcurrency) throws Exception { final IgniteCache<Integer, Integer> cache = grid(0).jcache(null); cache.put(key, 0); @@ -72,7 +71,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea if (i % 500 == 0) log.info("Iteration " + i); - try (IgniteTx tx = txs.txStart(txConcurrency, REPEATABLE_READ)) { + try (Transaction tx = txs.txStart(txConcurrency, REPEATABLE_READ)) { cache.invoke(key, new IncProcessor()); tx.commit(); @@ -122,7 +121,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea * @param txConcurrency Transaction concurrency. * @throws Exception If failed. */ - private void testPutTx(final Integer key, final IgniteTxConcurrency txConcurrency) throws Exception { + private void testPutTx(final Integer key, final TransactionConcurrency txConcurrency) throws Exception { final IgniteCache<Integer, Integer> cache = grid(0).jcache(null); cache.put(key, 0); @@ -136,7 +135,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea if (i % 500 == 0) log.info("Iteration " + i); - try (IgniteTx tx = grid(0).transactions().txStart(txConcurrency, REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(txConcurrency, REPEATABLE_READ)) { Integer val = cache.getAndPut(key, i); assertNotNull(val); @@ -178,7 +177,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea * @param txConcurrency Transaction concurrency. * @throws Exception If failed. */ - private void testPutxIfAbsentTx(final Integer key, final IgniteTxConcurrency txConcurrency) throws Exception { + private void testPutxIfAbsentTx(final Integer key, final TransactionConcurrency txConcurrency) throws Exception { final IgniteCache<Integer, Integer> cache = grid(0).jcache(null); cache.put(key, 0); @@ -192,7 +191,7 @@ public class GridCacheOffHeapMultiThreadedUpdateSelfTest extends GridCacheOffHea if (i % 500 == 0) log.info("Iteration " + i); - try (IgniteTx tx = grid(0).transactions().txStart(txConcurrency, REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(txConcurrency, REPEATABLE_READ)) { cache.putIfAbsent(key, 100); tx.commit(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java index bcde898..5d08746 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java @@ -35,8 +35,8 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMemoryMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * @@ -236,10 +236,10 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @param txConcurrency Transaction concurrency. * @throws Exception If failed. */ - private void checkPutGetRemoveTx(Integer key, IgniteTxConcurrency txConcurrency) throws Exception { + private void checkPutGetRemoveTx(Integer key, TransactionConcurrency txConcurrency) throws Exception { IgniteCache<Integer, Integer> c = grid(0).jcache(null); - IgniteTx tx = grid(0).transactions().txStart(txConcurrency, REPEATABLE_READ); + Transaction tx = grid(0).transactions().txStart(txConcurrency, REPEATABLE_READ); assertNull(c.getAndPut(key, key)); @@ -261,10 +261,10 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @param txConcurrency Transaction concurrency. * @throws Exception If failed. */ - private void checkPutGetRemoveTxByteArray(Integer key, IgniteTxConcurrency txConcurrency) throws Exception { + private void checkPutGetRemoveTxByteArray(Integer key, TransactionConcurrency txConcurrency) throws Exception { IgniteCache<Integer, byte[]> c = grid(0).jcache(null); - IgniteTx tx = grid(0).transactions().txStart(txConcurrency, REPEATABLE_READ); + Transaction tx = grid(0).transactions().txStart(txConcurrency, REPEATABLE_READ); byte[] val = new byte[] {key.byteValue()}; @@ -367,7 +367,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @param txConcurrency Transaction concurrency. * @throws Exception If failed. */ - private void checkPutAllGetAllRemoveAllTx(IgniteTxConcurrency txConcurrency) throws Exception { + private void checkPutAllGetAllRemoveAllTx(TransactionConcurrency txConcurrency) throws Exception { Map<Integer, Integer> map = new HashMap<>(); for (int i = 0; i < 100; i++) @@ -379,7 +379,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb assertTrue(map0.isEmpty()); - try (IgniteTx tx = grid(0).transactions().txStart(txConcurrency, REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(txConcurrency, REPEATABLE_READ)) { c.putAll(map); tx.commit(); @@ -392,7 +392,7 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb for (Map.Entry<Integer, Integer> e : map.entrySet()) checkValue(e.getKey(), e.getValue()); - try (IgniteTx tx = grid(0).transactions().txStart(txConcurrency, REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(txConcurrency, REPEATABLE_READ)) { c.removeAll(map.keySet()); tx.commit(); @@ -462,12 +462,12 @@ public abstract class GridCacheOffHeapTieredAbstractSelfTest extends GridCacheAb * @param txConcurrency Transaction concurrency. * @throws Exception If failed. */ - private void checkPutGetRemoveObjectTx(Integer key, IgniteTxConcurrency txConcurrency) throws Exception { + private void checkPutGetRemoveObjectTx(Integer key, TransactionConcurrency txConcurrency) throws Exception { IgniteCache<Integer, TestValue> c = grid(0).jcache(null); TestValue val = new TestValue(new byte[10]); - IgniteTx tx = grid(0).transactions().txStart(txConcurrency, REPEATABLE_READ); + Transaction tx = grid(0).transactions().txStart(txConcurrency, REPEATABLE_READ); assertNull(c.getAndPut(key, val)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java index 950a8f9..bdfe530 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapUpdateSelfTest.java @@ -24,8 +24,8 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.testframework.junits.common.*; import org.apache.ignite.transactions.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Check for specific support issue. @@ -66,13 +66,13 @@ public class GridCacheOffheapUpdateSelfTest extends GridCommonAbstractTest { IgniteCache<Object, Object> locCache = grid(1).jcache(null); - try (IgniteTx tx = grid(1).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = grid(1).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { locCache.putIfAbsent(key, 0); tx.commit(); } - try (IgniteTx tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { assertEquals(0, rmtCache.get(key)); rmtCache.put(key, 1); @@ -80,7 +80,7 @@ public class GridCacheOffheapUpdateSelfTest extends GridCommonAbstractTest { tx.commit(); } - try (IgniteTx tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { assertEquals(1, rmtCache.get(key)); rmtCache.put(key, 2); @@ -124,11 +124,11 @@ public class GridCacheOffheapUpdateSelfTest extends GridCommonAbstractTest { assertEquals(10, cache.get(key)); - try (IgniteTx ignored = grid.transactions().txStart(OPTIMISTIC, REPEATABLE_READ)) { + try (Transaction ignored = grid.transactions().txStart(OPTIMISTIC, REPEATABLE_READ)) { assertEquals(10, cache.get(key)); } - try (IgniteTx ignored = grid.transactions().txStart(PESSIMISTIC, READ_COMMITTED)) { + try (Transaction ignored = grid.transactions().txStart(PESSIMISTIC, READ_COMMITTED)) { assertEquals(10, cache.get(key)); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedWritesTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedWritesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedWritesTest.java index ea2e97a..c291b4e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedWritesTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedWritesTest.java @@ -107,7 +107,7 @@ public class GridCachePartitionedWritesTest extends GridCommonAbstractTest { try { cache.get(1); - IgniteTx tx = grid().transactions().txStart(); + Transaction tx = grid().transactions().txStart(); try { for (int i = 1; i <= 10; i++) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java index 1474b2f..fce301d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReferenceCleanupSelfTest.java @@ -436,7 +436,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest { refs.add(new WeakReference<Object>(cacheContext(cache))); - IgniteTx tx = g.transactions().txStart(); + Transaction tx = g.transactions().txStart(); TestValue val = new TestValue(0); @@ -474,7 +474,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest { refs.add(new WeakReference<Object>(cacheContext(cache))); - IgniteTx tx = g.transactions().txStart(); + Transaction tx = g.transactions().txStart(); for (int i = 0; i < 1000; i++) { TestValue val = new TestValue(i); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java index d9cfca2..827905e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSlowTxWarnTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -116,7 +115,7 @@ public class GridCacheSlowTxWarnTest extends GridCommonAbstractTest { IgniteCache<Object, Object> cache1 = g.jcache(cacheName); - IgniteTx tx = g.transactions().txStart(); + Transaction tx = g.transactions().txStart(); try { cache1.put(1, 1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java index 56ef1a0..dc0670e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java @@ -145,7 +145,7 @@ public class GridCacheStopSelfTest extends GridCommonAbstractTest { putFuts.add(GridTestUtils.runAsync(new Callable<Void>() { @Override public Void call() throws Exception { if (startTx) { - try (IgniteTx tx = grid(0).transactions().txStart()) { + try (Transaction tx = grid(0).transactions().txStart()) { cache.put(key, key); readyLatch.countDown(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.java index abe1a96..c441b96 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; @@ -102,7 +101,7 @@ public class GridCacheStorePutxSelfTest extends GridCommonAbstractTest { public void testPutShouldNotTriggerLoadWithTx() throws Exception { IgniteCache<Integer, Integer> cache = jcache(); - try (IgniteTx tx = grid().transactions().txStart()) { + try (Transaction tx = grid().transactions().txStart()) { cache.put(1, 1); cache.put(2, 2); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java index 77c9ef4..95b6d9b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java @@ -44,7 +44,7 @@ public final class GridCacheTestStore extends CacheStore<Integer, String> { private final Map<Integer, String> map; /** Transactions. */ - private final Collection<IgniteTx> txs = new GridConcurrentHashSet<>(); + private final Collection<Transaction> txs = new GridConcurrentHashSet<>(); /** Last method called. */ private String lastMtd; @@ -112,7 +112,7 @@ public final class GridCacheTestStore extends CacheStore<Integer, String> { /** * @return Transactions. */ - public Collection<IgniteTx> transactions() { + public Collection<Transaction> transactions() { return txs; } @@ -320,14 +320,14 @@ public final class GridCacheTestStore extends CacheStore<Integer, String> { * @param ses Session. */ private void checkTx(@Nullable CacheStoreSession ses, boolean load) { - IgniteTx tx = ses != null ? ses.transaction() : null; + Transaction tx = ses != null ? ses.transaction() : null; if (tx == null) return; txs.add(tx); - assertTrue("Unexpected tx class: " + tx.getClass(), tx instanceof IgniteTxProxy); + assertTrue("Unexpected tx class: " + tx.getClass(), tx instanceof TransactionProxy); IgniteInternalTx tx0 = GridTestUtils.getFieldValue(tx, "tx"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java index f433c10..11fbbd0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTransactionalAbstractMetricsSelfTest.java @@ -21,8 +21,8 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.transactions.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Transactional cache metrics test. @@ -205,12 +205,12 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid * @param put Put some data if {@code true}. * @throws Exception If failed. */ - private void testCommits(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, boolean put) + private void testCommits(TransactionConcurrency concurrency, TransactionIsolation isolation, boolean put) throws Exception { IgniteCache<Integer, Integer> cache = grid(0).jcache(null); for (int i = 0; i < TX_CNT; i++) { - IgniteTx tx = grid(0).transactions().txStart(concurrency, isolation); + Transaction tx = grid(0).transactions().txStart(concurrency, isolation); if (put) for (int j = 0; j < keyCount(); j++) @@ -220,7 +220,7 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid } for (int i = 0; i < gridCount(); i++) { - IgniteTxMetrics metrics = grid(i).transactions().metrics(); + TransactionMetrics metrics = grid(i).transactions().metrics(); CacheMetrics cacheMetrics = grid(i).jcache(null).metrics(); if (i == 0) { @@ -247,12 +247,12 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid * @param put Put some data if {@code true}. * @throws Exception If failed. */ - private void testRollbacks(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, + private void testRollbacks(TransactionConcurrency concurrency, TransactionIsolation isolation, boolean put) throws Exception { IgniteCache<Integer, Integer> cache = grid(0).jcache(null); for (int i = 0; i < TX_CNT; i++) { - IgniteTx tx = grid(0).transactions().txStart(concurrency, isolation); + Transaction tx = grid(0).transactions().txStart(concurrency, isolation); if (put) for (int j = 0; j < keyCount(); j++) @@ -262,7 +262,7 @@ public abstract class GridCacheTransactionalAbstractMetricsSelfTest extends Grid } for (int i = 0; i < gridCount(); i++) { - IgniteTxMetrics metrics = grid(i).transactions().metrics(); + TransactionMetrics metrics = grid(i).transactions().metrics(); CacheMetrics cacheMetrics = grid(i).jcache(null).metrics(); assertEquals(0, metrics.txCommits()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java index a3d519d..c6563f2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java @@ -21,7 +21,6 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; -import org.apache.ignite.internal.transactions.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -129,7 +128,7 @@ public class GridCacheVariableTopologySelfTest extends GridCommonAbstractTest { if (cnt % logMod == 0) info("Starting transaction: " + cnt); - try (IgniteTx tx = grid(0).transactions().txStart()) { + try (Transaction tx = grid(0).transactions().txStart()) { int kv = RAND.nextInt(keyRange); cache.put(kv, kv); @@ -138,7 +137,7 @@ public class GridCacheVariableTopologySelfTest extends GridCommonAbstractTest { tx.commit(); } - catch (IgniteTxOptimisticException e) { + catch (TransactionOptimisticException e) { info("Caught cache optimistic exception: " + e); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionMultinodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionMultinodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionMultinodeTest.java index 75bfa0e..5101d75 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionMultinodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionMultinodeTest.java @@ -29,8 +29,8 @@ import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * @@ -152,10 +152,10 @@ public class GridCacheVersionMultinodeTest extends GridCacheAbstractSelfTest { * @param txMode Non null tx mode if explicit transaction should be started. * @throws Exception If failed. */ - private void checkVersion(String key, @Nullable IgniteTxConcurrency txMode) throws Exception { + private void checkVersion(String key, @Nullable TransactionConcurrency txMode) throws Exception { IgniteCache<String, Integer> cache = jcache(0); - IgniteTx tx = null; + Transaction tx = null; if (txMode != null) tx = cache.unwrap(Ignite.class).transactions().txStart(txMode, REPEATABLE_READ); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java index 01dd961..b646e19 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStoreAbstractTest.java @@ -35,8 +35,8 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheDistributionMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Basic store test. @@ -113,7 +113,7 @@ public abstract class GridCacheWriteBehindStoreAbstractTest extends GridCommonAb assert map.isEmpty(); - IgniteTx tx = grid().transactions().txStart(OPTIMISTIC, REPEATABLE_READ); + Transaction tx = grid().transactions().txStart(OPTIMISTIC, REPEATABLE_READ); try { for (int i = 1; i <= 10; i++) { @@ -178,7 +178,7 @@ public abstract class GridCacheWriteBehindStoreAbstractTest extends GridCommonAb assert map.isEmpty(); - try (IgniteTx tx = grid().transactions().txStart(OPTIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = grid().transactions().txStart(OPTIMISTIC, REPEATABLE_READ)) { for (int i = 1; i <= 10; i++) cache.put(i, Integer.toString(i)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java index 935b1b5..acffe20 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java @@ -34,8 +34,8 @@ import java.util.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheDistributionMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Tests write-behind store with near and dht commit option. @@ -171,7 +171,7 @@ public class GridCacheWriteBehindStorePartitionedMultiNodeSelfTest extends GridC IgniteCache<Object, Object> cache = grid(0).jcache(null); - try (IgniteTx tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { for (int i = 0; i < 100; i++) cache.put(i, String.valueOf(i)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheContainsKeyAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheContainsKeyAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheContainsKeyAbstractSelfTest.java index 0d2161f..cf2e779 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheContainsKeyAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheContainsKeyAbstractSelfTest.java @@ -96,9 +96,9 @@ public abstract class IgniteCacheContainsKeyAbstractSelfTest extends GridCacheAb GridCache<String, Integer> cache = cache(0); - for (IgniteTxConcurrency conc : IgniteTxConcurrency.values()) { - for (IgniteTxIsolation iso : IgniteTxIsolation.values()) { - try (IgniteTx tx = grid(0).transactions().txStart(conc, iso)) { + for (TransactionConcurrency conc : TransactionConcurrency.values()) { + for (TransactionIsolation iso : TransactionIsolation.values()) { + try (Transaction tx = grid(0).transactions().txStart(conc, iso)) { assertFalse("Invalid result on grid inside tx", cache.containsKey(key)); assertFalse("Key was enlisted to transaction: " + tx, txContainsKey(tx, key)); @@ -124,8 +124,8 @@ public abstract class IgniteCacheContainsKeyAbstractSelfTest extends GridCacheAb * @param key Key to check. * @return {@code True} if key was enlisted. */ - private boolean txContainsKey(IgniteTx tx, String key) { - IgniteTxProxyImpl<String, Integer> proxy = (IgniteTxProxyImpl<String, Integer>)tx; + private boolean txContainsKey(Transaction tx, String key) { + TransactionProxyImpl<String, Integer> proxy = (TransactionProxyImpl<String, Integer>)tx; IgniteInternalTx<String, Integer> txEx = proxy.tx(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java index b2e771d..e39d9bb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java @@ -33,8 +33,8 @@ import java.util.concurrent.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.internal.processors.cache.CacheFlag.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * @@ -68,7 +68,7 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT * @param txMode Not null transaction concurrency mode if explicit transaction should be started. * @throws Exception If failed. */ - private void invoke(final IgniteCache<Integer, Integer> cache, @Nullable IgniteTxConcurrency txMode) + private void invoke(final IgniteCache<Integer, Integer> cache, @Nullable TransactionConcurrency txMode) throws Exception { IncrementProcessor incProcessor = new IncrementProcessor(); @@ -77,7 +77,7 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT cache.remove(key); - IgniteTx tx = startTx(txMode); + Transaction tx = startTx(txMode); Integer res = cache.invoke(key, incProcessor); @@ -197,7 +197,7 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT * @param txMode Not null transaction concurrency mode if explicit transaction should be started. * @throws Exception If failed. */ - private void invokeAll(IgniteCache<Integer, Integer> cache, @Nullable IgniteTxConcurrency txMode) throws Exception { + private void invokeAll(IgniteCache<Integer, Integer> cache, @Nullable TransactionConcurrency txMode) throws Exception { invokeAll(cache, new HashSet<>(primaryKeys(cache, 3, 0)), txMode); if (gridCount() > 1) { @@ -230,14 +230,14 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT */ private void invokeAll(IgniteCache<Integer, Integer> cache, Set<Integer> keys, - @Nullable IgniteTxConcurrency txMode) throws Exception { + @Nullable TransactionConcurrency txMode) throws Exception { cache.removeAll(keys); log.info("Test invokeAll [keys=" + keys + ", txMode=" + txMode + ']'); IncrementProcessor incProcessor = new IncrementProcessor(); - IgniteTx tx = startTx(txMode); + Transaction tx = startTx(txMode); Map<Integer, EntryProcessorResult<Integer>> resMap = cache.invokeAll(keys, incProcessor); @@ -509,7 +509,7 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT * @param txMode Transaction concurrency mode. * @return Transaction. */ - @Nullable private IgniteTx startTx(@Nullable IgniteTxConcurrency txMode) { + @Nullable private Transaction startTx(@Nullable TransactionConcurrency txMode) { return txMode == null ? null : ignite(0).transactions().txStart(txMode, REPEATABLE_READ); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java index e73504f..0e615fe 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java @@ -31,7 +31,7 @@ import java.util.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; /** * Tests putAll method with large number of keys. @@ -145,7 +145,7 @@ public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - private void checkPutAll(IgniteTxConcurrency concurrency, boolean nearEnabled) throws Exception { + private void checkPutAll(TransactionConcurrency concurrency, boolean nearEnabled) throws Exception { this.nearEnabled = nearEnabled; startGrids(GRID_CNT); @@ -168,7 +168,7 @@ public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest { info(">>> Starting test tx."); - try (IgniteTx tx = cache.txStart(concurrency, IgniteTxIsolation.REPEATABLE_READ)) { + try (Transaction tx = cache.txStart(concurrency, TransactionIsolation.REPEATABLE_READ)) { Map<Integer, Integer> map = new LinkedHashMap<>(); for (int i = 0; i < keyCnt; i++) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java index 02b2d67..415b560 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java @@ -25,8 +25,8 @@ import org.apache.ignite.internal.processors.cache.distributed.near.*; import org.apache.ignite.testframework.junits.common.*; import org.apache.ignite.transactions.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Tests . @@ -82,7 +82,7 @@ public class IgnitePutAllUpdateNonPreloadedPartitionSelfTest extends GridCommonA final int keyCnt = 100; - try (IgniteTx tx = cache.txStart(OPTIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = cache.txStart(OPTIMISTIC, REPEATABLE_READ)) { for (int k = 0; k < keyCnt; k++) cache.get(k); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java index c0a9e5c..67450b8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java @@ -33,8 +33,8 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Tests for local transactions. @@ -154,7 +154,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { * @param isolation Isolation. * @throws Exception If check failed. */ - protected void checkCommit(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception { + protected void checkCommit(TransactionConcurrency concurrency, TransactionIsolation isolation) throws Exception { int gridIdx = RAND.nextInt(gridCount()); Ignite ignite = grid(gridIdx); @@ -165,7 +165,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { for (int i = 0; i < iterations(); i++) { IgniteCache<Integer, String> cache = jcache(gridIdx); - IgniteTx tx = ignite(gridIdx).transactions().txStart(concurrency, isolation, 0, 0); + Transaction tx = ignite(gridIdx).transactions().txStart(concurrency, isolation, 0, 0); try { int prevKey = -1; @@ -225,7 +225,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { if (isTestDebug()) debug("Committed transaction [i=" + i + ", tx=" + tx + ']'); } - catch (IgniteTxOptimisticException e) { + catch (TransactionOptimisticException e) { if (concurrency != OPTIMISTIC || isolation != SERIALIZABLE) { error("Received invalid optimistic failure.", e); @@ -260,7 +260,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { throw e; } finally { - IgniteTx t = ignite(gridIdx).transactions().tx(); + Transaction t = ignite(gridIdx).transactions().tx(); assert t == null : "Thread should not have transaction upon completion ['t==tx'=" + (t == tx) + ", t=" + t + (t != tx ? "tx=" + tx : "tx=''") + ']'; @@ -279,7 +279,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { * @param isolation Isolation. * @throws IgniteCheckedException If check failed. */ - protected void checkRollback(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) + protected void checkRollback(TransactionConcurrency concurrency, TransactionIsolation isolation) throws Exception { checkRollback(new ConcurrentHashMap<Integer, String>(), concurrency, isolation); } @@ -290,8 +290,8 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { * @param isolation Isolation. * @throws IgniteCheckedException If check failed. */ - protected void checkRollback(ConcurrentMap<Integer, String> map, IgniteTxConcurrency concurrency, - IgniteTxIsolation isolation) throws Exception { + protected void checkRollback(ConcurrentMap<Integer, String> map, TransactionConcurrency concurrency, + TransactionIsolation isolation) throws Exception { int gridIdx = RAND.nextInt(gridCount()); Ignite ignite = grid(gridIdx); @@ -302,7 +302,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { for (int i = 0; i < iterations(); i++) { IgniteCache<Integer, String> cache = jcache(gridIdx); - IgniteTx tx = ignite(gridIdx).transactions().txStart(concurrency, isolation, 0, 0); + Transaction tx = ignite(gridIdx).transactions().txStart(concurrency, isolation, 0, 0); try { for (Integer key : getKeys()) { @@ -350,7 +350,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { debug("Rolled back transaction: " + tx); } - catch (IgniteTxOptimisticException e) { + catch (TransactionOptimisticException e) { tx.rollback(); log.warning("Rolled back transaction due to optimistic exception [tx=" + tx + ", e=" + e + ']'); @@ -365,7 +365,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { throw e; } finally { - IgniteTx t1 = ignite(gridIdx).transactions().tx(); + Transaction t1 = ignite(gridIdx).transactions().tx(); debug("t1=" + t1); @@ -403,7 +403,7 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest { for (int j = 0; j < gridCount(); j++) { IgniteCache<Integer, String> cache = jcache(j); - IgniteTx tx = ignite(j).transactions().tx(); + Transaction tx = ignite(j).transactions().tx(); assertNull("Transaction is not completed: " + tx, tx); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java index 3e394be..14e99ac 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java @@ -31,8 +31,8 @@ import org.apache.ignite.transactions.*; import java.util.*; import java.util.concurrent.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Checks multithreaded put/get cache operations on one node. @@ -122,7 +122,7 @@ public abstract class IgniteTxConcurrentGetAbstractTest extends GridCommonAbstra * @throws Exception If failed. */ private String txGet(Ignite ignite, String key) throws Exception { - try (IgniteTx tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { GridCacheEntryEx<String, Integer> dhtEntry = dht(ignite).peekEx(key); if (DEBUG) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java index cdd5580..cda3a77 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java @@ -213,8 +213,8 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac * @throws Exception If failed. */ public void testPutNearTx() throws Exception { - for (IgniteTxConcurrency concurrency : IgniteTxConcurrency.values()) { - for (IgniteTxIsolation isolation : IgniteTxIsolation.values()) { + for (TransactionConcurrency concurrency : TransactionConcurrency.values()) { + for (TransactionIsolation isolation : TransactionIsolation.values()) { checkPutTx(true, concurrency, isolation, keyForNode(grid(0).localNode(), NOT_PRIMARY_AND_BACKUP)); checkPutTx(false, concurrency, isolation, keyForNode(grid(0).localNode(), NOT_PRIMARY_AND_BACKUP)); @@ -226,8 +226,8 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac * @throws Exception If failed. */ public void testPutPrimaryTx() throws Exception { - for (IgniteTxConcurrency concurrency : IgniteTxConcurrency.values()) { - for (IgniteTxIsolation isolation : IgniteTxIsolation.values()) { + for (TransactionConcurrency concurrency : TransactionConcurrency.values()) { + for (TransactionIsolation isolation : TransactionIsolation.values()) { checkPutTx(true, concurrency, isolation, keyForNode(grid(0).localNode(), PRIMARY)); checkPutTx(false, concurrency, isolation, keyForNode(grid(0).localNode(), PRIMARY)); @@ -239,8 +239,8 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac * @throws Exception If failed. */ public void testPutBackupTx() throws Exception { - for (IgniteTxConcurrency concurrency : IgniteTxConcurrency.values()) { - for (IgniteTxIsolation isolation : IgniteTxIsolation.values()) { + for (TransactionConcurrency concurrency : TransactionConcurrency.values()) { + for (TransactionIsolation isolation : TransactionIsolation.values()) { checkPutTx(true, concurrency, isolation, keyForNode(grid(0).localNode(), BACKUP)); checkPutTx(false, concurrency, isolation, keyForNode(grid(0).localNode(), BACKUP)); @@ -252,8 +252,8 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac * @throws Exception If failed. */ public void testPutMultipleKeysTx() throws Exception { - for (IgniteTxConcurrency concurrency : IgniteTxConcurrency.values()) { - for (IgniteTxIsolation isolation : IgniteTxIsolation.values()) { + for (TransactionConcurrency concurrency : TransactionConcurrency.values()) { + for (TransactionIsolation isolation : TransactionIsolation.values()) { checkPutTx(true, concurrency, isolation, keyForNode(grid(0).localNode(), PRIMARY), keyForNode(grid(0).localNode(), PRIMARY), @@ -286,8 +286,8 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac * @param isolation Transaction isolation. * @throws Exception If failed. */ - private void checkPutTx(boolean putBefore, IgniteTxConcurrency concurrency, - IgniteTxIsolation isolation, final Integer... keys) throws Exception { + private void checkPutTx(boolean putBefore, TransactionConcurrency concurrency, + TransactionIsolation isolation, final Integer... keys) throws Exception { assertTrue(keys.length > 0); info("Test transaction [concurrency=" + concurrency + ", isolation=" + isolation + ']'); @@ -299,7 +299,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac info("Start transaction."); - try (IgniteTx tx = grid(0).transactions().txStart(concurrency, isolation)) { + try (Transaction tx = grid(0).transactions().txStart(concurrency, isolation)) { for (Integer key : keys) { info("Put " + key); @@ -323,7 +323,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac try { info("Start transaction."); - try (IgniteTx tx = grid(0).transactions().txStart(concurrency, isolation)) { + try (Transaction tx = grid(0).transactions().txStart(concurrency, isolation)) { for (Integer key : keys) { info("Put " + key); @@ -337,7 +337,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac fail("Transaction should fail."); } - catch (IgniteTxHeuristicException e) { + catch (TransactionHeuristicException e) { log.info("Expected exception: " + e); } @@ -407,7 +407,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac return null; } - }, IgniteTxHeuristicException.class, null); + }, TransactionHeuristicException.class, null); checkUnlocked(key); } @@ -448,7 +448,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac } }, CacheException.class, null); - assertTrue("Unexpected cause: " +e, e.getCause() instanceof IgniteTxHeuristicException); + assertTrue("Unexpected cause: " +e, e.getCause() instanceof TransactionHeuristicException); checkUnlocked(key); } @@ -495,7 +495,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac return null; } - }, IgniteTxHeuristicException.class, null); + }, TransactionHeuristicException.class, null); for (Integer key : m.keySet()) checkUnlocked(key); @@ -529,7 +529,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac return null; } - }, IgniteTxHeuristicException.class, null); + }, TransactionHeuristicException.class, null); checkUnlocked(key); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java index 1ba1bd9..7bf8aae 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java @@ -42,8 +42,8 @@ import java.util.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** @@ -165,7 +165,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe boolean isCntrPrimary = cntrPrimaryId.equals(locId); - try (IgniteTx tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { if (DEBUG) info("Before near get [retry=" + retry + ", xid=" + tx.xid() + ", node=" + ignite.name() + ", isCntrPrimary=" + isCntrPrimary + ", nearId=" + locId + @@ -217,7 +217,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe boolean isCntrPrimary = cntrPrimaryId.equals(locId); - try (IgniteTx tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { if (DEBUG) info("Before item primary get [retry=" + retry + ", xid=" + tx.xid() + ", node=" + ignite.name() + ", isCntrPrimary=" + isCntrPrimary + ", nearId=" + locId + @@ -269,7 +269,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe boolean isCntrPrimary = cntrPrimaryId.equals(locId); - try (IgniteTx tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { if (DEBUG) ignite.log().info("Before item lock [retry=" + retry + ", xid=" + tx.xid() + ", node=" + ignite.name() + ", isCntrPrimary=" + isCntrPrimary + ", nearId=" + locId + @@ -359,7 +359,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe boolean isCntrPrimary = cntrPrimaryId.equals(locId); - try (IgniteTx tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { if (DEBUG) ignite.log().info("Before item lock [retry=" + retry + ", xid=" + tx.xid() + ", node=" + ignite.name() + ", isCntrPrimary=" + isCntrPrimary + ", nearId=" + locId + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java index b60acd4..9c9cf00 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiThreadedAbstractTest.java @@ -18,9 +18,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.internal.*; -import org.apache.ignite.internal.transactions.*; import org.apache.ignite.testframework.*; import org.apache.ignite.transactions.*; import org.jetbrains.annotations.*; @@ -28,8 +26,8 @@ import org.jetbrains.annotations.*; import java.util.*; import java.util.concurrent.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Tests for local transactions. @@ -46,8 +44,8 @@ public abstract class IgniteTxMultiThreadedAbstractTest extends IgniteTxAbstract * @param isolation Isolation. * @throws Exception If check failed. */ - protected void checkCommitMultithreaded(final IgniteTxConcurrency concurrency, - final IgniteTxIsolation isolation) throws Exception { + protected void checkCommitMultithreaded(final TransactionConcurrency concurrency, + final TransactionIsolation isolation) throws Exception { GridTestUtils.runMultiThreaded(new Callable<Object>() { @Nullable @Override public Object call() throws Exception { Thread t = Thread.currentThread(); @@ -73,8 +71,8 @@ public abstract class IgniteTxMultiThreadedAbstractTest extends IgniteTxAbstract * @param isolation Isolation. * @throws Exception If check failed. */ - protected void checkRollbackMultithreaded(final IgniteTxConcurrency concurrency, - final IgniteTxIsolation isolation) throws Exception { + protected void checkRollbackMultithreaded(final TransactionConcurrency concurrency, + final TransactionIsolation isolation) throws Exception { final ConcurrentMap<Integer, String> map = new ConcurrentHashMap<>(); GridTestUtils.runMultiThreaded(new Callable<Object>() { @@ -229,7 +227,7 @@ public abstract class IgniteTxMultiThreadedAbstractTest extends IgniteTxAbstract for (int i = 0; i < ITERATIONS; i++) { while (true) { - try (IgniteTx tx = grid(0).transactions().txStart(OPTIMISTIC, SERIALIZABLE)) { + try (Transaction tx = grid(0).transactions().txStart(OPTIMISTIC, SERIALIZABLE)) { long val = cache.get(key); cache.put(key, val + 1); @@ -240,7 +238,7 @@ public abstract class IgniteTxMultiThreadedAbstractTest extends IgniteTxAbstract break; } - catch(IgniteTxOptimisticException e) { + catch(TransactionOptimisticException e) { log.info("Got error, will retry: " + e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java index e48f89c..d7ebaf2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxReentryAbstractSelfTest.java @@ -38,8 +38,8 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheDistributionMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Tests reentry in pessimistic repeatable read tx. @@ -102,7 +102,7 @@ public abstract class IgniteTxReentryAbstractSelfTest extends GridCommonAbstract // Find test key. int key = testKey(); - try (IgniteTx tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { // One near lock request. cache.get(key); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxSingleThreadedAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxSingleThreadedAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxSingleThreadedAbstractTest.java index d26edc3..43f668a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxSingleThreadedAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxSingleThreadedAbstractTest.java @@ -19,8 +19,8 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Tests for local transactions. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java index 3e0c2a5..1634476 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java @@ -205,8 +205,8 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ public void testPutNearTx() throws Exception { - for (IgniteTxConcurrency concurrency : IgniteTxConcurrency.values()) { - for (IgniteTxIsolation isolation : IgniteTxIsolation.values()) { + for (TransactionConcurrency concurrency : TransactionConcurrency.values()) { + for (TransactionIsolation isolation : TransactionIsolation.values()) { checkPutTx(true, concurrency, isolation, keyForNode(grid(0).localNode(), NOT_PRIMARY_AND_BACKUP)); checkPutTx(false, concurrency, isolation, keyForNode(grid(0).localNode(), NOT_PRIMARY_AND_BACKUP)); @@ -218,8 +218,8 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ public void testPutPrimaryTx() throws Exception { - for (IgniteTxConcurrency concurrency : IgniteTxConcurrency.values()) { - for (IgniteTxIsolation isolation : IgniteTxIsolation.values()) { + for (TransactionConcurrency concurrency : TransactionConcurrency.values()) { + for (TransactionIsolation isolation : TransactionIsolation.values()) { checkPutTx(true, concurrency, isolation, keyForNode(grid(0).localNode(), PRIMARY)); checkPutTx(false, concurrency, isolation, keyForNode(grid(0).localNode(), PRIMARY)); @@ -231,8 +231,8 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ public void testPutBackupTx() throws Exception { - for (IgniteTxConcurrency concurrency : IgniteTxConcurrency.values()) { - for (IgniteTxIsolation isolation : IgniteTxIsolation.values()) { + for (TransactionConcurrency concurrency : TransactionConcurrency.values()) { + for (TransactionIsolation isolation : TransactionIsolation.values()) { checkPutTx(true, concurrency, isolation, keyForNode(grid(0).localNode(), BACKUP)); checkPutTx(false, concurrency, isolation, keyForNode(grid(0).localNode(), BACKUP)); @@ -244,8 +244,8 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb * @throws Exception If failed. */ public void testPutMultipleKeysTx() throws Exception { - for (IgniteTxConcurrency concurrency : IgniteTxConcurrency.values()) { - for (IgniteTxIsolation isolation : IgniteTxIsolation.values()) { + for (TransactionConcurrency concurrency : TransactionConcurrency.values()) { + for (TransactionIsolation isolation : TransactionIsolation.values()) { checkPutTx(true, concurrency, isolation, keyForNode(grid(0).localNode(), PRIMARY), keyForNode(grid(0).localNode(), PRIMARY), @@ -278,8 +278,8 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb * @param isolation Transaction isolation. * @throws Exception If failed. */ - private void checkPutTx(boolean putBefore, IgniteTxConcurrency concurrency, - IgniteTxIsolation isolation, final Integer... keys) throws Exception { + private void checkPutTx(boolean putBefore, TransactionConcurrency concurrency, + TransactionIsolation isolation, final Integer... keys) throws Exception { assertTrue(keys.length > 0); info("Test transaction [concurrency=" + concurrency + ", isolation=" + isolation + ']'); @@ -291,7 +291,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb info("Start transaction."); - try (IgniteTx tx = grid(0).transactions().txStart(concurrency, isolation)) { + try (Transaction tx = grid(0).transactions().txStart(concurrency, isolation)) { for (Integer key : keys) { info("Put " + key); @@ -315,7 +315,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb try { info("Start transaction."); - try (IgniteTx tx = grid(0).transactions().txStart(concurrency, isolation)) { + try (Transaction tx = grid(0).transactions().txStart(concurrency, isolation)) { for (Integer key : keys) { info("Put " + key); @@ -410,7 +410,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb return null; } - }, IgniteTxRollbackException.class, null); + }, TransactionRollbackException.class, null); checkValue(key, putBefore); } @@ -451,7 +451,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb } }, CacheException.class, null); - assertTrue("Unexpected cause: " + e, e.getCause() instanceof IgniteTxRollbackException); + assertTrue("Unexpected cause: " + e, e.getCause() instanceof TransactionRollbackException); checkValue(key, putBefore); } @@ -498,7 +498,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb return null; } - }, IgniteTxRollbackException.class, null); + }, TransactionRollbackException.class, null); for (Integer key : m.keySet()) checkValue(key, putBefore); @@ -532,7 +532,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb return null; } - }, IgniteTxRollbackException.class, null); + }, TransactionRollbackException.class, null); checkValue(key, putBefore); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java index 6f4af4b..b343320 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java @@ -31,8 +31,8 @@ import java.util.*; import java.util.concurrent.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Cache sequence basic tests. @@ -243,7 +243,7 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends IgniteAtomics * @throws Exception If failed. */ public void testGetAndAddInTx() throws Exception { - try (IgniteTx tx = grid().transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = grid().transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { for (int i = 1; i < MAX_LOOPS_NUM; i++) { for (IgniteAtomicSequence seq : seqArr) getAndAdd(seq, i); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicLongApiAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicLongApiAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicLongApiAbstractSelfTest.java index e7d371e..6550e91 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicLongApiAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicLongApiAbstractSelfTest.java @@ -251,7 +251,7 @@ public abstract class IgniteAtomicLongApiAbstractSelfTest extends IgniteAtomicsA IgniteCache<Object, Object> cache = ignite.jcache(TRANSACTIONAL_CACHE_NAME); - try (IgniteTx tx = ignite.transactions().txStart()) { + try (Transaction tx = ignite.transactions().txStart()) { cache.put(1, 1); long newVal = RND.nextLong();
