Repository: incubator-ignite Updated Branches: refs/heads/ignite-797 13b3ad289 -> 0ec82a435
#ignite-797: remove partitionLock from IgniteTxLocalEx. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3b05913d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3b05913d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3b05913d Branch: refs/heads/ignite-797 Commit: 3b05913de9cb4af5a9dbf274eb1efd9cafa5cc3a Parents: 13b3ad2 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri May 15 13:47:55 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri May 15 13:47:55 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 6 +- .../dht/GridDhtTransactionalCacheAdapter.java | 1 - .../cache/distributed/dht/GridDhtTxLocal.java | 3 - .../distributed/dht/GridDhtTxLocalAdapter.java | 4 +- .../cache/distributed/near/GridNearTxLocal.java | 3 - .../transactions/IgniteTransactionsImpl.java | 3 +- .../cache/transactions/IgniteTxHandler.java | 2 - .../transactions/IgniteTxLocalAdapter.java | 68 -------------------- .../cache/transactions/IgniteTxLocalEx.java | 16 +---- .../cache/transactions/IgniteTxManager.java | 5 +- .../processors/cache/jta/CacheJtaManager.java | 3 +- 11 files changed, 7 insertions(+), 107 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3b05913d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 4106cb0..3cb6886 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -3907,8 +3907,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V tCfg.getDefaultTxTimeout(), !ctx.skipStore(), 0, - /** group lock keys */null, - /** partition lock */false + /** group lock keys */null ); assert tx != null; @@ -3978,8 +3977,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V ctx.kernalContext().config().getTransactionConfiguration().getDefaultTxTimeout(), !ctx.skipStore(), 0, - null, - false); + null); return asyncOp(tx, op); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3b05913d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java index af787e2..73159c1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java @@ -808,7 +808,6 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach false, req.txSize(), null, - false, null, req.subjectId(), req.taskNameHash()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3b05913d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java index 614f520..655cf7b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java @@ -94,7 +94,6 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa * @param storeEnabled Store enabled flag. * @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 whole partition should be locked. * @param txNodes Transaction nodes mapping. */ public GridDhtTxLocal( @@ -116,7 +115,6 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa boolean storeEnabled, int txSize, @Nullable IgniteTxKey grpLockKey, - boolean partLock, Map<UUID, Collection<UUID>> txNodes, UUID subjId, int taskNameHash @@ -136,7 +134,6 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa storeEnabled, txSize, grpLockKey, - partLock, subjId, taskNameHash); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3b05913d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java index 1c30fce..62f98bd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java @@ -95,7 +95,6 @@ public abstract class GridDhtTxLocalAdapter extends IgniteTxLocalAdapter { * @param timeout Timeout. * @param txSize Expected transaction size. * @param grpLockKey Group lock key if this is a group-lock transaction. - * @param partLock If this is a group-lock transaction and the whole partition should be locked. */ protected GridDhtTxLocalAdapter( GridCacheSharedContext cctx, @@ -112,12 +111,11 @@ public abstract class GridDhtTxLocalAdapter extends IgniteTxLocalAdapter { boolean storeEnabled, int txSize, @Nullable IgniteTxKey grpLockKey, - boolean partLock, @Nullable UUID subjId, int taskNameHash ) { super(cctx, xidVer, implicit, implicitSingle, sys, plc, concurrency, isolation, timeout, invalidate, - storeEnabled, txSize, grpLockKey, partLock, subjId, taskNameHash); + storeEnabled, txSize, grpLockKey, subjId, taskNameHash); assert cctx != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3b05913d/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 8c9c2b4..ede24ab 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 @@ -103,7 +103,6 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter { * @param storeEnabled Store enabled flag. * @param txSize 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 the whole partition should be locked. * @param subjId Subject ID. * @param taskNameHash Task name hash code. */ @@ -119,7 +118,6 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter { boolean storeEnabled, int txSize, @Nullable IgniteTxKey grpLockKey, - boolean partLock, @Nullable UUID subjId, int taskNameHash ) { @@ -138,7 +136,6 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter { storeEnabled, txSize, grpLockKey, - partLock, subjId, taskNameHash); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3b05913d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java index 044c3d7..54eb234 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java @@ -161,8 +161,7 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx { timeout, true, txSize, - /** group lock keys */null, - /** partition lock */false + /** group lock keys */null ); assert tx != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3b05913d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java index b247896..e68ee30 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java @@ -272,7 +272,6 @@ public class IgniteTxHandler { false, req.txSize(), null, - false, req.transactionNodes(), req.subjectId(), req.taskNameHash() @@ -555,7 +554,6 @@ public class IgniteTxHandler { req.storeEnabled(), req.txSize(), req.groupLockKey(), - false, null, req.subjectId(), req.taskNameHash())); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3b05913d/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 d4cd1f0..6d1ee9e 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 @@ -86,9 +86,6 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter /** Base for completed versions. */ private GridCacheVersion completedBase; - /** Flag indicating partition lock in group lock transaction. */ - private boolean partLock; - /** Flag indicating that transformed values should be sent to remote nodes. */ private boolean sndTransformedVals; @@ -140,17 +137,12 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter boolean storeEnabled, int txSize, @Nullable IgniteTxKey grpLockKey, - boolean partLock, @Nullable UUID subjId, int taskNameHash ) { super(cctx, xidVer, implicit, implicitSingle, /*local*/true, sys, plc, concurrency, isolation, timeout, invalidate, storeEnabled, txSize, grpLockKey, subjId, taskNameHash); - assert !partLock || grpLockKey != null; - - this.partLock = partLock; - minVer = xidVer; } @@ -182,11 +174,6 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter } /** {@inheritDoc} */ - @Override public boolean partitionLock() { - return partLock; - } - - /** {@inheritDoc} */ @Override public Throwable commitError() { return commitErr.get(); } @@ -2969,61 +2956,6 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter } /** - * Performs keys locking for affinity-based group lock transactions. - * @return Lock future. - */ - @Override public <K> IgniteInternalFuture<?> groupLockAsync(GridCacheContext cacheCtx, Collection<K> keys) { - assert groupLock(); - - try { - init(); - - GridCacheReturn ret = new GridCacheReturn(localResult(), false); - - Collection<KeyCacheObject> enlisted = new ArrayList<>(); - - Set<KeyCacheObject> skipped = enlistWrite( - cacheCtx, - keys, - /** cached entry */null, - /** expiry - leave unchanged */null, - /** implicit */false, - /** lookup map */null, - /** invoke map */null, - /** invoke arguments */null, - /** retval */false, - /** lock only */true, - CU.empty0(), - ret, - enlisted, - null, - null, - cacheCtx.skipStore() - ).get(); - - // No keys should be skipped with empty filter. - assert F.isEmpty(skipped); - - // Lock group key in pessimistic mode only. - return pessimistic() ? - cacheCtx.cache().txLockAsync(enlisted, - lockTimeout(), - this, - false, - false, - isolation, - isInvalidate(), - -1L) : - new GridFinishedFuture<>(); - } - catch (IgniteCheckedException e) { - setRollbackOnly(); - - return new GridFinishedFuture<Object>(e); - } - } - - /** * Initializes read map. * * @return {@code True} if transaction was successfully started. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3b05913d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java index a6ce09a..14562ab 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java @@ -60,7 +60,7 @@ public interface IgniteTxLocalEx extends IgniteInternalTx { /** * @param cacheCtx Cache context. * @param keys Keys to get. - * @param cached Cached entry if this method is called from entry wrapper. + * @param cached Cached entry if this method is called from entry wrapper * Cached entry is passed if and only if there is only one key in collection of keys. * @param deserializePortable Deserialize portable flag. * @param skipVals Skip values flag. @@ -139,20 +139,6 @@ public interface IgniteTxLocalEx extends IgniteInternalTx { Map<KeyCacheObject, GridCacheVersion> drMap); /** - * Performs keys locking for affinity-based group lock transactions. - * - * @param cacheCtx Cache context. - * @param keys Keys to lock. - * @return Lock future. - */ - public <K> IgniteInternalFuture<?> groupLockAsync(GridCacheContext cacheCtx, Collection<K> keys); - - /** - * @return {@code True} if keys from the same partition are allowed to be enlisted in group-lock transaction. - */ - public boolean partitionLock(); - - /** * @return Return value for */ public GridCacheReturn implicitSingleResult(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3b05913d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java index b08535c..d5ffebe 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java @@ -348,7 +348,6 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter { * @param timeout transaction timeout. * @param txSize Expected transaction size. * @param grpLockKey Group lock key if this is a group-lock transaction. - * @param partLock {@code True} if partition is locked. * @return New transaction. */ public IgniteTxLocalAdapter newTx( @@ -360,8 +359,7 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter { long timeout, boolean storeEnabled, int txSize, - @Nullable IgniteTxKey grpLockKey, - boolean partLock) { + @Nullable IgniteTxKey grpLockKey) { assert sysCacheCtx == null || sysCacheCtx.systemTx(); UUID subjId = null; // TODO GG-9141 how to get subj ID? @@ -380,7 +378,6 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter { storeEnabled, txSize, grpLockKey, - partLock, subjId, taskNameHash); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3b05913d/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java index 56bd676..e50ccc3 100644 --- a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java +++ b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java @@ -86,8 +86,7 @@ public class CacheJtaManager extends CacheJtaManagerAdapter { tCfg.getDefaultTxTimeout(), /*store enabled*/true, /*tx size*/0, - /*group lock keys*/null, - /*partition lock*/false + /*group lock keys*/null ); }
