http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java index bf4e90a..ec091d3 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java @@ -15,6 +15,7 @@ import org.apache.ignite.transactions.*; import org.gridgain.grid.kernal.*; 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.tostring.*; import org.gridgain.grid.util.typedef.internal.*; @@ -40,7 +41,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest /** Near writes. */ @GridToStringInclude @GridDirectTransient - private Collection<GridCacheTxEntry<K, V>> nearWrites; + private Collection<IgniteTxEntry<K, V>> nearWrites; /** Serialized near writes. */ @GridDirectCollection(byte[].class) @@ -125,11 +126,11 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest Collection<GridCacheVersion> rolledbackVers, Collection<GridCacheVersion> pendingVers, int txSize, - Collection<GridCacheTxEntry<K, V>> writes, - Collection<GridCacheTxEntry<K, V>> nearWrites, - Collection<GridCacheTxEntry<K, V>> recoverWrites, + Collection<IgniteTxEntry<K, V>> writes, + Collection<IgniteTxEntry<K, V>> nearWrites, + Collection<IgniteTxEntry<K, V>> recoverWrites, boolean onePhaseCommit, - @Nullable GridCacheTxKey grpLockKey, + @Nullable IgniteTxKey grpLockKey, @Nullable UUID subjId, int taskNameHash ) { @@ -160,8 +161,8 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest /** * @return Near writes. */ - public Collection<GridCacheTxEntry<K, V>> nearWrites() { - return nearWrites == null ? Collections.<GridCacheTxEntry<K, V>>emptyList() : nearWrites; + public Collection<IgniteTxEntry<K, V>> nearWrites() { + return nearWrites == null ? Collections.<IgniteTxEntry<K, V>>emptyList() : nearWrites; } /** @@ -254,7 +255,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest nearWritesBytes = new ArrayList<>(nearWrites.size()); - for (GridCacheTxEntry<K, V> e : nearWrites) + for (IgniteTxEntry<K, V> e : nearWrites) nearWritesBytes.add(ctx.marshaller().marshal(e)); } } @@ -267,7 +268,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest nearWrites = new ArrayList<>(nearWritesBytes.size()); for (byte[] arr : nearWritesBytes) - nearWrites.add(ctx.marshaller().<GridCacheTxEntry<K, V>>unmarshal(arr, ldr)); + nearWrites.add(ctx.marshaller().<IgniteTxEntry<K, V>>unmarshal(arr, ldr)); unmarshalTx(nearWrites, true, ctx, ldr); }
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java index 19b9ccc..7bb56c1 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java @@ -16,6 +16,7 @@ import org.apache.ignite.transactions.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; import org.gridgain.grid.kernal.processors.cache.distributed.near.*; +import org.gridgain.grid.kernal.processors.cache.transactions.*; import org.gridgain.grid.util.tostring.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; @@ -103,7 +104,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements boolean invalidate, boolean storeEnabled, int txSize, - @Nullable GridCacheTxKey grpLockKey, + @Nullable IgniteTxKey grpLockKey, boolean partLock, Map<UUID, Collection<UUID>> txNodes, UUID subjId, @@ -229,7 +230,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements } /** {@inheritDoc} */ - @Override public IgniteFuture<GridCacheTxEx<K, V>> future() { + @Override public IgniteFuture<IgniteTxEx<K, V>> future() { return prepFut.get(); } @@ -242,7 +243,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements /** {@inheritDoc} */ @Override @Nullable protected IgniteFuture<Boolean> addReader(long msgId, GridDhtCacheEntry<K, V> cached, - GridCacheTxEntry<K, V> entry, long topVer) { + IgniteTxEntry<K, V> entry, long topVer) { // Don't add local node as reader. if (!cctx.localNodeId().equals(nearNodeId)) { GridCacheContext<K, V> cacheCtx = cached.context(); @@ -264,18 +265,18 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements } /** {@inheritDoc} */ - @Override protected void updateExplicitVersion(GridCacheTxEntry<K, V> txEntry, GridCacheEntryEx<K, V> entry) + @Override protected void updateExplicitVersion(IgniteTxEntry<K, V> txEntry, GridCacheEntryEx<K, V> entry) throws GridCacheEntryRemovedException { // DHT local transactions don't have explicit locks. // No-op. } /** {@inheritDoc} */ - @Override public IgniteFuture<GridCacheTxEx<K, V>> prepareAsync() { + @Override public IgniteFuture<IgniteTxEx<K, V>> prepareAsync() { if (optimistic()) { assert isSystemInvalidate(); - return prepareAsync(null, null, Collections.<GridCacheTxKey<K>, GridCacheVersion>emptyMap(), 0, nearMiniId, null, true, + return prepareAsync(null, null, Collections.<IgniteTxKey<K>, GridCacheVersion>emptyMap(), 0, nearMiniId, null, true, null); } @@ -285,7 +286,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements if (fut == null) { // Future must be created before any exception can be thrown. if (!prepFut.compareAndSet(null, fut = new GridDhtTxPrepareFuture<>(cctx, this, nearMiniId, - Collections.<GridCacheTxKey<K>, GridCacheVersion>emptyMap(), true, null))) + Collections.<IgniteTxKey<K>, GridCacheVersion>emptyMap(), true, null))) return prepFut.get(); } else @@ -343,8 +344,8 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements * @param lastBackups IDs of backup nodes receiving last prepare request. * @return Future that will be completed when locks are acquired. */ - public IgniteFuture<GridCacheTxEx<K, V>> prepareAsync(@Nullable Iterable<GridCacheTxEntry<K, V>> reads, - @Nullable Iterable<GridCacheTxEntry<K, V>> writes, Map<GridCacheTxKey<K>, GridCacheVersion> verMap, long msgId, + public IgniteFuture<IgniteTxEx<K, V>> prepareAsync(@Nullable Iterable<IgniteTxEntry<K, V>> reads, + @Nullable Iterable<IgniteTxEntry<K, V>> writes, Map<IgniteTxKey<K>, GridCacheVersion> verMap, long msgId, IgniteUuid nearMiniId, Map<UUID, Collection<UUID>> txNodes, boolean last, Collection<UUID> lastBackups) { assert optimistic(); @@ -395,11 +396,11 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements try { if (reads != null) - for (GridCacheTxEntry<K, V> e : reads) + for (IgniteTxEntry<K, V> e : reads) addEntry(msgId, e); if (writes != null) - for (GridCacheTxEntry<K, V> e : writes) + for (IgniteTxEntry<K, V> e : writes) addEntry(msgId, e); userPrepare(); @@ -476,8 +477,8 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements } } else - prep.listenAsync(new CI1<IgniteFuture<GridCacheTxEx<K, V>>>() { - @Override public void apply(IgniteFuture<GridCacheTxEx<K, V>> f) { + prep.listenAsync(new CI1<IgniteFuture<IgniteTxEx<K, V>>>() { + @Override public void apply(IgniteFuture<IgniteTxEx<K, V>> f) { try { f.get(); // Check for errors of a parent future. @@ -564,8 +565,8 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements else { prepFut.complete(); - prepFut.listenAsync(new CI1<IgniteFuture<GridCacheTxEx<K, V>>>() { - @Override public void apply(IgniteFuture<GridCacheTxEx<K, V>> f) { + prepFut.listenAsync(new CI1<IgniteFuture<IgniteTxEx<K, V>>>() { + @Override public void apply(IgniteFuture<IgniteTxEx<K, V>> f) { try { f.get(); // Check for errors of a parent future. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java index 9c1578c..47e4b98 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java @@ -16,6 +16,7 @@ import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; 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.*; import org.gridgain.grid.util.future.*; import org.gridgain.grid.util.tostring.*; @@ -34,7 +35,7 @@ import static org.gridgain.grid.kernal.processors.cache.GridCacheOperation.*; /** * Replicated user transaction. */ -public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapter<K, V> { +public abstract class GridDhtTxLocalAdapter<K, V> extends IgniteTxLocalAdapter<K, V> { /** */ private static final long serialVersionUID = 0L; @@ -90,7 +91,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte boolean invalidate, boolean storeEnabled, int txSize, - @Nullable GridCacheTxKey grpLockKey, + @Nullable IgniteTxKey grpLockKey, boolean partLock, @Nullable UUID subjId, int taskNameHash @@ -128,7 +129,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte * @return {@code True} if reader was added as a result of this call. */ @Nullable protected abstract IgniteFuture<Boolean> addReader(long msgId, GridDhtCacheEntry<K, V> cached, - GridCacheTxEntry<K, V> entry, long topVer); + IgniteTxEntry<K, V> entry, long topVer); /** * @param commit Commit flag. @@ -184,7 +185,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte Map<ClusterNode, List<GridDhtCacheEntry<K, V>>> dhtEntryMap = null; Map<ClusterNode, List<GridDhtCacheEntry<K, V>>> nearEntryMap = null; - for (GridCacheTxEntry<K, V> e : allEntries()) { + for (IgniteTxEntry<K, V> e : allEntries()) { assert e.cached() != null; GridCacheContext<K, V> cacheCtx = e.cached().context(); @@ -321,7 +322,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte if (log.isDebugEnabled()) log.debug("Removing mapping for entry [nodeId=" + nodeId + ", entry=" + entry + ']'); - GridCacheTxEntry<K, V> txEntry = txMap.get(entry.txKey()); + IgniteTxEntry<K, V> txEntry = txMap.get(entry.txKey()); if (txEntry == null) return false; @@ -349,7 +350,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte ClusterNode n = mapping.getKey(); for (GridDhtCacheEntry<K, V> entry : mapping.getValue()) { - GridCacheTxEntry<K, V> txEntry = txMap.get(entry.txKey()); + IgniteTxEntry<K, V> txEntry = txMap.get(entry.txKey()); if (txEntry != null) { GridDistributedTxMapping<K, V> m = map.get(n.id()); @@ -376,7 +377,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte * @return Future for active transactions for the time when reader was added. * @throws IgniteCheckedException If failed. */ - @Nullable public IgniteFuture<Boolean> addEntry(long msgId, GridCacheTxEntry<K, V> e) throws IgniteCheckedException { + @Nullable public IgniteFuture<Boolean> addEntry(long msgId, IgniteTxEntry<K, V> e) throws IgniteCheckedException { init(); IgniteTxState state = state(); @@ -397,7 +398,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte GridDhtCacheAdapter<K, V> dhtCache = cacheCtx.isNear() ? cacheCtx.near().dht() : cacheCtx.dht(); try { - GridCacheTxEntry<K, V> entry = txMap.get(e.txKey()); + IgniteTxEntry<K, V> entry = txMap.get(e.txKey()); if (entry != null) { entry.op(e.op()); // Absolutely must set operation, as default is DELETE. @@ -468,7 +469,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte IgniteFuture<GridCacheReturn<V>> lockAllAsync( GridCacheContext<K, V> cacheCtx, Collection<GridCacheEntryEx<K, V>> entries, - List<GridCacheTxEntry<K, V>> writeEntries, + List<IgniteTxEntry<K, V>> writeEntries, boolean onePhaseCommit, GridCacheVersion[] drVers, long msgId, @@ -507,7 +508,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte for (GridCacheEntryEx<K, V> entry : entries) { K key = entry.key(); - GridCacheTxEntry<K, V> txEntry = entry(entry.txKey()); + IgniteTxEntry<K, V> txEntry = entry(entry.txKey()); // First time access. if (txEntry == null) { @@ -517,7 +518,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte cached.unswap(!read, read); - GridCacheTxEntry<K, V> w = writeEntries == null ? null : writeEntries.get(idx++); + IgniteTxEntry<K, V> w = writeEntries == null ? null : writeEntries.get(idx++); txEntry = addEntry(NOOP, null, null, cached, -1, CU.<K, V>empty(), false, -1L, -1L, drVers != null ? drVers[drVerIdx++] : null); @@ -613,7 +614,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte } /** {@inheritDoc} */ - @Override protected void addGroupTxMapping(Collection<GridCacheTxKey<K>> keys) { + @Override protected void addGroupTxMapping(Collection<IgniteTxKey<K>> keys) { assert groupLock(); for (GridDistributedTxMapping<K, V> mapping : dhtMap.values()) @@ -626,8 +627,8 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends GridCacheTxLocalAdapte Map<ClusterNode, List<GridDhtCacheEntry<K, V>>> locNearMap = null; - for (GridCacheTxKey<K> key : keys) { - GridCacheTxEntry<K, V> txEntry = entry(key); + for (IgniteTxKey<K> key : keys) { + IgniteTxEntry<K, V> txEntry = entry(key); if (!txEntry.groupLockEntry() || txEntry.context().isNear()) continue; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java index 2a6fd68..9c43989 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java @@ -16,6 +16,7 @@ import org.gridgain.grid.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; import org.gridgain.grid.kernal.processors.cache.distributed.near.*; +import org.gridgain.grid.kernal.processors.cache.transactions.*; import org.gridgain.grid.kernal.processors.dr.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; @@ -35,8 +36,8 @@ import static org.gridgain.grid.kernal.managers.communication.GridIoPolicy.*; /** * */ -public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFuture<GridCacheTxEx<K, V>> - implements GridCacheMvccFuture<K, V, GridCacheTxEx<K, V>> { +public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFuture<IgniteTxEx<K, V>> + implements GridCacheMvccFuture<K, V, IgniteTxEx<K, V>> { /** */ private static final long serialVersionUID = 0L; @@ -72,10 +73,10 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu private AtomicBoolean mapped = new AtomicBoolean(false); /** Prepare reads. */ - private Iterable<GridCacheTxEntry<K, V>> reads; + private Iterable<IgniteTxEntry<K, V>> reads; /** Prepare writes. */ - private Iterable<GridCacheTxEntry<K, V>> writes; + private Iterable<IgniteTxEntry<K, V>> writes; /** Tx nodes. */ private Map<UUID, Collection<UUID>> txNodes; @@ -87,7 +88,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu private IgniteUuid nearMiniId; /** DHT versions map. */ - private Map<GridCacheTxKey<K>, GridCacheVersion> dhtVerMap; + private Map<IgniteTxKey<K>, GridCacheVersion> dhtVerMap; /** {@code True} if this is last prepare operation for node. */ private boolean last; @@ -111,13 +112,13 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu * @param lastBackups IDs of backup nodes receiving last prepare request during this prepare. */ public GridDhtTxPrepareFuture(GridCacheSharedContext<K, V> cctx, final GridDhtTxLocalAdapter<K, V> tx, - IgniteUuid nearMiniId, Map<GridCacheTxKey<K>, GridCacheVersion> dhtVerMap, boolean last, Collection<UUID> lastBackups) { - super(cctx.kernalContext(), new IgniteReducer<GridCacheTxEx<K, V>, GridCacheTxEx<K, V>>() { - @Override public boolean collect(GridCacheTxEx<K, V> e) { + IgniteUuid nearMiniId, Map<IgniteTxKey<K>, GridCacheVersion> dhtVerMap, boolean last, Collection<UUID> lastBackups) { + super(cctx.kernalContext(), new IgniteReducer<IgniteTxEx<K, V>, IgniteTxEx<K, V>>() { + @Override public boolean collect(IgniteTxEx<K, V> e) { return true; } - @Override public GridCacheTxEx<K, V> reduce() { + @Override public IgniteTxEx<K, V> reduce() { // Nothing to aggregate. return tx; } @@ -207,7 +208,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu * @return {@code True} if all locks are owned. */ private boolean checkLocks() { - for (GridCacheTxEntry<K, V> txEntry : tx.optimisticLockEntries()) { + for (IgniteTxEntry<K, V> txEntry : tx.optimisticLockEntries()) { while (true) { GridCacheEntryEx<K, V> cached = txEntry.cached(); @@ -296,7 +297,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu */ public void onResult(UUID nodeId, GridDhtTxPrepareResponse<K, V> res) { if (!isDone()) { - for (IgniteFuture<GridCacheTxEx<K, V>> fut : pending()) { + for (IgniteFuture<IgniteTxEx<K, V>> fut : pending()) { if (isMini(fut)) { MiniFuture f = (MiniFuture)fut; @@ -320,10 +321,10 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu if (log.isDebugEnabled()) log.debug("Marking all local candidates as ready: " + this); - Iterable<GridCacheTxEntry<K, V>> checkEntries = tx.groupLock() ? + Iterable<IgniteTxEntry<K, V>> checkEntries = tx.groupLock() ? Collections.singletonList(tx.groupLockEntry()) : writes; - for (GridCacheTxEntry<K, V> txEntry : checkEntries) { + for (IgniteTxEntry<K, V> txEntry : checkEntries) { if (txEntry.cached().isLocal()) continue; @@ -365,7 +366,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu } /** {@inheritDoc} */ - @Override public boolean onDone(GridCacheTxEx<K, V> tx0, Throwable err) { + @Override public boolean onDone(IgniteTxEx<K, V> tx0, Throwable err) { assert err != null || (initialized() && !hasPending()) : "On done called for prepare future that has " + "pending mini futures: " + this; @@ -427,8 +428,8 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu private void addDhtValues(GridNearTxPrepareResponse<K, V> res) { // Interceptor on near node needs old values to execute callbacks. if (!F.isEmpty(writes)) { - for (GridCacheTxEntry<K, V> e : writes) { - GridCacheTxEntry<K, V> txEntry = tx.entry(e.txKey()); + for (IgniteTxEntry<K, V> e : writes) { + IgniteTxEntry<K, V> txEntry = tx.entry(e.txKey()); assert txEntry != null : "Missing tx entry for key [tx=" + tx + ", key=" + e.txKey() + ']'; @@ -464,8 +465,8 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu } } - for (Map.Entry<GridCacheTxKey<K>, GridCacheVersion> ver : dhtVerMap.entrySet()) { - GridCacheTxEntry<K, V> txEntry = tx.entry(ver.getKey()); + for (Map.Entry<IgniteTxKey<K>, GridCacheVersion> ver : dhtVerMap.entrySet()) { + IgniteTxEntry<K, V> txEntry = tx.entry(ver.getKey()); if (res.hasOwnedValue(ver.getKey())) continue; @@ -544,7 +545,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu * @param writes Write entries. * @param txNodes Transaction nodes mapping. */ - public void prepare(Iterable<GridCacheTxEntry<K, V>> reads, Iterable<GridCacheTxEntry<K, V>> writes, + public void prepare(Iterable<IgniteTxEntry<K, V>> reads, Iterable<IgniteTxEntry<K, V>> writes, Map<UUID, Collection<UUID>> txNodes) { if (tx.empty()) { tx.setRollbackOnly(); @@ -584,12 +585,12 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu // Assign keys to primary nodes. if (!F.isEmpty(reads)) { - for (GridCacheTxEntry<K, V> read : reads) + for (IgniteTxEntry<K, V> read : reads) hasRemoteNodes |= map(tx.entry(read.txKey()), futDhtMap, futNearMap); } if (!F.isEmpty(writes)) { - for (GridCacheTxEntry<K, V> write : writes) + for (IgniteTxEntry<K, V> write : writes) hasRemoteNodes |= map(tx.entry(write.txKey()), futDhtMap, futNearMap); } @@ -612,7 +613,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu add(fut); // Append new future. - Collection<GridCacheTxEntry<K, V>> nearWrites = nearMapping == null ? null : nearMapping.writes(); + Collection<IgniteTxEntry<K, V>> nearWrites = nearMapping == null ? null : nearMapping.writes(); GridDhtTxPrepareRequest<K, V> req = new GridDhtTxPrepareRequest<>( futId, @@ -631,7 +632,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu int idx = 0; - for (GridCacheTxEntry<K, V> entry : dhtMapping.writes()) { + for (IgniteTxEntry<K, V> entry : dhtMapping.writes()) { try { GridDhtCacheEntry<K, V> cached = (GridDhtCacheEntry<K, V>)entry.cached(); @@ -660,7 +661,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu } if (!F.isEmpty(nearWrites)) { - for (GridCacheTxEntry<K, V> entry : nearWrites) { + for (IgniteTxEntry<K, V> entry : nearWrites) { try { GridCacheMvccCandidate<K> added = entry.cached().candidate(version()); @@ -713,7 +714,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu tx.subjectId(), tx.taskNameHash()); - for (GridCacheTxEntry<K, V> entry : nearMapping.writes()) { + for (IgniteTxEntry<K, V> entry : nearMapping.writes()) { try { GridCacheMvccCandidate<K> added = entry.cached().candidate(version()); @@ -757,7 +758,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu * @return {@code True} if mapped. */ private boolean map( - GridCacheTxEntry<K, V> entry, + IgniteTxEntry<K, V> entry, Map<UUID, GridDistributedTxMapping<K, V>> futDhtMap, Map<UUID, GridDistributedTxMapping<K, V>> futNearMap) { if (entry.cached().isLocal()) @@ -818,7 +819,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu * @param locMap Exclude map. * @return {@code True} if mapped. */ - private boolean map(GridCacheTxEntry<K, V> entry, Iterable<ClusterNode> nodes, + private boolean map(IgniteTxEntry<K, V> entry, Iterable<ClusterNode> nodes, Map<UUID, GridDistributedTxMapping<K, V>> globalMap, Map<UUID, GridDistributedTxMapping<K, V>> locMap) { boolean ret = false; @@ -852,11 +853,11 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu * @param baseVer Base version. * @return Collection of pending candidates versions. */ - private Collection<GridCacheVersion> localDhtPendingVersions(Iterable<GridCacheTxEntry<K, V>> entries, + private Collection<GridCacheVersion> localDhtPendingVersions(Iterable<IgniteTxEntry<K, V>> entries, GridCacheVersion baseVer) { Collection<GridCacheVersion> lessPending = new GridLeanSet<>(5); - for (GridCacheTxEntry<K, V> entry : entries) { + for (IgniteTxEntry<K, V> entry : entries) { try { for (GridCacheMvccCandidate cand : entry.cached().localCandidates()) { if (cand.version().isLess(baseVer)) @@ -880,7 +881,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu * Mini-future for get operations. Mini-futures are only waiting on a single * node as opposed to multiple nodes. */ - private class MiniFuture extends GridFutureAdapter<GridCacheTxEx<K, V>> { + private class MiniFuture extends GridFutureAdapter<IgniteTxEx<K, V>> { /** */ private static final long serialVersionUID = 0L; @@ -970,7 +971,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu if (nearMapping != null && !F.isEmpty(res.nearEvicted())) { nearMapping.evictReaders(res.nearEvicted()); - for (GridCacheTxEntry<K, V> entry : nearMapping.entries()) { + for (IgniteTxEntry<K, V> entry : nearMapping.entries()) { if (res.nearEvicted().contains(entry.txKey())) { while (true) { try { @@ -995,8 +996,8 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu // Process invalid partitions (no need to remap). if (!F.isEmpty(res.invalidPartitions())) { - for (Iterator<GridCacheTxEntry<K, V>> it = dhtMapping.entries().iterator(); it.hasNext();) { - GridCacheTxEntry<K, V> entry = it.next(); + for (Iterator<IgniteTxEntry<K, V>> it = dhtMapping.entries().iterator(); it.hasNext();) { + IgniteTxEntry<K, V> entry = it.next(); if (res.invalidPartitions().contains(entry.cached().partition())) { it.remove(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java index e6f9051..ed01977 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java @@ -14,6 +14,7 @@ import org.apache.ignite.lang.*; import org.gridgain.grid.kernal.*; 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.*; import org.gridgain.grid.util.direct.*; import org.gridgain.grid.util.tostring.*; @@ -49,7 +50,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque /** Near writes. */ @GridToStringInclude @GridDirectTransient - private Collection<GridCacheTxEntry<K, V>> nearWrites; + private Collection<IgniteTxEntry<K, V>> nearWrites; /** Serialized near writes. */ @GridDirectCollection(byte[].class) @@ -58,7 +59,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque /** Owned versions by key. */ @GridToStringInclude @GridDirectTransient - private Map<GridCacheTxKey<K>, GridCacheVersion> owned; + private Map<IgniteTxKey<K>, GridCacheVersion> owned; /** Owned versions bytes. */ private byte[] ownedBytes; @@ -106,9 +107,9 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque IgniteUuid miniId, long topVer, GridDhtTxLocalAdapter<K, V> tx, - Collection<GridCacheTxEntry<K, V>> dhtWrites, - Collection<GridCacheTxEntry<K, V>> nearWrites, - GridCacheTxKey grpLockKey, + Collection<IgniteTxEntry<K, V>> dhtWrites, + Collection<IgniteTxEntry<K, V>> nearWrites, + IgniteTxKey grpLockKey, boolean partLock, Map<UUID, Collection<UUID>> txNodes, GridCacheVersion nearXidVer, @@ -177,8 +178,8 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque /** * @return Near writes. */ - public Collection<GridCacheTxEntry<K, V>> nearWrites() { - return nearWrites == null ? Collections.<GridCacheTxEntry<K, V>>emptyList() : nearWrites; + public Collection<IgniteTxEntry<K, V>> nearWrites() { + return nearWrites == null ? Collections.<IgniteTxEntry<K, V>>emptyList() : nearWrites; } /** @@ -244,7 +245,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque * @param key Key. * @param ownerMapped Owner mapped version. */ - public void owned(GridCacheTxKey<K> key, GridCacheVersion ownerMapped) { + public void owned(IgniteTxKey<K> key, GridCacheVersion ownerMapped) { if (owned == null) owned = new GridLeanMap<>(3); @@ -254,7 +255,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque /** * @return Owned versions map. */ - public Map<GridCacheTxKey<K>, GridCacheVersion> owned() { + public Map<IgniteTxKey<K>, GridCacheVersion> owned() { return owned; } @@ -267,7 +268,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque ownedBytes = CU.marshal(ctx, owned); if (ctx.deploymentEnabled()) { - for (GridCacheTxKey<K> k : owned.keySet()) + for (IgniteTxKey<K> k : owned.keySet()) prepareObject(k, ctx); } } @@ -277,7 +278,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque nearWritesBytes = new ArrayList<>(nearWrites.size()); - for (GridCacheTxEntry<K, V> e : nearWrites) + for (IgniteTxEntry<K, V> e : nearWrites) nearWritesBytes.add(ctx.marshaller().marshal(e)); } } @@ -293,7 +294,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque nearWrites = new ArrayList<>(nearWritesBytes.size()); for (byte[] arr : nearWritesBytes) - nearWrites.add(ctx.marshaller().<GridCacheTxEntry<K, V>>unmarshal(arr, ldr)); + nearWrites.add(ctx.marshaller().<IgniteTxEntry<K, V>>unmarshal(arr, ldr)); unmarshalTx(nearWrites, true, ctx, ldr); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java index 1ada909..871d2f8 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java @@ -14,6 +14,7 @@ import org.apache.ignite.lang.*; import org.gridgain.grid.kernal.*; 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.tostring.*; import org.gridgain.grid.util.typedef.internal.*; @@ -32,7 +33,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp /** Evicted readers. */ @GridToStringInclude @GridDirectTransient - private Collection<GridCacheTxKey<K>> nearEvicted; + private Collection<IgniteTxKey<K>> nearEvicted; /** */ @GridDirectCollection(byte[].class) @@ -99,14 +100,14 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp /** * @return Evicted readers. */ - public Collection<GridCacheTxKey<K>> nearEvicted() { + public Collection<IgniteTxKey<K>> nearEvicted() { return nearEvicted; } /** * @param nearEvicted Evicted readers. */ - public void nearEvicted(Collection<GridCacheTxKey<K>> nearEvicted) { + public void nearEvicted(Collection<IgniteTxKey<K>> nearEvicted) { this.nearEvicted = nearEvicted; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxRemote.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxRemote.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxRemote.java index 380dc42..8c3f0e6 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxRemote.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxRemote.java @@ -14,6 +14,7 @@ import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; 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.tostring.*; import org.jdk8.backport.*; import org.jetbrains.annotations.*; @@ -85,7 +86,7 @@ public class GridDhtTxRemote<K, V> extends GridDistributedTxRemoteAdapter<K, V> boolean invalidate, long timeout, int txSize, - @Nullable GridCacheTxKey grpLockKey, + @Nullable IgniteTxKey grpLockKey, GridCacheVersion nearXidVer, Map<UUID, Collection<UUID>> txNodes, @Nullable UUID subjId, @@ -145,7 +146,7 @@ public class GridDhtTxRemote<K, V> extends GridDistributedTxRemoteAdapter<K, V> boolean invalidate, long timeout, int txSize, - @Nullable GridCacheTxKey grpLockKey, + @Nullable IgniteTxKey grpLockKey, @Nullable UUID subjId, int taskNameHash ) { @@ -230,8 +231,8 @@ public class GridDhtTxRemote<K, V> extends GridDistributedTxRemoteAdapter<K, V> @Override public void addInvalidPartition(GridCacheContext<K, V> cacheCtx, int part) { super.addInvalidPartition(cacheCtx, part); - for (Iterator<GridCacheTxEntry<K, V>> it = writeMap.values().iterator(); it.hasNext();) { - GridCacheTxEntry<K, V> e = it.next(); + for (Iterator<IgniteTxEntry<K, V>> it = writeMap.values().iterator(); it.hasNext();) { + IgniteTxEntry<K, V> e = it.next(); GridCacheEntryEx<K, V> cached = e.cached(); @@ -249,7 +250,7 @@ public class GridDhtTxRemote<K, V> extends GridDistributedTxRemoteAdapter<K, V> * @param ldr Class loader. * @throws IgniteCheckedException If failed. */ - public void addWrite(GridCacheTxEntry<K, V> entry, ClassLoader ldr) throws IgniteCheckedException { + public void addWrite(IgniteTxEntry<K, V> entry, ClassLoader ldr) throws IgniteCheckedException { entry.unmarshal(cctx, false, ldr); GridCacheContext<K, V> cacheCtx = entry.context(); @@ -280,7 +281,7 @@ public class GridDhtTxRemote<K, V> extends GridDistributedTxRemoteAdapter<K, V> * @param drVer Data center replication version. * @param clos Transform closures. */ - public void addWrite(GridCacheContext<K, V> cacheCtx, GridCacheOperation op, GridCacheTxKey<K> key, byte[] keyBytes, + public void addWrite(GridCacheContext<K, V> cacheCtx, GridCacheOperation op, IgniteTxKey<K> key, byte[] keyBytes, @Nullable V val, @Nullable byte[] valBytes, @Nullable Collection<IgniteClosure<V, V>> clos, @Nullable GridCacheVersion drVer) { checkInternal(key); @@ -290,7 +291,7 @@ public class GridDhtTxRemote<K, V> extends GridDistributedTxRemoteAdapter<K, V> GridDhtCacheEntry<K, V> cached = cacheCtx.dht().entryExx(key.key(), topologyVersion()); - GridCacheTxEntry<K, V> txEntry = new GridCacheTxEntry<>(cacheCtx, this, op, val, 0L, -1L, cached, drVer); + IgniteTxEntry<K, V> txEntry = new IgniteTxEntry<>(cacheCtx, this, op, val, 0L, -1L, cached, drVer); txEntry.keyBytes(keyBytes); txEntry.valueBytes(valBytes); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index e879e5f..508943a 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -21,6 +21,7 @@ import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*; import org.gridgain.grid.kernal.processors.cache.distributed.near.*; import org.gridgain.grid.kernal.processors.cache.dr.*; +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.*; @@ -553,7 +554,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { /** {@inheritDoc} */ @Override protected IgniteFuture<Boolean> lockAllAsync(Collection<? extends K> keys, long timeout, - @Nullable GridCacheTxLocalEx<K, V> tx, + @Nullable IgniteTxLocalEx<K, V> tx, boolean isInvalidate, boolean isRead, boolean retval, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java index eeadf99..6776cc6 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java @@ -19,6 +19,7 @@ import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; import org.gridgain.grid.kernal.processors.cache.distributed.near.*; +import org.gridgain.grid.kernal.processors.cache.transactions.*; import org.gridgain.grid.util.future.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.typedef.*; @@ -158,11 +159,11 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte if (F.isEmpty(keys)) return new GridFinishedFuture<>(ctx.kernalContext(), Collections.<K, V>emptyMap()); - GridCacheTxLocalAdapter<K, V> tx = ctx.tm().threadLocalTx(); + IgniteTxLocalAdapter<K, V> tx = ctx.tm().threadLocalTx(); if (tx != null && !tx.implicit() && !skipTx) { 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, entry, deserializePortable, filter)); } }); @@ -316,7 +317,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte * {@inheritDoc} */ @Override public IgniteFuture<Boolean> lockAllAsync(Collection<? extends K> keys, long timeout, - @Nullable GridCacheTxLocalEx<K, V> tx, boolean isInvalidate, boolean isRead, boolean retval, + @Nullable IgniteTxLocalEx<K, V> tx, boolean isInvalidate, boolean isRead, boolean retval, @Nullable IgniteTxIsolation isolation, IgnitePredicate<GridCacheEntry<K, V>>[] filter) { assert tx == null || tx instanceof GridNearTxLocal; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java index 3593878..1a8f8d1 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java @@ -19,6 +19,7 @@ import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; import org.gridgain.grid.kernal.processors.cache.distributed.near.*; +import org.gridgain.grid.kernal.processors.cache.transactions.*; import org.gridgain.grid.kernal.processors.timeout.*; import org.gridgain.grid.util.future.*; import org.gridgain.grid.util.lang.*; @@ -252,7 +253,7 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity GridCacheMvccCandidate<K> cand = cctx.mvcc().explicitLock(threadId, entry.key()); if (inTx()) { - GridCacheTxEntry<K, V> txEntry = tx.entry(entry.txKey()); + IgniteTxEntry<K, V> txEntry = tx.entry(entry.txKey()); txEntry.cached(entry, txEntry.keyBytes()); @@ -654,7 +655,7 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity for (K key : mappedKeys) { boolean explicit; - GridCacheTxKey<K> txKey = cctx.txKey(key); + IgniteTxKey<K> txKey = cctx.txKey(key); while (true) { GridDistributedCacheEntry<K, V> entry = null; @@ -722,7 +723,7 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity req.onePhaseCommit(true); } - GridCacheTxEntry<K, V> writeEntry = tx != null ? tx.writeMap().get(txKey) : null; + IgniteTxEntry<K, V> writeEntry = tx != null ? tx.writeMap().get(txKey) : null; if (writeEntry != null) // We are sending entry to remote node, clear transfer flag. @@ -1222,7 +1223,7 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity } if (inTx()) { - GridCacheTxEntry<K, V> txEntry = tx.entry(cctx.txKey(k)); + IgniteTxEntry<K, V> txEntry = tx.entry(cctx.txKey(k)); // In colocated cache we must receive responses only for detached entries. assert txEntry.cached().detached(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearAtomicCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearAtomicCache.java index 7b22e47..3972424 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearAtomicCache.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearAtomicCache.java @@ -18,6 +18,7 @@ import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic.*; import org.gridgain.grid.kernal.processors.cache.dr.*; +import org.gridgain.grid.kernal.processors.cache.transactions.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.future.*; import org.gridgain.grid.util.typedef.*; @@ -592,7 +593,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { /** {@inheritDoc} */ @Override protected IgniteFuture<Boolean> lockAllAsync(Collection<? extends K> keys, long timeout, - @Nullable GridCacheTxLocalEx<K, V> tx, + @Nullable IgniteTxLocalEx<K, V> tx, boolean isInvalidate, boolean isRead, boolean retval, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearCacheAdapter.java index b785103..44bb2e8 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearCacheAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearCacheAdapter.java @@ -15,6 +15,7 @@ import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; +import org.gridgain.grid.kernal.processors.cache.transactions.*; import org.gridgain.grid.util.future.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.typedef.*; @@ -162,7 +163,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda /** {@inheritDoc} */ @SuppressWarnings({"unchecked", "RedundantCast"}) @Override public IgniteFuture<Object> readThroughAllAsync(Collection<? extends K> keys, boolean reload, - GridCacheTxEx<K, V> tx, IgnitePredicate<GridCacheEntry<K, V>>[] filter, @Nullable UUID subjId, String taskName, + IgniteTxEx<K, V> tx, IgnitePredicate<GridCacheEntry<K, V>>[] filter, @Nullable UUID subjId, String taskName, IgniteBiInClosure<K, V> vis) { return (IgniteFuture)loadAsync(tx, keys, reload, false, filter, subjId, taskName, true); } @@ -248,7 +249,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda * @param filter Filter. * @return Loaded values. */ - public IgniteFuture<Map<K, V>> loadAsync(@Nullable GridCacheTxEx tx, @Nullable Collection<? extends K> keys, + public IgniteFuture<Map<K, V>> loadAsync(@Nullable IgniteTxEx tx, @Nullable Collection<? extends K> keys, boolean reload, boolean forcePrimary, @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, @Nullable UUID subjId, String taskName, boolean deserializePortable) { if (F.isEmpty(keys)) @@ -257,7 +258,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda if (keyCheck) validateCacheKeys(keys); - GridCacheTxLocalEx<K, V> txx = (tx != null && tx.local()) ? (GridCacheTxLocalEx<K, V>)tx : null; + IgniteTxLocalEx<K, V> txx = (tx != null && tx.local()) ? (IgniteTxLocalEx<K, V>)tx : null; GridNearGetFuture<K, V> fut = new GridNearGetFuture<>(ctx, keys, reload, forcePrimary, txx, filter, subjId, taskName, deserializePortable); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearCacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearCacheEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearCacheEntry.java index 40d20cb..8699ed9 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearCacheEntry.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearCacheEntry.java @@ -16,6 +16,7 @@ import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; 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.typedef.*; import org.gridgain.grid.util.typedef.internal.*; @@ -310,7 +311,7 @@ public class GridNearCacheEntry<K, V> extends GridDistributedCacheEntry<K, V> { } /** {@inheritDoc} */ - @Override protected V readThrough(GridCacheTxEx<K, V> tx, K key, boolean reload, + @Override protected V readThrough(IgniteTxEx<K, V> tx, K key, boolean reload, IgnitePredicate<GridCacheEntry<K, V>>[] filter, UUID subjId, String taskName) throws IgniteCheckedException { return cctx.near().loadAsync(tx, F.asList(key), reload, /*force primary*/false, filter, subjId, taskName, true). get().get(key); @@ -333,7 +334,7 @@ public class GridNearCacheEntry<K, V> extends GridDistributedCacheEntry<K, V> { * @throws GridCacheEntryRemovedException If entry was removed. */ @SuppressWarnings({"RedundantTypeArguments"}) - public boolean loadedValue(@Nullable GridCacheTxEx tx, UUID primaryNodeId, V val, byte[] valBytes, + public boolean loadedValue(@Nullable IgniteTxEx tx, UUID primaryNodeId, V val, byte[] valBytes, GridCacheVersion ver, GridCacheVersion dhtVer, @Nullable GridCacheVersion expVer, long ttl, long expireTime, boolean evt, long topVer, UUID subjId) throws IgniteCheckedException, GridCacheEntryRemovedException { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java index 38d27ff..2ef19a8 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java @@ -15,6 +15,7 @@ import org.apache.ignite.lang.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.*; 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.*; @@ -67,7 +68,7 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma private GridCacheVersion ver; /** Transaction. */ - private GridCacheTxLocalEx<K, V> tx; + private IgniteTxLocalEx<K, V> tx; /** Filters. */ private IgnitePredicate<GridCacheEntry<K, V>>[] filters; @@ -111,7 +112,7 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma Collection<? extends K> keys, boolean reload, boolean forcePrimary, - @Nullable GridCacheTxLocalEx<K, V> tx, + @Nullable IgniteTxLocalEx<K, V> tx, @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filters, @Nullable UUID subjId, String taskName, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java index b185e8d..2653fd0 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java @@ -18,6 +18,7 @@ import org.gridgain.grid.kernal.managers.discovery.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; 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.future.*; import org.gridgain.grid.util.lang.*; @@ -297,7 +298,7 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B ); if (inTx()) { - GridCacheTxEntry<K, V> txEntry = tx.entry(entry.txKey()); + IgniteTxEntry<K, V> txEntry = tx.entry(entry.txKey()); txEntry.cached(entry, txEntry.keyBytes()); } @@ -770,7 +771,7 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B boolean explicit = false; for (K key : mappedKeys) { - GridCacheTxKey<K> txKey = cctx.txKey(key); + IgniteTxKey<K> txKey = cctx.txKey(key); while (true) { GridNearCacheEntry<K, V> entry = null; @@ -858,7 +859,7 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B distributedKeys.add(key); - GridCacheTxEntry<K, V> writeEntry = tx != null ? tx.writeMap().get(txKey) : null; + IgniteTxEntry<K, V> writeEntry = tx != null ? tx.writeMap().get(txKey) : null; if (tx != null) tx.addKeyMapping(txKey, mapping.node()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockRequest.java index 5992acb..e237352 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockRequest.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockRequest.java @@ -16,6 +16,7 @@ import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; 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.tostring.*; import org.gridgain.grid.util.typedef.internal.*; @@ -115,7 +116,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> int keyCnt, int txSize, boolean syncCommit, - @Nullable GridCacheTxKey grpLockKey, + @Nullable IgniteTxKey grpLockKey, boolean partLock, @Nullable UUID subjId, int taskNameHash @@ -267,7 +268,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> byte[] keyBytes, boolean retVal, @Nullable GridCacheVersion dhtVer, - @Nullable GridCacheTxEntry<K, V> writeEntry, + @Nullable IgniteTxEntry<K, V> writeEntry, @Nullable GridCacheVersion drVer, GridCacheContext<K, V> ctx ) throws IgniteCheckedException { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTransactionalCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTransactionalCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTransactionalCache.java index bdd83d5..8c2a5dd 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTransactionalCache.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTransactionalCache.java @@ -18,6 +18,7 @@ import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; +import org.gridgain.grid.kernal.processors.cache.transactions.*; import org.gridgain.grid.util.future.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; @@ -99,11 +100,11 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> if (F.isEmpty(keys)) return new GridFinishedFuture<>(ctx.kernalContext(), Collections.<K, V>emptyMap()); - GridCacheTxLocalAdapter<K, V> tx = ctx.tm().threadLocalTx(); + IgniteTxLocalAdapter<K, V> tx = ctx.tm().threadLocalTx(); if (tx != null && !tx.implicit() && !skipTx) { 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, entry, deserializePortable, filter)); } }); @@ -215,7 +216,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> ClassLoader ldr = ctx.deploy().globalLoader(); if (ldr != null) { - Collection<GridCacheTxKey<K>> evicted = null; + Collection<IgniteTxKey<K>> evicted = null; for (int i = 0; i < nearKeys.size(); i++) { K key = nearKeys.get(i); @@ -223,7 +224,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> if (key == null) continue; - GridCacheTxKey<K> txKey = ctx.txKey(key); + IgniteTxKey<K> txKey = ctx.txKey(key); byte[] bytes = !keyBytes.isEmpty() ? keyBytes.get(i) : null; @@ -340,7 +341,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> if (tx != null && evicted != null) { assert !evicted.isEmpty(); - for (GridCacheTxKey<K> evict : evicted) + for (IgniteTxKey<K> evict : evicted) tx.addEvicted(evict); } } @@ -372,7 +373,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> /** {@inheritDoc} */ @Override protected IgniteFuture<Boolean> lockAllAsync(Collection<? extends K> keys, long timeout, - GridCacheTxLocalEx<K, V> tx, boolean isInvalidate, boolean isRead, boolean retval, + IgniteTxLocalEx<K, V> tx, boolean isInvalidate, boolean isRead, boolean retval, IgniteTxIsolation isolation, IgnitePredicate<GridCacheEntry<K, V>>[] filter) { GridNearLockFuture<K, V> fut = new GridNearLockFuture<>(ctx, keys, (GridNearTxLocal<K, V>)tx, isRead, retval, timeout, filter); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishFuture.java index 7695e07..48c516d 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishFuture.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishFuture.java @@ -15,6 +15,7 @@ import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; 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.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.future.*; @@ -213,7 +214,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu if (error() instanceof IgniteTxHeuristicException) { long topVer = this.tx.topologyVersion(); - for (GridCacheTxEntry<K, V> e : this.tx.writeMap().values()) { + for (IgniteTxEntry<K, V> e : this.tx.writeMap().values()) { GridCacheContext<K, V> cacheCtx = e.context(); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishRequest.java index 097730e..b7b274f 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishRequest.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishRequest.java @@ -13,6 +13,7 @@ import org.apache.ignite.lang.*; import org.gridgain.grid.kernal.*; 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.tostring.*; import org.jetbrains.annotations.*; @@ -88,8 +89,8 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques Collection<GridCacheVersion> committedVers, Collection<GridCacheVersion> rolledbackVers, int txSize, - Collection<GridCacheTxEntry<K, V>> writeEntries, - Collection<GridCacheTxEntry<K, V>> recoverEntries, + Collection<IgniteTxEntry<K, V>> writeEntries, + Collection<IgniteTxEntry<K, V>> recoverEntries, @Nullable UUID subjId, int taskNameHash) { super(xidVer, futId, null, threadId, commit, invalidate, sys, syncCommit, syncRollback, baseVer, committedVers, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd46f567/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxLocal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxLocal.java index fa00c49..0750b5c 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxLocal.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxLocal.java @@ -18,6 +18,7 @@ import org.gridgain.grid.kernal.managers.discovery.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; +import org.gridgain.grid.kernal.processors.cache.transactions.*; import org.gridgain.grid.util.future.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.tostring.*; @@ -50,7 +51,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { new ConcurrentHashMap8<>(); /** Future. */ - private final AtomicReference<IgniteFuture<GridCacheTxEx<K, V>>> prepFut = + private final AtomicReference<IgniteFuture<IgniteTxEx<K, V>>> prepFut = new AtomicReference<>(); /** */ @@ -62,7 +63,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { new AtomicReference<>(); /** Entries to lock on next step of prepare stage. */ - private Collection<GridCacheTxEntry<K, V>> optimisticLockEntries = Collections.emptyList(); + private Collection<IgniteTxEntry<K, V>> optimisticLockEntries = Collections.emptyList(); /** True if transaction contains near cache entries mapped to local node. */ private boolean nearLocallyMapped; @@ -100,7 +101,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { boolean invalidate, boolean storeEnabled, int txSize, - @Nullable GridCacheTxKey grpLockKey, + @Nullable IgniteTxKey grpLockKey, boolean partLock, @Nullable UUID subjId, int taskNameHash @@ -164,7 +165,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { /** {@inheritDoc} */ @Override protected IgniteFuture<Boolean> addReader(long msgId, GridDhtCacheEntry<K, V> cached, - GridCacheTxEntry<K, V> entry, long topVer) { + IgniteTxEntry<K, V> entry, long topVer) { // We are in near transaction, do not add local node as reader. return null; } @@ -245,7 +246,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { } /** {@inheritDoc} */ - @Override public Collection<GridCacheTxEntry<K, V>> optimisticLockEntries() { + @Override public Collection<IgniteTxEntry<K, V>> optimisticLockEntries() { if (groupLock()) return super.optimisticLockEntries(); @@ -255,7 +256,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { /** * @param optimisticLockEntries Optimistic lock entries. */ - public void optimisticLockEntries(Collection<GridCacheTxEntry<K, V>> optimisticLockEntries) { + public void optimisticLockEntries(Collection<IgniteTxEntry<K, V>> optimisticLockEntries) { this.optimisticLockEntries = optimisticLockEntries; } @@ -318,7 +319,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { } /** {@inheritDoc} */ - @Override protected void updateExplicitVersion(GridCacheTxEntry<K, V> txEntry, GridCacheEntryEx<K, V> entry) + @Override protected void updateExplicitVersion(IgniteTxEntry<K, V> txEntry, GridCacheEntryEx<K, V> entry) throws GridCacheEntryRemovedException { if (entry.detached()) { GridCacheMvccCandidate<K> cand = cctx.mvcc().explicitLock(threadId(), entry.key()); @@ -344,7 +345,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { } /** {@inheritDoc} */ - @Override public Collection<GridCacheTxEntry<K, V>> recoveryWrites() { + @Override public Collection<IgniteTxEntry<K, V>> recoveryWrites() { return F.view(writeEntries(), CU.<K, V>transferRequired()); } @@ -381,7 +382,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { } /** {@inheritDoc} */ - @Override protected void addGroupTxMapping(Collection<GridCacheTxKey<K>> keys) { + @Override protected void addGroupTxMapping(Collection<IgniteTxKey<K>> keys) { super.addGroupTxMapping(keys); addKeyMapping(cctx.localNode(), keys); @@ -393,13 +394,13 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { * @param key Key to add. * @param node Node this key mapped to. */ - public void addKeyMapping(GridCacheTxKey<K> key, ClusterNode node) { + public void addKeyMapping(IgniteTxKey<K> key, ClusterNode node) { GridDistributedTxMapping<K, V> m = mappings.get(node.id()); if (m == null) mappings.put(node.id(), m = new GridDistributedTxMapping<>(node)); - GridCacheTxEntry<K, V> txEntry = txMap.get(key); + IgniteTxEntry<K, V> txEntry = txMap.get(key); assert txEntry != null; @@ -418,14 +419,14 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { * @param n Mapped node. * @param mappedKeys Mapped keys. */ - private void addKeyMapping(ClusterNode n, Iterable<GridCacheTxKey<K>> mappedKeys) { + private void addKeyMapping(ClusterNode n, Iterable<IgniteTxKey<K>> mappedKeys) { GridDistributedTxMapping<K, V> m = mappings.get(n.id()); if (m == null) mappings.put(n.id(), m = new GridDistributedTxMapping<>(n)); - for (GridCacheTxKey<K> key : mappedKeys) { - GridCacheTxEntry<K, V> txEntry = txMap.get(key); + for (IgniteTxKey<K> key : mappedKeys) { + IgniteTxEntry<K, V> txEntry = txMap.get(key); assert txEntry != null; @@ -450,7 +451,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { assert m != null; - for (GridCacheTxEntry<K, V> entry : map.entries()) + for (IgniteTxEntry<K, V> entry : map.entries()) m.add(entry); } @@ -481,7 +482,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { GridDistributedTxMapping<K, V> mapping = mappings.get(nodeId); if (mapping != null) { - for (GridCacheTxEntry<K, V> entry : m.entries()) + for (IgniteTxEntry<K, V> entry : m.entries()) mapping.removeEntry(entry); if (mapping.entries().isEmpty()) @@ -509,7 +510,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { /** {@inheritDoc} */ @Override public boolean onOwnerChanged(GridCacheEntryEx<K, V> entry, GridCacheMvccCandidate<K> owner) { - GridCacheMvccFuture<K, V, GridCacheTxEx<K, V>> fut = (GridCacheMvccFuture<K, V, GridCacheTxEx<K, V>>)prepFut + GridCacheMvccFuture<K, V, IgniteTxEx<K, V>> fut = (GridCacheMvccFuture<K, V, IgniteTxEx<K, V>>)prepFut .get(); return fut != null && fut.onOwnerChanged(entry, owner); @@ -518,7 +519,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { /** * @return Commit fut. */ - @Override public IgniteFuture<GridCacheTxEx<K, V>> future() { + @Override public IgniteFuture<IgniteTxEx<K, V>> future() { return prepFut.get(); } @@ -530,11 +531,11 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { */ void readyNearLocks(GridDistributedTxMapping<K, V> mapping, Collection<GridCacheVersion> pendingVers, Collection<GridCacheVersion> committedVers, Collection<GridCacheVersion> rolledbackVers) { - Collection<GridCacheTxEntry<K, V>> entries = groupLock() ? + Collection<IgniteTxEntry<K, V>> entries = groupLock() ? Collections.singletonList(groupLockEntry()) : F.concat(false, mapping.reads(), mapping.writes()); - for (GridCacheTxEntry<K, V> txEntry : entries) { + for (IgniteTxEntry<K, V> txEntry : entries) { while (true) { GridCacheContext<K, V> cacheCtx = txEntry.cached().context(); @@ -666,8 +667,8 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { } /** {@inheritDoc} */ - @Override public IgniteFuture<GridCacheTxEx<K, V>> prepareAsync() { - IgniteFuture<GridCacheTxEx<K, V>> fut = prepFut.get(); + @Override public IgniteFuture<IgniteTxEx<K, V>> prepareAsync() { + IgniteFuture<IgniteTxEx<K, V>> fut = prepFut.get(); if (fut == null) { // Future must be created before any exception can be thrown. @@ -747,10 +748,10 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { cctx.mvcc().addFuture(fut); - IgniteFuture<GridCacheTxEx<K, V>> prepareFut = prepFut.get(); + IgniteFuture<IgniteTxEx<K, V>> prepareFut = prepFut.get(); - prepareFut.listenAsync(new CI1<IgniteFuture<GridCacheTxEx<K, V>>>() { - @Override public void apply(IgniteFuture<GridCacheTxEx<K, V>> f) { + prepareFut.listenAsync(new CI1<IgniteFuture<IgniteTxEx<K, V>>>() { + @Override public void apply(IgniteFuture<IgniteTxEx<K, V>> f) { GridNearTxFinishFuture<K, V> fut0 = commitFut.get(); try { @@ -794,7 +795,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { cctx.mvcc().addFuture(fut); - IgniteFuture<GridCacheTxEx<K, V>> prepFut = this.prepFut.get(); + IgniteFuture<IgniteTxEx<K, V>> prepFut = this.prepFut.get(); if (prepFut == null || prepFut.isDone()) { try { @@ -818,8 +819,8 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { } } else { - prepFut.listenAsync(new CI1<IgniteFuture<GridCacheTxEx<K, V>>>() { - @Override public void apply(IgniteFuture<GridCacheTxEx<K, V>> f) { + prepFut.listenAsync(new CI1<IgniteFuture<IgniteTxEx<K, V>>>() { + @Override public void apply(IgniteFuture<IgniteTxEx<K, V>> f) { try { // Check for errors in prepare future. f.get(); @@ -862,8 +863,8 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { * @return Future that will be completed when locks are acquired. */ @SuppressWarnings("TypeMayBeWeakened") - public IgniteFuture<GridCacheTxEx<K, V>> prepareAsyncLocal(@Nullable Collection<GridCacheTxEntry<K, V>> reads, - @Nullable Collection<GridCacheTxEntry<K, V>> writes, Map<UUID, Collection<UUID>> txNodes, boolean last, + public IgniteFuture<IgniteTxEx<K, V>> prepareAsyncLocal(@Nullable Collection<IgniteTxEntry<K, V>> reads, + @Nullable Collection<IgniteTxEntry<K, V>> writes, Map<UUID, Collection<UUID>> txNodes, boolean last, Collection<UUID> lastBackups) { assert optimistic(); @@ -881,7 +882,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { init(); GridDhtTxPrepareFuture<K, V> fut = new GridDhtTxPrepareFuture<>(cctx, this, IgniteUuid.randomUuid(), - Collections.<GridCacheTxKey<K>, GridCacheVersion>emptyMap(), last, lastBackups); + Collections.<IgniteTxKey<K>, GridCacheVersion>emptyMap(), last, lastBackups); try { // At this point all the entries passed in must be enlisted in transaction because this is an @@ -936,7 +937,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { if (pessimistic()) prepareAsync(); - IgniteFuture<GridCacheTxEx<K, V>> prep = prepFut.get(); + IgniteFuture<IgniteTxEx<K, V>> prep = prepFut.get(); // Do not create finish future if there are no remote nodes. if (F.isEmpty(dhtMap) && F.isEmpty(nearMap)) { @@ -972,8 +973,8 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { } } else - prep.listenAsync(new CI1<IgniteFuture<GridCacheTxEx<K, V>>>() { - @Override public void apply(IgniteFuture<GridCacheTxEx<K, V>> f) { + prep.listenAsync(new CI1<IgniteFuture<IgniteTxEx<K, V>>>() { + @Override public void apply(IgniteFuture<IgniteTxEx<K, V>> f) { try { f.get(); // Check for errors of a parent future. @@ -1009,7 +1010,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { cctx.mvcc().addFuture(fut); - IgniteFuture<GridCacheTxEx<K, V>> prep = prepFut.get(); + IgniteFuture<IgniteTxEx<K, V>> prep = prepFut.get(); if (prep == null || prep.isDone()) { try { @@ -1025,8 +1026,8 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { fut.finish(); } else - prep.listenAsync(new CI1<IgniteFuture<GridCacheTxEx<K, V>>>() { - @Override public void apply(IgniteFuture<GridCacheTxEx<K, V>> f) { + prep.listenAsync(new CI1<IgniteFuture<IgniteTxEx<K, V>>>() { + @Override public void apply(IgniteFuture<IgniteTxEx<K, V>> f) { try { f.get(); // Check for errors of a parent future. } @@ -1081,9 +1082,9 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { } /** {@inheritDoc} */ - @Override protected GridCacheEntryEx<K, V> entryEx(GridCacheContext<K, V> cacheCtx, GridCacheTxKey<K> key) { + @Override protected GridCacheEntryEx<K, V> entryEx(GridCacheContext<K, V> cacheCtx, IgniteTxKey<K> key) { if (cacheCtx.isColocated()) { - GridCacheTxEntry<K, V> txEntry = entry(key); + IgniteTxEntry<K, V> txEntry = entry(key); if (txEntry == null) return cacheCtx.colocated().entryExx(key.key(), topologyVersion(), true); @@ -1108,9 +1109,9 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { } /** {@inheritDoc} */ - @Override protected GridCacheEntryEx<K, V> entryEx(GridCacheContext<K, V> cacheCtx, GridCacheTxKey<K> key, long topVer) { + @Override protected GridCacheEntryEx<K, V> entryEx(GridCacheContext<K, V> cacheCtx, IgniteTxKey<K> key, long topVer) { if (cacheCtx.isColocated()) { - GridCacheTxEntry<K, V> txEntry = entry(key); + IgniteTxEntry<K, V> txEntry = entry(key); if (txEntry == null) return cacheCtx.colocated().entryExx(key.key(), topVer, true); @@ -1142,13 +1143,13 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { /** * */ - private static class PessimisticPrepareFuture<K, V> extends GridFutureAdapter<GridCacheTxEx<K, V>> { + private static class PessimisticPrepareFuture<K, V> extends GridFutureAdapter<IgniteTxEx<K, V>> { /** */ private static final long serialVersionUID = 0L; /** Transaction. */ @GridToStringExclude - private GridCacheTxEx<K, V> tx; + private IgniteTxEx<K, V> tx; /** * Empty constructor required by {@link Externalizable}. @@ -1161,7 +1162,7 @@ public class GridNearTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> { * @param ctx Kernal context. * @param tx Transaction. */ - private PessimisticPrepareFuture(GridKernalContext ctx, GridCacheTxEx<K, V> tx) { + private PessimisticPrepareFuture(GridKernalContext ctx, IgniteTxEx<K, V> tx) { super(ctx); this.tx = tx; }
