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 2014/12/22 11:42:42 UTC
[40/50] [abbrv] incubator-ignite git commit: GG-9141 - Renaming.
GG-9141 - Renaming.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cd46f567
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cd46f567
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cd46f567
Branch: refs/heads/ignite-41
Commit: cd46f567364c1b42911878ed5ce8256fcc68f7d9
Parents: 8365bb3
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Fri Dec 19 18:53:42 2014 -0800
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Fri Dec 19 18:53:42 2014 -0800
----------------------------------------------------------------------
.../GridClientAbstractMultiNodeSelfTest.java | 5 +-
.../processors/cache/GridCacheAdapter.java | 122 +-
.../processors/cache/GridCacheContext.java | 7 +-
.../processors/cache/GridCacheEntryEx.java | 15 +-
.../processors/cache/GridCacheEntryImpl.java | 7 +-
.../cache/GridCacheEvictionEntry.java | 5 +-
.../cache/GridCacheEvictionManager.java | 3 +-
.../processors/cache/GridCacheMapEntry.java | 31 +-
.../processors/cache/GridCacheMessage.java | 9 +-
.../cache/GridCacheMultiTxFuture.java | 13 +-
.../kernal/processors/cache/GridCacheMvcc.java | 3 +-
.../processors/cache/GridCacheMvccManager.java | 15 +-
.../processors/cache/GridCacheProcessor.java | 2 +-
.../cache/GridCacheSharedContext.java | 16 +-
.../processors/cache/GridCacheTxAdapter.java | 1523 ---------
.../processors/cache/GridCacheTxEntry.java | 1059 ------
.../kernal/processors/cache/GridCacheTxEx.java | 519 ---
.../processors/cache/GridCacheTxHandler.java | 1492 --------
.../kernal/processors/cache/GridCacheTxKey.java | 97 -
.../cache/GridCacheTxLocalAdapter.java | 3178 -----------------
.../processors/cache/GridCacheTxLocalEx.java | 166 -
.../processors/cache/GridCacheTxManager.java | 2212 ------------
.../kernal/processors/cache/GridCacheTxMap.java | 179 -
.../processors/cache/GridCacheTxRemoteEx.java | 37 -
.../kernal/processors/cache/GridCacheUtils.java | 57 +-
.../GridCacheDataStructuresManager.java | 7 +-
.../distributed/GridCacheCommittedTxInfo.java | 9 +-
...ridCacheOptimisticCheckPreparedTxFuture.java | 6 +-
...idCacheOptimisticCheckPreparedTxRequest.java | 3 +-
.../GridCachePerThreadTxCommitBuffer.java | 3 +-
...dCachePessimisticCheckCommittedTxFuture.java | 9 +-
...CachePessimisticCheckCommittedTxRequest.java | 3 +-
.../distributed/GridCacheTxCommitBuffer.java | 3 +-
.../GridDistributedCacheAdapter.java | 7 +-
.../distributed/GridDistributedCacheEntry.java | 5 +-
.../distributed/GridDistributedLockRequest.java | 13 +-
.../GridDistributedTxFinishRequest.java | 31 +-
.../distributed/GridDistributedTxMapping.java | 31 +-
.../GridDistributedTxPrepareRequest.java | 53 +-
.../GridDistributedTxRemoteAdapter.java | 67 +-
.../distributed/dht/GridDhtCacheEntry.java | 5 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 5 +-
.../distributed/dht/GridDhtLockFuture.java | 3 +-
.../distributed/dht/GridDhtLockRequest.java | 5 +-
.../distributed/dht/GridDhtLockResponse.java | 7 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 21 +-
.../distributed/dht/GridDhtTxFinishRequest.java | 19 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 31 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 29 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 67 +-
.../dht/GridDhtTxPrepareRequest.java | 25 +-
.../dht/GridDhtTxPrepareResponse.java | 7 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 15 +-
.../dht/atomic/GridDhtAtomicCache.java | 3 +-
.../dht/colocated/GridDhtColocatedCache.java | 7 +-
.../colocated/GridDhtColocatedLockFuture.java | 9 +-
.../distributed/near/GridNearAtomicCache.java | 3 +-
.../distributed/near/GridNearCacheAdapter.java | 7 +-
.../distributed/near/GridNearCacheEntry.java | 5 +-
.../distributed/near/GridNearGetFuture.java | 5 +-
.../distributed/near/GridNearLockFuture.java | 7 +-
.../distributed/near/GridNearLockRequest.java | 5 +-
.../near/GridNearTransactionalCache.java | 13 +-
.../near/GridNearTxFinishFuture.java | 3 +-
.../near/GridNearTxFinishRequest.java | 5 +-
.../cache/distributed/near/GridNearTxLocal.java | 89 +-
.../near/GridNearTxPrepareFuture.java | 49 +-
.../near/GridNearTxPrepareRequest.java | 15 +-
.../near/GridNearTxPrepareResponse.java | 15 +-
.../distributed/near/GridNearTxRemote.java | 31 +-
.../processors/cache/dr/GridCacheDrManager.java | 3 +-
.../cache/dr/os/GridOsCacheDrManager.java | 3 +-
.../processors/cache/local/GridLocalCache.java | 7 +-
.../cache/local/GridLocalCacheEntry.java | 5 +-
.../cache/local/GridLocalLockFuture.java | 6 +-
.../processors/cache/local/GridLocalTx.java | 9 +-
.../cache/local/GridLocalTxFuture.java | 9 +-
.../local/atomic/GridLocalAtomicCache.java | 3 +-
.../transactions/IgniteTransactionsImpl.java | 4 +-
.../cache/transactions/IgniteTxAdapter.java | 1523 +++++++++
.../cache/transactions/IgniteTxEntry.java | 1060 ++++++
.../cache/transactions/IgniteTxEx.java | 520 +++
.../cache/transactions/IgniteTxHandler.java | 1493 ++++++++
.../cache/transactions/IgniteTxKey.java | 97 +
.../transactions/IgniteTxLocalAdapter.java | 3179 ++++++++++++++++++
.../cache/transactions/IgniteTxLocalEx.java | 167 +
.../cache/transactions/IgniteTxManager.java | 2213 ++++++++++++
.../cache/transactions/IgniteTxMap.java | 179 +
.../cache/transactions/IgniteTxProxyImpl.java | 6 +-
.../cache/transactions/IgniteTxRemoteEx.java | 39 +
.../processors/cache/GridCacheTestEntryEx.java | 17 +-
.../processors/cache/GridCacheTestStore.java | 3 +-
...xOriginatingNodeFailureAbstractSelfTest.java | 2 +-
...cOriginatingNodeFailureAbstractSelfTest.java | 5 +-
.../atomic/GridCacheAtomicPreloadSelfTest.java | 4 +-
.../near/GridCacheNearTxMultiNodeSelfTest.java | 8 +-
.../GridCachePartitionedTxSalvageSelfTest.java | 9 +-
.../ggfs/GridGgfsDataManagerSelfTest.java | 7 +-
.../loadtests/hashmap/GridCacheTestContext.java | 4 +-
.../loadtests/hashmap/GridHashMapLoadTest.java | 5 +-
.../cache/jta/GridCacheJtaManager.java | 4 +-
.../cache/jta/GridCacheXAResource.java | 5 +-
102 files changed, 11104 insertions(+), 11026 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java
index 60ab835..62c0d4c 100644
--- a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java
+++ b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java
@@ -28,6 +28,7 @@ import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.managers.communication.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
+import org.gridgain.grid.kernal.processors.cache.transactions.*;
import org.gridgain.grid.util.direct.*;
import org.gridgain.grid.util.typedef.*;
import org.gridgain.testframework.*;
@@ -781,11 +782,11 @@ public abstract class GridClientAbstractMultiNodeSelfTest extends GridCommonAbst
GridCacheContext<Object, Object> cacheCtx = g.internalCache(REPLICATED_ASYNC_CACHE_NAME).context();
- GridCacheTxManager<Object, Object> tm = cacheCtx.tm();
+ IgniteTxManager<Object, Object> tm = cacheCtx.tm();
GridCacheVersion v = ((GridCacheVersionable)o).version();
- GridCacheTxEx t = tm.tx(v);
+ IgniteTxEx 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/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
index 3a6d702..a88cc02 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
@@ -488,7 +488,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
public abstract IgniteFuture<Boolean> txLockAsync(
Collection<? extends K> keys,
long timeout,
- GridCacheTxLocalEx<K, V> tx,
+ IgniteTxLocalEx<K, V> tx,
boolean isRead,
boolean retval,
IgniteTxIsolation isolation,
@@ -625,7 +625,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
}
}
- GridCacheTxEx<K, V> tx = ctx.tm().localTx();
+ IgniteTxEx<K, V> tx = ctx.tm().localTx();
if (tx != null) {
GridTuple<V> peek = tx.peek(ctx, failFast, key, filter);
@@ -704,7 +704,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
* @return Peeked value.
* @throws IgniteCheckedException In case of error.
*/
- @Nullable protected V peek0(K key, @Nullable Collection<GridCachePeekMode> modes, GridCacheTxEx<K, V> tx)
+ @Nullable protected V peek0(K key, @Nullable Collection<GridCachePeekMode> modes, IgniteTxEx<K, V> tx)
throws IgniteCheckedException {
try {
GridTuple<V> peek = peek0(false, key, modes, tx);
@@ -730,7 +730,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
* @throws GridCacheFilterFailedException If filer validation failed.
*/
@Nullable protected GridTuple<V> peek0(boolean failFast, K key, @Nullable Collection<GridCachePeekMode> modes,
- GridCacheTxEx<K, V> tx) throws IgniteCheckedException, GridCacheFilterFailedException {
+ IgniteTxEx<K, V> tx) throws IgniteCheckedException, GridCacheFilterFailedException {
if (F.isEmpty(modes))
return F.t(peek(key, (IgnitePredicate<GridCacheEntry<K, V>>)null));
@@ -801,7 +801,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
* @throws IgniteCheckedException If failed.
*/
protected Map<K, V> peekAll0(@Nullable Collection<? extends K> keys, @Nullable Collection<GridCachePeekMode> modes,
- GridCacheTxEx<K, V> tx, @Nullable Collection<K> skipped) throws IgniteCheckedException {
+ IgniteTxEx<K, V> tx, @Nullable Collection<K> skipped) throws IgniteCheckedException {
if (F.isEmpty(keys))
return emptyMap();
@@ -1242,7 +1242,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
/**
* @param entry Removes entry from cache if currently mapped value is the same as passed.
*/
- protected void removeEntry(GridCacheEntryEx<K, V> entry) {
+ public void removeEntry(GridCacheEntryEx<K, V> entry) {
map.removeEntry(entry);
}
@@ -1371,7 +1371,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
* @return Future.
*/
public IgniteFuture<Object> readThroughAllAsync(final Collection<? extends K> keys, boolean reload,
- @Nullable final GridCacheTxEx<K, V> tx, IgnitePredicate<GridCacheEntry<K, V>>[] filter, @Nullable UUID subjId,
+ @Nullable final IgniteTxEx<K, V> tx, IgnitePredicate<GridCacheEntry<K, V>>[] filter, @Nullable UUID subjId,
String taskName, final IgniteBiInClosure<K, V> vis) {
return ctx.closures().callLocalSafe(new GPC<Object>() {
@Nullable @Override public Object call() {
@@ -1712,7 +1712,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
if (keyCheck)
validateCacheKeys(keys);
- GridCacheTxLocalAdapter<K, V> tx = null;
+ IgniteTxLocalAdapter<K, V> tx = null;
if (checkTx) {
try {
@@ -1812,7 +1812,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
final Collection<K> redos = new LinkedList<>();
- final GridCacheTxLocalAdapter<K, V> tx0 = tx;
+ final IgniteTxLocalAdapter<K, V> tx0 = tx;
final Collection<K> loaded = new HashSet<>();
@@ -1964,7 +1964,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
final GridCacheEntryEx<K, V> cached0 = cached;
return asyncOp(tx, new AsyncOp<Map<K, V>>(keys) {
- @Override public IgniteFuture<Map<K, V>> op(GridCacheTxLocalAdapter<K, V> tx) {
+ @Override public IgniteFuture<Map<K, V>> op(IgniteTxLocalAdapter<K, V> tx) {
return ctx.wrapCloneMap(tx.getAllAsync(ctx, keys, cached0, deserializePortable, filter));
}
});
@@ -1990,7 +1990,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
ctx.denyOnLocalRead();
return ctx.cloneOnFlag(syncOp(new SyncOp<V>(true) {
- @Override public V op(GridCacheTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
+ @Override public V op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
return tx.putAllAsync(ctx, F.t(key, val), true, cached, ttl, filter).get().value();
}
@@ -2015,7 +2015,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
return syncOp(new SyncOp<Boolean>(true) {
@Override
- public Boolean op(GridCacheTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
+ public Boolean op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
return tx.putAllAsync(ctx, F.t(key, val), false, cached, ttl, filter).get().success();
}
@@ -2046,7 +2046,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
return ctx.wrapClone(asyncOp(new AsyncOp<V>(key) {
@Override
- public IgniteFuture<V> op(GridCacheTxLocalAdapter<K, V> tx) {
+ public IgniteFuture<V> op(IgniteTxLocalAdapter<K, V> tx) {
return tx.putAllAsync(ctx, F.t(key, val), true, entry, ttl, filter)
.chain((IgniteClosure<IgniteFuture<GridCacheReturn<V>>, V>)RET2VAL);
}
@@ -2072,7 +2072,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
return syncOp(new SyncOp<Boolean>(true) {
@Override
- public Boolean op(GridCacheTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
+ public Boolean op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
return tx.putAllAsync(ctx, F.t(key, val), false, null, -1, filter).get().success();
}
@@ -2093,7 +2093,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
ctx.denyOnLocalRead();
syncOp(new SyncInOp(drMap.size() == 1) {
- @Override public void inOp(GridCacheTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
+ @Override public void inOp(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
tx.putAllDrAsync(ctx, drMap).get();
}
@@ -2114,7 +2114,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
ctx.denyOnLocalRead();
return asyncOp(new AsyncInOp(drMap.keySet()) {
- @Override public IgniteFuture<?> inOp(GridCacheTxLocalAdapter<K, V> tx) {
+ @Override public IgniteFuture<?> inOp(IgniteTxLocalAdapter<K, V> tx) {
return tx.putAllDrAsync(ctx, drMap);
}
@@ -2134,7 +2134,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
ctx.denyOnLocalRead();
syncOp(new SyncInOp(true) {
- @Override public void inOp(GridCacheTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
+ @Override public void inOp(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
tx.transformAllAsync(ctx, Collections.singletonMap(key, transformer), false, null, -1).get();
}
@@ -2155,7 +2155,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
ctx.denyOnLocalRead();
return syncOp(new SyncOp<R>(true) {
- @Override public R op(GridCacheTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
+ @Override public R op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
IgniteFuture<GridCacheReturn<V>> ret = tx.transformAllAsync(ctx,
F.t(key, new GridCacheTransformComputeClosure<>(transformer)), true, null, -1);
@@ -2188,7 +2188,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
ctx.denyOnLocalRead();
return asyncOp(new AsyncOp<Boolean>(key) {
- @Override public IgniteFuture<Boolean> op(GridCacheTxLocalAdapter<K, V> tx) {
+ @Override public IgniteFuture<Boolean> op(IgniteTxLocalAdapter<K, V> tx) {
return tx.putAllAsync(ctx, F.t(key, val), false, entry, ttl, filter).chain(
(IgniteClosure<IgniteFuture<GridCacheReturn<V>>, Boolean>)RET2FLAG);
}
@@ -2215,7 +2215,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
ctx.denyOnLocalRead();
return asyncOp(new AsyncInOp(key) {
- @Override public IgniteFuture<?> inOp(GridCacheTxLocalAdapter<K, V> tx) {
+ @Override public IgniteFuture<?> inOp(IgniteTxLocalAdapter<K, V> tx) {
return tx.transformAllAsync(ctx, F.t(key, transformer), false, entry, ttl);
}
@@ -2237,7 +2237,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
ctx.denyOnLocalRead();
return ctx.cloneOnFlag(syncOp(new SyncOp<V>(true) {
- @Override public V op(GridCacheTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
+ @Override public V op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
return tx.putAllAsync(ctx, F.t(key, val), true, null, -1, ctx.noPeekArray()).get().value();
}
@@ -2259,7 +2259,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
ctx.denyOnLocalRead();
return ctx.wrapClone(asyncOp(new AsyncOp<V>(key) {
- @Override public IgniteFuture<V> op(GridCacheTxLocalAdapter<K, V> tx) {
+ @Override public IgniteFuture<V> op(IgniteTxLocalAdapter<K, V> tx) {
return tx.putAllAsync(ctx, F.t(key, val), true, null, -1, ctx.noPeekArray())
.chain((IgniteClosure<IgniteFuture<GridCacheReturn<V>>, V>)RET2VAL);
}
@@ -2282,7 +2282,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
ctx.denyOnLocalRead();
return syncOp(new SyncOp<Boolean>(true) {
- @Override public Boolean op(GridCacheTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
+ @Override public Boolean op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
return tx.putAllAsync(ctx, F.t(key, val), false, null, -1, ctx.noPeekArray()).get().success();
}
@@ -2304,7 +2304,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
ctx.denyOnLocalRead();
return asyncOp(new AsyncOp<Boolean>(key) {
- @Override public IgniteFuture<Boolean> op(GridCacheTxLocalAdapter<K, V> tx) {
+ @Override public IgniteFuture<Boolean> op(IgniteTxLocalAdapter<K, V> tx) {
return tx.putAllAsync(ctx, F.t(key, val), false, null, -1, ctx.noPeekArray()).chain(
(IgniteClosure<IgniteFuture<GridCacheReturn<V>>, Boolean>)RET2FLAG);
}
@@ -2328,7 +2328,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
ctx.denyOnLocalRead();
return ctx.cloneOnFlag(syncOp(new SyncOp<V>(true) {
- @Override public V op(GridCacheTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
+ @Override public V op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
return tx.putAllAsync(ctx, F.t(key, val), true, null, -1, ctx.hasPeekArray()).get().value();
}
@@ -2350,7 +2350,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
ctx.denyOnLocalRead();
return ctx.wrapClone(asyncOp(new AsyncOp<V>(key) {
- @Override public IgniteFuture<V> op(GridCacheTxLocalAdapter<K, V> tx) {
+ @Override public IgniteFuture<V> op(IgniteTxLocalAdapter<K, V> tx) {
return tx.putAllAsync(ctx, F.t(key, val), true, null, -1, ctx.hasPeekArray()).chain(
(IgniteClosure<IgniteFuture<GridCacheReturn<V>>, V>)RET2VAL);
}
@@ -2373,7 +2373,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
ctx.denyOnLocalRead();
return syncOp(new SyncOp<Boolean>(true) {
- @Override public Boolean op(GridCacheTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
+ @Override public Boolean op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
return tx.putAllAsync(ctx, F.t(key, val), false, null, -1, ctx.hasPeekArray()).get().success();
}
@@ -2395,7 +2395,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
ctx.denyOnLocalRead();
return asyncOp(new AsyncOp<Boolean>(key) {
- @Override public IgniteFuture<Boolean> op(GridCacheTxLocalAdapter<K, V> tx) {
+ @Override public IgniteFuture<Boolean> op(IgniteTxLocalAdapter<K, V> tx) {
return tx.putAllAsync(ctx, F.t(key, val), false, null, -1, ctx.hasPeekArray()).chain(
(IgniteClosure<IgniteFuture<GridCacheReturn<V>>, Boolean>)RET2FLAG);
}
@@ -2420,7 +2420,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
ctx.denyOnLocalRead();
return syncOp(new SyncOp<Boolean>(true) {
- @Override public Boolean op(GridCacheTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
+ @Override public Boolean op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
// Register before hiding in the filter.
if (ctx.deploymentEnabled())
ctx.deploy().registerClass(oldVal);
@@ -2449,7 +2449,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
ctx.denyOnLocalRead();
return asyncOp(new AsyncOp<Boolean>(key) {
- @Override public IgniteFuture<Boolean> op(GridCacheTxLocalAdapter<K, V> tx) {
+ @Override public IgniteFuture<Boolean> op(IgniteTxLocalAdapter<K, V> tx) {
// Register before hiding in the filter.
if (ctx.deploymentEnabled()) {
try {
@@ -2484,7 +2484,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
ctx.denyOnLocalRead();
syncOp(new SyncInOp(m.size() == 1) {
- @Override public void inOp(GridCacheTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
+ @Override public void inOp(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
tx.putAllAsync(ctx, m, false, null, -1, filter).get();
}
@@ -2506,7 +2506,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
ctx.denyOnLocalRead();
syncOp(new SyncInOp(m.size() == 1) {
- @Override public void inOp(GridCacheTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
+ @Override public void inOp(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
tx.transformAllAsync(ctx, m, false, null, -1).get();
}
@@ -2544,7 +2544,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
ctx.denyOnLocalRead();
return asyncOp(new AsyncInOp(m.keySet()) {
- @Override public IgniteFuture<?> inOp(GridCacheTxLocalAdapter<K, V> tx) {
+ @Override public IgniteFuture<?> inOp(IgniteTxLocalAdapter<K, V> tx) {
return tx.putAllAsync(ctx, m, false, null, -1, filter);
}
@@ -2565,7 +2565,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
ctx.denyOnLocalRead();
return asyncOp(new AsyncInOp(m.keySet()) {
- @Override public IgniteFuture<?> inOp(GridCacheTxLocalAdapter<K, V> tx) {
+ @Override public IgniteFuture<?> inOp(IgniteTxLocalAdapter<K, V> tx) {
return tx.transformAllAsync(ctx, m, false, null, -1);
}
@@ -2606,7 +2606,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
validateCacheKey(key);
return ctx.cloneOnFlag(syncOp(new SyncOp<V>(true) {
- @Override public V op(GridCacheTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
+ @Override public V op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
V ret = tx.removeAllAsync(ctx, Collections.singletonList(key), entry, true, filter).get().value();
if (ctx.config().getInterceptor() != null)
@@ -2637,7 +2637,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
validateCacheKey(key);
return ctx.wrapClone(asyncOp(new AsyncOp<V>(key) {
- @Override public IgniteFuture<V> op(GridCacheTxLocalAdapter<K, V> tx) {
+ @Override public IgniteFuture<V> op(IgniteTxLocalAdapter<K, V> tx) {
// TODO should we invoke interceptor here?
return tx.removeAllAsync(ctx, Collections.singletonList(key), null, true, filter)
.chain((IgniteClosure<IgniteFuture<GridCacheReturn<V>>, V>) RET2VAL);
@@ -2672,7 +2672,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
final Collection<K> pKeys0 = pKeys;
syncOp(new SyncInOp(keys.size() == 1) {
- @Override public void inOp(GridCacheTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
+ @Override public void inOp(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
tx.removeAllAsync(ctx, pKeys0 != null ? pKeys0 : keys, null, false, filter).get();
}
@@ -2694,7 +2694,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
ctx.denyOnLocalRead();
return asyncOp(new AsyncInOp(keys) {
- @Override public IgniteFuture<?> inOp(GridCacheTxLocalAdapter<K, V> tx) {
+ @Override public IgniteFuture<?> inOp(IgniteTxLocalAdapter<K, V> tx) {
return tx.removeAllAsync(ctx, keys, null, false, filter);
}
@@ -2721,7 +2721,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
validateCacheKey(key);
return syncOp(new SyncOp<Boolean>(true) {
- @Override public Boolean op(GridCacheTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
+ @Override public Boolean op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
return tx.removeAllAsync(ctx, Collections.singletonList(key), entry, false, filter).get().success();
}
@@ -2747,7 +2747,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
validateCacheKey(key);
return asyncOp(new AsyncOp<Boolean>(key) {
- @Override public IgniteFuture<Boolean> op(GridCacheTxLocalAdapter<K, V> tx) {
+ @Override public IgniteFuture<Boolean> op(IgniteTxLocalAdapter<K, V> tx) {
return tx.removeAllAsync(ctx, Collections.singletonList(key), entry, false, filter).chain(
(IgniteClosure<IgniteFuture<GridCacheReturn<V>>, Boolean>)RET2FLAG);
}
@@ -2768,7 +2768,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
validateCacheKey(key);
return syncOp(new SyncOp<GridCacheReturn<V>>(true) {
- @Override public GridCacheReturn<V> op(GridCacheTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
+ @Override public GridCacheReturn<V> op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
// Register before hiding in the filter.
if (ctx.deploymentEnabled())
ctx.deploy().registerClass(val);
@@ -2793,7 +2793,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
ctx.dr().onReceiveCacheEntriesReceived(drMap.size());
syncOp(new SyncInOp(false) {
- @Override public void inOp(GridCacheTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
+ @Override public void inOp(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
tx.removeAllDrAsync(ctx, drMap).get();
}
@@ -2814,7 +2814,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
ctx.dr().onReceiveCacheEntriesReceived(drMap.size());
return asyncOp(new AsyncInOp(drMap.keySet()) {
- @Override public IgniteFuture<?> inOp(GridCacheTxLocalAdapter<K, V> tx) {
+ @Override public IgniteFuture<?> inOp(IgniteTxLocalAdapter<K, V> tx) {
return tx.removeAllDrAsync(ctx, drMap);
}
@@ -2834,7 +2834,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
ctx.denyOnLocalRead();
return syncOp(new SyncOp<GridCacheReturn<V>>(true) {
- @Override public GridCacheReturn<V> op(GridCacheTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
+ @Override public GridCacheReturn<V> op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
// Register before hiding in the filter.
if (ctx.deploymentEnabled())
ctx.deploy().registerClass(oldVal);
@@ -2858,7 +2858,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
validateCacheKey(key);
return asyncOp(new AsyncOp<GridCacheReturn<V>>(key) {
- @Override public IgniteFuture<GridCacheReturn<V>> op(GridCacheTxLocalAdapter<K, V> tx) {
+ @Override public IgniteFuture<GridCacheReturn<V>> op(IgniteTxLocalAdapter<K, V> tx) {
// Register before hiding in the filter.
try {
if (ctx.deploymentEnabled())
@@ -2888,7 +2888,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
ctx.denyOnLocalRead();
return asyncOp(new AsyncOp<GridCacheReturn<V>>(key) {
- @Override public IgniteFuture<GridCacheReturn<V>> op(GridCacheTxLocalAdapter<K, V> tx) {
+ @Override public IgniteFuture<GridCacheReturn<V>> op(IgniteTxLocalAdapter<K, V> tx) {
// Register before hiding in the filter.
try {
if (ctx.deploymentEnabled())
@@ -2919,7 +2919,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
validateCacheValue(val);
return syncOp(new SyncOp<Boolean>(true) {
- @Override public Boolean op(GridCacheTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
+ @Override public Boolean op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
// Register before hiding in the filter.
if (ctx.deploymentEnabled())
ctx.deploy().registerClass(val);
@@ -2951,7 +2951,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
validateCacheValue(val);
return asyncOp(new AsyncOp<Boolean>(key) {
- @Override public IgniteFuture<Boolean> op(GridCacheTxLocalAdapter<K, V> tx) {
+ @Override public IgniteFuture<Boolean> op(IgniteTxLocalAdapter<K, V> tx) {
// Register before hiding in the filter.
if (ctx.deploymentEnabled()) {
try {
@@ -2994,7 +2994,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
final IgnitePredicate<GridCacheEntry<K, V>>[] p = filter;
syncOp(new SyncInOp(false) {
- @Override public void inOp(GridCacheTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
+ @Override public void inOp(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
tx.removeAllAsync(ctx, keySet(p), null, false, null).get();
}
@@ -3011,7 +3011,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
final Set<? extends K> keys = keySet(filter);
return asyncOp(new AsyncInOp(keys) {
- @Override public IgniteFuture<?> inOp(GridCacheTxLocalAdapter<K, V> tx) {
+ @Override public IgniteFuture<?> inOp(IgniteTxLocalAdapter<K, V> tx) {
return tx.removeAllAsync(ctx, keys, null, false, null);
}
@@ -3035,7 +3035,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
/** {@inheritDoc} */
@Nullable @Override public IgniteTx tx() {
- GridCacheTxAdapter<K, V> tx = ctx.tm().threadLocalTx();
+ IgniteTxAdapter<K, V> tx = ctx.tm().threadLocalTx();
return tx == null ? null : new IgniteTxProxyImpl<>(tx, ctx.shared());
}
@@ -3601,7 +3601,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
awaitLastFut();
- GridCacheTxLocalAdapter<K, V> tx = ctx.tm().threadLocalTx();
+ IgniteTxLocalAdapter<K, V> tx = ctx.tm().threadLocalTx();
if (tx == null || tx.implicit()) {
TransactionsConfiguration tCfg = ctx.gridConfig().getTransactionsConfiguration();
@@ -3678,7 +3678,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
if (log.isDebugEnabled())
log.debug("Performing async op: " + op);
- GridCacheTxLocalAdapter<K, V> tx = ctx.tm().threadLocalTx();
+ IgniteTxLocalAdapter<K, V> tx = ctx.tm().threadLocalTx();
if (tx == null || tx.implicit()) {
tx = ctx.tm().newTx(
@@ -3708,7 +3708,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
* @return Future.
*/
@SuppressWarnings("unchecked")
- protected <T> IgniteFuture<T> asyncOp(GridCacheTxLocalAdapter<K, V> tx, final AsyncOp<T> op) {
+ protected <T> IgniteFuture<T> asyncOp(IgniteTxLocalAdapter<K, V> tx, final AsyncOp<T> op) {
IgniteFuture<T> fail = asyncOpAcquire();
if (fail != null)
@@ -3722,7 +3722,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
IgniteFuture fut = holder.future();
if (fut != null && !fut.isDone()) {
- final GridCacheTxLocalAdapter<K, V> tx0 = tx;
+ final IgniteTxLocalAdapter<K, V> tx0 = tx;
IgniteFuture<T> f = new GridEmbeddedFuture<>(fut,
new C2<T, Exception, IgniteFuture<T>>() {
@@ -4505,7 +4505,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
* @return Operation return value.
* @throws IgniteCheckedException If failed.
*/
- @Nullable public abstract T op(GridCacheTxLocalAdapter<K, V> tx) throws IgniteCheckedException;
+ @Nullable public abstract T op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException;
}
/**
@@ -4520,7 +4520,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
}
/** {@inheritDoc} */
- @Nullable @Override public final Object op(GridCacheTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
+ @Nullable @Override public final Object op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException {
inOp(tx);
return null;
@@ -4530,7 +4530,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
* @param tx Transaction.
* @throws IgniteCheckedException If failed.
*/
- public abstract void inOp(GridCacheTxLocalAdapter<K, V> tx) throws IgniteCheckedException;
+ public abstract void inOp(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException;
}
/**
@@ -4579,7 +4579,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
* @param tx Transaction.
* @return Operation return value.
*/
- public abstract IgniteFuture<T> op(GridCacheTxLocalAdapter<K, V> tx);
+ public abstract IgniteFuture<T> op(IgniteTxLocalAdapter<K, V> tx);
}
/**
@@ -4602,7 +4602,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
/** {@inheritDoc} */
@SuppressWarnings({"unchecked"})
- @Override public final IgniteFuture<Object> op(GridCacheTxLocalAdapter<K, V> tx) {
+ @Override public final IgniteFuture<Object> op(IgniteTxLocalAdapter<K, V> tx) {
return (IgniteFuture<Object>)inOp(tx);
}
@@ -4610,7 +4610,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
* @param tx Transaction.
* @return Operation return value.
*/
- public abstract IgniteFuture<?> inOp(GridCacheTxLocalAdapter<K, V> tx);
+ public abstract IgniteFuture<?> inOp(IgniteTxLocalAdapter<K, V> tx);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
index a15713e..dd55965 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
@@ -32,6 +32,7 @@ import org.gridgain.grid.kernal.processors.cache.jta.*;
import org.gridgain.grid.kernal.processors.cache.local.*;
import org.gridgain.grid.kernal.processors.cache.query.*;
import org.gridgain.grid.kernal.processors.cache.query.continuous.*;
+import org.gridgain.grid.kernal.processors.cache.transactions.*;
import org.gridgain.grid.kernal.processors.closure.*;
import org.gridgain.grid.kernal.processors.offheap.*;
import org.gridgain.grid.kernal.processors.portable.*;
@@ -527,8 +528,8 @@ public class GridCacheContext<K, V> implements Externalizable {
* @param key Key to construct tx key for.
* @return Transaction key.
*/
- public GridCacheTxKey<K> txKey(K key) {
- return new GridCacheTxKey<>(key, cacheId);
+ public IgniteTxKey<K> txKey(K key) {
+ return new IgniteTxKey<>(key, cacheId);
}
/**
@@ -762,7 +763,7 @@ public class GridCacheContext<K, V> implements Externalizable {
/**
* @return Cache transaction manager.
*/
- public GridCacheTxManager<K, V> tm() {
+ public IgniteTxManager<K, V> tm() {
return sharedCtx.tm();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryEx.java
index e94016f..01c1695 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryEx.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryEx.java
@@ -14,6 +14,7 @@ import org.apache.ignite.lang.*;
import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
+import org.gridgain.grid.kernal.processors.cache.transactions.*;
import org.gridgain.grid.kernal.processors.dr.*;
import org.gridgain.grid.util.lang.*;
import org.jetbrains.annotations.*;
@@ -92,7 +93,7 @@ public interface GridCacheEntryEx<K, V> extends GridMetadataAware {
/**
* @return Transaction key.
*/
- public GridCacheTxKey<K> txKey();
+ public IgniteTxKey<K> txKey();
/**
* @return Value.
@@ -278,7 +279,7 @@ public interface GridCacheEntryEx<K, V> extends GridMetadataAware {
* @throws GridCacheEntryRemovedException If entry was removed.
* @throws GridCacheFilterFailedException If filter failed.
*/
- @Nullable public V innerGet(@Nullable GridCacheTxEx<K, V> tx,
+ @Nullable public V innerGet(@Nullable IgniteTxEx<K, V> tx,
boolean readSwap,
boolean readThrough,
boolean failFast,
@@ -327,7 +328,7 @@ public interface GridCacheEntryEx<K, V> extends GridMetadataAware {
* @throws GridCacheEntryRemovedException If entry has been removed.
*/
public GridCacheUpdateTxResult<V> innerSet(
- @Nullable GridCacheTxEx<K, V> tx,
+ @Nullable IgniteTxEx<K, V> tx,
UUID evtNodeId,
UUID affNodeId,
@Nullable V val,
@@ -366,7 +367,7 @@ public interface GridCacheEntryEx<K, V> extends GridMetadataAware {
* @throws GridCacheEntryRemovedException If entry has been removed.
*/
public GridCacheUpdateTxResult<V> innerRemove(
- @Nullable GridCacheTxEx<K, V> tx,
+ @Nullable IgniteTxEx<K, V> tx,
UUID evtNodeId,
UUID affNodeId,
boolean writeThrough,
@@ -496,7 +497,7 @@ public interface GridCacheEntryEx<K, V> extends GridMetadataAware {
* @throws GridCacheEntryRemovedException If this entry is obsolete.
* @throws GridDistributedLockCancelledException If lock has been cancelled.
*/
- public boolean tmLock(GridCacheTxEx<K, V> tx, long timeout) throws GridCacheEntryRemovedException,
+ public boolean tmLock(IgniteTxEx<K, V> tx, long timeout) throws GridCacheEntryRemovedException,
GridDistributedLockCancelledException;
/**
@@ -505,7 +506,7 @@ public interface GridCacheEntryEx<K, V> extends GridMetadataAware {
* @param tx Cache transaction.
* @throws GridCacheEntryRemovedException If this entry has been removed from cache.
*/
- public abstract void txUnlock(GridCacheTxEx<K, V> tx) throws GridCacheEntryRemovedException;
+ public abstract void txUnlock(IgniteTxEx<K, V> tx) throws GridCacheEntryRemovedException;
/**
* @param ver Removes lock.
@@ -605,7 +606,7 @@ public interface GridCacheEntryEx<K, V> extends GridMetadataAware {
*/
@SuppressWarnings({"RedundantTypeArguments"})
@Nullable public GridTuple<V> peek0(boolean failFast, GridCachePeekMode mode,
- @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, @Nullable GridCacheTxEx<K, V> tx)
+ @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, @Nullable IgniteTxEx<K, V> tx)
throws GridCacheEntryRemovedException, GridCacheFilterFailedException, IgniteCheckedException;
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryImpl.java
index bad8d2e..f7545b0 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryImpl.java
@@ -14,6 +14,7 @@ import org.apache.ignite.lang.*;
import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
+import org.gridgain.grid.kernal.processors.cache.transactions.*;
import org.gridgain.grid.util.lang.*;
import org.gridgain.grid.util.tostring.*;
import org.gridgain.grid.util.typedef.*;
@@ -268,7 +269,7 @@ public class GridCacheEntryImpl<K, V> implements GridCacheEntry<K, V>, Externali
*/
@SuppressWarnings({"unchecked"})
@Nullable private V peek0(@Nullable GridCachePeekMode mode,
- @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, @Nullable GridCacheTxEx<K, V> tx)
+ @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, @Nullable IgniteTxEx<K, V> tx)
throws IgniteCheckedException {
assert tx == null || tx.local();
@@ -340,7 +341,7 @@ public class GridCacheEntryImpl<K, V> implements GridCacheEntry<K, V>, Externali
* @throws IgniteCheckedException If failed.
*/
@Nullable private V peek0(@Nullable Collection<GridCachePeekMode> modes,
- @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, GridCacheTxEx<K, V> tx) throws IgniteCheckedException {
+ @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, IgniteTxEx<K, V> tx) throws IgniteCheckedException {
if (F.isEmpty(modes))
return peek0(SMART, filter, tx);
@@ -474,7 +475,7 @@ public class GridCacheEntryImpl<K, V> implements GridCacheEntry<K, V>, Externali
this.ttl = ttl;
// Make sure to update only user transaction.
- GridCacheTxLocalAdapter<K, V> tx;
+ IgniteTxLocalAdapter<K, V> tx;
if (ctx.isDht())
tx = ctx.dht().near().context().tm().localTx();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionEntry.java
index 1c3a386..04fe0a9 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionEntry.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionEntry.java
@@ -13,6 +13,7 @@ import org.apache.ignite.*;
import org.apache.ignite.lang.*;
import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
+import org.gridgain.grid.kernal.processors.cache.transactions.*;
import org.gridgain.grid.util.typedef.*;
import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.grid.util.lang.*;
@@ -143,7 +144,7 @@ public class GridCacheEvictionEntry<K, V> implements GridCacheEntry<K, V>, Exter
*/
@SuppressWarnings({"unchecked"})
@Nullable private V peek0(@Nullable GridCachePeekMode mode,
- @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, @Nullable GridCacheTxEx<K, V> tx)
+ @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, @Nullable IgniteTxEx<K, V> tx)
throws IgniteCheckedException {
assert tx == null || tx.local();
@@ -175,7 +176,7 @@ public class GridCacheEvictionEntry<K, V> implements GridCacheEntry<K, V>, Exter
* @throws IgniteCheckedException If failed.
*/
@Nullable private V peek0(@Nullable Collection<GridCachePeekMode> modes,
- @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, GridCacheTxEx<K, V> tx) throws IgniteCheckedException {
+ @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, IgniteTxEx<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/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionManager.java
index c61a037..01e938d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionManager.java
@@ -20,6 +20,7 @@ import org.gridgain.grid.cache.eviction.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.managers.eventstorage.*;
import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
+import org.gridgain.grid.kernal.processors.cache.transactions.*;
import org.gridgain.grid.kernal.processors.timeout.*;
import org.gridgain.grid.util.*;
import org.gridgain.grid.util.future.*;
@@ -675,7 +676,7 @@ public class GridCacheEvictionManager<K, V> extends GridCacheManagerAdapter<K, V
/**
* @param txEntry Transactional entry.
*/
- public void touch(GridCacheTxEntry<K, V> txEntry, boolean loc) {
+ public void touch(IgniteTxEntry<K, V> txEntry, boolean loc) {
if (!plcEnabled && memoryMode != OFFHEAP_TIERED)
return;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java
index bdc8882..84c6eed 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java
@@ -17,6 +17,7 @@ import org.gridgain.grid.kernal.managers.deployment.*;
import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
import org.gridgain.grid.kernal.processors.cache.extras.*;
import org.gridgain.grid.kernal.processors.cache.query.*;
+import org.gridgain.grid.kernal.processors.cache.transactions.*;
import org.gridgain.grid.kernal.processors.dr.*;
import org.gridgain.grid.util.*;
import org.gridgain.grid.util.lang.*;
@@ -681,13 +682,13 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V>
* @throws IgniteCheckedException If failed.
*/
@SuppressWarnings({"RedundantTypeArguments"})
- @Nullable protected V readThrough(@Nullable GridCacheTxEx<K, V> tx, K key, boolean reload,
+ @Nullable protected V readThrough(@Nullable IgniteTxEx<K, V> tx, K key, boolean reload,
IgnitePredicate<GridCacheEntry<K, V>>[] filter, UUID subjId, String taskName) throws IgniteCheckedException {
return cctx.store().loadFromStore(tx, key);
}
/** {@inheritDoc} */
- @Nullable @Override public final V innerGet(@Nullable GridCacheTxEx<K, V> tx,
+ @Nullable @Override public final V innerGet(@Nullable IgniteTxEx<K, V> tx,
boolean readSwap,
boolean readThrough,
boolean failFast,
@@ -718,7 +719,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V>
/** {@inheritDoc} */
@SuppressWarnings({"unchecked", "RedundantTypeArguments", "TooBroadScope"})
- private V innerGet0(GridCacheTxEx<K, V> tx,
+ private V innerGet0(IgniteTxEx<K, V> tx,
boolean readSwap,
boolean readThrough,
boolean evt,
@@ -911,7 +912,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V>
boolean loadedFromStore = false;
if (ret == null && readThrough) {
- GridCacheTxEx tx0 = null;
+ IgniteTxEx tx0 = null;
if (tx != null && tx.local()) {
if (cctx.isReplicated() || cctx.isColocated() || tx.near())
@@ -1093,7 +1094,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V>
/** {@inheritDoc} */
@Override public final GridCacheUpdateTxResult<V> innerSet(
- @Nullable GridCacheTxEx<K, V> tx,
+ @Nullable IgniteTxEx<K, V> tx,
UUID evtNodeId,
UUID affNodeId,
V val,
@@ -1235,7 +1236,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V>
/** {@inheritDoc} */
@Override public final GridCacheUpdateTxResult<V> innerRemove(
- @Nullable GridCacheTxEx<K, V> tx,
+ @Nullable IgniteTxEx<K, V> tx,
UUID evtNodeId,
UUID affNodeId,
boolean writeThrough,
@@ -2451,7 +2452,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V>
}
/** {@inheritDoc} */
- @Override public GridCacheTxKey<K> txKey() {
+ @Override public IgniteTxKey<K> txKey() {
return cctx.txKey(key);
}
@@ -2563,7 +2564,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V>
*/
@SuppressWarnings({"RedundantTypeArguments"})
@Nullable @Override public GridTuple<V> peek0(boolean failFast, GridCachePeekMode mode,
- IgnitePredicate<GridCacheEntry<K, V>>[] filter, @Nullable GridCacheTxEx<K, V> tx)
+ IgnitePredicate<GridCacheEntry<K, V>>[] filter, @Nullable IgniteTxEx<K, V> tx)
throws GridCacheEntryRemovedException, GridCacheFilterFailedException, IgniteCheckedException {
assert tx == null || tx.local();
@@ -2654,10 +2655,10 @@ 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(GridCacheTxEx<K, V> tx) throws GridCacheEntryRemovedException, IgniteCheckedException {
+ private void groupLockSanityCheck(IgniteTxEx<K, V> tx) throws GridCacheEntryRemovedException, IgniteCheckedException {
assert tx.groupLock();
- GridCacheTxEntry<K, V> txEntry = tx.entry(txKey());
+ IgniteTxEntry<K, V> txEntry = tx.entry(txKey());
if (txEntry.groupLockEntry()) {
if (lockedByAny())
@@ -2676,7 +2677,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<GridCacheEntry<K, V>>[] filter,
- GridCacheTxEx<K, V> tx) throws GridCacheFilterFailedException, GridCacheEntryRemovedException, IgniteCheckedException {
+ IgniteTxEx<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).
@@ -2697,7 +2698,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V>
*/
@Nullable private GridTuple<V> peekTx(boolean failFast,
IgnitePredicate<GridCacheEntry<K, V>>[] filter,
- @Nullable GridCacheTxEx<K, V> tx) throws GridCacheFilterFailedException {
+ @Nullable IgniteTxEx<K, V> tx) throws GridCacheFilterFailedException {
return tx == null ? null : tx.peek(cctx, failFast, key, filter);
}
@@ -3196,7 +3197,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V>
/** {@inheritDoc} */
@SuppressWarnings({"IfMayBeConditional"})
@Override public long expireTime() throws GridCacheEntryRemovedException {
- GridCacheTxLocalAdapter<K, V> tx;
+ IgniteTxLocalAdapter<K, V> tx;
if (cctx.isDht())
tx = cctx.dht().near().context().tm().localTx();
@@ -3282,7 +3283,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V>
/** {@inheritDoc} */
@SuppressWarnings({"IfMayBeConditional"})
@Override public long ttl() throws GridCacheEntryRemovedException {
- GridCacheTxLocalAdapter<K, V> tx;
+ IgniteTxLocalAdapter<K, V> tx;
if (cctx.isDht())
tx = cctx.dht().near().context().tm().localTx();
@@ -3655,7 +3656,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V>
return false;
}
- GridCacheTxEx<K, V> tx = cctx.tm().localTxx();
+ IgniteTxEx<K, V> tx = cctx.tm().localTxx();
return tx == null || !tx.removed(txKey());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java
index 71eac41..12e7329 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java
@@ -15,6 +15,7 @@ import org.apache.ignite.marshaller.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.managers.deployment.*;
+import org.gridgain.grid.kernal.processors.cache.transactions.*;
import org.gridgain.grid.util.direct.*;
import org.gridgain.grid.util.tostring.*;
import org.gridgain.grid.util.typedef.internal.*;
@@ -325,12 +326,12 @@ public abstract class GridCacheMessage<K, V> extends GridTcpCommunicationMessage
* @param ctx Context.
* @throws IgniteCheckedException If failed.
*/
- protected final void marshalTx(Iterable<GridCacheTxEntry<K, V>> txEntries, GridCacheSharedContext<K, V> ctx)
+ protected final void marshalTx(Iterable<IgniteTxEntry<K, V>> txEntries, GridCacheSharedContext<K, V> ctx)
throws IgniteCheckedException {
assert ctx != null;
if (txEntries != null) {
- for (GridCacheTxEntry<K, V> e : txEntries) {
+ for (IgniteTxEntry<K, V> e : txEntries) {
e.marshal(ctx);
if (ctx.deploymentEnabled()) {
@@ -348,13 +349,13 @@ public abstract class GridCacheMessage<K, V> extends GridTcpCommunicationMessage
* @param ldr Loader.
* @throws IgniteCheckedException If failed.
*/
- protected final void unmarshalTx(Iterable<GridCacheTxEntry<K, V>> txEntries, boolean near,
+ protected final void unmarshalTx(Iterable<IgniteTxEntry<K, V>> txEntries, boolean near,
GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException {
assert ldr != null;
assert ctx != null;
if (txEntries != null) {
- for (GridCacheTxEntry<K, V> e : txEntries)
+ for (IgniteTxEntry<K, V> e : txEntries)
e.unmarshal(ctx, near, ldr);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiTxFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiTxFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiTxFuture.java
index 9975b27..19a0a69 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiTxFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiTxFuture.java
@@ -12,6 +12,7 @@ package org.gridgain.grid.kernal.processors.cache;
import org.apache.ignite.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.transactions.*;
+import org.gridgain.grid.kernal.processors.cache.transactions.*;
import org.gridgain.grid.util.*;
import org.gridgain.grid.util.typedef.*;
import org.gridgain.grid.util.typedef.internal.*;
@@ -32,10 +33,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<GridCacheTxEx<K, V>> txs = new GridLeanSet<>();
+ private final Set<IgniteTxEx<K, V>> txs = new GridLeanSet<>();
/** */
- private Set<GridCacheTxEx<K, V>> remainingTxs;
+ private Set<IgniteTxEx<K, V>> remainingTxs;
/** Logger. */
private IgniteLogger log;
@@ -62,21 +63,21 @@ public final class GridCacheMultiTxFuture<K, V> extends GridFutureAdapter<Boolea
/**
* @return Transactions to wait for.
*/
- public Set<GridCacheTxEx<K, V>> txs() {
+ public Set<IgniteTxEx<K, V>> txs() {
return txs;
}
/**
* @return Remaining transactions.
*/
- public Set<GridCacheTxEx<K, V>> remainingTxs() {
+ public Set<IgniteTxEx<K, V>> remainingTxs() {
return remainingTxs;
}
/**
* @param tx Transaction to add.
*/
- public void addTx(GridCacheTxEx<K, V> tx) {
+ public void addTx(IgniteTxEx<K, V> tx) {
txs.add(tx);
}
@@ -92,7 +93,7 @@ public final class GridCacheMultiTxFuture<K, V> extends GridFutureAdapter<Boolea
else {
remainingTxs = new GridConcurrentHashSet<>(txs);
- for (final GridCacheTxEx<K, V> tx : txs) {
+ for (final IgniteTxEx<K, V> tx : txs) {
if (!tx.done()) {
tx.finishFuture().listenAsync(new CI1<IgniteFuture<IgniteTx>>() {
@Override public void apply(IgniteFuture<IgniteTx> t) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvcc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvcc.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvcc.java
index 7445179..f0c085e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvcc.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvcc.java
@@ -10,6 +10,7 @@
package org.gridgain.grid.kernal.processors.cache;
import org.apache.ignite.*;
+import org.gridgain.grid.kernal.processors.cache.transactions.*;
import org.gridgain.grid.util.typedef.*;
import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.grid.util.tostring.*;
@@ -796,7 +797,7 @@ public final class GridCacheMvcc<K> {
// Only Near and DHT remote candidates should be released.
assert !rmt.nearLocal();
- GridCacheTxEx tx = cctx.tm().tx(rmt.version());
+ IgniteTxEx tx = cctx.tm().tx(rmt.version());
if (tx != null) {
tx.systemInvalidate(true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java
index 93bf3fa..fddefcd 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java
@@ -17,6 +17,7 @@ import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.managers.discovery.*;
import org.gridgain.grid.kernal.managers.eventstorage.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
+import org.gridgain.grid.kernal.processors.cache.transactions.*;
import org.gridgain.grid.util.*;
import org.gridgain.grid.util.future.*;
import org.gridgain.grid.util.tostring.*;
@@ -60,11 +61,11 @@ public class GridCacheMvccManager<K, V> extends GridCacheSharedManagerAdapter<K,
/** Locked keys. */
@GridToStringExclude
- private final ConcurrentMap<GridCacheTxKey<K>, GridDistributedCacheEntry<K, V>> locked = newMap();
+ private final ConcurrentMap<IgniteTxKey<K>, GridDistributedCacheEntry<K, V>> locked = newMap();
/** Near locked keys. Need separate map because mvcc manager is shared between caches. */
@GridToStringExclude
- private final ConcurrentMap<GridCacheTxKey<K>, GridDistributedCacheEntry<K, V>> nearLocked = newMap();
+ private final ConcurrentMap<IgniteTxKey<K>, GridDistributedCacheEntry<K, V>> nearLocked = newMap();
/** Active futures mapped by version ID. */
@GridToStringExclude
@@ -1023,7 +1024,7 @@ public class GridCacheMvccManager<K, V> extends GridCacheSharedManagerAdapter<K,
/** */
@GridToStringInclude
- private final Map<GridCacheTxKey<K>, Collection<GridCacheMvccCandidate<K>>> pendingLocks =
+ private final Map<IgniteTxKey<K>, Collection<GridCacheMvccCandidate<K>>> pendingLocks =
new ConcurrentHashMap8<>();
/**
@@ -1092,8 +1093,8 @@ public class GridCacheMvccManager<K, V> extends GridCacheSharedManagerAdapter<K,
*
*/
void recheck() {
- for (Iterator<GridCacheTxKey<K>> it = pendingLocks.keySet().iterator(); it.hasNext(); ) {
- GridCacheTxKey<K> key = it.next();
+ for (Iterator<IgniteTxKey<K>> it = pendingLocks.keySet().iterator(); it.hasNext(); ) {
+ IgniteTxKey<K> key = it.next();
GridCacheContext<K, V> cacheCtx = cctx.cacheContext(key.cacheId());
@@ -1155,11 +1156,11 @@ public class GridCacheMvccManager<K, V> extends GridCacheSharedManagerAdapter<K,
/** {@inheritDoc} */
@Override public String toString() {
if (!pendingLocks.isEmpty()) {
- Map<GridCacheVersion, GridCacheTxEx> txs = new HashMap<>(1, 1.0f);
+ Map<GridCacheVersion, IgniteTxEx> txs = new HashMap<>(1, 1.0f);
for (Collection<GridCacheMvccCandidate<K>> cands : pendingLocks.values())
for (GridCacheMvccCandidate<K> c : cands)
- txs.put(c.version(), cctx.tm().<GridCacheTxEx>tx(c.version()));
+ txs.put(c.version(), cctx.tm().<IgniteTxEx>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/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java
index 3e3d7de..2a7c792 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java
@@ -855,7 +855,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
*/
@SuppressWarnings("unchecked")
private GridCacheSharedContext createSharedContext(GridKernalContext kernalCtx) {
- GridCacheTxManager tm = new GridCacheTxManager();
+ IgniteTxManager tm = new IgniteTxManager();
GridCacheMvccManager mvccMgr = new GridCacheMvccManager();
GridCacheVersionManager verMgr = new GridCacheVersionManager();
GridCacheDeploymentManager depMgr = new GridCacheDeploymentManager();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java
index 7912b69..82fb86f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java
@@ -42,7 +42,7 @@ public class GridCacheSharedContext<K, V> {
private List<GridCacheSharedManager<K, V>> mgrs = new LinkedList<>();
/** Cache transaction manager. */
- private GridCacheTxManager<K, V> txMgr;
+ private IgniteTxManager<K, V> txMgr;
/** Partition exchange manager. */
private GridCachePartitionExchangeManager<K, V> exchMgr;
@@ -75,7 +75,7 @@ public class GridCacheSharedContext<K, V> {
*/
public GridCacheSharedContext(
GridKernalContext kernalCtx,
- GridCacheTxManager<K, V> txMgr,
+ IgniteTxManager<K, V> txMgr,
GridCacheVersionManager<K, V> verMgr,
GridCacheMvccManager<K, V> mvccMgr,
GridCacheDeploymentManager<K, V> depMgr,
@@ -232,7 +232,7 @@ public class GridCacheSharedContext<K, V> {
/**
* @return Cache transaction manager.
*/
- public GridCacheTxManager<K, V> tm() {
+ public IgniteTxManager<K, V> tm() {
return txMgr;
}
@@ -392,7 +392,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(GridCacheTxEx<K, V> tx, Iterable<Integer> activeCacheIds, GridCacheContext<K, V> cacheCtx) {
+ public boolean txCompatible(IgniteTxEx<K, V> tx, Iterable<Integer> activeCacheIds, GridCacheContext<K, V> cacheCtx) {
if (cacheCtx.system() ^ tx.system())
return false;
@@ -412,7 +412,7 @@ public class GridCacheSharedContext<K, V> {
* @throws GridCacheFlagException If given flags are conflicting with given transaction.
*/
public void checkTxFlags(@Nullable Collection<GridCacheFlag> flags) throws GridCacheFlagException {
- GridCacheTxEx tx = tm().userTxx();
+ IgniteTxEx tx = tm().userTxx();
if (tx == null || F.isEmpty(flags))
return;
@@ -439,7 +439,7 @@ public class GridCacheSharedContext<K, V> {
* @param tx Transaction to close.
* @throws IgniteCheckedException If failed.
*/
- public void endTx(GridCacheTxEx<K, V> tx) throws IgniteCheckedException {
+ public void endTx(IgniteTxEx<K, V> tx) throws IgniteCheckedException {
Collection<Integer> cacheIds = tx.activeCacheIds();
if (!cacheIds.isEmpty()) {
@@ -454,7 +454,7 @@ public class GridCacheSharedContext<K, V> {
* @param tx Transaction to commit.
* @return Commit future.
*/
- public IgniteFuture<IgniteTx> commitTxAsync(GridCacheTxEx<K, V> tx) {
+ public IgniteFuture<IgniteTx> commitTxAsync(IgniteTxEx<K, V> tx) {
Collection<Integer> cacheIds = tx.activeCacheIds();
if (cacheIds.isEmpty())
@@ -476,7 +476,7 @@ public class GridCacheSharedContext<K, V> {
* @param tx Transaction to rollback.
* @throws IgniteCheckedException If failed.
*/
- public void rollbackTx(GridCacheTxEx<K, V> tx) throws IgniteCheckedException {
+ public void rollbackTx(IgniteTxEx<K, V> tx) throws IgniteCheckedException {
Collection<Integer> cacheIds = tx.activeCacheIds();
if (!cacheIds.isEmpty()) {