Repository: incubator-ignite Updated Branches: refs/heads/ignite-tx-rename 494e6ddef -> 0b5390336
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java index c211cd5..0154372 100644 --- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java +++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheJtaSelfTest.java @@ -22,13 +22,13 @@ import org.apache.ignite.cache.*; import org.apache.ignite.cache.jta.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; -import org.apache.ignite.transactions.*; +import org.apache.ignite.transactions.Transaction; import org.objectweb.jotm.*; import javax.transaction.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.transactions.IgniteTxState.*; +import static org.apache.ignite.transactions.TransactionState.*; /** * Abstract class for cache tests. @@ -118,7 +118,7 @@ public class GridCacheJtaSelfTest extends GridCacheAbstractSelfTest { assert cache.getAndPut("key", 1) == null; - IgniteTx tx = ignite(0).transactions().tx(); + Transaction tx = ignite(0).transactions().tx(); assert tx != null; assert tx.state() == ACTIVE; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/web/src/main/java/org/apache/ignite/cache/websession/IgniteWebSessionFilter.java ---------------------------------------------------------------------- diff --git a/modules/web/src/main/java/org/apache/ignite/cache/websession/IgniteWebSessionFilter.java b/modules/web/src/main/java/org/apache/ignite/cache/websession/IgniteWebSessionFilter.java index 107adc0..aead242 100644 --- a/modules/web/src/main/java/org/apache/ignite/cache/websession/IgniteWebSessionFilter.java +++ b/modules/web/src/main/java/org/apache/ignite/cache/websession/IgniteWebSessionFilter.java @@ -36,8 +36,8 @@ import static java.util.concurrent.TimeUnit.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; 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.*; /** * Filter for web sessions caching. @@ -287,7 +287,7 @@ public class IgniteWebSessionFilter implements Filter { try { if (txEnabled) { - try (IgniteTx tx = txs.txStart(PESSIMISTIC, REPEATABLE_READ)) { + try (Transaction tx = txs.txStart(PESSIMISTIC, REPEATABLE_READ)) { sesId = doFilter0(httpReq, res, chain); tx.commit(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java index 72d7013..e8060e3 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java @@ -52,11 +52,11 @@ public class IgniteBenchmarkArguments { /** */ @Parameter(names = {"-txc", "--txConcurrency"}, description = "Transaction concurrency") - private IgniteTxConcurrency txConcurrency = IgniteTxConcurrency.OPTIMISTIC; + private TransactionConcurrency txConcurrency = TransactionConcurrency.OPTIMISTIC; /** */ @Parameter(names = {"-txi", "--txIsolation"}, description = "Transaction isolation") - private IgniteTxIsolation txIsolation = IgniteTxIsolation.REPEATABLE_READ; + private TransactionIsolation txIsolation = TransactionIsolation.REPEATABLE_READ; /** */ @Parameter(names = {"-ot", "--offheapTiered"}, description = "Tiered offheap") @@ -97,14 +97,14 @@ public class IgniteBenchmarkArguments { /** * @return Transaction concurrency. */ - public IgniteTxConcurrency txConcurrency() { + public TransactionConcurrency txConcurrency() { return txConcurrency; } /** * @return Transaction isolation. */ - public IgniteTxIsolation txIsolation() { + public TransactionIsolation txIsolation() { return txIsolation; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxBenchmark.java index 206dabc..f8276bd 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxBenchmark.java @@ -31,7 +31,7 @@ public class IgnitePutGetTxBenchmark extends IgniteCacheAbstractBenchmark { @Override public boolean test(Map<Object, Object> ctx) throws Exception { int key = nextRandom(0, args.range() / 2); - try (IgniteTx tx = ignite().transactions().txStart()) { + try (Transaction tx = ignite().transactions().txStart()) { Object val = cache.get(key); if (val != null)
