http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java index 4ec2dc5..cf7dc99 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java @@ -197,7 +197,7 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * This method will return {@code true} if value is stored in cache and {@code false} otherwise. * <p> * If write-through is enabled, the stored value will be persisted to {@link CacheStore} - * via {@link CacheStore#put(IgniteTx, Object, Object)} method. + * via {@link CacheStore#put(Transaction, Object, Object)} method. * <h2 class="header">Transactions</h2> * This method is transactional and will enlist the entry into ongoing transaction * if there is one. @@ -222,7 +222,7 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * This method will return {@code true} if value is stored in cache and {@code false} otherwise. * <p> * If write-through is enabled, the stored value will be persisted to {@link CacheStore} - * via {@link CacheStore#put(IgniteTx, Object, Object)} method. + * via {@link CacheStore#put(Transaction, Object, Object)} method. * <h2 class="header">Transactions</h2> * This method is transactional and will enlist the entry into ongoing transaction * if there is one. @@ -244,7 +244,7 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * Removes given key mapping from cache if one exists and value is equal to the passed in value. * <p> * If write-through is enabled, the value will be removed from {@link CacheStore} - * via {@link CacheStore#remove(IgniteTx, Object)} method. + * via {@link CacheStore#remove(Transaction, Object)} method. * <h2 class="header">Transactions</h2> * This method is transactional and will enlist the entry into ongoing transaction * if there is one. @@ -268,7 +268,7 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * provided filters have passed and there was something to remove, {@code false} otherwise. * <p> * If write-through is enabled, the value will be removed from {@link CacheStore} - * via {@link CacheStore#remove(IgniteTx, Object)} method. + * via {@link CacheStore#remove(Transaction, Object)} method. * <h2 class="header">Transactions</h2> * This method is transactional and will enlist the entry into ongoing transaction * if there is one.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java index 254fcae..eb854d5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java @@ -1279,28 +1279,28 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteTx txStart() throws IllegalStateException { + @Override public Transaction txStart() throws IllegalStateException { return cache.txStart(); } /** {@inheritDoc} */ - @Override public IgniteInternalTx txStartEx(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) { + @Override public IgniteInternalTx txStartEx(TransactionConcurrency concurrency, TransactionIsolation isolation) { return cache.txStartEx(concurrency, isolation); } /** {@inheritDoc} */ - @Override public IgniteTx txStart(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) { + @Override public Transaction txStart(TransactionConcurrency concurrency, TransactionIsolation isolation) { return cache.txStart(concurrency, isolation); } /** {@inheritDoc} */ - @Override public IgniteTx txStart(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, + @Override public Transaction txStart(TransactionConcurrency concurrency, TransactionIsolation isolation, long timeout, int txSize) { return cache.txStart(concurrency, isolation, timeout, txSize); } /** {@inheritDoc} */ - @Override public IgniteTx tx() { + @Override public Transaction tx() { return cache.tx(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java index 0cb01e3..2a653af 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java @@ -153,7 +153,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public void txSynchronize(@Nullable IgniteTxSynchronization syncs) { + @Override public void txSynchronize(@Nullable TransactionSynchronization syncs) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -165,7 +165,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public void txUnsynchronize(@Nullable IgniteTxSynchronization syncs) { + @Override public void txUnsynchronize(@Nullable TransactionSynchronization syncs) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -177,7 +177,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public Collection<IgniteTxSynchronization> txSynchronizations() { + @Override public Collection<TransactionSynchronization> txSynchronizations() { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1143,7 +1143,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteTx txStart() throws IllegalStateException { + @Override public Transaction txStart() throws IllegalStateException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1155,7 +1155,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteInternalTx txStartEx(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) { + @Override public IgniteInternalTx txStartEx(TransactionConcurrency concurrency, TransactionIsolation isolation) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1167,7 +1167,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteTx txStart(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) { + @Override public Transaction txStart(TransactionConcurrency concurrency, TransactionIsolation isolation) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1180,7 +1180,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteTx txStart(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, + @Override public Transaction txStart(TransactionConcurrency concurrency, TransactionIsolation isolation, long timeout, int txSize) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -1193,7 +1193,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteTx tx() { + @Override public Transaction tx() { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java index ab4e0ac..6b17038 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java @@ -71,7 +71,7 @@ public class GridCacheSharedContext<K, V> { private Map<Integer, GridCacheContext<K, V>> ctxMap; /** Tx metrics. */ - private volatile IgniteTxMetricsAdapter txMetrics; + private volatile TransactionMetricsAdapter txMetrics; /** Preloaders start future. */ private IgniteInternalFuture<Object> preloadersStartFut; @@ -98,7 +98,7 @@ public class GridCacheSharedContext<K, V> { this.exchMgr = add(exchMgr); this.ioMgr = add(ioMgr); - txMetrics = new IgniteTxMetricsAdapter(); + txMetrics = new TransactionMetricsAdapter(); ctxMap = new HashMap<>(); } @@ -226,7 +226,7 @@ public class GridCacheSharedContext<K, V> { /** * @return Transactional metrics adapter. */ - public IgniteTxMetricsAdapter txMetrics() { + public TransactionMetricsAdapter txMetrics() { return txMetrics; } @@ -234,7 +234,7 @@ public class GridCacheSharedContext<K, V> { * Resets tx metrics. */ public void resetTxMetrics() { - txMetrics = new IgniteTxMetricsAdapter(); + txMetrics = new TransactionMetricsAdapter(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java index b067f20..5a17b4f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java @@ -841,7 +841,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> { /** * @return Transaction. */ - @Nullable private IgniteTx transaction() { + @Nullable private Transaction transaction() { return tx != null ? tx.proxy() : null; } @@ -890,7 +890,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> { } /** {@inheritDoc} */ - @Nullable @Override public IgniteTx transaction() { + @Nullable @Override public Transaction transaction() { SessionData ses0 = sesHolder.get(); return ses0 != null ? ses0.transaction() : null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java index 79b6ae7..a3a5b20 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java @@ -1201,7 +1201,7 @@ public class GridCacheUtils { * @return New transaction. */ public static IgniteInternalTx txStartInternal(GridCacheContext ctx, CacheProjection prj, - IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) { + TransactionConcurrency concurrency, TransactionIsolation isolation) { assert ctx != null; assert prj != null; @@ -1622,8 +1622,8 @@ public class GridCacheUtils { * @param clo Closure. * @throws IgniteCheckedException If failed. */ - public static <K, V> void inTx(CacheProjection<K, V> cache, IgniteTxConcurrency concurrency, - IgniteTxIsolation isolation, IgniteInClosureX<CacheProjection<K ,V>> clo) throws IgniteCheckedException { + public static <K, V> void inTx(CacheProjection<K, V> cache, TransactionConcurrency concurrency, + TransactionIsolation isolation, IgniteInClosureX<CacheProjection<K ,V>> clo) throws IgniteCheckedException { try (IgniteInternalTx tx = cache.txStartEx(concurrency, isolation);) { clo.applyx(cache); @@ -1641,10 +1641,10 @@ public class GridCacheUtils { * @param clo Closure. * @throws IgniteCheckedException If failed. */ - public static <K, V> void inTx(Ignite ignite, IgniteCache<K, V> cache, IgniteTxConcurrency concurrency, - IgniteTxIsolation isolation, IgniteInClosureX<IgniteCache<K ,V>> clo) throws IgniteCheckedException { + public static <K, V> void inTx(Ignite ignite, IgniteCache<K, V> cache, TransactionConcurrency concurrency, + TransactionIsolation isolation, IgniteInClosureX<IgniteCache<K ,V>> clo) throws IgniteCheckedException { - try (IgniteTx tx = ignite.transactions().txStart(concurrency, isolation)) { + try (Transaction tx = ignite.transactions().txStart(concurrency, isolation)) { clo.applyx(cache); tx.commit(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java index d647371..8c73cee 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java @@ -79,7 +79,7 @@ public abstract class GridDistributedCacheAdapter<K, V> extends GridCacheAdapter IgniteTxLocalEx<K, V> tx, boolean isRead, boolean retval, - IgniteTxIsolation isolation, + TransactionIsolation isolation, boolean isInvalidate, long accessTtl, IgnitePredicate<Cache.Entry<K, V>>[] filter @@ -116,7 +116,7 @@ public abstract class GridDistributedCacheAdapter<K, V> extends GridCacheAdapter boolean isInvalidate, boolean isRead, boolean retval, - @Nullable IgniteTxIsolation isolation, + @Nullable TransactionIsolation isolation, long accessTtl, IgnitePredicate<Cache.Entry<K, V>>[] filter); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java index cacc4e6..576941f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java @@ -64,7 +64,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage private boolean isRead; /** Transaction isolation. */ - private IgniteTxIsolation isolation; + private TransactionIsolation isolation; /** Key bytes for keys to lock. */ @GridDirectCollection(byte[].class) @@ -128,7 +128,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage GridCacheVersion lockVer, boolean isInTx, boolean isRead, - IgniteTxIsolation isolation, + TransactionIsolation isolation, boolean isInvalidate, long timeout, int keyCnt, @@ -228,7 +228,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage /** * @return Transaction isolation or <tt>null</tt> if not in transaction. */ - public IgniteTxIsolation isolation() { + public TransactionIsolation isolation() { return isolation; } @@ -505,7 +505,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage if (!reader.isLastRead()) return false; - isolation = IgniteTxIsolation.fromOrdinal(isolationOrd); + isolation = TransactionIsolation.fromOrdinal(isolationOrd); readState++; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java index 196a178..2de6088 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java @@ -46,11 +46,11 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe /** Transaction concurrency. */ @GridToStringInclude - private IgniteTxConcurrency concurrency; + private TransactionConcurrency concurrency; /** Transaction isolation. */ @GridToStringInclude - private IgniteTxIsolation isolation; + private TransactionIsolation isolation; /** Commit version for EC transactions. */ @GridToStringInclude @@ -224,14 +224,14 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe /** * @return Concurrency. */ - public IgniteTxConcurrency concurrency() { + public TransactionConcurrency concurrency() { return concurrency; } /** * @return Isolation level. */ - public IgniteTxIsolation isolation() { + public TransactionIsolation isolation() { return isolation; } @@ -540,7 +540,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe if (!reader.isLastRead()) return false; - concurrency = IgniteTxConcurrency.fromOrdinal(concurrencyOrd); + concurrency = TransactionConcurrency.fromOrdinal(concurrencyOrd); readState++; @@ -576,7 +576,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe if (!reader.isLastRead()) return false; - isolation = IgniteTxIsolation.fromOrdinal(isolationOrd); + isolation = TransactionIsolation.fromOrdinal(isolationOrd); readState++; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java index b6f814a..0513cc7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java @@ -40,7 +40,7 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*; import static org.apache.ignite.internal.processors.dr.GridDrType.*; -import static org.apache.ignite.transactions.IgniteTxState.*; +import static org.apache.ignite.transactions.TransactionState.*; /** * Transaction created by system implicitly on remote nodes. @@ -104,8 +104,8 @@ public class GridDistributedTxRemoteAdapter<K, V> extends IgniteTxAdapter<K, V> GridCacheVersion xidVer, GridCacheVersion commitVer, boolean sys, - IgniteTxConcurrency concurrency, - IgniteTxIsolation isolation, + TransactionConcurrency concurrency, + TransactionIsolation isolation, boolean invalidate, long timeout, int txSize, @@ -689,7 +689,7 @@ public class GridDistributedTxRemoteAdapter<K, V> extends IgniteTxAdapter<K, V> state(PREPARED); if (!state(COMMITTING)) { - IgniteTxState state = state(); + TransactionState state = state(); // If other thread is doing commit, then no-op. if (state == COMMITTING || state == COMMITTED) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java index 9ff2ca5..dba5ed2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java @@ -315,7 +315,7 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo /** * @return Transaction isolation or {@code null} if no transaction. */ - @Nullable private IgniteTxIsolation isolation() { + @Nullable private TransactionIsolation isolation() { return tx == null ? null : tx.isolation(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java index 5f7fb97..3022efa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java @@ -123,7 +123,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { long topVer, boolean isInTx, boolean isRead, - IgniteTxIsolation isolation, + TransactionIsolation isolation, boolean isInvalidate, long timeout, int dhtCnt, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java index 6834f13..753f7e9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java @@ -43,8 +43,8 @@ import java.util.*; import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*; import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxState.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionState.*; /** * Base class for transactional DHT caches. @@ -552,7 +552,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach boolean isInvalidate, boolean isRead, boolean retval, - IgniteTxIsolation isolation, + TransactionIsolation isolation, long accessTtl, IgnitePredicate<Cache.Entry<K, V>>[] filter) { return lockAllAsyncInternal( @@ -587,7 +587,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach boolean isInvalidate, boolean isRead, boolean retval, - IgniteTxIsolation isolation, + TransactionIsolation isolation, long accessTtl, IgnitePredicate<Cache.Entry<K, V>>[] filter) { if (keys == null || keys.isEmpty()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java index 793066a..7dac17b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java @@ -37,7 +37,7 @@ import java.io.*; import java.util.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.transactions.IgniteTxState.*; +import static org.apache.ignite.transactions.TransactionState.*; /** * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java index b1be2b6..ff75d86 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java @@ -43,7 +43,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest private UUID nearNodeId; /** Transaction isolation. */ - private IgniteTxIsolation isolation; + private TransactionIsolation isolation; /** Mini future ID. */ private IgniteUuid miniId; @@ -107,7 +107,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest GridCacheVersion xidVer, GridCacheVersion commitVer, long threadId, - IgniteTxIsolation isolation, + TransactionIsolation isolation, boolean commit, boolean invalidate, boolean sys, @@ -169,7 +169,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest /** * @return Transaction isolation. */ - public IgniteTxIsolation isolation() { + public TransactionIsolation isolation() { return isolation; } @@ -313,7 +313,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest if (!reader.isLastRead()) return false; - isolation = IgniteTxIsolation.fromOrdinal(isolationOrd); + isolation = TransactionIsolation.fromOrdinal(isolationOrd); readState++; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java index 1e2a222..6aa159c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java @@ -37,9 +37,8 @@ import java.io.*; import java.util.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*; -import static org.apache.ignite.transactions.IgniteTxState.*; +import static org.apache.ignite.transactions.TransactionState.*; /** * Replicated user transaction. @@ -106,8 +105,8 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements boolean implicit, boolean implicitSingle, boolean sys, - IgniteTxConcurrency concurrency, - IgniteTxIsolation isolation, + TransactionConcurrency concurrency, + TransactionIsolation isolation, long timeout, boolean invalidate, boolean storeEnabled, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java index a862854..aab5680 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java @@ -40,7 +40,7 @@ import java.util.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*; -import static org.apache.ignite.transactions.IgniteTxState.*; +import static org.apache.ignite.transactions.TransactionState.*; /** * Replicated user transaction. @@ -95,8 +95,8 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends IgniteTxLocalAdapter<K boolean implicit, boolean implicitSingle, boolean sys, - IgniteTxConcurrency concurrency, - IgniteTxIsolation isolation, + TransactionConcurrency concurrency, + TransactionIsolation isolation, long timeout, boolean invalidate, boolean storeEnabled, @@ -428,7 +428,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends IgniteTxLocalAdapter<K @Nullable public IgniteInternalFuture<Boolean> addEntry(long msgId, IgniteTxEntry<K, V> e) throws IgniteCheckedException { init(); - IgniteTxState state = state(); + TransactionState state = state(); assert state == PREPARING : "Invalid tx state for " + "adding entry [msgId=" + msgId + ", e=" + e + ", tx=" + this + ']'; @@ -743,7 +743,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends IgniteTxLocalAdapter<K if (commit) { if (!state(COMMITTING)) { - IgniteTxState state = state(); + TransactionState state = state(); if (state != COMMITTING && state != COMMITTED) throw new IgniteCheckedException("Invalid transaction state for commit [state=" + state() + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java index 237c2a7..c6e91a3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java @@ -42,7 +42,7 @@ import java.util.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*; -import static org.apache.ignite.transactions.IgniteTxState.*; +import static org.apache.ignite.transactions.TransactionState.*; import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java index 8474955..506888b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java @@ -89,8 +89,8 @@ public class GridDhtTxRemote<K, V> extends GridDistributedTxRemoteAdapter<K, V> GridCacheVersion xidVer, GridCacheVersion commitVer, boolean sys, - IgniteTxConcurrency concurrency, - IgniteTxIsolation isolation, + TransactionConcurrency concurrency, + TransactionIsolation isolation, boolean invalidate, long timeout, int txSize, @@ -149,8 +149,8 @@ public class GridDhtTxRemote<K, V> extends GridDistributedTxRemoteAdapter<K, V> GridCacheVersion xidVer, GridCacheVersion commitVer, boolean sys, - IgniteTxConcurrency concurrency, - IgniteTxIsolation isolation, + TransactionConcurrency concurrency, + TransactionIsolation isolation, boolean invalidate, long timeout, int txSize, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index e0abcf2..2a8a2c7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -601,7 +601,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { boolean isInvalidate, boolean isRead, boolean retval, - @Nullable IgniteTxIsolation isolation, + @Nullable TransactionIsolation isolation, long accessTtl, IgnitePredicate<Cache.Entry<K, V>>[] filter) { return new FinishedLockFuture(new UnsupportedOperationException("Locks are not supported for " + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java index 9d44cda..a59b6aa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java @@ -363,7 +363,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte boolean isInvalidate, boolean isRead, boolean retval, - @Nullable IgniteTxIsolation isolation, + @Nullable TransactionIsolation isolation, long accessTtl, IgnitePredicate<Cache.Entry<K, V>>[] filter ) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java index 265ffe6..21f6364 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java @@ -244,7 +244,7 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity /** * @return Transaction isolation or {@code null} if no transaction. */ - @Nullable private IgniteTxIsolation isolation() { + @Nullable private TransactionIsolation isolation() { return tx == null ? null : tx.isolation(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java index aed161b..f409e94 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java @@ -661,7 +661,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { boolean isInvalidate, boolean isRead, boolean retval, - @Nullable IgniteTxIsolation isolation, + @Nullable TransactionIsolation isolation, long accessTtl, IgnitePredicate<Cache.Entry<K, V>>[] filter) { return dht.lockAllAsync(keys, timeout, filter); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java index 8cd19c4..3ae2fc6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java @@ -40,7 +40,7 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.IgniteSystemProperties.*; import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java index 3e10040..210772d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java @@ -266,7 +266,7 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B /** * @return Transaction isolation or {@code null} if no transaction. */ - @Nullable private IgniteTxIsolation isolation() { + @Nullable private TransactionIsolation isolation() { return tx == null ? null : tx.isolation(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java index 345da10..f640815 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java @@ -124,7 +124,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> boolean implicitTx, boolean implicitSingleTx, boolean isRead, - IgniteTxIsolation isolation, + TransactionIsolation isolation, boolean isInvalidate, long timeout, int keyCnt, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java index aff0f82..d6ec9dd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java @@ -39,7 +39,7 @@ import java.io.*; import java.util.*; import static org.apache.ignite.internal.processors.cache.CacheFlag.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; /** * Near cache for transactional cache. @@ -414,7 +414,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> boolean isInvalidate, boolean isRead, boolean retval, - IgniteTxIsolation isolation, + TransactionIsolation isolation, long accessTtl, IgnitePredicate<Cache.Entry<K, V>>[] filter ) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java index dbb17d8..f3811c6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java @@ -38,9 +38,8 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*; -import static org.apache.ignite.transactions.IgniteTxState.*; +import static org.apache.ignite.transactions.TransactionState.*; /** * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java index d5faab6..06e4767 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java @@ -44,7 +44,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; -import static org.apache.ignite.transactions.IgniteTxState.*; +import static org.apache.ignite.transactions.TransactionState.*; /** * Replicated user transaction. @@ -113,8 +113,8 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { boolean implicit, boolean implicitSingle, boolean sys, - IgniteTxConcurrency concurrency, - IgniteTxIsolation isolation, + TransactionConcurrency concurrency, + TransactionIsolation isolation, long timeout, boolean invalidate, boolean storeEnabled, @@ -614,7 +614,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { if (commit) { if (!state(COMMITTING)) { - IgniteTxState state = state(); + TransactionState state = state(); if (state != COMMITTING && state != COMMITTED) throw new IgniteCheckedException("Invalid transaction state for commit [state=" + state() + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java index 6808ee0..a94ffba 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java @@ -46,7 +46,7 @@ import java.util.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*; -import static org.apache.ignite.transactions.IgniteTxState.*; +import static org.apache.ignite.transactions.TransactionState.*; /** * @@ -346,7 +346,7 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut prepare0(); } - catch (IgniteTxTimeoutException | IgniteTxOptimisticException e) { + catch (TransactionTimeoutException | TransactionOptimisticException e) { onError(cctx.localNodeId(), null, e); } catch (IgniteCheckedException e) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxRemote.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxRemote.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxRemote.java index 5a9fdb1..5f9a0b7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxRemote.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxRemote.java @@ -92,8 +92,8 @@ public class GridNearTxRemote<K, V> extends GridDistributedTxRemoteAdapter<K, V> GridCacheVersion xidVer, GridCacheVersion commitVer, boolean sys, - IgniteTxConcurrency concurrency, - IgniteTxIsolation isolation, + TransactionConcurrency concurrency, + TransactionIsolation isolation, boolean invalidate, long timeout, Collection<IgniteTxEntry<K, V>> writeEntries, @@ -149,8 +149,8 @@ public class GridNearTxRemote<K, V> extends GridDistributedTxRemoteAdapter<K, V> GridCacheVersion xidVer, GridCacheVersion commitVer, boolean sys, - IgniteTxConcurrency concurrency, - IgniteTxIsolation isolation, + TransactionConcurrency concurrency, + TransactionIsolation isolation, boolean invalidate, long timeout, int txSize, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java index dc3dabe..53b216c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java @@ -102,7 +102,7 @@ public class GridLocalCache<K, V> extends GridCacheAdapter<K, V> { IgniteTxLocalEx<K, V> tx, boolean isRead, boolean retval, - IgniteTxIsolation isolation, + TransactionIsolation isolation, boolean invalidate, long accessTtl, IgnitePredicate<Cache.Entry<K, V>>[] filter) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalTx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalTx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalTx.java index e8a3b44..6727f7e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalTx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalTx.java @@ -30,7 +30,7 @@ import java.io.*; import java.util.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.transactions.IgniteTxState.*; +import static org.apache.ignite.transactions.TransactionState.*; /** * Local cache transaction. @@ -62,8 +62,8 @@ class GridLocalTx<K, V> extends IgniteTxLocalAdapter<K, V> { GridCacheSharedContext<K, V> ctx, boolean implicit, boolean implicitSingle, - IgniteTxConcurrency concurrency, - IgniteTxIsolation isolation, + TransactionConcurrency concurrency, + TransactionIsolation isolation, long timeout, int txSize, @Nullable UUID subjId, @@ -83,7 +83,7 @@ class GridLocalTx<K, V> extends IgniteTxLocalAdapter<K, V> { /** {@inheritDoc} */ @Override public void prepare() throws IgniteCheckedException { if (!state(PREPARING)) { - IgniteTxState state = state(); + TransactionState state = state(); // If other thread is doing "prepare", then no-op. if (state == PREPARING || state == PREPARED || state == COMMITTING || state == COMMITTED) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalTxFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalTxFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalTxFuture.java index fb87fad..66a5eb2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalTxFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalTxFuture.java @@ -32,7 +32,7 @@ import java.io.*; import java.util.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.transactions.IgniteTxState.*; +import static org.apache.ignite.transactions.TransactionState.*; /** * Replicated cache transaction future. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java index d6d2a97..2d81681 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java @@ -1491,7 +1491,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { IgniteTxLocalEx<K, V> tx, boolean isRead, boolean retval, - IgniteTxIsolation isolation, + TransactionIsolation isolation, boolean invalidate, long accessTtl, IgnitePredicate<Cache.Entry<K, V>>[] filter) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java index 9a086cd..a06a558 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java @@ -87,14 +87,14 @@ public interface IgniteInternalTx<K, V> extends AutoCloseable, GridTimeoutObject * * @return Isolation level. */ - public IgniteTxIsolation isolation(); + public TransactionIsolation isolation(); /** * Cache transaction concurrency mode. * * @return Concurrency mode. */ - public IgniteTxConcurrency concurrency(); + public TransactionConcurrency concurrency(); /** * Flag indicating whether transaction was started automatically by the @@ -124,7 +124,7 @@ public interface IgniteInternalTx<K, V> extends AutoCloseable, GridTimeoutObject * * @return Current transaction state. */ - public IgniteTxState state(); + public TransactionState state(); /** * Gets timeout value in milliseconds for this transaction. If transaction times @@ -572,7 +572,7 @@ public interface IgniteInternalTx<K, V> extends AutoCloseable, GridTimeoutObject * @param state Transaction state. * @return {@code True} if transition was valid, {@code false} otherwise. */ - public boolean state(IgniteTxState state); + public boolean state(TransactionState state); /** * @param invalidate Invalidate flag. @@ -701,5 +701,5 @@ public interface IgniteInternalTx<K, V> extends AutoCloseable, GridTimeoutObject /** * @return Public API proxy. */ - public IgniteTxProxy proxy(); + public TransactionProxy proxy(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java index 411976d..19b8a78 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java @@ -24,7 +24,7 @@ import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.transactions.*; import org.jetbrains.annotations.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Grid transactions implementation. @@ -41,7 +41,7 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx { } /** {@inheritDoc} */ - @Override public IgniteTx txStart() throws IllegalStateException { + @Override public Transaction txStart() throws IllegalStateException { TransactionConfiguration cfg = cctx.gridConfig().getTransactionConfiguration(); return txStart0( @@ -54,7 +54,7 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx { } /** {@inheritDoc} */ - @Override public IgniteTx txStart(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) { + @Override public Transaction txStart(TransactionConcurrency concurrency, TransactionIsolation isolation) { A.notNull(concurrency, "concurrency"); A.notNull(isolation, "isolation"); @@ -70,7 +70,7 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx { } /** {@inheritDoc} */ - @Override public IgniteTx txStart(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, + @Override public Transaction txStart(TransactionConcurrency concurrency, TransactionIsolation isolation, long timeout, int txSize) { A.notNull(concurrency, "concurrency"); A.notNull(isolation, "isolation"); @@ -89,8 +89,8 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx { /** {@inheritDoc} */ @Override public IgniteInternalTx txStartEx( GridCacheContext ctx, - IgniteTxConcurrency concurrency, - IgniteTxIsolation isolation, + TransactionConcurrency concurrency, + TransactionIsolation isolation, long timeout, int txSize) { @@ -109,8 +109,8 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx { /** {@inheritDoc} */ @Override public IgniteInternalTx txStartEx( GridCacheContext ctx, - IgniteTxConcurrency concurrency, - IgniteTxIsolation isolation) + TransactionConcurrency concurrency, + TransactionIsolation isolation) { A.notNull(concurrency, "concurrency"); A.notNull(isolation, "isolation"); @@ -125,7 +125,7 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx { } /** {@inheritDoc} */ - @Override public IgniteTx txStartSystem(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, + @Override public Transaction txStartSystem(TransactionConcurrency concurrency, TransactionIsolation isolation, long timeout, int txSize) { A.notNull(concurrency, "concurrency"); A.notNull(isolation, "isolation"); @@ -149,7 +149,7 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx { * @param sys System flag. * @return Transaction. */ - private IgniteInternalTx txStart0(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, + private IgniteInternalTx txStart0(TransactionConcurrency concurrency, TransactionIsolation isolation, long timeout, int txSize, boolean sys) { TransactionConfiguration cfg = cctx.gridConfig().getTransactionConfiguration(); @@ -183,14 +183,14 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx { } /** {@inheritDoc} */ - @Nullable @Override public IgniteTx tx() { + @Nullable @Override public Transaction tx() { IgniteInternalTx tx = cctx.tm().userTx(); return tx != null ? tx.proxy() : null; } /** {@inheritDoc} */ - @Override public IgniteTxMetrics metrics() { + @Override public TransactionMetrics metrics() { return cctx.txMetrics(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java index 9bf50bb..62d4e3b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java @@ -46,9 +46,9 @@ import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*; import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; -import static org.apache.ignite.transactions.IgniteTxState.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; +import static org.apache.ignite.transactions.TransactionState.*; /** * Managed transaction adapter. @@ -113,11 +113,11 @@ public abstract class IgniteTxAdapter<K, V> extends GridMetadataAwareAdapter /** Isolation. */ @GridToStringInclude - protected IgniteTxIsolation isolation = READ_COMMITTED; + protected TransactionIsolation isolation = READ_COMMITTED; /** Concurrency. */ @GridToStringInclude - protected IgniteTxConcurrency concurrency = PESSIMISTIC; + protected TransactionConcurrency concurrency = PESSIMISTIC; /** Transaction timeout. */ @GridToStringInclude @@ -164,11 +164,11 @@ public abstract class IgniteTxAdapter<K, V> extends GridMetadataAwareAdapter /** * Transaction state. Note that state is not protected, as we want to - * always use {@link #state()} and {@link #state(IgniteTxState)} + * always use {@link #state()} and {@link #state(TransactionState)} * methods. */ @GridToStringInclude - private volatile IgniteTxState state = ACTIVE; + private volatile TransactionState state = ACTIVE; /** Timed out flag. */ private volatile boolean timedOut; @@ -209,7 +209,7 @@ public abstract class IgniteTxAdapter<K, V> extends GridMetadataAwareAdapter /** */ @GridToStringExclude - private IgniteTxProxyImpl proxy; + private TransactionProxyImpl proxy; /** * Empty constructor required for {@link Externalizable}. @@ -238,8 +238,8 @@ public abstract class IgniteTxAdapter<K, V> extends GridMetadataAwareAdapter boolean implicitSingle, boolean loc, boolean sys, - IgniteTxConcurrency concurrency, - IgniteTxIsolation isolation, + TransactionConcurrency concurrency, + TransactionIsolation isolation, long timeout, boolean invalidate, boolean storeEnabled, @@ -296,8 +296,8 @@ public abstract class IgniteTxAdapter<K, V> extends GridMetadataAwareAdapter GridCacheVersion startVer, long threadId, boolean sys, - IgniteTxConcurrency concurrency, - IgniteTxIsolation isolation, + TransactionConcurrency concurrency, + TransactionIsolation isolation, long timeout, int txSize, @Nullable IgniteTxKey grpLockKey, @@ -733,12 +733,12 @@ public abstract class IgniteTxAdapter<K, V> extends GridMetadataAwareAdapter } /** {@inheritDoc} */ - @Override public IgniteTxIsolation isolation() { + @Override public TransactionIsolation isolation() { return isolation; } /** {@inheritDoc} */ - @Override public IgniteTxConcurrency concurrency() { + @Override public TransactionConcurrency concurrency() { return concurrency; } @@ -798,7 +798,7 @@ public abstract class IgniteTxAdapter<K, V> extends GridMetadataAwareAdapter } /** {@inheritDoc} */ - @Override public IgniteTxState state() { + @Override public TransactionState state() { return state; } @@ -848,7 +848,7 @@ public abstract class IgniteTxAdapter<K, V> extends GridMetadataAwareAdapter * */ @Override public void close() throws IgniteCheckedException { - IgniteTxState state = state(); + TransactionState state = state(); if (state != ROLLING_BACK && state != ROLLED_BACK && state != COMMITTING && state != COMMITTED) rollback(); @@ -949,7 +949,7 @@ public abstract class IgniteTxAdapter<K, V> extends GridMetadataAwareAdapter } /** {@inheritDoc} */ - @Override public boolean state(IgniteTxState state) { + @Override public boolean state(TransactionState state) { return state(state, false); } @@ -984,10 +984,10 @@ public abstract class IgniteTxAdapter<K, V> extends GridMetadataAwareAdapter * @return {@code True} if state changed. */ @SuppressWarnings({"TooBroadScope"}) - private boolean state(IgniteTxState state, boolean timedOut) { + private boolean state(TransactionState state, boolean timedOut) { boolean valid = false; - IgniteTxState prev; + TransactionState prev; boolean notify = false; @@ -1417,10 +1417,10 @@ public abstract class IgniteTxAdapter<K, V> extends GridMetadataAwareAdapter nodeId = U.readUuid(in); - isolation = IgniteTxIsolation.fromOrdinal(in.read()); - concurrency = IgniteTxConcurrency.fromOrdinal(in.read()); + isolation = TransactionIsolation.fromOrdinal(in.read()); + concurrency = TransactionConcurrency.fromOrdinal(in.read()); - state = IgniteTxState.fromOrdinal(in.read()); + state = TransactionState.fromOrdinal(in.read()); } /** @@ -1446,9 +1446,9 @@ public abstract class IgniteTxAdapter<K, V> extends GridMetadataAwareAdapter } /** {@inheritDoc} */ - @Override public IgniteTxProxy proxy() { + @Override public TransactionProxy proxy() { if (proxy == null) - proxy = new IgniteTxProxyImpl(this, cctx, false); + proxy = new TransactionProxyImpl(this, cctx, false); return proxy; } @@ -1487,10 +1487,10 @@ public abstract class IgniteTxAdapter<K, V> extends GridMetadataAwareAdapter private final long startTime; /** Transaction isolation. */ - private final IgniteTxIsolation isolation; + private final TransactionIsolation isolation; /** Concurrency. */ - private final IgniteTxConcurrency concurrency; + private final TransactionConcurrency concurrency; /** Invalidate flag. */ private final boolean invalidate; @@ -1499,7 +1499,7 @@ public abstract class IgniteTxAdapter<K, V> extends GridMetadataAwareAdapter private final long timeout; /** State. */ - private final IgniteTxState state; + private final TransactionState state; /** Rollback only flag. */ private final boolean rollbackOnly; @@ -1520,9 +1520,9 @@ public abstract class IgniteTxAdapter<K, V> extends GridMetadataAwareAdapter * @param state Transaction state. * @param rollbackOnly Rollback-only flag. */ - TxShadow(IgniteUuid xid, UUID nodeId, long threadId, long startTime, IgniteTxIsolation isolation, - IgniteTxConcurrency concurrency, boolean invalidate, boolean implicit, long timeout, - IgniteTxState state, boolean rollbackOnly) { + TxShadow(IgniteUuid xid, UUID nodeId, long threadId, long startTime, TransactionIsolation isolation, + TransactionConcurrency concurrency, boolean invalidate, boolean implicit, long timeout, + TransactionState state, boolean rollbackOnly) { this.xid = xid; this.nodeId = nodeId; this.threadId = threadId; @@ -1557,12 +1557,12 @@ public abstract class IgniteTxAdapter<K, V> extends GridMetadataAwareAdapter } /** {@inheritDoc} */ - @Override public IgniteTxIsolation isolation() { + @Override public TransactionIsolation isolation() { return isolation; } /** {@inheritDoc} */ - @Override public IgniteTxConcurrency concurrency() { + @Override public TransactionConcurrency concurrency() { return concurrency; } @@ -1582,7 +1582,7 @@ public abstract class IgniteTxAdapter<K, V> extends GridMetadataAwareAdapter } /** {@inheritDoc} */ - @Override public IgniteTxState state() { + @Override public TransactionState state() { return state; } @@ -1927,7 +1927,7 @@ public abstract class IgniteTxAdapter<K, V> extends GridMetadataAwareAdapter } /** {@inheritDoc} */ - @Override public boolean state(IgniteTxState state) { + @Override public boolean state(TransactionState state) { return false; } @@ -2037,7 +2037,7 @@ public abstract class IgniteTxAdapter<K, V> extends GridMetadataAwareAdapter } /** {@inheritDoc} */ - @Override public IgniteTxProxy proxy() { + @Override public TransactionProxy proxy() { return null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java index 600e0d6..b29f721 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java @@ -39,9 +39,9 @@ import java.util.*; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*; import static org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx.FinalizationStatus.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxIsolation.*; -import static org.apache.ignite.transactions.IgniteTxState.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; +import static org.apache.ignite.transactions.TransactionState.*; /** * Isolated logic to process cache messages. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java index 3b01130..0856f67 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java @@ -47,7 +47,7 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*; import static org.apache.ignite.internal.processors.dr.GridDrType.*; -import static org.apache.ignite.transactions.IgniteTxState.*; +import static org.apache.ignite.transactions.TransactionState.*; /** * Transaction adapter for cache transactions. @@ -129,8 +129,8 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> boolean implicit, boolean implicitSingle, boolean sys, - IgniteTxConcurrency concurrency, - IgniteTxIsolation isolation, + TransactionConcurrency concurrency, + TransactionIsolation isolation, long timeout, boolean invalidate, boolean storeEnabled, @@ -401,7 +401,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> if (timedOut()) throw new IgniteTxTimeoutCheckedException("Transaction timed out: " + this); - IgniteTxState state = state(); + TransactionState state = state(); setRollbackOnly(); @@ -641,7 +641,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> /** {@inheritDoc} */ @SuppressWarnings({"CatchGenericClass"}) @Override public void userCommit() throws IgniteCheckedException { - IgniteTxState state = state(); + TransactionState state = state(); if (state != COMMITTING) { if (timedOut()) @@ -1071,7 +1071,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> /** {@inheritDoc} */ @Override public void userRollback() throws IgniteCheckedException { - IgniteTxState state = state(); + TransactionState state = state(); if (state != ROLLING_BACK && state != ROLLED_BACK) { setRollbackOnly(); @@ -3074,7 +3074,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> if (timedOut()) throw new IgniteTxTimeoutCheckedException("Cache transaction timed out: " + this); - IgniteTxState state = state(); + TransactionState state = state(); if (state == ROLLING_BACK || state == ROLLED_BACK) throw new IgniteTxRollbackCheckedException("Cache transaction is marked as rollback-only " + @@ -3128,9 +3128,9 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> checkInternal(key); - IgniteTxState state = state(); + TransactionState state = state(); - assert state == IgniteTxState.ACTIVE || timedOut() : + assert state == TransactionState.ACTIVE || timedOut() : "Invalid tx state for adding entry [op=" + op + ", val=" + val + ", entry=" + entry + ", filter=" + Arrays.toString(filter) + ", txCtx=" + cctx.tm().txContextVersion() + ", tx=" + this + ']'; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b539033/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java index bf8f855..cf32dcc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java @@ -48,8 +48,8 @@ import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*; import static org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx.FinalizationStatus.*; import static org.apache.ignite.internal.util.GridConcurrentFactory.*; -import static org.apache.ignite.transactions.IgniteTxConcurrency.*; -import static org.apache.ignite.transactions.IgniteTxState.*; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionState.*; /** * Cache transaction manager. @@ -94,7 +94,7 @@ public class IgniteTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V> { new GridBoundedConcurrentOrderedMap<>(Integer.getInteger(IGNITE_MAX_COMPLETED_TX_COUNT, DFLT_MAX_COMPLETED_TX_CNT)); /** Transaction synchronizations. */ - private final Collection<IgniteTxSynchronization> syncs = + private final Collection<TransactionSynchronization> syncs = new GridConcurrentHashSet<>(); /** Transaction finish synchronizer. */ @@ -176,7 +176,7 @@ public class IgniteTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V> { private boolean salvageTx(IgniteInternalTx<K, V> tx, boolean warn, IgniteInternalTx.FinalizationStatus status) { assert tx != null; - IgniteTxState state = tx.state(); + TransactionState state = tx.state(); if (state == ACTIVE || state == PREPARING || state == PREPARED) { try { @@ -354,8 +354,8 @@ public class IgniteTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V> { boolean implicit, boolean implicitSingle, boolean sys, - IgniteTxConcurrency concurrency, - IgniteTxIsolation isolation, + TransactionConcurrency concurrency, + TransactionIsolation isolation, long timeout, boolean invalidate, boolean storeEnabled, @@ -486,9 +486,9 @@ public class IgniteTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V> { * Creates a future that will wait for all ongoing transactions that maybe affected by topology update * to be finished. This set of transactions include * <ul> - * <li/> All {@link IgniteTxConcurrency#PESSIMISTIC} transactions with topology version + * <li/> All {@link TransactionConcurrency#PESSIMISTIC} transactions with topology version * less or equal to {@code topVer}. - * <li/> {@link IgniteTxConcurrency#OPTIMISTIC} transactions in PREPARING state with topology + * <li/> {@link TransactionConcurrency#OPTIMISTIC} transactions in PREPARING state with topology * version less or equal to {@code topVer} and having transaction key with entry that belongs to * one of partitions in {@code parts}. * </ul> @@ -522,7 +522,7 @@ public class IgniteTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V> { else if (tx.concurrency() == OPTIMISTIC) { // For OPTIMISTIC mode we wait only for txs in PREPARING state that // have keys for given partitions. - IgniteTxState state = tx.state(); + TransactionState state = tx.state(); long txTopVer = tx.topologyVersion(); if ((state == PREPARING || state == PREPARED || state == COMMITTING) @@ -1647,7 +1647,7 @@ public class IgniteTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V> { /** * @param sync Transaction synchronizations to add. */ - public void addSynchronizations(IgniteTxSynchronization... sync) { + public void addSynchronizations(TransactionSynchronization... sync) { if (F.isEmpty(sync)) return; @@ -1657,7 +1657,7 @@ public class IgniteTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V> { /** * @param sync Transaction synchronizations to remove. */ - public void removeSynchronizations(IgniteTxSynchronization... sync) { + public void removeSynchronizations(TransactionSynchronization... sync) { if (F.isEmpty(sync)) return; @@ -1667,7 +1667,7 @@ public class IgniteTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V> { /** * @return Registered transaction synchronizations */ - public Collection<IgniteTxSynchronization> synchronizations() { + public Collection<TransactionSynchronization> synchronizations() { return Collections.unmodifiableList(new LinkedList<>(syncs)); } @@ -1676,9 +1676,9 @@ public class IgniteTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V> { * @param newState New state. * @param tx Cache transaction. */ - public void onTxStateChange(@Nullable IgniteTxState prevState, IgniteTxState newState, IgniteInternalTx tx) { + public void onTxStateChange(@Nullable TransactionState prevState, TransactionState newState, IgniteInternalTx tx) { // Notify synchronizations. - for (IgniteTxSynchronization s : syncs) + for (TransactionSynchronization s : syncs) s.onStateChanged(prevState, newState, tx.proxy()); } @@ -1751,7 +1751,7 @@ public class IgniteTxManager<K, V> extends GridCacheSharedManagerAdapter<K, V> { for (IgniteInternalTx<K, V> tx : txs()) { if (nearVer.equals(tx.nearXidVersion())) { - IgniteTxState state = tx.state(); + TransactionState state = tx.state(); if (state == PREPARED || state == COMMITTING || state == COMMITTED) { if (--txNum == 0)
