#ignite-797: remove groupLock from IgniteInternalTx.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2ab01229 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2ab01229 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2ab01229 Branch: refs/heads/ignite-797 Commit: 2ab01229eaeba72e3bc72e010a62ce8c3f78d50e Parents: a122580 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri May 15 13:57:38 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri May 15 13:57:38 2015 +0300 ---------------------------------------------------------------------- .../near/GridNearOptimisticTxPrepareFuture.java | 3 --- .../cache/distributed/near/GridNearTxLocal.java | 3 --- .../distributed/near/GridNearTxRemote.java | 16 -------------- .../cache/transactions/IgniteInternalTx.java | 5 ----- .../cache/transactions/IgniteTxAdapter.java | 12 +---------- .../transactions/IgniteTxLocalAdapter.java | 22 ++++++++++---------- 6 files changed, 12 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ab01229/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java index 07dbd9e..4f74303 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java @@ -546,9 +546,6 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAd }); } else { - assert !tx.groupLock() : "Got group lock transaction that is mapped on remote node [tx=" + tx + - ", nodeId=" + n.id() + ']'; - try { cctx.io().send(n, req, tx.ioPolicy()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ab01229/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java index ede24ab..50c509e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java @@ -269,9 +269,6 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter { /** {@inheritDoc} */ @Override public Collection<IgniteTxEntry> optimisticLockEntries() { - if (groupLock()) - return super.optimisticLockEntries(); - return optimisticLockEntries; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ab01229/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxRemote.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxRemote.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxRemote.java index b6b6017..1ef101e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxRemote.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxRemote.java @@ -51,9 +51,6 @@ public class GridNearTxRemote extends GridDistributedTxRemoteAdapter { /** Owned versions. */ private Map<IgniteTxKey, GridCacheVersion> owned; - /** Group lock flag. */ - private boolean grpLock; - /** * Empty constructor required for {@link Externalizable}. */ @@ -192,19 +189,6 @@ public class GridNearTxRemote extends GridDistributedTxRemoteAdapter { } /** - * Marks near local transaction as group lock. Note that near remote transaction may be - * marked as group lock even if it does not contain any locked key. - */ - public void markGroupLock() { - grpLock = true; - } - - /** {@inheritDoc} */ - @Override public boolean groupLock() { - return grpLock || super.groupLock(); - } - - /** * @return Near transaction ID. */ @Override public GridCacheVersion nearXidVersion() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ab01229/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java index df91221..5f877ec 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java @@ -284,11 +284,6 @@ public interface IgniteInternalTx extends AutoCloseable, GridTimeoutObject { public boolean empty(); /** - * @return {@code True} if transaction group-locked. - */ - public boolean groupLock(); - - /** * @return {@code True} if preparing flag was set with this call. */ public boolean markPreparing(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ab01229/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java index d20f5ca..ca3e89b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java @@ -570,11 +570,6 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter public abstract boolean isStarted(); /** {@inheritDoc} */ - @Override public boolean groupLock() { - return grpLockKey != null; - } - - /** {@inheritDoc} */ @Override public int size() { return txSize; } @@ -1510,7 +1505,7 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter /** {@inheritDoc} */ @Override public String toString() { return GridToStringBuilder.toString(IgniteTxAdapter.class, this, - "duration", (U.currentTimeMillis() - startTime) + "ms", "grpLock", groupLock(), + "duration", (U.currentTimeMillis() - startTime) + "ms", "onePhaseCommit", onePhaseCommit); } @@ -1735,11 +1730,6 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter } /** {@inheritDoc} */ - @Override public boolean groupLock() { - return false; - } - - /** {@inheritDoc} */ @Override public boolean markPreparing() { throw new IllegalStateException("Deserialized transaction can only be used as read-only."); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2ab01229/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java index 416913b..8a1d1a1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java @@ -485,7 +485,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter CacheStoreManager store = store(); if (store != null && store.isWriteThrough() && storeEnabled() && - (!internal() || groupLock()) && (near() || store.isWriteToStoreFromDht())) { + !internal() && (near() || store.isWriteToStoreFromDht())) { try { if (writeEntries != null) { Map<Object, IgniteBiTuple<Object, GridCacheVersion>> putMap = null; @@ -975,7 +975,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter else { CacheStoreManager store = store(); - if (store != null && (!internal() || groupLock())) { + if (store != null && !internal()) { try { store.sessionEnd(this, true); } @@ -1081,7 +1081,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter CacheStoreManager store = store(); if (store != null && (near() || store.isWriteToStoreFromDht())) { - if (!internal() || groupLock()) + if (!internal()) store.sessionEnd(this, false); } } @@ -1240,7 +1240,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter CacheObject val = null; - if (!pessimistic() || readCommitted() || groupLock() && !skipVals) { + if (!pessimistic() || readCommitted() && !skipVals) { IgniteCacheExpiryPolicy accessPlc = optimistic() ? accessPolicy(cacheCtx, txKey, expiryPlc) : null; @@ -1502,7 +1502,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter nextVer = cctx.versions().next(topologyVersion()); while (true) { - assert txEntry != null || readCommitted() || groupLock() || skipVals; + assert txEntry != null || readCommitted() || skipVals; GridCacheEntryEx e = txEntry == null ? entryEx(cacheCtx, txKey) : txEntry.cached(); @@ -1537,7 +1537,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter // In pessimistic mode, we should always be able to set. assert set || !pessimistic(); - if (readCommitted() || groupLock() || skipVals) { + if (readCommitted() || skipVals) { cacheCtx.evicts().touch(e, topologyVersion()); if (visibleVal != null) { @@ -1628,7 +1628,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter return new GridFinishedFuture<>(retMap); // Handle locks. - if (pessimistic() && !readCommitted() && !groupLock() && !skipVals) { + if (pessimistic() && !readCommitted() && !skipVals) { if (expiryPlc == null) expiryPlc = cacheCtx.expiry(); @@ -1785,7 +1785,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter } } else { - assert optimistic() || readCommitted() || groupLock() || skipVals; + assert optimistic() || readCommitted() || skipVals; final Collection<KeyCacheObject> redos = new ArrayList<>(); @@ -2168,7 +2168,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter enlisted.add(cacheKey); - if ((!pessimistic() && !implicit()) || (groupLock() && !lockOnly)) { + if (!pessimistic() && !implicit()) { txEntry.markValid(); if (old == null) { @@ -2613,7 +2613,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter null, opCtx != null && opCtx.skipStore()); - if (pessimistic() && !groupLock()) { + if (pessimistic()) { // Loose all skipped. final Set<KeyCacheObject> loaded = loadFut.get(); @@ -2836,7 +2836,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter // Acquire locks only after having added operation to the write set. // Otherwise, during rollback we will not know whether locks need // to be rolled back. - if (pessimistic() && !groupLock()) { + if (pessimistic()) { // Loose all skipped. final Collection<KeyCacheObject> passedKeys = F.view(enlisted, F0.notIn(loadFut.get()));
