#ignite-797: remove grpLockKey from constructors.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/401de5eb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/401de5eb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/401de5eb Branch: refs/heads/ignite-797 Commit: 401de5eb34c74700634cd8fffaa7321663d2dfbc Parents: ce08666 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri May 15 14:08:05 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri May 15 14:08:05 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheAdapter.java | 6 ++---- .../cache/distributed/GridDistributedTxRemoteAdapter.java | 3 --- .../distributed/dht/GridDhtTransactionalCacheAdapter.java | 2 -- .../processors/cache/distributed/dht/GridDhtTxLocal.java | 3 --- .../cache/distributed/dht/GridDhtTxLocalAdapter.java | 4 +--- .../processors/cache/distributed/dht/GridDhtTxRemote.java | 8 ++------ .../cache/distributed/near/GridNearTransactionalCache.java | 1 - .../processors/cache/distributed/near/GridNearTxLocal.java | 3 --- .../processors/cache/distributed/near/GridNearTxRemote.java | 8 ++------ .../cache/transactions/IgniteTransactionsImpl.java | 3 +-- .../processors/cache/transactions/IgniteTxAdapter.java | 9 --------- .../processors/cache/transactions/IgniteTxHandler.java | 4 ---- .../processors/cache/transactions/IgniteTxLocalAdapter.java | 4 +--- .../processors/cache/transactions/IgniteTxManager.java | 5 +---- .../internal/processors/cache/jta/CacheJtaManager.java | 3 +-- 15 files changed, 11 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/401de5eb/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 3cb6886..8d7b135 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 @@ -3906,8 +3906,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V READ_COMMITTED, tCfg.getDefaultTxTimeout(), !ctx.skipStore(), - 0, - /** group lock keys */null + 0 ); assert tx != null; @@ -3976,8 +3975,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V READ_COMMITTED, ctx.kernalContext().config().getTransactionConfiguration().getDefaultTxTimeout(), !ctx.skipStore(), - 0, - null); + 0); return asyncOp(tx, op); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/401de5eb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java index f032dae..8594853 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java @@ -95,7 +95,6 @@ public class GridDistributedTxRemoteAdapter extends IgniteTxAdapter * @param invalidate Invalidate flag. * @param timeout Timeout. * @param txSize Expected transaction size. - * @param grpLockKey Group lock key if this is a group-lock transaction. * @param subjId Subject ID. * @param taskNameHash Task name hash code. */ @@ -112,7 +111,6 @@ public class GridDistributedTxRemoteAdapter extends IgniteTxAdapter boolean invalidate, long timeout, int txSize, - @Nullable IgniteTxKey grpLockKey, @Nullable UUID subjId, int taskNameHash ) { @@ -128,7 +126,6 @@ public class GridDistributedTxRemoteAdapter extends IgniteTxAdapter isolation, timeout, txSize, - grpLockKey, subjId, taskNameHash); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/401de5eb/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 73159c1..26eef50 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 @@ -203,7 +203,6 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach req.isInvalidate(), req.timeout(), req.txSize(), - null, req.subjectId(), req.taskNameHash()); @@ -808,7 +807,6 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach false, req.txSize(), null, - null, req.subjectId(), req.taskNameHash()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/401de5eb/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 655cf7b..841cac8 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 @@ -93,7 +93,6 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa * @param timeout Timeout. * @param storeEnabled Store enabled flag. * @param txSize Expected transaction size. - * @param grpLockKey Group lock key if this is a group-lock transaction. * @param txNodes Transaction nodes mapping. */ public GridDhtTxLocal( @@ -114,7 +113,6 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa boolean invalidate, boolean storeEnabled, int txSize, - @Nullable IgniteTxKey grpLockKey, Map<UUID, Collection<UUID>> txNodes, UUID subjId, int taskNameHash @@ -133,7 +131,6 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa invalidate, storeEnabled, txSize, - grpLockKey, subjId, taskNameHash); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/401de5eb/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 62f98bd..54b59b8 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 @@ -94,7 +94,6 @@ public abstract class GridDhtTxLocalAdapter extends IgniteTxLocalAdapter { * @param isolation Isolation. * @param timeout Timeout. * @param txSize Expected transaction size. - * @param grpLockKey Group lock key if this is a group-lock transaction. */ protected GridDhtTxLocalAdapter( GridCacheSharedContext cctx, @@ -110,12 +109,11 @@ public abstract class GridDhtTxLocalAdapter extends IgniteTxLocalAdapter { boolean invalidate, boolean storeEnabled, int txSize, - @Nullable IgniteTxKey grpLockKey, @Nullable UUID subjId, int taskNameHash ) { super(cctx, xidVer, implicit, implicitSingle, sys, plc, concurrency, isolation, timeout, invalidate, - storeEnabled, txSize, grpLockKey, subjId, taskNameHash); + storeEnabled, txSize, subjId, taskNameHash); assert cctx != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/401de5eb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java index 30464a5..0a69910 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java @@ -77,7 +77,6 @@ public class GridDhtTxRemote extends GridDistributedTxRemoteAdapter { * @param timeout Timeout. * @param ctx Cache context. * @param txSize Expected transaction size. - * @param grpLockKey Group lock key if this is a group-lock transaction. * @param nearXidVer Near transaction ID. * @param txNodes Transaction nodes mapping. */ @@ -97,14 +96,13 @@ public class GridDhtTxRemote extends GridDistributedTxRemoteAdapter { boolean invalidate, long timeout, int txSize, - @Nullable IgniteTxKey grpLockKey, GridCacheVersion nearXidVer, Map<UUID, Collection<UUID>> txNodes, @Nullable UUID subjId, int taskNameHash ) { super(ctx, nodeId, rmtThreadId, xidVer, commitVer, sys, plc, concurrency, isolation, invalidate, timeout, - txSize, grpLockKey, subjId, taskNameHash); + txSize, subjId, taskNameHash); assert nearNodeId != null; assert rmtFutId != null; @@ -139,7 +137,6 @@ public class GridDhtTxRemote extends GridDistributedTxRemoteAdapter { * @param timeout Timeout. * @param ctx Cache context. * @param txSize Expected transaction size. - * @param grpLockKey Group lock key if transaction is group-lock. */ public GridDhtTxRemote( GridCacheSharedContext ctx, @@ -158,12 +155,11 @@ public class GridDhtTxRemote extends GridDistributedTxRemoteAdapter { boolean invalidate, long timeout, int txSize, - @Nullable IgniteTxKey grpLockKey, @Nullable UUID subjId, int taskNameHash ) { super(ctx, nodeId, rmtThreadId, xidVer, commitVer, sys, plc, concurrency, isolation, invalidate, timeout, - txSize, grpLockKey, subjId, taskNameHash); + txSize, subjId, taskNameHash); assert nearNodeId != null; assert rmtFutId != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/401de5eb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java index 2cc2da0..df7a65f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java @@ -301,7 +301,6 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> req.isInvalidate(), req.timeout(), req.txSize(), - null, req.subjectId(), req.taskNameHash() ); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/401de5eb/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 50c509e..5c426ed 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 @@ -102,7 +102,6 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter { * @param timeout Timeout. * @param storeEnabled Store enabled flag. * @param txSize Transaction size. - * @param grpLockKey Group lock key if this is a group lock transaction. * @param subjId Subject ID. * @param taskNameHash Task name hash code. */ @@ -117,7 +116,6 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter { long timeout, boolean storeEnabled, int txSize, - @Nullable IgniteTxKey grpLockKey, @Nullable UUID subjId, int taskNameHash ) { @@ -135,7 +133,6 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter { false, storeEnabled, txSize, - grpLockKey, subjId, taskNameHash); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/401de5eb/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 1ef101e..49283cb 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 @@ -75,7 +75,6 @@ public class GridNearTxRemote extends GridDistributedTxRemoteAdapter { * @param writeEntries Write entries. * @param ctx Cache registry. * @param txSize Expected transaction size. - * @param grpLockKey Group lock key if this is a group-lock transaction. * @throws IgniteCheckedException If unmarshalling failed. */ public GridNearTxRemote( @@ -94,12 +93,11 @@ public class GridNearTxRemote extends GridDistributedTxRemoteAdapter { long timeout, Collection<IgniteTxEntry> writeEntries, int txSize, - @Nullable IgniteTxKey grpLockKey, @Nullable UUID subjId, int taskNameHash ) throws IgniteCheckedException { super(ctx, nodeId, rmtThreadId, xidVer, commitVer, sys, plc, concurrency, isolation, invalidate, timeout, - txSize, grpLockKey, subjId, taskNameHash); + txSize, subjId, taskNameHash); assert nearNodeId != null; @@ -135,7 +133,6 @@ public class GridNearTxRemote extends GridDistributedTxRemoteAdapter { * @param timeout Timeout. * @param ctx Cache registry. * @param txSize Expected transaction size. - * @param grpLockKey Collection of group lock keys if this is a group-lock transaction. */ public GridNearTxRemote( GridCacheSharedContext ctx, @@ -152,12 +149,11 @@ public class GridNearTxRemote extends GridDistributedTxRemoteAdapter { boolean invalidate, long timeout, int txSize, - @Nullable IgniteTxKey grpLockKey, @Nullable UUID subjId, int taskNameHash ) { super(ctx, nodeId, rmtThreadId, xidVer, commitVer, sys, plc, concurrency, isolation, invalidate, timeout, - txSize, grpLockKey, subjId, taskNameHash); + txSize, subjId, taskNameHash); assert nearNodeId != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/401de5eb/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 54eb234..99907e4 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 @@ -160,8 +160,7 @@ public class IgniteTransactionsImpl<K, V> implements IgniteTransactionsEx { isolation, timeout, true, - txSize, - /** group lock keys */null + txSize ); assert tx != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/401de5eb/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 ca3e89b..eb8825e 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 @@ -179,9 +179,6 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter /** */ protected int txSize; - /** Group lock key, if any. */ - protected IgniteTxKey grpLockKey; - /** */ @GridToStringExclude private AtomicReference<GridFutureAdapter<IgniteInternalTx>> finFut = new AtomicReference<>(); @@ -233,7 +230,6 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter * @param isolation Isolation. * @param timeout Timeout. * @param txSize Transaction size. - * @param grpLockKey Group lock key if this is group-lock transaction. */ protected IgniteTxAdapter( GridCacheSharedContext<?, ?> cctx, @@ -249,7 +245,6 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter boolean invalidate, boolean storeEnabled, int txSize, - @Nullable IgniteTxKey grpLockKey, @Nullable UUID subjId, int taskNameHash ) { @@ -269,7 +264,6 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter this.invalidate = invalidate; this.storeEnabled = storeEnabled; this.txSize = txSize; - this.grpLockKey = grpLockKey; this.subjId = subjId; this.taskNameHash = taskNameHash; @@ -294,7 +288,6 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter * @param isolation Isolation. * @param timeout Timeout. * @param txSize Transaction size. - * @param grpLockKey Group lock key if this is group-lock transaction. */ protected IgniteTxAdapter( GridCacheSharedContext<?, ?> cctx, @@ -308,7 +301,6 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter TransactionIsolation isolation, long timeout, int txSize, - @Nullable IgniteTxKey grpLockKey, @Nullable UUID subjId, int taskNameHash ) { @@ -323,7 +315,6 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter this.isolation = isolation; this.timeout = timeout; this.txSize = txSize; - this.grpLockKey = grpLockKey; this.subjId = subjId; this.taskNameHash = taskNameHash; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/401de5eb/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 e68ee30..f466bf2 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 @@ -271,7 +271,6 @@ public class IgniteTxHandler { req.isInvalidate(), false, req.txSize(), - null, req.transactionNodes(), req.subjectId(), req.taskNameHash() @@ -553,7 +552,6 @@ public class IgniteTxHandler { req.isInvalidate(), req.storeEnabled(), req.txSize(), - req.groupLockKey(), null, req.subjectId(), req.taskNameHash())); @@ -1000,7 +998,6 @@ public class IgniteTxHandler { req.isInvalidate(), req.timeout(), req.writes() != null ? Math.max(req.writes().size(), req.txSize()) : req.txSize(), - null, req.nearXidVersion(), req.transactionNodes(), req.subjectId(), @@ -1134,7 +1131,6 @@ public class IgniteTxHandler { req.timeout(), req.nearWrites(), req.txSize(), - null, req.subjectId(), req.taskNameHash() ); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/401de5eb/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 8a1d1a1..609108f 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 @@ -120,7 +120,6 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter * @param isolation Isolation. * @param timeout Timeout. * @param txSize Expected transaction size. - * @param grpLockKey Group lock key if this is a group-lock transaction. */ protected IgniteTxLocalAdapter( GridCacheSharedContext cctx, @@ -135,12 +134,11 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter boolean invalidate, boolean storeEnabled, int txSize, - @Nullable IgniteTxKey grpLockKey, @Nullable UUID subjId, int taskNameHash ) { super(cctx, xidVer, implicit, implicitSingle, /*local*/true, sys, plc, concurrency, isolation, timeout, - invalidate, storeEnabled, txSize, grpLockKey, subjId, taskNameHash); + invalidate, storeEnabled, txSize, subjId, taskNameHash); minVer = xidVer; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/401de5eb/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 d5ffebe..24f433b 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 @@ -347,7 +347,6 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter { * @param isolation Isolation. * @param timeout transaction timeout. * @param txSize Expected transaction size. - * @param grpLockKey Group lock key if this is a group-lock transaction. * @return New transaction. */ public IgniteTxLocalAdapter newTx( @@ -358,8 +357,7 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter { TransactionIsolation isolation, long timeout, boolean storeEnabled, - int txSize, - @Nullable IgniteTxKey grpLockKey) { + int txSize) { assert sysCacheCtx == null || sysCacheCtx.systemTx(); UUID subjId = null; // TODO GG-9141 how to get subj ID? @@ -377,7 +375,6 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter { timeout, storeEnabled, txSize, - grpLockKey, subjId, taskNameHash); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/401de5eb/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 e50ccc3..9af29d6 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 @@ -85,8 +85,7 @@ public class CacheJtaManager extends CacheJtaManagerAdapter { tCfg.getDefaultTxIsolation(), tCfg.getDefaultTxTimeout(), /*store enabled*/true, - /*tx size*/0, - /*group lock keys*/null + /*tx size*/0 ); }
