#ignite-797: remove groupLockKey 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/a122580d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a122580d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a122580d Branch: refs/heads/ignite-797 Commit: a122580db391733e2ccb325194482bdb07c7b12b Parents: 3b05913 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri May 15 13:52:51 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri May 15 13:52:51 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/GridDhtTxFinishFuture.java | 6 +++--- .../cache/distributed/dht/GridDhtTxPrepareFuture.java | 6 ++---- .../near/GridNearOptimisticTxPrepareFuture.java | 6 ++---- .../processors/cache/transactions/IgniteInternalTx.java | 5 ----- .../processors/cache/transactions/IgniteTxAdapter.java | 10 ---------- .../cache/transactions/IgniteTxLocalAdapter.java | 4 +--- 6 files changed, 8 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a122580d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java index 7c35fc5..36192bb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java @@ -309,7 +309,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur tx.rolledbackVersions(), tx.pendingVersions(), tx.size(), - tx.groupLockKey(), + null, tx.subjectId(), tx.taskNameHash()); @@ -387,7 +387,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur tx.rolledbackVersions(), tx.pendingVersions(), tx.size(), - tx.groupLockKey(), + null, tx.subjectId(), tx.taskNameHash()); @@ -439,7 +439,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur tx.rolledbackVersions(), tx.pendingVersions(), tx.size(), - tx.groupLockKey(), + null, tx.subjectId(), tx.taskNameHash()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a122580d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java index ceae886..3056ae5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java @@ -430,10 +430,8 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter txEntry.cached(entry); } - if (tx.optimistic() && txEntry.explicitVersion() == null) { - if (!tx.groupLock() || tx.groupLockKey().equals(entry.txKey())) - lockKeys.add(txEntry.txKey()); - } + if (tx.optimistic() && txEntry.explicitVersion() == null) + lockKeys.add(txEntry.txKey()); while (true) { try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a122580d/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 9a00a24..07dbd9e 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 @@ -597,10 +597,8 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAd entry.cached(cacheCtx.local().entryEx(entry.key(), topVer)); if (cacheCtx.isNear() || cacheCtx.isLocal()) { - if (waitLock && entry.explicitVersion() == null) { - if (!tx.groupLock() || tx.groupLockKey().equals(entry.txKey())) - lockKeys.add(entry.txKey()); - } + if (waitLock && entry.explicitVersion() == null) + lockKeys.add(entry.txKey()); } if (cur == null || !cur.node().id().equals(primary.id()) || cur.near() != cacheCtx.isNear()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a122580d/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 2bed843..df91221 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 @@ -289,11 +289,6 @@ public interface IgniteInternalTx extends AutoCloseable, GridTimeoutObject { public boolean groupLock(); /** - * @return Group lock key if {@link #groupLock()} is {@code true}. - */ - @Nullable public IgniteTxKey groupLockKey(); - - /** * @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/a122580d/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 57adea3..d20f5ca 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 @@ -575,11 +575,6 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter } /** {@inheritDoc} */ - @Override public IgniteTxKey groupLockKey() { - return grpLockKey; - } - - /** {@inheritDoc} */ @Override public int size() { return txSize; } @@ -1745,11 +1740,6 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter } /** {@inheritDoc} */ - @Nullable @Override public IgniteTxKey groupLockKey() { - throw new IllegalStateException("Deserialized transaction can only be used as read-only."); - } - - /** {@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/a122580d/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 6d1ee9e..416913b 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 @@ -121,7 +121,6 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter * @param timeout Timeout. * @param txSize Expected transaction size. * @param grpLockKey Group lock key if this is a group-lock transaction. - * @param partLock {@code True} if this is a group-lock transaction and lock is acquired for whole partition. */ protected IgniteTxLocalAdapter( GridCacheSharedContext cctx, @@ -1520,8 +1519,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter log.debug("Got removed entry in transaction getAll method " + "(will try again): " + e); - if (pessimistic() && !readCommitted() && !isRollbackOnly() && - (!groupLock() || F.eq(e.key(), groupLockKey()))) { + if (pessimistic() && !readCommitted() && !isRollbackOnly()) { U.error(log, "Inconsistent transaction state (entry got removed while " + "holding lock) [entry=" + e + ", tx=" + IgniteTxLocalAdapter.this + "]");
