http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java index 4251357..23b6aa5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java @@ -43,8 +43,8 @@ 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.cache.CachePreloadMode.*; -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.*; /** * Multiple put test. @@ -312,7 +312,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst GridCacheEntryEx<String, Integer> dhtNear = near(pri).peekEx(CNTR_KEY); - try (IgniteTx tx = pri.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = pri.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { if (DEBUG) info("Started tx [grid=" + pri.name() + ", primary=true, xid=" + tx.xid() + ", oldCntr=" + oldCntr + ", node=" + priId + ", dhtEntry=" + dhtEntry + @@ -407,7 +407,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst Integer oldCntr = c.localPeek(CNTR_KEY, CachePeekMode.ONHEAP); - try (IgniteTx tx = near.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = near.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { if (DEBUG) info("Started tx [grid=" + near.name() + ", primary=false, xid=" + tx.xid() + ", oldCntr=" + oldCntr + ", node=" + nearId + @@ -644,7 +644,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst Integer oldCntr = c.localPeek(CNTR_KEY, CachePeekMode.ONHEAP); - try (IgniteTx tx = near.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = near.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { if (DEBUG) log.info("Started tx [grid=" + near.name() + ", primary=false, xid=" + tx.xid() + ", oldCntr=" + oldCntr + ", node=" + nearId + ", nearEntry=" + nearEntry + ']'); @@ -715,7 +715,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst GridCacheEntryEx<String, Integer> dhtNear = near(pri).peekEx(CNTR_KEY); - try (IgniteTx tx = pri.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = pri.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { if (DEBUG) log.info("Started tx [grid=" + pri.name() + ", primary=true, xid=" + tx.xid() + ", oldCntr=" + oldCntr + ", node=" + pri.name() + ", dhtEntry=" +
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java index 75d6a22..32eff24 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java @@ -34,8 +34,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.*; /** * Multithreaded partition cache put get test. @@ -171,7 +171,7 @@ public class GridCachePartitionedMultiThreadedPutGetSelfTest extends GridCommonA * @throws Exception If failed. */ @SuppressWarnings({"TooBroadScope", "PointlessBooleanExpression"}) - private void doTest(final IgniteTxConcurrency concurrency, final IgniteTxIsolation isolation) + private void doTest(final TransactionConcurrency concurrency, final TransactionIsolation isolation) throws Exception { final AtomicInteger cntr = new AtomicInteger(); @@ -183,7 +183,7 @@ public class GridCachePartitionedMultiThreadedPutGetSelfTest extends GridCommonA for (int i = 0; i < TX_CNT; i++) { int kv = cntr.incrementAndGet(); - try (IgniteTx tx = grid(0).transactions().txStart(concurrency, isolation)) { + try (Transaction tx = grid(0).transactions().txStart(concurrency, isolation)) { assertNull(c.get(kv)); c.put(kv, kv); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java index 834085f..30f4a28 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java @@ -24,7 +24,7 @@ import org.apache.ignite.internal.processors.cache.distributed.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; /** * Test node restart. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java index 324c118..e2fd6a5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java @@ -24,7 +24,7 @@ import org.apache.ignite.transactions.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; /** * Test node restart. @@ -53,7 +53,7 @@ public class GridCachePartitionedOptimisticTxNodeRestartTest extends GridCacheAb } /** {@inheritDoc} */ - @Override protected IgniteTxConcurrency txConcurrency() { + @Override protected TransactionConcurrency txConcurrency() { return OPTIMISTIC; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java index 52300a4..2c510c5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java @@ -48,8 +48,8 @@ public class GridCachePartitionedPreloadLifecycleSelfTest extends GridCachePrelo @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - c.getTransactionConfiguration().setDefaultTxConcurrency(IgniteTxConcurrency.OPTIMISTIC); - c.getTransactionConfiguration().setDefaultTxIsolation(IgniteTxIsolation.READ_COMMITTED); + c.getTransactionConfiguration().setDefaultTxConcurrency(TransactionConcurrency.OPTIMISTIC); + c.getTransactionConfiguration().setDefaultTxIsolation(TransactionIsolation.READ_COMMITTED); CacheConfiguration cc1 = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java index 1cf1410..685f9d2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java @@ -34,8 +34,8 @@ import org.apache.ignite.transactions.*; import java.util.*; import static org.apache.ignite.IgniteSystemProperties.*; -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 tx salvage. @@ -144,7 +144,7 @@ public class GridCachePartitionedTxSalvageSelfTest extends GridCommonAbstractTes * (i.e. call {@link org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx#prepare()}). * @throws Exception If failed. */ - private void checkSalvageAfterTimeout(IgniteTxConcurrency mode, boolean prepare) throws Exception { + private void checkSalvageAfterTimeout(TransactionConcurrency mode, boolean prepare) throws Exception { startTxAndPutKeys(mode, prepare); stopNodeAndSleep(SALVAGE_TIMEOUT + DELTA_AFTER); @@ -163,7 +163,7 @@ public class GridCachePartitionedTxSalvageSelfTest extends GridCommonAbstractTes * (i.e. call {@link org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx#prepare()}). * @throws Exception If failed. */ - private void checkSalvageBeforeTimeout(IgniteTxConcurrency mode, boolean prepare) throws Exception { + private void checkSalvageBeforeTimeout(TransactionConcurrency mode, boolean prepare) throws Exception { startTxAndPutKeys(mode, prepare); List<Integer> nearSizes = new ArrayList<>(GRID_CNT - 1); @@ -190,7 +190,7 @@ public class GridCachePartitionedTxSalvageSelfTest extends GridCommonAbstractTes * (i.e. call {@link org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx#prepare()}). * @throws Exception If failed. */ - private void startTxAndPutKeys(final IgniteTxConcurrency mode, final boolean prepare) throws Exception { + private void startTxAndPutKeys(final TransactionConcurrency mode, final boolean prepare) throws Exception { Ignite ignite = grid(0); final Collection<Integer> keys = nearKeys(ignite); @@ -200,7 +200,7 @@ public class GridCachePartitionedTxSalvageSelfTest extends GridCommonAbstractTes IgniteCache<Object, Object> c = jcache(0); try { - IgniteTx tx = grid(0).transactions().txStart(mode, REPEATABLE_READ); + Transaction tx = grid(0).transactions().txStart(mode, REPEATABLE_READ); for (Integer key : keys) c.put(key, "val" + key); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java index 5d8545f..75ea88b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java @@ -38,8 +38,8 @@ import java.util.*; 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.*; /** * @@ -149,13 +149,13 @@ public class GridCacheReplicatedInvalidateSelfTest extends GridCommonAbstractTes * @param isolation Isolation. * @throws Throwable If check failed. */ - private void checkCommit(IgniteTxConcurrency concurrency, - IgniteTxIsolation isolation) throws Throwable { + private void checkCommit(TransactionConcurrency concurrency, + TransactionIsolation isolation) throws Throwable { int idx = RAND.nextInt(GRID_CNT); GridCache<Integer, String> cache = cache(idx); - IgniteTx tx = cache.txStart(concurrency, isolation, 0, 0); + Transaction tx = cache.txStart(concurrency, isolation, 0, 0); try { cache.put(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/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java index 8c5f4e3..44d8d80 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java @@ -34,8 +34,8 @@ import java.util.*; 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 for replicated cache preloader. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java index e55966e..8389de5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java @@ -37,8 +37,8 @@ import java.util.concurrent.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; 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.*; /** * @@ -186,7 +186,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb int j = rnd.nextInt(keyCnt); - try (IgniteTx tx = ignite.transactions().txStart()) { + try (Transaction tx = ignite.transactions().txStart()) { // Put or remove? if (rnd.nextBoolean()) cache.put(j, j); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java index 9e31411..0742153 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java @@ -35,8 +35,8 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; 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.*; /** * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java index 1d45e6c..d548d12 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.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.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.*; /** * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java index de80679..910c2d5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java @@ -55,10 +55,10 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb private CacheStore<String, String> testStore; /** Tx concurrency to use. */ - private IgniteTxConcurrency txConcurrency; + private TransactionConcurrency txConcurrency; /** Tx isolation to use. */ - private IgniteTxIsolation txIsolation; + private TransactionIsolation txIsolation; /** {@inheritDoc} */ @SuppressWarnings("unchecked") @@ -164,10 +164,10 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb * @throws Exception If failed. */ private void checkPolicy0() throws Exception { - for (IgniteTxConcurrency concurrency : IgniteTxConcurrency.values()) { + for (TransactionConcurrency concurrency : TransactionConcurrency.values()) { txConcurrency = concurrency; - for (IgniteTxIsolation isolation : IgniteTxIsolation.values()) { + for (TransactionIsolation isolation : TransactionIsolation.values()) { txIsolation = isolation; Ignite g = startGrids(); @@ -226,7 +226,7 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb private void checkExplicitTx(Ignite ignite, IgniteCache<String, String> cache) throws Exception { IgniteCache<String, String> asyncCache = cache.withAsync(); - IgniteTx tx = ignite.transactions().txStart(); + Transaction tx = ignite.transactions().txStart(); try { assertNull(cache.get("key1")); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java index 84da7e7..d68f67f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionAbstractTest.java @@ -41,8 +41,8 @@ import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.events.EventType.*; -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.*; /** * Base class for eviction tests. @@ -363,7 +363,7 @@ public abstract class GridCacheEvictionAbstractTest<T extends CacheEvictionPolic int key = rand.nextInt(1000); String val = Integer.toString(key); - try (IgniteTx tx = grid.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = grid.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { String v = cache.get(key); assert v == null || v.equals(Integer.toString(key)) : "Invalid value for key [key=" + key + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java index e8fa27e..0837024 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.eviction; import org.apache.ignite.*; -import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cache.eviction.*; import org.apache.ignite.cache.eviction.fifo.*; import org.apache.ignite.cache.store.*; @@ -37,8 +36,8 @@ import java.util.*; import static org.apache.ignite.cache.CacheMode.*; 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.*; /** * @@ -121,7 +120,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { final Random rnd = new Random(); - try (IgniteTx tx = ignite.transactions().txStart()) { + try (Transaction tx = ignite.transactions().txStart()) { int iterCnt = 20; int keyCnt = 5000; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java index 920ab0c..3110cbc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java @@ -41,8 +41,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.*; /** * @@ -292,9 +292,9 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs } if (atomicityMode() == TRANSACTIONAL) { - IgniteTxConcurrency[] txModes = {PESSIMISTIC}; + TransactionConcurrency[] txModes = {PESSIMISTIC}; - for (IgniteTxConcurrency txMode : txModes) { + for (TransactionConcurrency txMode : txModes) { for (final Integer key : keys()) { log.info("Test txGet [key=" + key + ", txMode=" + txMode + ']'); @@ -302,7 +302,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs } } - for (IgniteTxConcurrency txMode : txModes) { + for (TransactionConcurrency txMode : txModes) { log.info("Test txGetAll [txMode=" + txMode + ']'); txGetAll(txMode); @@ -334,14 +334,14 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs * @param txMode Transaction concurrency mode. * @throws Exception If failed. */ - private void txGet(Integer key, IgniteTxConcurrency txMode) throws Exception { + private void txGet(Integer key, TransactionConcurrency txMode) throws Exception { IgniteCache<Integer, Integer> cache = jcache(); cache.put(key, 1); checkTtl(key, 60_000L); - try (IgniteTx tx = ignite(0).transactions().txStart(txMode, REPEATABLE_READ)) { + try (Transaction tx = ignite(0).transactions().txStart(txMode, REPEATABLE_READ)) { assertEquals((Integer)1, cache.get(key)); tx.commit(); @@ -349,7 +349,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs checkTtl(key, 62_000L, true); - try (IgniteTx tx = ignite(0).transactions().txStart(txMode, REPEATABLE_READ)) { + try (Transaction tx = ignite(0).transactions().txStart(txMode, REPEATABLE_READ)) { assertEquals((Integer)1, cache.withExpiryPolicy(new TestPolicy(100L, 200L, 1000L)).get(key)); tx.commit(); @@ -362,7 +362,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs * @param txMode Transaction concurrency mode. * @throws Exception If failed. */ - private void txGetAll(IgniteTxConcurrency txMode) throws Exception { + private void txGetAll(TransactionConcurrency txMode) throws Exception { IgniteCache<Integer, Integer> cache = jcache(0); Map<Integer, Integer> vals = new HashMap<>(); @@ -372,7 +372,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs cache.putAll(vals); - try (IgniteTx tx = ignite(0).transactions().txStart(txMode, REPEATABLE_READ)) { + try (Transaction tx = ignite(0).transactions().txStart(txMode, REPEATABLE_READ)) { assertEquals(vals, cache.getAll(vals.keySet())); tx.commit(); @@ -381,7 +381,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs for (Integer key : vals.keySet()) checkTtl(key, 62_000L); - try (IgniteTx tx = ignite(0).transactions().txStart(txMode, REPEATABLE_READ)) { + try (Transaction tx = ignite(0).transactions().txStart(txMode, REPEATABLE_READ)) { assertEquals(vals, cache.withExpiryPolicy(new TestPolicy(100L, 200L, 1000L)).getAll(vals.keySet())); tx.commit(); @@ -523,9 +523,9 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs createUpdatePutAll(null); if (atomicityMode() == TRANSACTIONAL) { - IgniteTxConcurrency[] txModes = new IgniteTxConcurrency[]{PESSIMISTIC, OPTIMISTIC}; + TransactionConcurrency[] txModes = new TransactionConcurrency[]{PESSIMISTIC, OPTIMISTIC}; - for (IgniteTxConcurrency tx : txModes) { + for (TransactionConcurrency tx : txModes) { for (final Integer key : keys()) { log.info("Test createUpdate [key=" + key + ", tx=" + tx + ']'); @@ -547,7 +547,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs * @param txConcurrency Not null transaction concurrency mode if explicit transaction should be started. * @throws Exception If failed. */ - private void createUpdatePutAll(@Nullable IgniteTxConcurrency txConcurrency) throws Exception { + private void createUpdatePutAll(@Nullable TransactionConcurrency txConcurrency) throws Exception { Map<Integer, Integer> vals = new HashMap<>(); for (int i = 0; i < 1000; i++) @@ -557,7 +557,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs cache.removeAll(vals.keySet()); - IgniteTx tx = startTx(txConcurrency); + Transaction tx = startTx(txConcurrency); // Create. cache.putAll(vals); @@ -623,13 +623,13 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs * @param txConcurrency Not null transaction concurrency mode if explicit transaction should be started. * @throws Exception If failed. */ - private void createUpdateCustomPolicy(Integer key, @Nullable IgniteTxConcurrency txConcurrency) + private void createUpdateCustomPolicy(Integer key, @Nullable TransactionConcurrency txConcurrency) throws Exception { IgniteCache<Integer, Integer> cache = jcache(); assertNull(cache.get(key)); - IgniteTx tx = startTx(txConcurrency); + Transaction tx = startTx(txConcurrency); cache.withExpiryPolicy(new TestPolicy(10_000L, 20_000L, 30_000L)).put(key, 1); @@ -682,7 +682,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs * @param txConcurrency Not null transaction concurrency mode if explicit transaction should be started. * @throws Exception If failed. */ - private void createUpdate(Integer key, @Nullable IgniteTxConcurrency txConcurrency) + private void createUpdate(Integer key, @Nullable TransactionConcurrency txConcurrency) throws Exception { IgniteCache<Integer, Integer> cache = jcache(); @@ -690,7 +690,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs for (int i = 0; i < 3; i++) { log.info("Iteration: " + i); - IgniteTx tx = startTx(txConcurrency); + Transaction tx = startTx(txConcurrency); cache.put(key, 1); // Create. @@ -736,7 +736,7 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest extends IgniteCacheAbs * @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/integration/IgniteCacheNoLoadPreviousValueAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoLoadPreviousValueAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoLoadPreviousValueAbstractTest.java index afb5dce..4cd8716 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoLoadPreviousValueAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoLoadPreviousValueAbstractTest.java @@ -143,8 +143,8 @@ public abstract class IgniteCacheNoLoadPreviousValueAbstractTest extends IgniteC assertEquals(expData, cache.getAll(expData.keySet())); if (atomicityMode() == TRANSACTIONAL) { - for (IgniteTxConcurrency concurrency : IgniteTxConcurrency.values()) { - for (IgniteTxIsolation isolation : IgniteTxIsolation.values()) { + for (TransactionConcurrency concurrency : TransactionConcurrency.values()) { + for (TransactionIsolation isolation : TransactionIsolation.values()) { for (Integer key : keys()) { log.info("Test tx [key=" + key + ", concurrency=" + concurrency + @@ -152,7 +152,7 @@ public abstract class IgniteCacheNoLoadPreviousValueAbstractTest extends IgniteC storeMap.put(key, key); - try (IgniteTx tx = ignite(0).transactions().txStart(concurrency, isolation)) { + try (Transaction tx = ignite(0).transactions().txStart(concurrency, isolation)) { assertNull("Invalid value [concurrency=" + concurrency + ", isolation=" + isolation + ']', cache.getAndPut(key, -1)); @@ -167,7 +167,7 @@ public abstract class IgniteCacheNoLoadPreviousValueAbstractTest extends IgniteC storeMap.put(key, key); - try (IgniteTx tx = ignite(0).transactions().txStart(concurrency, isolation)) { + try (Transaction tx = ignite(0).transactions().txStart(concurrency, isolation)) { assertTrue(cache.putIfAbsent(key, -1)); tx.commit(); @@ -175,7 +175,7 @@ public abstract class IgniteCacheNoLoadPreviousValueAbstractTest extends IgniteC assertEquals(-1, storeMap.get(key)); - try (IgniteTx tx = ignite(0).transactions().txStart(concurrency, isolation)) { + try (Transaction tx = ignite(0).transactions().txStart(concurrency, isolation)) { assertEquals(expData, cache.getAll(expData.keySet())); 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/integration/IgniteCacheNoReadThroughAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java index c5897d9..f734229 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java @@ -189,8 +189,8 @@ public abstract class IgniteCacheNoReadThroughAbstractTest extends IgniteCacheAb assertTrue(cache.getAll(keys).isEmpty()); if (atomicityMode() == TRANSACTIONAL) { - for (IgniteTxConcurrency concurrency : IgniteTxConcurrency.values()) { - for (IgniteTxIsolation isolation : IgniteTxIsolation.values()) { + for (TransactionConcurrency concurrency : TransactionConcurrency.values()) { + for (TransactionIsolation isolation : TransactionIsolation.values()) { for (Integer key : keys()) { log.info("Test tx [key=" + key + ", concurrency=" + concurrency + @@ -198,7 +198,7 @@ public abstract class IgniteCacheNoReadThroughAbstractTest extends IgniteCacheAb storeMap.put(key, key); - try (IgniteTx tx = ignite(0).transactions().txStart(concurrency, isolation)) { + try (Transaction tx = ignite(0).transactions().txStart(concurrency, isolation)) { assertNull(cache.get(key)); tx.commit(); @@ -206,7 +206,7 @@ public abstract class IgniteCacheNoReadThroughAbstractTest extends IgniteCacheAb assertEquals(key, storeMap.get(key)); - try (IgniteTx tx = ignite(0).transactions().txStart(concurrency, isolation)) { + try (Transaction tx = ignite(0).transactions().txStart(concurrency, isolation)) { assertNull(cache.getAndPut(key, -1)); tx.commit(); @@ -220,7 +220,7 @@ public abstract class IgniteCacheNoReadThroughAbstractTest extends IgniteCacheAb storeMap.put(key, key); - try (IgniteTx tx = ignite(0).transactions().txStart(concurrency, isolation)) { + try (Transaction tx = ignite(0).transactions().txStart(concurrency, isolation)) { assertTrue(cache.putIfAbsent(key, -1)); tx.commit(); @@ -234,7 +234,7 @@ public abstract class IgniteCacheNoReadThroughAbstractTest extends IgniteCacheAb storeMap.put(key, key); - try (IgniteTx tx = ignite(0).transactions().txStart(concurrency, isolation)) { + try (Transaction tx = ignite(0).transactions().txStart(concurrency, isolation)) { Object ret = cache.invoke(key, new EntryProcessor<Integer, Integer, Object>() { @Override public Object process(MutableEntry<Integer, Integer> e, Object... args) { Integer val = e.getValue(); @@ -256,7 +256,7 @@ public abstract class IgniteCacheNoReadThroughAbstractTest extends IgniteCacheAb assertEquals(-1, storeMap.get(key)); - try (IgniteTx tx = ignite(0).transactions().txStart(concurrency, isolation)) { + try (Transaction tx = ignite(0).transactions().txStart(concurrency, isolation)) { assertTrue(cache.getAll(keys).isEmpty()); 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/integration/IgniteCacheNoWriteThroughAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java index 6c11d61..955db49 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoWriteThroughAbstractTest.java @@ -214,8 +214,8 @@ public abstract class IgniteCacheNoWriteThroughAbstractTest extends IgniteCacheA assertTrue(cache.getAll(expData.keySet()).isEmpty()); if (atomicityMode() == TRANSACTIONAL) { - for (IgniteTxConcurrency concurrency : IgniteTxConcurrency.values()) { - for (IgniteTxIsolation isolation : IgniteTxIsolation.values()) { + for (TransactionConcurrency concurrency : TransactionConcurrency.values()) { + for (TransactionIsolation isolation : TransactionIsolation.values()) { for (Integer key : keys()) { log.info("Test tx [key=" + key + ", concurrency=" + concurrency + @@ -223,7 +223,7 @@ public abstract class IgniteCacheNoWriteThroughAbstractTest extends IgniteCacheA storeMap.put(key, key); - try (IgniteTx tx = ignite(0).transactions().txStart(concurrency, isolation)) { + try (Transaction tx = ignite(0).transactions().txStart(concurrency, isolation)) { assertEquals(key, cache.getAndPut(key, -1)); tx.commit(); @@ -233,7 +233,7 @@ public abstract class IgniteCacheNoWriteThroughAbstractTest extends IgniteCacheA assertEquals(key, storeMap.get(key)); - try (IgniteTx tx = ignite(0).transactions().txStart(concurrency, isolation)) { + try (Transaction tx = ignite(0).transactions().txStart(concurrency, isolation)) { cache.put(key, -2); tx.commit(); @@ -243,7 +243,7 @@ public abstract class IgniteCacheNoWriteThroughAbstractTest extends IgniteCacheA assertEquals(key, storeMap.get(key)); - try (IgniteTx tx = ignite(0).transactions().txStart(concurrency, isolation)) { + try (Transaction tx = ignite(0).transactions().txStart(concurrency, isolation)) { assertEquals(-2, (int)cache.getAndRemove(key)); tx.commit(); @@ -259,7 +259,7 @@ public abstract class IgniteCacheNoWriteThroughAbstractTest extends IgniteCacheA cache.put(key, key); - try (IgniteTx tx = ignite(0).transactions().txStart(concurrency, isolation)) { + try (Transaction tx = ignite(0).transactions().txStart(concurrency, isolation)) { assertTrue(cache.replace(key, -1)); tx.commit(); @@ -273,7 +273,7 @@ public abstract class IgniteCacheNoWriteThroughAbstractTest extends IgniteCacheA storeMap.clear(); - try (IgniteTx tx = ignite(0).transactions().txStart(concurrency, isolation)) { + try (Transaction tx = ignite(0).transactions().txStart(concurrency, isolation)) { cache.putAll(expData); tx.commit(); @@ -283,7 +283,7 @@ public abstract class IgniteCacheNoWriteThroughAbstractTest extends IgniteCacheA assertEquals(expData, cache.getAll(expData.keySet())); - try (IgniteTx tx = ignite(0).transactions().txStart(concurrency, isolation)) { + try (Transaction tx = ignite(0).transactions().txStart(concurrency, isolation)) { cache.invokeAll(expData.keySet(), new EntryProcessor<Integer, Integer, Object>() { @Override public Object process(MutableEntry<Integer, Integer> entry, Object... args) { entry.setValue(1); @@ -301,7 +301,7 @@ public abstract class IgniteCacheNoWriteThroughAbstractTest extends IgniteCacheA storeMap.putAll(expData); - try (IgniteTx tx = ignite(0).transactions().txStart(concurrency, isolation)) { + try (Transaction tx = ignite(0).transactions().txStart(concurrency, isolation)) { cache.removeAll(expData.keySet()); 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/integration/IgniteCacheTxStoreSessionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java index 813695a..1dcef08 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java @@ -27,8 +27,8 @@ import java.util.*; 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.*; /** * @@ -66,8 +66,8 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra testTxPutRemove(null, null); - for (IgniteTxConcurrency concurrency : F.asList(PESSIMISTIC)) { - for (IgniteTxIsolation isolation : F.asList(REPEATABLE_READ)) { + for (TransactionConcurrency concurrency : F.asList(PESSIMISTIC)) { + for (TransactionIsolation isolation : F.asList(REPEATABLE_READ)) { testTxPut(jcache(0), concurrency, isolation); testTxRemove(concurrency, isolation); @@ -82,7 +82,7 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra * @param isolation Isolation mode. * @throws Exception If failed. */ - private void testTxPutRemove(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception { + private void testTxPutRemove(TransactionConcurrency concurrency, TransactionIsolation isolation) throws Exception { log.info("Test tx put/remove [concurrency=" + concurrency + ", isolation=" + isolation + ']'); IgniteCache<Integer, Integer> cache = jcache(0); @@ -93,7 +93,7 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra Integer key2 = keys.get(1); Integer key3 = keys.get(2); - try (IgniteTx tx = startTx(concurrency, isolation)) { + try (Transaction tx = startTx(concurrency, isolation)) { log.info("Do tx put1."); cache.put(key1, key1); @@ -125,15 +125,15 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra * @throws Exception If failed. */ private void testTxPut(IgniteCache<Object, Object> cache, - IgniteTxConcurrency concurrency, - IgniteTxIsolation isolation) throws Exception { + TransactionConcurrency concurrency, + TransactionIsolation isolation) throws Exception { log.info("Test tx put [concurrency=" + concurrency + ", isolation=" + isolation + ']'); List<Integer> keys = testKeys(cache, 3); Integer key1 = keys.get(0); - try (IgniteTx tx = startTx(concurrency, isolation)) { + try (Transaction tx = startTx(concurrency, isolation)) { log.info("Do tx get."); cache.get(key1); @@ -155,7 +155,7 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra Integer key2 = keys.get(1); Integer key3 = keys.get(2); - try (IgniteTx tx = startTx(concurrency, isolation)) { + try (Transaction tx = startTx(concurrency, isolation)) { log.info("Do tx put1."); cache.put(key2, key2); @@ -180,7 +180,7 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra * @param isolation Isolation mode. * @throws Exception If failed. */ - private void testTxRemove(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) throws Exception { + private void testTxRemove(TransactionConcurrency concurrency, TransactionIsolation isolation) throws Exception { log.info("Test tx remove [concurrency=" + concurrency + ", isolation=" + isolation + ']'); IgniteCache<Integer, Integer> cache = jcache(0); @@ -189,7 +189,7 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra Integer key1 = keys.get(0); - try (IgniteTx tx = startTx(concurrency, isolation)) { + try (Transaction tx = startTx(concurrency, isolation)) { log.info("Do tx get."); cache.get(key1); @@ -211,7 +211,7 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra Integer key2 = keys.get(1); Integer key3 = keys.get(2); - try (IgniteTx tx = startTx(concurrency, isolation)) { + try (Transaction tx = startTx(concurrency, isolation)) { log.info("Do tx remove1."); cache.remove(key2, key2); @@ -236,7 +236,7 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra * @param isolation Isolation mode. * @return Transaction. */ - private IgniteTx startTx(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) { + private Transaction startTx(TransactionConcurrency concurrency, TransactionIsolation isolation) { IgniteTransactions txs = ignite(0).transactions(); if (concurrency == null) @@ -256,7 +256,7 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra Integer key1 = primaryKey(cache0); Integer key2 = primaryKeys(cache1, 1, key1 + 1).get(0); - try (IgniteTx tx = startTx(null, null)) { + try (Transaction tx = startTx(null, null)) { cache0.put(key1, 1); cache1.put(key2, 0); @@ -270,7 +270,7 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra assertEquals(0, expData.size()); - try (IgniteTx tx = startTx(null, null)) { + try (Transaction tx = startTx(null, null)) { cache1.put(key1, 1); cache0.put(key2, 0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java index 10cee0f..4cd2889 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java @@ -32,8 +32,8 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMemoryMode.*; import static org.apache.ignite.cache.CacheMode.*; 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.*; /** * Byte values test for LOCAL cache. @@ -205,7 +205,7 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte * @param val Value. * @throws Exception If failed. */ - private void testTransaction(IgniteCache<Integer, Object> cache, IgniteTxConcurrency concurrency, + private void testTransaction(IgniteCache<Integer, Object> cache, TransactionConcurrency concurrency, Integer key, byte[] val) throws Exception { testTransactionMixed(cache, concurrency, key, val, null, null); } @@ -221,10 +221,10 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte * @param val2 Value 2. * @throws Exception If failed. */ - private void testTransactionMixed(IgniteCache<Integer, Object> cache, IgniteTxConcurrency concurrency, + private void testTransactionMixed(IgniteCache<Integer, Object> cache, TransactionConcurrency concurrency, Integer key1, byte[] val1, @Nullable Integer key2, @Nullable Object val2) throws Exception { - IgniteTx tx = ignite.transactions().txStart(concurrency, REPEATABLE_READ); + Transaction tx = ignite.transactions().txStart(concurrency, REPEATABLE_READ); try { cache.put(key1, val1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java index 6548781..6034288 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java @@ -28,8 +28,8 @@ import org.apache.ignite.transactions.*; import javax.cache.*; 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.*; /** * @@ -126,12 +126,12 @@ public class GridCacheLocalTxTimeoutSelfTest extends GridCommonAbstractTest { * @param isolation Isolation. * @throws IgniteCheckedException If test failed. */ - private void checkTransactionTimeout(IgniteTxConcurrency concurrency, - IgniteTxIsolation isolation) throws Exception { + private void checkTransactionTimeout(TransactionConcurrency concurrency, + TransactionIsolation isolation) throws Exception { boolean wasEx = false; - IgniteTx tx = null; + Transaction tx = null; try { IgniteCache<Integer, String> cache = ignite.jcache(null); @@ -147,7 +147,7 @@ public class GridCacheLocalTxTimeoutSelfTest extends GridCommonAbstractTest { tx.commit(); } catch (CacheException e) { - assertTrue(X.hasCause(e, IgniteTxTimeoutException.class)); + assertTrue(X.hasCause(e, TransactionTimeoutException.class)); info("Received expected optimistic exception: " + e.getMessage()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java index ca46228..f9aea39 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java @@ -46,8 +46,8 @@ import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.internal.processors.igfs.IgfsFileInfo.*; -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.*; /** * {@link IgfsAttributes} test case. @@ -503,7 +503,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { @Override public void run() { try { - try (IgniteTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ)) { metaCache.get(id); latch.await(); @@ -521,7 +521,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { // Now add file ID to trash listing so that delete worker could "see" it. - try (IgniteTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ)) { Map<String, IgfsListingEntry> listing = Collections.singletonMap(path.name(), new IgfsListingEntry(info)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java index 9b97b79..48a1171 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheAbstractLoadTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.loadtests.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.*; @@ -59,10 +58,10 @@ abstract class GridCacheAbstractLoadTest { protected final int operationsPerTx; /** Transaction isolation level. */ - protected final IgniteTxIsolation isolation; + protected final TransactionIsolation isolation; /** Transaction concurrency control. */ - protected final IgniteTxConcurrency concurrency; + protected final TransactionConcurrency concurrency; /** Threads count. */ protected final int threads; @@ -111,8 +110,8 @@ abstract class GridCacheAbstractLoadTest { tx = Boolean.valueOf(props.getProperty("transactions")); operationsPerTx = Integer.valueOf(props.getProperty("operations.per.tx")); - isolation = IgniteTxIsolation.valueOf(props.getProperty("isolation")); - concurrency = IgniteTxConcurrency.valueOf(props.getProperty("concurrency")); + isolation = TransactionIsolation.valueOf(props.getProperty("isolation")); + concurrency = TransactionConcurrency.valueOf(props.getProperty("concurrency")); threads = Integer.valueOf(props.getProperty("threads")); writeRatio = Double.valueOf(props.getProperty("write.ratio")); testDuration = Long.valueOf(props.getProperty("duration")); @@ -142,7 +141,7 @@ abstract class GridCacheAbstractLoadTest { while (!done.get()) { if (tx) { - try (IgniteTx tx = ignite.transactions().txStart()) { + try (Transaction tx = ignite.transactions().txStart()) { writeClos.apply(cache); tx.commit(); @@ -164,7 +163,7 @@ abstract class GridCacheAbstractLoadTest { while(!done.get()) { if (tx) { - try (IgniteTx tx = ignite.transactions().txStart()) { + try (Transaction tx = ignite.transactions().txStart()) { readClos.apply(cache); tx.commit(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java index 063b150..da677e1 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheDataStructuresLoadTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.loadtests.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.*; @@ -390,7 +389,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad while (!done.get()) { if (tx) { - try (IgniteTx tx = ignite.transactions().txStart()) { + try (Transaction tx = ignite.transactions().txStart()) { writeClos.apply(ignite); tx.commit(); @@ -412,7 +411,7 @@ public final class GridCacheDataStructuresLoadTest extends GridCacheAbstractLoad while(!done.get()) { if (tx) { - try (IgniteTx tx = ignite.transactions().txStart()) { + try (Transaction tx = ignite.transactions().txStart()) { readClos.apply(ignite); tx.commit(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java index 9605c60..1055102 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java @@ -32,8 +32,8 @@ import java.util.concurrent.*; 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.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** @@ -118,7 +118,7 @@ public class GridCachePartitionedAtomicLongLoadTest extends GridCommonAbstractTe long start = System.currentTimeMillis(); while (System.currentTimeMillis() - start < DURATION && !Thread.currentThread().isInterrupted()) { - IgniteTx tx = ignite.transactions().txStart(); + Transaction tx = ignite.transactions().txStart(); long seqVal = seq.incrementAndGet(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java index e6d30d0..89e2106 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java @@ -18,7 +18,6 @@ package org.apache.ignite.loadtests.dsi; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; @@ -258,7 +257,7 @@ public class GridDsiPerfJob extends ComputeJobAdapter { ses = new GridDsiSession(terminalId); try { - try (IgniteTx tx = ignite.transactions().txStart()) { + try (Transaction tx = ignite.transactions().txStart()) { GridDsiRequest req = new GridDsiRequest(getId()); req.setMessageId(getId()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java index f07c639..8682caa 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java @@ -61,7 +61,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object */ public void testStore() throws Exception { // Create dummy transaction - IgniteTx tx = new DummyTx(); + Transaction tx = new DummyTx(); ses.newSession(tx); @@ -93,7 +93,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object * @throws IgniteCheckedException if failed. */ public void testRollback() throws IgniteCheckedException { - IgniteTx tx = new DummyTx(); + Transaction tx = new DummyTx(); ses.newSession(tx); @@ -200,7 +200,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object * @param commit Commit. * @throws IgniteCheckedException If failed. */ - private void doTestAllOps(@Nullable IgniteTx tx, boolean commit) throws IgniteCheckedException { + private void doTestAllOps(@Nullable Transaction tx, boolean commit) throws IgniteCheckedException { try { ses.newSession(tx); @@ -302,7 +302,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object multithreaded(new Callable<Object>() { @Override public Object call() throws Exception { for (int i = 0; i < 1000; i++) { - IgniteTx tx = rnd.nextBoolean() ? new DummyTx() : null; + Transaction tx = rnd.nextBoolean() ? new DummyTx() : null; ses.newSession(tx); @@ -461,7 +461,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object /** * Dummy transaction for test purposes. */ - public static class DummyTx extends GridMetadataAwareAdapter implements IgniteTx { + public static class DummyTx extends GridMetadataAwareAdapter implements Transaction { /** */ private final IgniteUuid xid = IgniteUuid.randomUuid(); @@ -486,12 +486,12 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object } /** {@inheritDoc} */ - @Nullable @Override public IgniteTxIsolation isolation() { + @Nullable @Override public TransactionIsolation isolation() { return null; } /** {@inheritDoc} */ - @Nullable @Override public IgniteTxConcurrency concurrency() { + @Nullable @Override public TransactionConcurrency concurrency() { return null; } @@ -506,7 +506,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object } /** {@inheritDoc} */ - @Nullable @Override public IgniteTxState state() { + @Nullable @Override public TransactionState state() { return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestCacheSession.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestCacheSession.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestCacheSession.java index f2be178..cca20fe 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestCacheSession.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestCacheSession.java @@ -29,7 +29,7 @@ import java.util.*; */ public class TestCacheSession implements CacheStoreSession { /** */ - private IgniteTx tx; + private Transaction tx; /** */ private Map<Object, Object> props; @@ -38,14 +38,14 @@ public class TestCacheSession implements CacheStoreSession { * * @param tx Transaction. */ - public void newSession(@Nullable IgniteTx tx) { + public void newSession(@Nullable Transaction tx) { this.tx = tx; props = null; } /** {@inheritDoc} */ - @Nullable @Override public IgniteTx transaction() { + @Nullable @Override public Transaction transaction() { return tx; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestThreadLocalCacheSession.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestThreadLocalCacheSession.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestThreadLocalCacheSession.java index 91ccf71..6687f1f 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestThreadLocalCacheSession.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/TestThreadLocalCacheSession.java @@ -33,7 +33,7 @@ public class TestThreadLocalCacheSession implements CacheStoreSession { /** * @param tx Transaction. */ - public void newSession(@Nullable IgniteTx tx) { + public void newSession(@Nullable Transaction tx) { TestCacheSession ses = new TestCacheSession(); ses.newSession(tx); @@ -42,7 +42,7 @@ public class TestThreadLocalCacheSession implements CacheStoreSession { } /** {@inheritDoc} */ - @Nullable @Override public IgniteTx transaction() { + @Nullable @Override public Transaction transaction() { TestCacheSession ses = sesHolder.get(); return ses != null ? ses.transaction() : null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadWriteAccessStrategy.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadWriteAccessStrategy.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadWriteAccessStrategy.java index b764b5d..4694d03 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadWriteAccessStrategy.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/GridHibernateReadWriteAccessStrategy.java @@ -26,8 +26,8 @@ import org.hibernate.cache.spi.access.*; import java.util.*; -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.*; /** * Implementation of {@link AccessType#READ_WRITE} cache access strategy. @@ -203,7 +203,7 @@ public class GridHibernateReadWriteAccessStrategy extends GridHibernateAccessStr if (ctx.unlocked(key)) { // Finish transaction if last key is unlocked. txCtx.remove(); - IgniteTx tx = cache.tx(); + Transaction tx = cache.tx(); assert tx != null; @@ -228,7 +228,7 @@ public class GridHibernateReadWriteAccessStrategy extends GridHibernateAccessStr if (ctx != null) { txCtx.remove(); - IgniteTx tx = cache.tx(); + Transaction tx = cache.tx(); if (tx != null) tx.rollback(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java index 66ab5c2..87e8816 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java @@ -24,7 +24,7 @@ import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.resources.*; -import org.apache.ignite.transactions.*; +import org.apache.ignite.transactions.Transaction; import org.hibernate.*; import org.hibernate.cfg.*; import org.jetbrains.annotations.*; @@ -197,7 +197,7 @@ public class CacheHibernateBlobStore<K, V> extends CacheStoreAdapter<K, V> { @Override public V load(K key) { init(); - IgniteTx tx = transaction(); + Transaction tx = transaction(); if (log.isDebugEnabled()) log.debug("Store load [key=" + key + ", tx=" + tx + ']'); @@ -227,7 +227,7 @@ public class CacheHibernateBlobStore<K, V> extends CacheStoreAdapter<K, V> { @Override public void write(javax.cache.Cache.Entry<? extends K, ? extends V> entry) { init(); - IgniteTx tx = transaction(); + Transaction tx = transaction(); K key = entry.getKey(); V val = entry.getValue(); @@ -263,7 +263,7 @@ public class CacheHibernateBlobStore<K, V> extends CacheStoreAdapter<K, V> { @Override public void delete(Object key) { init(); - IgniteTx tx = transaction(); + Transaction tx = transaction(); if (log.isDebugEnabled()) log.debug("Store remove [key=" + key + ", tx=" + tx + ']'); @@ -292,11 +292,11 @@ public class CacheHibernateBlobStore<K, V> extends CacheStoreAdapter<K, V> { * @param ses Hibernate session. * @param tx Cache ongoing transaction. */ - private void rollback(SharedSessionContract ses, IgniteTx tx) { + private void rollback(SharedSessionContract ses, Transaction tx) { // Rollback only if there is no cache transaction, // otherwise txEnd() will do all required work. if (tx == null) { - Transaction hTx = ses.getTransaction(); + org.hibernate.Transaction hTx = ses.getTransaction(); if (hTx != null && hTx.isActive()) hTx.rollback(); @@ -309,11 +309,11 @@ public class CacheHibernateBlobStore<K, V> extends CacheStoreAdapter<K, V> { * @param ses Hibernate session. * @param tx Cache ongoing transaction. */ - private void end(Session ses, IgniteTx tx) { + private void end(Session ses, Transaction tx) { // Commit only if there is no cache transaction, // otherwise txEnd() will do all required work. if (tx == null) { - Transaction hTx = ses.getTransaction(); + org.hibernate.Transaction hTx = ses.getTransaction(); if (hTx != null && hTx.isActive()) hTx.commit(); @@ -326,14 +326,14 @@ public class CacheHibernateBlobStore<K, V> extends CacheStoreAdapter<K, V> { @Override public void txEnd(boolean commit) { init(); - IgniteTx tx = transaction(); + Transaction tx = transaction(); Map<String, Session> props = session().properties(); Session ses = props.remove(ATTR_SES); if (ses != null) { - Transaction hTx = ses.getTransaction(); + org.hibernate.Transaction hTx = ses.getTransaction(); if (hTx != null) { try { @@ -365,7 +365,7 @@ public class CacheHibernateBlobStore<K, V> extends CacheStoreAdapter<K, V> { * @param tx Cache transaction. * @return Session. */ - Session session(@Nullable IgniteTx tx) { + Session session(@Nullable Transaction tx) { Session ses; if (tx != null) { @@ -586,7 +586,7 @@ public class CacheHibernateBlobStore<K, V> extends CacheStoreAdapter<K, V> { /** * @return Current transaction. */ - @Nullable private IgniteTx transaction() { + @Nullable private Transaction transaction() { CacheStoreSession ses = session(); return ses != null ? ses.transaction() : null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java index 29752d0..11397f1 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -64,8 +63,8 @@ public class GridCachePartitionedHitsAndMissesSelfTest extends GridCommonAbstrac TransactionConfiguration tCfg = new TransactionConfiguration(); - tCfg.setDefaultTxConcurrency(IgniteTxConcurrency.PESSIMISTIC); - tCfg.setDefaultTxIsolation(IgniteTxIsolation.REPEATABLE_READ); + tCfg.setDefaultTxConcurrency(TransactionConcurrency.PESSIMISTIC); + tCfg.setDefaultTxIsolation(TransactionIsolation.REPEATABLE_READ); cfg.setTransactionConfiguration(tCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java index ae331d3..1ec087e 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java @@ -186,7 +186,7 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf public void testLocalQuery() throws Exception { cache1.clear(); - IgniteTx tx = cache1.txStart(); + Transaction tx = cache1.txStart(); try { cache1.put(new CacheKey(1), new CacheValue("1")); @@ -228,7 +228,7 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf ignite2.events().localListen(lsnr, EventType.EVT_CACHE_OBJECT_PUT); ignite3.events().localListen(lsnr, EventType.EVT_CACHE_OBJECT_PUT); - IgniteTx tx = cache1.txStart(); + Transaction tx = cache1.txStart(); try { for (int i = 1; i <= keyCnt; i++) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/GridCacheXAResource.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/GridCacheXAResource.java b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/GridCacheXAResource.java index 749a237..690b251 100644 --- a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/GridCacheXAResource.java +++ b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/GridCacheXAResource.java @@ -26,7 +26,7 @@ import org.apache.ignite.transactions.*; import javax.transaction.xa.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.transactions.IgniteTxState.*; +import static org.apache.ignite.transactions.TransactionState.*; /** * Cache XA resource implementation. @@ -236,7 +236,7 @@ public final class GridCacheXAResource implements XAResource { * @return {@code true} if jta was already committed or rolled back. */ public boolean isFinished() { - IgniteTxState state = cacheTx.state(); + TransactionState state = cacheTx.state(); return state == COMMITTED || state == ROLLED_BACK; }
