You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/02/02 15:22:00 UTC
[4/4] incubator-ignite git commit: # ignite-26 renamed IgniteTxEx -
IgniteInternalTx
# ignite-26 renamed IgniteTxEx - IgniteInternalTx
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d89ef5bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d89ef5bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d89ef5bd
Branch: refs/heads/ignite-26
Commit: d89ef5bdf6befd8476f457da3367ca1ed9347f17
Parents: cd4040d
Author: sboikov <sb...@gridgain.com>
Authored: Mon Feb 2 17:21:21 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Feb 2 17:21:23 2015 +0300
----------------------------------------------------------------------
.../ClientAbstractMultiNodeSelfTest.java | 2 +-
.../apache/ignite/cache/CacheProjection.java | 2 +-
.../org/apache/ignite/cluster/ClusterGroup.java | 4 +-
.../ignite/internal/ClusterGroupAdapter.java | 4 +-
.../ignite/internal/IgniteClusterAsyncImpl.java | 2 +-
.../ignite/internal/IgniteTransactionsEx.java | 8 +-
.../processors/cache/GridCacheAdapter.java | 22 +-
.../processors/cache/GridCacheEntryEx.java | 12 +-
.../processors/cache/GridCacheEntryImpl.java | 4 +-
.../processors/cache/GridCacheEventManager.java | 6 +-
.../cache/GridCacheEvictionEntry.java | 4 +-
.../processors/cache/GridCacheMapEntry.java | 22 +-
.../cache/GridCacheMultiTxFuture.java | 17 +-
.../processors/cache/GridCacheMvcc.java | 2 +-
.../processors/cache/GridCacheMvccManager.java | 4 +-
.../cache/GridCacheProjectionImpl.java | 2 +-
.../processors/cache/GridCacheProxyImpl.java | 2 +-
.../cache/GridCacheSharedContext.java | 11 +-
.../processors/cache/GridCacheStoreManager.java | 26 +-
.../processors/cache/GridCacheUtils.java | 16 +-
.../datastructures/GridCacheAtomicLongImpl.java | 17 +-
.../GridCacheAtomicReferenceImpl.java | 5 +-
.../GridCacheAtomicSequenceImpl.java | 3 +-
.../GridCacheAtomicStampedImpl.java | 5 +-
.../GridCacheCountDownLatchImpl.java | 4 +-
.../GridCacheDataStructuresManager.java | 16 +-
.../GridTransactionalCacheQueueImpl.java | 9 +-
.../distributed/GridCacheCommittedTxInfo.java | 2 +-
...ridCacheOptimisticCheckPreparedTxFuture.java | 4 +-
...idCacheOptimisticCheckPreparedTxRequest.java | 2 +-
.../GridCachePerThreadTxCommitBuffer.java | 2 +-
...dCachePessimisticCheckCommittedTxFuture.java | 4 +-
...CachePessimisticCheckCommittedTxRequest.java | 2 +-
.../distributed/GridCacheTxCommitBuffer.java | 2 +-
.../distributed/GridDistributedCacheEntry.java | 4 +-
.../GridDistributedTxPrepareRequest.java | 2 +-
.../GridDistributedTxRemoteAdapter.java | 10 +-
.../distributed/dht/GridDhtCacheEntry.java | 4 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 6 +-
.../distributed/dht/GridDhtTxFinishFuture.java | 12 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 16 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 16 +-
.../distributed/near/GridNearCacheAdapter.java | 4 +-
.../distributed/near/GridNearCacheEntry.java | 4 +-
.../near/GridNearTxFinishFuture.java | 16 +-
.../cache/distributed/near/GridNearTxLocal.java | 52 +-
.../near/GridNearTxPrepareFuture.java | 22 +-
.../near/GridNearTxPrepareRequest.java | 2 +-
.../cache/local/GridLocalCacheEntry.java | 4 +-
.../processors/cache/local/GridLocalTx.java | 10 +-
.../cache/local/GridLocalTxFuture.java | 4 +-
.../cache/transactions/IgniteInternalTx.java | 706 +++++++++++++++++++
.../transactions/IgniteTransactionsImpl.java | 18 +-
.../cache/transactions/IgniteTxAdapter.java | 24 +-
.../cache/transactions/IgniteTxEntry.java | 6 +-
.../cache/transactions/IgniteTxEx.java | 706 -------------------
.../cache/transactions/IgniteTxHandler.java | 58 +-
.../transactions/IgniteTxLocalAdapter.java | 16 +-
.../cache/transactions/IgniteTxLocalEx.java | 2 +-
.../cache/transactions/IgniteTxManager.java | 168 ++---
.../cache/transactions/IgniteTxProxyImpl.java | 14 +-
.../cache/transactions/IgniteTxRemoteEx.java | 2 +-
.../processors/fs/GridGgfsDataManager.java | 5 +-
.../processors/fs/GridGgfsMetaManager.java | 26 +-
.../handlers/cache/GridCacheCommandHandler.java | 3 +-
.../service/GridServiceProcessor.java | 3 +-
.../processors/cache/GridCacheTestEntryEx.java | 12 +-
.../processors/cache/GridCacheTestStore.java | 2 +-
...xOriginatingNodeFailureAbstractSelfTest.java | 2 +-
.../near/GridCacheNearTxMultiNodeSelfTest.java | 4 +-
.../GridCachePartitionedTxSalvageSelfTest.java | 8 +-
.../fs/GridGgfsDataManagerSelfTest.java | 6 +-
.../loadtests/hashmap/GridHashMapLoadTest.java | 4 +-
...idHadoopDefaultMapReducePlannerSelfTest.java | 2 +-
.../processors/cache/jta/CacheJtaManager.java | 5 +-
.../cache/jta/GridCacheXAResource.java | 4 +-
76 files changed, 1116 insertions(+), 1127 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java
index de1a398..2a3ef69 100644
--- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java
@@ -791,7 +791,7 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract
GridCacheVersion v = ((GridCacheVersionable)o).version();
- IgniteTxEx t = tm.tx(v);
+ IgniteInternalTx t = tm.tx(v);
if (t.hasWriteKey(cacheCtx.txKey("x1")))
assertFalse("Invalid tx flags: " + t, t.syncCommit());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
index 33c6d1e..c3cc619 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
@@ -1171,7 +1171,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> {
* @param isolation Isolation.
* @return New transaction.
*/
- public IgniteTxEx txStartEx(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation);
+ public IgniteInternalTx txStartEx(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation);
/**
* Starts transaction with specified isolation, concurrency, timeout, invalidation flag,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroup.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroup.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroup.java
index 2237d9d..9841fc2 100644
--- a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroup.java
+++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroup.java
@@ -250,7 +250,7 @@ public interface ClusterGroup {
* Gets a metrics snapshot for this projection.
*
* @return Grid projection metrics snapshot.
- * @throws IgniteCheckedException If projection is empty.
+ * @throws IgniteException If projection is empty.
*/
- public ClusterMetrics metrics() throws IgniteCheckedException;
+ public ClusterMetrics metrics() throws IgniteException;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/internal/ClusterGroupAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/ClusterGroupAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/ClusterGroupAdapter.java
index 528e9a1..38c02bf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/ClusterGroupAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/ClusterGroupAdapter.java
@@ -264,12 +264,12 @@ public class ClusterGroupAdapter implements ClusterGroupEx, Externalizable {
}
/** {@inheritDoc} */
- @Override public final ClusterMetrics metrics() throws IgniteCheckedException {
+ @Override public final ClusterMetrics metrics() {
guard();
try {
if (nodes().isEmpty())
- throw U.emptyTopologyException();
+ throw U.convertException(U.emptyTopologyException());
return new ClusterMetricsSnapshot(this);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/internal/IgniteClusterAsyncImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteClusterAsyncImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteClusterAsyncImpl.java
index c684217..4b966e4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteClusterAsyncImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteClusterAsyncImpl.java
@@ -245,7 +245,7 @@ public class IgniteClusterAsyncImpl extends IgniteAsyncSupportAdapter<IgniteClus
}
/** {@inheritDoc} */
- @Override public ClusterMetrics metrics() throws IgniteCheckedException {
+ @Override public ClusterMetrics metrics() {
return grid.metrics();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/internal/IgniteTransactionsEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteTransactionsEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteTransactionsEx.java
index 6efe99f..08a9fe0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteTransactionsEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteTransactionsEx.java
@@ -49,7 +49,7 @@ public interface IgniteTransactionsEx extends IgniteTransactions {
* @param txSize Number of entries participating in transaction (may be approximate).
* @return New transaction.
*/
- public IgniteTxEx txStartEx(GridCacheContext ctx,
+ public IgniteInternalTx txStartEx(GridCacheContext ctx,
IgniteTxConcurrency concurrency,
IgniteTxIsolation isolation,
long timeout,
@@ -61,7 +61,7 @@ public interface IgniteTransactionsEx extends IgniteTransactions {
* @param isolation Isolation.
* @return New transaction.
*/
- public IgniteTxEx txStartEx(GridCacheContext ctx, IgniteTxConcurrency concurrency, IgniteTxIsolation isolation);
+ public IgniteInternalTx txStartEx(GridCacheContext ctx, IgniteTxConcurrency concurrency, IgniteTxIsolation isolation);
/**
* @param ctx Cache context.
@@ -73,7 +73,7 @@ public interface IgniteTransactionsEx extends IgniteTransactions {
* @return New transaction.
* @throws IgniteCheckedException If failed.
*/
- public IgniteTxEx txStartPartitionEx(GridCacheContext ctx,
+ public IgniteInternalTx txStartPartitionEx(GridCacheContext ctx,
int partId,
IgniteTxConcurrency concurrency,
IgniteTxIsolation isolation,
@@ -90,7 +90,7 @@ public interface IgniteTransactionsEx extends IgniteTransactions {
* @return New transaction.
* @throws IgniteCheckedException If failed.
*/
- public IgniteTxEx txStartAffinity(GridCacheContext ctx,
+ public IgniteInternalTx txStartAffinity(GridCacheContext ctx,
Object affinityKey,
IgniteTxConcurrency concurrency,
IgniteTxIsolation isolation,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 3f9753c..9e06d86 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -720,7 +720,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
}
- IgniteTxEx<K, V> tx = ctx.tm().localTx();
+ IgniteInternalTx<K, V> tx = ctx.tm().localTx();
if (tx != null) {
GridTuple<V> peek = tx.peek(ctx, failFast, key, filter);
@@ -799,7 +799,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
* @return Peeked value.
* @throws IgniteCheckedException In case of error.
*/
- @Nullable protected V peek0(K key, @Nullable Collection<GridCachePeekMode> modes, IgniteTxEx<K, V> tx)
+ @Nullable protected V peek0(K key, @Nullable Collection<GridCachePeekMode> modes, IgniteInternalTx<K, V> tx)
throws IgniteCheckedException {
try {
GridTuple<V> peek = peek0(false, key, modes, tx);
@@ -825,7 +825,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
* @throws GridCacheFilterFailedException If filer validation failed.
*/
@Nullable protected GridTuple<V> peek0(boolean failFast, K key, @Nullable Collection<GridCachePeekMode> modes,
- IgniteTxEx<K, V> tx) throws IgniteCheckedException, GridCacheFilterFailedException {
+ IgniteInternalTx<K, V> tx) throws IgniteCheckedException, GridCacheFilterFailedException {
if (F.isEmpty(modes))
return F.t(peek(key, (IgnitePredicate<CacheEntry<K, V>>)null));
@@ -896,7 +896,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
* @throws IgniteCheckedException If failed.
*/
protected Map<K, V> peekAll0(@Nullable Collection<? extends K> keys, @Nullable Collection<GridCachePeekMode> modes,
- IgniteTxEx<K, V> tx, @Nullable Collection<K> skipped) throws IgniteCheckedException {
+ IgniteInternalTx<K, V> tx, @Nullable Collection<K> skipped) throws IgniteCheckedException {
if (F.isEmpty(keys))
return emptyMap();
@@ -1467,7 +1467,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
*/
public IgniteInternalFuture<Object> readThroughAllAsync(final Collection<? extends K> keys,
boolean reload,
- @Nullable final IgniteTxEx<K, V> tx,
+ @Nullable final IgniteInternalTx<K, V> tx,
IgnitePredicate<CacheEntry<K, V>>[] filter,
@Nullable UUID subjId,
String taskName,
@@ -3561,7 +3561,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
}
/** {@inheritDoc} */
- @Override public IgniteTxEx txStartEx(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) {
+ @Override public IgniteInternalTx txStartEx(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) {
IgniteTransactionsEx txs = ctx.kernalContext().cache().transactions();
return txs.txStartEx(ctx, concurrency, isolation);
@@ -4049,7 +4049,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
* @return Transaction commit future.
*/
@SuppressWarnings("unchecked")
- public IgniteInternalFuture<IgniteTxEx> commitTxAsync(final IgniteTxEx tx) {
+ public IgniteInternalFuture<IgniteInternalTx> commitTxAsync(final IgniteInternalTx tx) {
FutureHolder holder = lastFut.get();
holder.lock();
@@ -4058,9 +4058,9 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
IgniteInternalFuture fut = holder.future();
if (fut != null && !fut.isDone()) {
- IgniteInternalFuture<IgniteTxEx> f = new GridEmbeddedFuture<>(fut,
- new C2<Object, Exception, IgniteInternalFuture<IgniteTxEx>>() {
- @Override public IgniteInternalFuture<IgniteTxEx> apply(Object o, Exception e) {
+ IgniteInternalFuture<IgniteInternalTx> f = new GridEmbeddedFuture<>(fut,
+ new C2<Object, Exception, IgniteInternalFuture<IgniteInternalTx>>() {
+ @Override public IgniteInternalFuture<IgniteInternalTx> apply(Object o, Exception e) {
return tx.commitAsync();
}
}, ctx.kernalContext());
@@ -4070,7 +4070,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>,
return f;
}
- IgniteInternalFuture<IgniteTxEx> f = tx.commitAsync();
+ IgniteInternalFuture<IgniteInternalTx> f = tx.commitAsync();
saveFuture(holder, f);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
index 8eeacc5..0311fdd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java
@@ -291,7 +291,7 @@ public interface GridCacheEntryEx<K, V> {
* @throws GridCacheEntryRemovedException If entry was removed.
* @throws GridCacheFilterFailedException If filter failed.
*/
- @Nullable public V innerGet(@Nullable IgniteTxEx<K, V> tx,
+ @Nullable public V innerGet(@Nullable IgniteInternalTx<K, V> tx,
boolean readSwap,
boolean readThrough,
boolean failFast,
@@ -341,7 +341,7 @@ public interface GridCacheEntryEx<K, V> {
* @throws GridCacheEntryRemovedException If entry has been removed.
*/
public GridCacheUpdateTxResult<V> innerSet(
- @Nullable IgniteTxEx<K, V> tx,
+ @Nullable IgniteInternalTx<K, V> tx,
UUID evtNodeId,
UUID affNodeId,
@Nullable V val,
@@ -380,7 +380,7 @@ public interface GridCacheEntryEx<K, V> {
* @throws GridCacheEntryRemovedException If entry has been removed.
*/
public GridCacheUpdateTxResult<V> innerRemove(
- @Nullable IgniteTxEx<K, V> tx,
+ @Nullable IgniteInternalTx<K, V> tx,
UUID evtNodeId,
UUID affNodeId,
boolean writeThrough,
@@ -514,7 +514,7 @@ public interface GridCacheEntryEx<K, V> {
* @throws GridCacheEntryRemovedException If this entry is obsolete.
* @throws GridDistributedLockCancelledException If lock has been cancelled.
*/
- public boolean tmLock(IgniteTxEx<K, V> tx, long timeout) throws GridCacheEntryRemovedException,
+ public boolean tmLock(IgniteInternalTx<K, V> tx, long timeout) throws GridCacheEntryRemovedException,
GridDistributedLockCancelledException;
/**
@@ -523,7 +523,7 @@ public interface GridCacheEntryEx<K, V> {
* @param tx Cache transaction.
* @throws GridCacheEntryRemovedException If this entry has been removed from cache.
*/
- public abstract void txUnlock(IgniteTxEx<K, V> tx) throws GridCacheEntryRemovedException;
+ public abstract void txUnlock(IgniteInternalTx<K, V> tx) throws GridCacheEntryRemovedException;
/**
* @param ver Removes lock.
@@ -623,7 +623,7 @@ public interface GridCacheEntryEx<K, V> {
*/
@SuppressWarnings({"RedundantTypeArguments"})
@Nullable public GridTuple<V> peek0(boolean failFast, GridCachePeekMode mode,
- @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, @Nullable IgniteTxEx<K, V> tx)
+ @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, @Nullable IgniteInternalTx<K, V> tx)
throws GridCacheEntryRemovedException, GridCacheFilterFailedException, IgniteCheckedException;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java
index f018a8a..05998a5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java
@@ -277,7 +277,7 @@ public class GridCacheEntryImpl<K, V> implements CacheEntry<K, V>, Externalizabl
*/
@SuppressWarnings({"unchecked"})
@Nullable private V peek0(@Nullable GridCachePeekMode mode,
- @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, @Nullable IgniteTxEx<K, V> tx)
+ @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, @Nullable IgniteInternalTx<K, V> tx)
throws IgniteCheckedException {
assert tx == null || tx.local();
@@ -349,7 +349,7 @@ public class GridCacheEntryImpl<K, V> implements CacheEntry<K, V>, Externalizabl
* @throws IgniteCheckedException If failed.
*/
@Nullable private V peek0(@Nullable Collection<GridCachePeekMode> modes,
- @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, IgniteTxEx<K, V> tx) throws IgniteCheckedException {
+ @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, IgniteInternalTx<K, V> tx) throws IgniteCheckedException {
if (F.isEmpty(modes))
return peek0(SMART, filter, tx);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
index 25c07f0..a98b93b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
@@ -75,7 +75,7 @@ public class GridCacheEventManager<K, V> extends GridCacheManagerAdapter<K, V> {
* @param cloClsName Closure class name.
* @param taskName Task name.
*/
- public void addEvent(int part, K key, IgniteTxEx tx, @Nullable GridCacheMvccCandidate<K> owner,
+ public void addEvent(int part, K key, IgniteInternalTx tx, @Nullable GridCacheMvccCandidate<K> owner,
int type, @Nullable V newVal, boolean hasNewVal, @Nullable V oldVal, boolean hasOldVal, UUID subjId,
String cloClsName, String taskName) {
addEvent(part, key, locNodeId, tx, owner, type, newVal, hasNewVal, oldVal, hasOldVal, subjId, cloClsName,
@@ -97,7 +97,7 @@ public class GridCacheEventManager<K, V> extends GridCacheManagerAdapter<K, V> {
* @param cloClsName Closure class name.
* @param taskName Task name.
*/
- public void addEvent(int part, K key, UUID nodeId, IgniteTxEx tx, GridCacheMvccCandidate<K> owner,
+ public void addEvent(int part, K key, UUID nodeId, IgniteInternalTx tx, GridCacheMvccCandidate<K> owner,
int type, V newVal, boolean hasNewVal, V oldVal, boolean hasOldVal, UUID subjId, String cloClsName,
String taskName) {
addEvent(part, key, nodeId, tx == null ? null : tx.xid(), owner == null ? null : owner.version(), type,
@@ -121,7 +121,7 @@ public class GridCacheEventManager<K, V> extends GridCacheManagerAdapter<K, V> {
public void addEvent(int part, K key, UUID evtNodeId, @Nullable GridCacheMvccCandidate<K> owner,
int type, @Nullable V newVal, boolean hasNewVal, V oldVal, boolean hasOldVal, UUID subjId, String cloClsName,
String taskName) {
- IgniteTxEx tx = owner == null ? null : cctx.tm().tx(owner.version());
+ IgniteInternalTx tx = owner == null ? null : cctx.tm().tx(owner.version());
addEvent(part, key, evtNodeId, tx == null ? null : tx.xid(), owner == null ? null : owner.version(), type,
newVal, hasNewVal, oldVal, hasOldVal, subjId, cloClsName, taskName);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEntry.java
index 20e6e74..bb11b7d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEntry.java
@@ -152,7 +152,7 @@ public class GridCacheEvictionEntry<K, V> implements CacheEntry<K, V>, Externali
*/
@SuppressWarnings({"unchecked"})
@Nullable private V peek0(@Nullable GridCachePeekMode mode,
- @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, @Nullable IgniteTxEx<K, V> tx)
+ @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, @Nullable IgniteInternalTx<K, V> tx)
throws IgniteCheckedException {
assert tx == null || tx.local();
@@ -184,7 +184,7 @@ public class GridCacheEvictionEntry<K, V> implements CacheEntry<K, V>, Externali
* @throws IgniteCheckedException If failed.
*/
@Nullable private V peek0(@Nullable Collection<GridCachePeekMode> modes,
- @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, IgniteTxEx<K, V> tx) throws IgniteCheckedException {
+ @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, IgniteInternalTx<K, V> tx) throws IgniteCheckedException {
if (F.isEmpty(modes))
return peek0(SMART, filter, tx);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 3c4e9d6..5711ec1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -618,13 +618,13 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V>
* @throws IgniteCheckedException If failed.
*/
@SuppressWarnings({"RedundantTypeArguments"})
- @Nullable protected V readThrough(@Nullable IgniteTxEx<K, V> tx, K key, boolean reload,
+ @Nullable protected V readThrough(@Nullable IgniteInternalTx<K, V> tx, K key, boolean reload,
IgnitePredicate<CacheEntry<K, V>>[] filter, UUID subjId, String taskName) throws IgniteCheckedException {
return cctx.store().loadFromStore(tx, key);
}
/** {@inheritDoc} */
- @Nullable @Override public final V innerGet(@Nullable IgniteTxEx<K, V> tx,
+ @Nullable @Override public final V innerGet(@Nullable IgniteInternalTx<K, V> tx,
boolean readSwap,
boolean readThrough,
boolean failFast,
@@ -657,7 +657,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V>
/** {@inheritDoc} */
@SuppressWarnings({"unchecked", "RedundantTypeArguments", "TooBroadScope"})
- private V innerGet0(IgniteTxEx<K, V> tx,
+ private V innerGet0(IgniteInternalTx<K, V> tx,
boolean readSwap,
boolean readThrough,
boolean evt,
@@ -853,7 +853,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V>
boolean loadedFromStore = false;
if (ret == null && readThrough) {
- IgniteTxEx tx0 = null;
+ IgniteInternalTx tx0 = null;
if (tx != null && tx.local()) {
if (cctx.isReplicated() || cctx.isColocated() || tx.near())
@@ -1036,7 +1036,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V>
/** {@inheritDoc} */
@Override public final GridCacheUpdateTxResult<V> innerSet(
- @Nullable IgniteTxEx<K, V> tx,
+ @Nullable IgniteInternalTx<K, V> tx,
UUID evtNodeId,
UUID affNodeId,
V val,
@@ -1190,7 +1190,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V>
/** {@inheritDoc} */
@Override public final GridCacheUpdateTxResult<V> innerRemove(
- @Nullable IgniteTxEx<K, V> tx,
+ @Nullable IgniteInternalTx<K, V> tx,
UUID evtNodeId,
UUID affNodeId,
boolean writeThrough,
@@ -2740,7 +2740,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V>
*/
@SuppressWarnings({"RedundantTypeArguments"})
@Nullable @Override public GridTuple<V> peek0(boolean failFast, GridCachePeekMode mode,
- IgnitePredicate<CacheEntry<K, V>>[] filter, @Nullable IgniteTxEx<K, V> tx)
+ IgnitePredicate<CacheEntry<K, V>>[] filter, @Nullable IgniteInternalTx<K, V> tx)
throws GridCacheEntryRemovedException, GridCacheFilterFailedException, IgniteCheckedException {
assert tx == null || tx.local();
@@ -2831,7 +2831,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V>
* @throws GridCacheEntryRemovedException If entry is obsolete.
* @throws IgniteCheckedException If entry was externally locked.
*/
- private void groupLockSanityCheck(IgniteTxEx<K, V> tx) throws GridCacheEntryRemovedException, IgniteCheckedException {
+ private void groupLockSanityCheck(IgniteInternalTx<K, V> tx) throws GridCacheEntryRemovedException, IgniteCheckedException {
assert tx.groupLock();
IgniteTxEntry<K, V> txEntry = tx.entry(txKey());
@@ -2853,7 +2853,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V>
* @throws IgniteCheckedException If unexpected cache failure occurred.
*/
@Nullable private GridTuple<V> peekTxThenGlobal(boolean failFast, IgnitePredicate<CacheEntry<K, V>>[] filter,
- IgniteTxEx<K, V> tx) throws GridCacheFilterFailedException, GridCacheEntryRemovedException, IgniteCheckedException {
+ IgniteInternalTx<K, V> tx) throws GridCacheFilterFailedException, GridCacheEntryRemovedException, IgniteCheckedException {
GridTuple<V> peek = peekTx(failFast, filter, tx);
// If transaction has value (possibly null, which means value is to be deleted).
@@ -2874,7 +2874,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V>
*/
@Nullable private GridTuple<V> peekTx(boolean failFast,
IgnitePredicate<CacheEntry<K, V>>[] filter,
- @Nullable IgniteTxEx<K, V> tx) throws GridCacheFilterFailedException {
+ @Nullable IgniteInternalTx<K, V> tx) throws GridCacheFilterFailedException {
return tx == null ? null : tx.peek(cctx, failFast, key, filter);
}
@@ -3874,7 +3874,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V>
return false;
}
- IgniteTxEx<K, V> tx = cctx.tm().localTxx();
+ IgniteInternalTx<K, V> tx = cctx.tm().localTxx();
return tx == null || !tx.removed(txKey());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java
index af5cc87..94cf5a2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMultiTxFuture.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.util.*;
-import org.apache.ignite.transactions.*;
import org.apache.ignite.internal.processors.cache.transactions.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
@@ -41,10 +40,10 @@ public final class GridCacheMultiTxFuture<K, V> extends GridFutureAdapter<Boolea
private static final AtomicReference<IgniteLogger> logRef = new AtomicReference<>();
/** Transactions to wait for. */
- private final Set<IgniteTxEx<K, V>> txs = new GridLeanSet<>();
+ private final Set<IgniteInternalTx<K, V>> txs = new GridLeanSet<>();
/** */
- private Set<IgniteTxEx<K, V>> remainingTxs;
+ private Set<IgniteInternalTx<K, V>> remainingTxs;
/** Logger. */
private IgniteLogger log;
@@ -71,21 +70,21 @@ public final class GridCacheMultiTxFuture<K, V> extends GridFutureAdapter<Boolea
/**
* @return Transactions to wait for.
*/
- public Set<IgniteTxEx<K, V>> txs() {
+ public Set<IgniteInternalTx<K, V>> txs() {
return txs;
}
/**
* @return Remaining transactions.
*/
- public Set<IgniteTxEx<K, V>> remainingTxs() {
+ public Set<IgniteInternalTx<K, V>> remainingTxs() {
return remainingTxs;
}
/**
* @param tx Transaction to add.
*/
- public void addTx(IgniteTxEx<K, V> tx) {
+ public void addTx(IgniteInternalTx<K, V> tx) {
txs.add(tx);
}
@@ -101,10 +100,10 @@ public final class GridCacheMultiTxFuture<K, V> extends GridFutureAdapter<Boolea
else {
remainingTxs = new GridConcurrentHashSet<>(txs);
- for (final IgniteTxEx<K, V> tx : txs) {
+ for (final IgniteInternalTx<K, V> tx : txs) {
if (!tx.done()) {
- tx.finishFuture().listenAsync(new CI1<IgniteInternalFuture<IgniteTxEx>>() {
- @Override public void apply(IgniteInternalFuture<IgniteTxEx> t) {
+ tx.finishFuture().listenAsync(new CI1<IgniteInternalFuture<IgniteInternalTx>>() {
+ @Override public void apply(IgniteInternalFuture<IgniteInternalTx> t) {
remainingTxs.remove(tx);
checkRemaining();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
index 5489246..e208ad8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvcc.java
@@ -806,7 +806,7 @@ public final class GridCacheMvcc<K> {
// Only Near and DHT remote candidates should be released.
assert !rmt.nearLocal();
- IgniteTxEx tx = cctx.tm().tx(rmt.version());
+ IgniteInternalTx tx = cctx.tm().tx(rmt.version());
if (tx != null) {
tx.systemInvalidate(true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
index 18c8c7a..c2556d1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
@@ -1166,11 +1166,11 @@ public class GridCacheMvccManager<K, V> extends GridCacheSharedManagerAdapter<K,
/** {@inheritDoc} */
@Override public String toString() {
if (!pendingLocks.isEmpty()) {
- Map<GridCacheVersion, IgniteTxEx> txs = new HashMap<>(1, 1.0f);
+ Map<GridCacheVersion, IgniteInternalTx> txs = new HashMap<>(1, 1.0f);
for (Collection<GridCacheMvccCandidate<K>> cands : pendingLocks.values())
for (GridCacheMvccCandidate<K> c : cands)
- txs.put(c.version(), cctx.tm().<IgniteTxEx>tx(c.version()));
+ txs.put(c.version(), cctx.tm().<IgniteInternalTx>tx(c.version()));
return S.toString(FinishLockFuture.class, this, "txs=" + txs + ", super=" + super.toString());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/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 ebd6f81..3346f0b 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
@@ -1240,7 +1240,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V
}
/** {@inheritDoc} */
- @Override public IgniteTxEx txStartEx(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) {
+ @Override public IgniteInternalTx txStartEx(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) {
return cache.txStartEx(concurrency, isolation);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/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 0dfea35..7a02c50 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
@@ -1129,7 +1129,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali
}
/** {@inheritDoc} */
- @Override public IgniteTxEx txStartEx(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) {
+ @Override public IgniteInternalTx txStartEx(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) {
GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/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 c036de4..64d4ee1 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
@@ -23,7 +23,6 @@ import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.version.*;
import org.apache.ignite.marshaller.*;
-import org.apache.ignite.transactions.*;
import org.apache.ignite.internal.managers.communication.*;
import org.apache.ignite.internal.managers.deployment.*;
import org.apache.ignite.internal.managers.discovery.*;
@@ -399,7 +398,7 @@ public class GridCacheSharedContext<K, V> {
* @param cacheCtx Cache context.
* @return {@code True} if cross-cache transaction can include this new cache.
*/
- public boolean txCompatible(IgniteTxEx<K, V> tx, Iterable<Integer> activeCacheIds, GridCacheContext<K, V> cacheCtx) {
+ public boolean txCompatible(IgniteInternalTx<K, V> tx, Iterable<Integer> activeCacheIds, GridCacheContext<K, V> cacheCtx) {
if (cacheCtx.system() ^ tx.system())
return false;
@@ -419,7 +418,7 @@ public class GridCacheSharedContext<K, V> {
* @throws CacheFlagException If given flags are conflicting with given transaction.
*/
public void checkTxFlags(@Nullable Collection<CacheFlag> flags) throws CacheFlagException {
- IgniteTxEx tx = tm().userTxx();
+ IgniteInternalTx tx = tm().userTxx();
if (tx == null || F.isEmpty(flags))
return;
@@ -446,7 +445,7 @@ public class GridCacheSharedContext<K, V> {
* @param tx Transaction to close.
* @throws IgniteCheckedException If failed.
*/
- public void endTx(IgniteTxEx<K, V> tx) throws IgniteCheckedException {
+ public void endTx(IgniteInternalTx<K, V> tx) throws IgniteCheckedException {
Collection<Integer> cacheIds = tx.activeCacheIds();
if (!cacheIds.isEmpty()) {
@@ -461,7 +460,7 @@ public class GridCacheSharedContext<K, V> {
* @param tx Transaction to commit.
* @return Commit future.
*/
- public IgniteInternalFuture<IgniteTxEx> commitTxAsync(IgniteTxEx<K, V> tx) {
+ public IgniteInternalFuture<IgniteInternalTx> commitTxAsync(IgniteInternalTx<K, V> tx) {
Collection<Integer> cacheIds = tx.activeCacheIds();
if (cacheIds.isEmpty())
@@ -483,7 +482,7 @@ public class GridCacheSharedContext<K, V> {
* @param tx Transaction to rollback.
* @throws IgniteCheckedException If failed.
*/
- public IgniteInternalFuture rollbackTxAsync(IgniteTxEx<K, V> tx) throws IgniteCheckedException {
+ public IgniteInternalFuture rollbackTxAsync(IgniteInternalTx<K, V> tx) throws IgniteCheckedException {
Collection<Integer> cacheIds = tx.activeCacheIds();
if (!cacheIds.isEmpty()) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/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 98c9ad3..3f15fe5 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
@@ -249,7 +249,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
* @throws IgniteCheckedException If data loading failed.
*/
@SuppressWarnings("unchecked")
- @Nullable public V loadFromStore(@Nullable IgniteTxEx tx, K key) throws IgniteCheckedException {
+ @Nullable public V loadFromStore(@Nullable IgniteInternalTx tx, K key) throws IgniteCheckedException {
return (V)loadFromStore(tx, key, true);
}
@@ -263,7 +263,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
* @throws IgniteCheckedException If data loading failed.
*/
@SuppressWarnings("unchecked")
- @Nullable private Object loadFromStore(@Nullable IgniteTxEx tx,
+ @Nullable private Object loadFromStore(@Nullable IgniteInternalTx tx,
K key,
boolean convert)
throws IgniteCheckedException {
@@ -338,7 +338,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
* @param vis Closure to apply for loaded elements.
* @throws IgniteCheckedException If data loading failed.
*/
- public void localStoreLoadAll(@Nullable IgniteTxEx tx,
+ public void localStoreLoadAll(@Nullable IgniteInternalTx tx,
Collection<? extends K> keys,
final GridInClosure3<K, V, GridCacheVersion> vis)
throws IgniteCheckedException {
@@ -358,7 +358,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
* @throws IgniteCheckedException If data loading failed.
*/
@SuppressWarnings({"unchecked"})
- public boolean loadAllFromStore(@Nullable IgniteTxEx tx,
+ public boolean loadAllFromStore(@Nullable IgniteInternalTx tx,
Collection<? extends K> keys,
final IgniteBiInClosure<K, V> vis) throws IgniteCheckedException {
if (store != null) {
@@ -382,7 +382,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
* @throws IgniteCheckedException If failed.
*/
@SuppressWarnings("unchecked")
- private void loadAllFromStore(@Nullable IgniteTxEx tx,
+ private void loadAllFromStore(@Nullable IgniteInternalTx tx,
Collection<? extends K> keys,
final @Nullable IgniteBiInClosure<K, V> vis,
final @Nullable GridInClosure3<K, V, GridCacheVersion> verVis)
@@ -538,7 +538,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
* @throws IgniteCheckedException If storage failed.
*/
@SuppressWarnings("unchecked")
- public boolean putToStore(@Nullable IgniteTxEx tx, K key, V val, GridCacheVersion ver)
+ public boolean putToStore(@Nullable IgniteInternalTx tx, K key, V val, GridCacheVersion ver)
throws IgniteCheckedException {
if (store != null) {
// Never persist internal keys.
@@ -588,7 +588,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
* @return {@code True} if there is a persistent storage.
* @throws IgniteCheckedException If storage failed.
*/
- public boolean putAllToStore(@Nullable IgniteTxEx tx, Map<K, IgniteBiTuple<V, GridCacheVersion>> map)
+ public boolean putAllToStore(@Nullable IgniteInternalTx tx, Map<K, IgniteBiTuple<V, GridCacheVersion>> map)
throws IgniteCheckedException {
if (F.isEmpty(map))
return true;
@@ -649,7 +649,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
* @throws IgniteCheckedException If storage failed.
*/
@SuppressWarnings("unchecked")
- public boolean removeFromStore(@Nullable IgniteTxEx tx, K key) throws IgniteCheckedException {
+ public boolean removeFromStore(@Nullable IgniteInternalTx tx, K key) throws IgniteCheckedException {
if (store != null) {
// Never remove internal key from store as it is never persisted.
if (key instanceof GridCacheInternal)
@@ -695,7 +695,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
* @throws IgniteCheckedException If storage failed.
*/
@SuppressWarnings("unchecked")
- public boolean removeAllFromStore(@Nullable IgniteTxEx tx, Collection<?> keys) throws IgniteCheckedException {
+ public boolean removeAllFromStore(@Nullable IgniteInternalTx tx, Collection<?> keys) throws IgniteCheckedException {
if (F.isEmpty(keys))
return true;
@@ -762,7 +762,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
* @param commit Commit.
* @throws IgniteCheckedException If failed.
*/
- public void txEnd(IgniteTxEx tx, boolean commit) throws IgniteCheckedException {
+ public void txEnd(IgniteInternalTx tx, boolean commit) throws IgniteCheckedException {
assert store != null;
initSession(tx);
@@ -796,7 +796,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
/**
* @param tx Current transaction.
*/
- private void initSession(@Nullable IgniteTxEx<?, ?> tx) {
+ private void initSession(@Nullable IgniteInternalTx<?, ?> tx) {
SessionData ses;
if (tx != null) {
@@ -823,7 +823,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
private static class SessionData {
/** */
@GridToStringExclude
- private final IgniteTxEx tx;
+ private final IgniteInternalTx tx;
/** */
private String cacheName;
@@ -836,7 +836,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K, V> {
* @param tx Current transaction.
* @param cacheName Cache name.
*/
- private SessionData(@Nullable IgniteTxEx tx, @Nullable String cacheName) {
+ private SessionData(@Nullable IgniteInternalTx tx, @Nullable String cacheName) {
this.tx = tx;
this.cacheName = cacheName;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/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 7c5e732..12200eb 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
@@ -167,8 +167,8 @@ public class GridCacheUtils {
};
/** Converts transaction to XID version. */
- private static final IgniteClosure tx2xidVer = new C1<IgniteTxEx, GridCacheVersion>() {
- @Override public GridCacheVersion apply(IgniteTxEx tx) {
+ private static final IgniteClosure tx2xidVer = new C1<IgniteInternalTx, GridCacheVersion>() {
+ @Override public GridCacheVersion apply(IgniteInternalTx tx) {
return tx.xidVersion();
}
@@ -790,8 +790,8 @@ public class GridCacheUtils {
* @return Closure which converts transaction entry xid to XID version.
*/
@SuppressWarnings( {"unchecked"})
- public static <K, V> IgniteClosure<IgniteTxEx<K, V>, GridCacheVersion> tx2xidVersion() {
- return (IgniteClosure<IgniteTxEx<K, V>, GridCacheVersion>)tx2xidVer;
+ public static <K, V> IgniteClosure<IgniteInternalTx<K, V>, GridCacheVersion> tx2xidVersion() {
+ return (IgniteClosure<IgniteInternalTx<K, V>, GridCacheVersion>)tx2xidVer;
}
/**
@@ -1192,7 +1192,7 @@ public class GridCacheUtils {
* @param isolation Isolation.
* @return New transaction.
*/
- public static IgniteTxEx txStartInternal(GridCacheContext ctx, CacheProjection prj,
+ public static IgniteInternalTx txStartInternal(GridCacheContext ctx, CacheProjection prj,
IgniteTxConcurrency concurrency, IgniteTxIsolation isolation) {
assert ctx != null;
assert prj != null;
@@ -1206,7 +1206,7 @@ public class GridCacheUtils {
* @param tx Transaction.
* @return String view of all safe-to-print transaction properties.
*/
- public static String txString(@Nullable IgniteTxEx tx) {
+ public static String txString(@Nullable IgniteInternalTx tx) {
if (tx == null)
return "null";
@@ -1609,7 +1609,7 @@ public class GridCacheUtils {
public static <K, V> void inTx(CacheProjection<K, V> cache, IgniteTxConcurrency concurrency,
IgniteTxIsolation isolation, IgniteInClosureX<CacheProjection<K ,V>> clo) throws IgniteCheckedException {
- try (IgniteTxEx tx = cache.txStartEx(concurrency, isolation);) {
+ try (IgniteInternalTx tx = cache.txStartEx(concurrency, isolation);) {
clo.applyx(cache);
tx.commit();
@@ -1622,7 +1622,7 @@ public class GridCacheUtils {
* @param tx Transaction.
* @return Subject ID.
*/
- public static <K, V> UUID subjectId(IgniteTxEx<K, V> tx, GridCacheSharedContext<K, V> ctx) {
+ public static <K, V> UUID subjectId(IgniteInternalTx<K, V> tx, GridCacheSharedContext<K, V> ctx) {
if (tx == null)
return ctx.localNodeId();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongImpl.java
index 3157674..e791797 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicLongImpl.java
@@ -23,7 +23,6 @@ import org.apache.ignite.cache.datastructures.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.transactions.*;
import org.apache.ignite.lang.*;
-import org.apache.ignite.transactions.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.jetbrains.annotations.*;
@@ -82,7 +81,7 @@ public final class GridCacheAtomicLongImpl implements GridCacheAtomicLongEx, Ext
/** Callable for {@link #incrementAndGet()}. */
private final Callable<Long> incAndGetCall = new Callable<Long>() {
@Override public Long call() throws Exception {
- IgniteTxEx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteInternalTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheAtomicLongValue val = atomicView.get(key);
@@ -113,7 +112,7 @@ public final class GridCacheAtomicLongImpl implements GridCacheAtomicLongEx, Ext
/** Callable for {@link #getAndIncrement()}. */
private final Callable<Long> getAndIncCall = new Callable<Long>() {
@Override public Long call() throws Exception {
- IgniteTxEx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteInternalTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheAtomicLongValue val = atomicView.get(key);
@@ -144,7 +143,7 @@ public final class GridCacheAtomicLongImpl implements GridCacheAtomicLongEx, Ext
/** Callable for {@link #decrementAndGet()}. */
private final Callable<Long> decAndGetCall = new Callable<Long>() {
@Override public Long call() throws Exception {
- IgniteTxEx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteInternalTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheAtomicLongValue val = atomicView.get(key);
@@ -175,7 +174,7 @@ public final class GridCacheAtomicLongImpl implements GridCacheAtomicLongEx, Ext
/** Callable for {@link #getAndDecrement()}. */
private final Callable<Long> getAndDecCall = new Callable<Long>() {
@Override public Long call() throws Exception {
- IgniteTxEx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteInternalTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheAtomicLongValue val = atomicView.get(key);
@@ -340,7 +339,7 @@ public final class GridCacheAtomicLongImpl implements GridCacheAtomicLongEx, Ext
private Callable<Long> internalAddAndGet(final long l) {
return new Callable<Long>() {
@Override public Long call() throws Exception {
- IgniteTxEx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteInternalTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheAtomicLongValue val = atomicView.get(key);
@@ -378,7 +377,7 @@ public final class GridCacheAtomicLongImpl implements GridCacheAtomicLongEx, Ext
private Callable<Long> internalGetAndAdd(final long l) {
return new Callable<Long>() {
@Override public Long call() throws Exception {
- IgniteTxEx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteInternalTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheAtomicLongValue val = atomicView.get(key);
@@ -416,7 +415,7 @@ public final class GridCacheAtomicLongImpl implements GridCacheAtomicLongEx, Ext
private Callable<Long> internalGetAndSet(final long l) {
return new Callable<Long>() {
@Override public Long call() throws Exception {
- IgniteTxEx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteInternalTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheAtomicLongValue val = atomicView.get(key);
@@ -456,7 +455,7 @@ public final class GridCacheAtomicLongImpl implements GridCacheAtomicLongEx, Ext
private Callable<Boolean> internalCompareAndSet(final long expVal, final long newVal) {
return new Callable<Boolean>() {
@Override public Boolean call() throws Exception {
- IgniteTxEx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteInternalTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheAtomicLongValue val = atomicView.get(key);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java
index 72504a9..40ac895 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java
@@ -23,7 +23,6 @@ import org.apache.ignite.cache.datastructures.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.transactions.*;
import org.apache.ignite.lang.*;
-import org.apache.ignite.transactions.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.jetbrains.annotations.*;
@@ -194,7 +193,7 @@ public final class GridCacheAtomicReferenceImpl<T> implements GridCacheAtomicRef
private Callable<Boolean> internalSet(final T val) {
return new Callable<Boolean>() {
@Override public Boolean call() throws Exception {
- IgniteTxEx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteInternalTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheAtomicReferenceValue<T> ref = atomicView.get(key);
@@ -233,7 +232,7 @@ public final class GridCacheAtomicReferenceImpl<T> implements GridCacheAtomicRef
final IgniteClosure<T, T> newValClos) {
return new Callable<Boolean>() {
@Override public Boolean call() throws Exception {
- IgniteTxEx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteInternalTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheAtomicReferenceValue<T> ref = atomicView.get(key);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java
index c8c46aa..6c6c890 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java
@@ -24,7 +24,6 @@ import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.transactions.*;
import org.apache.ignite.lang.*;
-import org.apache.ignite.transactions.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.internal.util.future.*;
@@ -401,7 +400,7 @@ public final class GridCacheAtomicSequenceImpl implements GridCacheAtomicSequenc
private Callable<Long> internalUpdate(final long l, final boolean updated) {
return new Callable<Long>() {
@Override public Long call() throws Exception {
- IgniteTxEx tx = CU.txStartInternal(ctx, seqView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteInternalTx tx = CU.txStartInternal(ctx, seqView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheAtomicSequenceValue seq = seqView.get(key);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java
index bf5861a..01764dd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java
@@ -24,7 +24,6 @@ import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.transactions.*;
import org.apache.ignite.internal.util.*;
import org.apache.ignite.lang.*;
-import org.apache.ignite.transactions.*;
import org.apache.ignite.internal.util.tostring.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
@@ -220,7 +219,7 @@ public final class GridCacheAtomicStampedImpl<T, S> implements GridCacheAtomicSt
private Callable<Boolean> internalSet(final T val, final S stamp) {
return new Callable<Boolean>() {
@Override public Boolean call() throws Exception {
- IgniteTxEx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteInternalTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheAtomicStampedValue<T, S> stmp = atomicView.get(key);
@@ -262,7 +261,7 @@ public final class GridCacheAtomicStampedImpl<T, S> implements GridCacheAtomicSt
final IgniteClosure<S, S> newStampClos) {
return new Callable<Boolean>() {
@Override public Boolean call() throws Exception {
- IgniteTxEx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteInternalTx tx = CU.txStartInternal(ctx, atomicView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheAtomicStampedValue<T, S> stmp = atomicView.get(key);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchImpl.java
index 018d8d5..6e9dfa8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchImpl.java
@@ -219,7 +219,7 @@ public final class GridCacheCountDownLatchImpl implements GridCacheCountDownLatc
internalLatch = CU.outTx(
new Callable<CountDownLatch>() {
@Override public CountDownLatch call() throws Exception {
- IgniteTxEx tx = CU.txStartInternal(ctx, latchView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteInternalTx tx = CU.txStartInternal(ctx, latchView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheCountDownLatchValue val = latchView.get(key);
@@ -318,7 +318,7 @@ public final class GridCacheCountDownLatchImpl implements GridCacheCountDownLatc
/** {@inheritDoc} */
@Override public Integer call() throws Exception {
- IgniteTxEx tx = CU.txStartInternal(ctx, latchView, PESSIMISTIC, REPEATABLE_READ);
+ IgniteInternalTx tx = CU.txStartInternal(ctx, latchView, PESSIMISTIC, REPEATABLE_READ);
try {
GridCacheCountDownLatchValue latchVal = latchView.get(key);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheDataStructuresManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheDataStructuresManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheDataStructuresManager.java
index 593459f..0537407 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheDataStructuresManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheDataStructuresManager.java
@@ -199,7 +199,7 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager
return CU.outTx(new Callable<CacheAtomicSequence>() {
@Override public CacheAtomicSequence call() throws Exception {
- try (IgniteTxEx tx = CU.txStartInternal(cctx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteInternalTx tx = CU.txStartInternal(cctx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
GridCacheAtomicSequenceValue seqVal = cast(dsView.get(key),
GridCacheAtomicSequenceValue.class);
@@ -317,7 +317,7 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager
return CU.outTx(new Callable<CacheAtomicLong>() {
@Override
public CacheAtomicLong call() throws Exception {
- try (IgniteTxEx tx = CU.txStartInternal(cctx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteInternalTx tx = CU.txStartInternal(cctx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
GridCacheAtomicLongValue val = cast(dsView.get(key),
GridCacheAtomicLongValue.class);
@@ -413,7 +413,7 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager
return CU.outTx(new Callable<CacheAtomicReference<T>>() {
@Override
public CacheAtomicReference<T> call() throws Exception {
- try (IgniteTxEx tx = CU.txStartInternal(cctx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteInternalTx tx = CU.txStartInternal(cctx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
GridCacheAtomicReferenceValue val = cast(dsView.get(key),
GridCacheAtomicReferenceValue.class);
@@ -512,7 +512,7 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager
return CU.outTx(new Callable<CacheAtomicStamped<T, S>>() {
@Override
public CacheAtomicStamped<T, S> call() throws Exception {
- try (IgniteTxEx tx = CU.txStartInternal(cctx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteInternalTx tx = CU.txStartInternal(cctx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
GridCacheAtomicStampedValue val = cast(dsView.get(key),
GridCacheAtomicStampedValue.class);
@@ -792,7 +792,7 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager
return CU.outTx(new Callable<CacheCountDownLatch>() {
@Override public CacheCountDownLatch call() throws Exception {
- try (IgniteTxEx tx = CU.txStartInternal(cctx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteInternalTx tx = CU.txStartInternal(cctx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
GridCacheCountDownLatchValue val = cast(dsView.get(key),
GridCacheCountDownLatchValue.class);
@@ -856,7 +856,7 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager
@Override public Boolean call() throws Exception {
GridCacheInternal key = new GridCacheInternalKeyImpl(name);
- try (IgniteTxEx tx = CU.txStartInternal(cctx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteInternalTx tx = CU.txStartInternal(cctx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
// Check correctness type of removable object.
GridCacheCountDownLatchValue val =
cast(dsView.get(key), GridCacheCountDownLatchValue.class);
@@ -903,7 +903,7 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager
return CU.outTx(
new Callable<Boolean>() {
@Override public Boolean call() throws Exception {
- try (IgniteTxEx tx = CU.txStartInternal(cctx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteInternalTx tx = CU.txStartInternal(cctx, dsView, PESSIMISTIC, REPEATABLE_READ)) {
// Check correctness type of removable object.
R val = cast(dsView.get(key), cls);
@@ -933,7 +933,7 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager
*
* @param tx Committed transaction.
*/
- public void onTxCommitted(IgniteTxEx<K, V> tx) {
+ public void onTxCommitted(IgniteInternalTx<K, V> tx) {
if (!cctx.isDht() && tx.internal() && (!cctx.isColocated() || cctx.isReplicated())) {
try {
waitInitialization();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridTransactionalCacheQueueImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridTransactionalCacheQueueImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridTransactionalCacheQueueImpl.java
index 9340380..861bbd5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridTransactionalCacheQueueImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridTransactionalCacheQueueImpl.java
@@ -24,7 +24,6 @@ import org.apache.ignite.internal.processors.cache.transactions.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.jetbrains.annotations.*;
-import javax.cache.*;
import java.util.*;
import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
@@ -55,7 +54,7 @@ public class GridTransactionalCacheQueueImpl<T> extends GridCacheQueueAdapter<T>
while (true) {
try {
- try (IgniteTxEx tx = cache.txStartEx(PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteInternalTx tx = cache.txStartEx(PESSIMISTIC, REPEATABLE_READ)) {
Long idx = (Long)cache.invoke(queueKey, new AddProcessor(id, 1)).get();
if (idx != null) {
@@ -103,7 +102,7 @@ public class GridTransactionalCacheQueueImpl<T> extends GridCacheQueueAdapter<T>
T retVal;
while (true) {
- try (IgniteTxEx tx = cache.txStartEx(PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteInternalTx tx = cache.txStartEx(PESSIMISTIC, REPEATABLE_READ)) {
Long idx = (Long)cache.invoke(queueKey, new PollProcessor(id)).get();
if (idx != null) {
@@ -152,7 +151,7 @@ public class GridTransactionalCacheQueueImpl<T> extends GridCacheQueueAdapter<T>
int cnt = 0;
while (true) {
- try (IgniteTxEx tx = cache.txStartEx(PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteInternalTx tx = cache.txStartEx(PESSIMISTIC, REPEATABLE_READ)) {
Long idx = (Long)cache.invoke(queueKey, new AddProcessor(id, items.size())).get();
if (idx != null) {
@@ -205,7 +204,7 @@ public class GridTransactionalCacheQueueImpl<T> extends GridCacheQueueAdapter<T>
int cnt = 0;
while (true) {
- try (IgniteTxEx tx = cache.txStartEx(PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteInternalTx tx = cache.txStartEx(PESSIMISTIC, REPEATABLE_READ)) {
Long idx = (Long)cache.invoke(queueKey, new RemoveProcessor(id, rmvIdx)).get();
if (idx != null) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheCommittedTxInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheCommittedTxInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheCommittedTxInfo.java
index 8609259..72fb002 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheCommittedTxInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheCommittedTxInfo.java
@@ -53,7 +53,7 @@ public class GridCacheCommittedTxInfo<K, V> implements Externalizable {
/**
* @param tx Committed cache transaction.
*/
- public GridCacheCommittedTxInfo(IgniteTxEx<K, V> tx) {
+ public GridCacheCommittedTxInfo(IgniteInternalTx<K, V> tx) {
assert !tx.local() || !tx.replicated();
originatingTxId = tx.nearXidVersion();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxFuture.java
index 21fbffa..958d557 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxFuture.java
@@ -56,7 +56,7 @@ public class GridCacheOptimisticCheckPreparedTxFuture<K, V> extends GridCompound
private final IgniteUuid futId = IgniteUuid.randomUuid();
/** Transaction. */
- private final IgniteTxEx<K, V> tx;
+ private final IgniteInternalTx<K, V> tx;
/** All involved nodes. */
private final Map<UUID, ClusterNode> nodes;
@@ -77,7 +77,7 @@ public class GridCacheOptimisticCheckPreparedTxFuture<K, V> extends GridCompound
* @param txNodes Transaction mapping.
*/
@SuppressWarnings("ConstantConditions")
- public GridCacheOptimisticCheckPreparedTxFuture(GridCacheSharedContext<K, V> cctx, IgniteTxEx<K, V> tx,
+ public GridCacheOptimisticCheckPreparedTxFuture(GridCacheSharedContext<K, V> cctx, IgniteInternalTx<K, V> tx,
UUID failedNodeId, Map<UUID, Collection<UUID>> txNodes) {
super(cctx.kernalContext(), CU.boolReducer());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java
index 73ad5d0..41144b1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java
@@ -59,7 +59,7 @@ public class GridCacheOptimisticCheckPreparedTxRequest<K, V> extends GridDistrib
* @param futId Future ID.
* @param miniId Mini future ID.
*/
- public GridCacheOptimisticCheckPreparedTxRequest(IgniteTxEx<K, V> tx, int txNum, IgniteUuid futId, IgniteUuid miniId) {
+ public GridCacheOptimisticCheckPreparedTxRequest(IgniteInternalTx<K, V> tx, int txNum, IgniteUuid futId, IgniteUuid miniId) {
super(tx.xidVersion(), 0);
nearXidVer = tx.nearXidVersion();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePerThreadTxCommitBuffer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePerThreadTxCommitBuffer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePerThreadTxCommitBuffer.java
index e6c7e5c..120127a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePerThreadTxCommitBuffer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePerThreadTxCommitBuffer.java
@@ -58,7 +58,7 @@ public class GridCachePerThreadTxCommitBuffer<K, V> implements GridCacheTxCommit
}
/** {@inheritDoc} */
- @Override public void addCommittedTx(IgniteTxEx<K, V> tx) {
+ @Override public void addCommittedTx(IgniteInternalTx<K, V> tx) {
long threadId = tx.threadId();
StoreKey key = new StoreKey(tx.eventNodeId(), threadId);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxFuture.java
index 2c6cc51..730c358 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxFuture.java
@@ -54,7 +54,7 @@ public class GridCachePessimisticCheckCommittedTxFuture<K, V> extends GridCompou
private final IgniteUuid futId = IgniteUuid.randomUuid();
/** Transaction. */
- private final IgniteTxEx<K, V> tx;
+ private final IgniteInternalTx<K, V> tx;
/** All involved nodes. */
private final Map<UUID, ClusterNode> nodes;
@@ -71,7 +71,7 @@ public class GridCachePessimisticCheckCommittedTxFuture<K, V> extends GridCompou
* @param failedNodeId ID of failed node started transaction.
*/
@SuppressWarnings("ConstantConditions")
- public GridCachePessimisticCheckCommittedTxFuture(GridCacheSharedContext<K, V> cctx, IgniteTxEx<K, V> tx,
+ public GridCachePessimisticCheckCommittedTxFuture(GridCacheSharedContext<K, V> cctx, IgniteInternalTx<K, V> tx,
UUID failedNodeId) {
super(cctx.kernalContext(), new SingleReducer<K, V>());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxRequest.java
index 2aae468..9280e48 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxRequest.java
@@ -67,7 +67,7 @@ public class GridCachePessimisticCheckCommittedTxRequest<K, V> extends GridDistr
* @param originatingThreadId Originating thread ID.
* @param futId Future ID.
*/
- public GridCachePessimisticCheckCommittedTxRequest(IgniteTxEx<K, V> tx, long originatingThreadId, IgniteUuid futId,
+ public GridCachePessimisticCheckCommittedTxRequest(IgniteInternalTx<K, V> tx, long originatingThreadId, IgniteUuid futId,
boolean nearOnlyCheck) {
super(tx.xidVersion(), 0);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxCommitBuffer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxCommitBuffer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxCommitBuffer.java
index dd099db..54342d7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxCommitBuffer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxCommitBuffer.java
@@ -32,7 +32,7 @@ public interface GridCacheTxCommitBuffer<K, V> {
*
* @param tx Committed transaction.
*/
- public void addCommittedTx(IgniteTxEx<K, V> tx);
+ public void addCommittedTx(IgniteInternalTx<K, V> tx);
/**
* Gets transaction from commit buffer.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
index 078e84e..9f32d14 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
@@ -721,7 +721,7 @@ public class GridDistributedCacheEntry<K, V> extends GridCacheMapEntry<K, V> {
}
/** {@inheritDoc} */
- @Override public boolean tmLock(IgniteTxEx<K, V> tx, long timeout)
+ @Override public boolean tmLock(IgniteInternalTx<K, V> tx, long timeout)
throws GridCacheEntryRemovedException, GridDistributedLockCancelledException {
if (tx.local())
// Null is returned if timeout is negative and there is other lock owner.
@@ -756,7 +756,7 @@ public class GridDistributedCacheEntry<K, V> extends GridCacheMapEntry<K, V> {
}
/** {@inheritDoc} */
- @Override public void txUnlock(IgniteTxEx<K, V> tx) throws GridCacheEntryRemovedException {
+ @Override public void txUnlock(IgniteInternalTx<K, V> tx) throws GridCacheEntryRemovedException {
removeLock(tx.xidVersion());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d89ef5bd/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 7d5741f..9dbeacd 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
@@ -132,7 +132,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe
* @param txNodes Transaction nodes mapping.
*/
public GridDistributedTxPrepareRequest(
- IgniteTxEx<K, V> tx,
+ IgniteInternalTx<K, V> tx,
@Nullable Collection<IgniteTxEntry<K, V>> reads,
Collection<IgniteTxEntry<K, V>> writes,
IgniteTxKey grpLockKey,