# ignite-51 merge from sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9b288fa5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9b288fa5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9b288fa5 Branch: refs/heads/ignite-51 Commit: 9b288fa538449c1d8796a20f1e8f50e544cc357f Parents: b37bd35 Author: sboikov <sboi...@gridgain.com> Authored: Wed Mar 11 09:43:13 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Mar 11 09:43:13 2015 +0300 ---------------------------------------------------------------------- .../GridDistributedTxFinishRequest.java | 2 +- .../GridDistributedTxPrepareRequest.java | 56 ++++++++++++++------ .../dht/GridDhtTxPrepareRequest.java | 54 +++++++++---------- .../near/GridNearTxPrepareRequest.java | 42 +++++++-------- .../extras/GridCacheObsoleteEntryExtras.java | 2 +- .../extras/GridCacheObsoleteTtlEntryExtras.java | 2 +- .../cache/extras/GridCacheTtlEntryExtras.java | 2 +- .../cache/transactions/IgniteTxManager.java | 16 +++--- .../IgniteCacheSystemTransactionsSelfTest.java | 4 +- 9 files changed, 103 insertions(+), 77 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b288fa5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java index 1a375dd..9672a75 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java @@ -302,7 +302,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage { writer.incrementState(); case 14: - if (!writer.writeByte("plc", plc != null ? (byte) plc.ordinal() : -1)) + if (!writer.writeByte("plc", plc != null ? (byte)plc.ordinal() : -1)) return false; writer.incrementState(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b288fa5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java index 5e1aee4..ec02e6e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java @@ -421,54 +421,60 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage writer.incrementState(); case 15: - if (!writer.writeByte("plc", plc != null ? (byte)plc.ordinal() : -1)) + if (!writer.writeBoolean("partLock", partLock)) return false; writer.incrementState(); case 16: - if (!writer.writeCollection("reads", reads, MessageCollectionItemType.MSG)) + if (!writer.writeByte("plc", plc != null ? (byte)plc.ordinal() : -1)) return false; writer.incrementState(); case 17: - if (!writer.writeBoolean("sys", sys)) + if (!writer.writeCollection("reads", reads, MessageCollectionItemType.MSG)) return false; writer.incrementState(); case 18: - if (!writer.writeLong("threadId", threadId)) + if (!writer.writeBoolean("sys", sys)) return false; writer.incrementState(); case 19: - if (!writer.writeLong("timeout", timeout)) + if (!writer.writeLong("threadId", threadId)) return false; writer.incrementState(); case 20: - if (!writer.writeByteArray("txNodesBytes", txNodesBytes)) + if (!writer.writeLong("timeout", timeout)) return false; writer.incrementState(); case 21: - if (!writer.writeInt("txSize", txSize)) + if (!writer.writeByteArray("txNodesBytes", txNodesBytes)) return false; writer.incrementState(); case 22: - if (!writer.writeMessage("writeVer", writeVer)) + if (!writer.writeInt("txSize", txSize)) return false; writer.incrementState(); case 23: + if (!writer.writeMessage("writeVer", writeVer)) + return false; + + writer.incrementState(); + + case 24: if (!writer.writeCollection("writes", writes, MessageCollectionItemType.MSG)) return false; @@ -563,15 +569,19 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage reader.incrementState(); case 16: - sys = reader.readBoolean("sys"); + byte plcOrd; + + plcOrd = reader.readByte("plc"); if (!reader.isLastRead()) return false; + plc = GridIoPolicy.fromOrdinal(plcOrd); + reader.incrementState(); case 17: - threadId = reader.readLong("threadId"); + reads = reader.readCollection("reads", MessageCollectionItemType.MSG); if (!reader.isLastRead()) return false; @@ -579,7 +589,15 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage reader.incrementState(); case 18: - timeout = reader.readLong("timeout"); + sys = reader.readBoolean("sys"); + + if (!reader.isLastRead()) + return false; + + reader.incrementState(); + + case 19: + threadId = reader.readLong("threadId"); if (!reader.isLastRead()) return false; @@ -587,7 +605,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage reader.incrementState(); case 20: - txNodesBytes = reader.readByteArray("txNodesBytes"); + timeout = reader.readLong("timeout"); if (!reader.isLastRead()) return false; @@ -595,7 +613,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage reader.incrementState(); case 21: - txSize = reader.readInt("txSize"); + txNodesBytes = reader.readByteArray("txNodesBytes"); if (!reader.isLastRead()) return false; @@ -603,7 +621,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage reader.incrementState(); case 22: - writeVer = reader.readMessage("writeVer"); + txSize = reader.readInt("txSize"); if (!reader.isLastRead()) return false; @@ -611,6 +629,14 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage reader.incrementState(); case 23: + writeVer = reader.readMessage("writeVer"); + + if (!reader.isLastRead()) + return false; + + reader.incrementState(); + + case 24: writes = reader.readCollection("writes", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -630,7 +656,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 24; + return 25; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b288fa5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java index 34a59c7..1ffe82e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java @@ -336,79 +336,79 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { } switch (writer.state()) { - case 24: + case 25: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 25: + case 26: if (!writer.writeBitSet("invalidateNearEntries", invalidateNearEntries)) return false; writer.incrementState(); - case 26: + case 27: if (!writer.writeBoolean("last", last)) return false; writer.incrementState(); - case 27: + case 28: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 28: + case 29: if (!writer.writeUuid("nearNodeId", nearNodeId)) return false; writer.incrementState(); - case 29: + case 30: if (!writer.writeCollection("nearWrites", nearWrites, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 30: + case 31: if (!writer.writeMessage("nearXidVer", nearXidVer)) return false; writer.incrementState(); - case 31: + case 32: if (!writer.writeCollection("ownedKeys", ownedKeys, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 32: + case 33: if (!writer.writeCollection("ownedVals", ownedVals, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 33: + case 34: if (!writer.writeBitSet("preloadKeys", preloadKeys)) return false; writer.incrementState(); - case 34: + case 35: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 35: + case 36: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 36: + case 37: if (!writer.writeLong("topVer", topVer)) return false; @@ -430,7 +430,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { return false; switch (reader.state()) { - case 24: + case 25: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -438,7 +438,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 25: + case 26: invalidateNearEntries = reader.readBitSet("invalidateNearEntries"); if (!reader.isLastRead()) @@ -446,7 +446,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 26: + case 27: last = reader.readBoolean("last"); if (!reader.isLastRead()) @@ -454,7 +454,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 27: + case 28: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -462,7 +462,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 28: + case 29: nearNodeId = reader.readUuid("nearNodeId"); if (!reader.isLastRead()) @@ -470,7 +470,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 29: + case 30: nearWrites = reader.readCollection("nearWrites", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -478,7 +478,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 30: + case 31: nearXidVer = reader.readMessage("nearXidVer"); if (!reader.isLastRead()) @@ -486,7 +486,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 31: + case 32: ownedKeys = reader.readCollection("ownedKeys", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -494,7 +494,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 32: + case 33: ownedVals = reader.readCollection("ownedVals", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -502,7 +502,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 33: + case 34: preloadKeys = reader.readBitSet("preloadKeys"); if (!reader.isLastRead()) @@ -510,7 +510,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 34: + case 35: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -518,7 +518,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 35: + case 36: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -526,7 +526,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 36: + case 37: topVer = reader.readLong("topVer"); if (!reader.isLastRead()) @@ -546,6 +546,6 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 37; + return 38; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b288fa5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java index e4111ad..f23db12 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java @@ -257,61 +257,61 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { } switch (writer.state()) { - case 24: + case 25: if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); - case 25: + case 26: if (!writer.writeBoolean("implicitSingle", implicitSingle)) return false; writer.incrementState(); - case 26: + case 27: if (!writer.writeBoolean("last", last)) return false; writer.incrementState(); - case 27: + case 28: if (!writer.writeCollection("lastBackups", lastBackups, MessageCollectionItemType.UUID)) return false; writer.incrementState(); - case 28: + case 29: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 29: + case 30: if (!writer.writeBoolean("near", near)) return false; writer.incrementState(); - case 30: + case 31: if (!writer.writeBoolean("retVal", retVal)) return false; writer.incrementState(); - case 31: + case 32: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 32: + case 33: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 33: + case 34: if (!writer.writeLong("topVer", topVer)) return false; @@ -333,7 +333,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { return false; switch (reader.state()) { - case 24: + case 25: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -341,7 +341,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 25: + case 26: implicitSingle = reader.readBoolean("implicitSingle"); if (!reader.isLastRead()) @@ -349,7 +349,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 26: + case 27: last = reader.readBoolean("last"); if (!reader.isLastRead()) @@ -357,7 +357,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 27: + case 28: lastBackups = reader.readCollection("lastBackups", MessageCollectionItemType.UUID); if (!reader.isLastRead()) @@ -365,7 +365,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 28: + case 29: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -373,7 +373,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 29: + case 30: near = reader.readBoolean("near"); if (!reader.isLastRead()) @@ -381,7 +381,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 30: + case 31: retVal = reader.readBoolean("retVal"); if (!reader.isLastRead()) @@ -389,7 +389,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 31: + case 32: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -397,7 +397,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 32: + case 33: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -405,7 +405,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); - case 33: + case 34: topVer = reader.readLong("topVer"); if (!reader.isLastRead()) @@ -425,7 +425,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 34; + return 35; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b288fa5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteEntryExtras.java index dae3f00..c025c43 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteEntryExtras.java @@ -44,7 +44,7 @@ public class GridCacheObsoleteEntryExtras extends GridCacheEntryExtrasAdapter { /** {@inheritDoc} */ @Override public GridCacheEntryExtras attributesData(GridLeanMap<UUID, Object> attrData) { - return attrData != null ? new GridCacheAttributesObsoleteEntryExtras<K>(attrData, obsoleteVer) : this; + return attrData != null ? new GridCacheAttributesObsoleteEntryExtras(attrData, obsoleteVer) : this; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b288fa5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteTtlEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteTtlEntryExtras.java index 96cf8b6..9755a96 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteTtlEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheObsoleteTtlEntryExtras.java @@ -55,7 +55,7 @@ public class GridCacheObsoleteTtlEntryExtras extends GridCacheEntryExtrasAdapter /** {@inheritDoc} */ @Override public GridCacheEntryExtras attributesData(GridLeanMap<UUID, Object> attrData) { - return attrData != null ? new GridCacheAttributesObsoleteTtlEntryExtras<K>(attrData, obsoleteVer, ttl, + return attrData != null ? new GridCacheAttributesObsoleteTtlEntryExtras(attrData, obsoleteVer, ttl, expireTime) : this; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b288fa5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheTtlEntryExtras.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheTtlEntryExtras.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheTtlEntryExtras.java index 6169952..06df09e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheTtlEntryExtras.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/extras/GridCacheTtlEntryExtras.java @@ -49,7 +49,7 @@ public class GridCacheTtlEntryExtras extends GridCacheEntryExtrasAdapter { /** {@inheritDoc} */ @Override public GridCacheEntryExtras attributesData(GridLeanMap<UUID, Object> attrData) { - return attrData != null ? new GridCacheAttributesTtlEntryExtras<K>(attrData, ttl, expireTime) : this; + return attrData != null ? new GridCacheAttributesTtlEntryExtras(attrData, ttl, expireTime) : this; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b288fa5/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 45186d8..8b2ab3e 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 @@ -72,7 +72,7 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter { private final ConcurrentMap<Long, IgniteInternalTx> threadMap = newMap(); /** Per-thread system transaction map. */ - private final ConcurrentMap<TxThreadKey, IgniteInternalTx<K, V>> sysThreadMap = newMap(); + private final ConcurrentMap<TxThreadKey, IgniteInternalTx> sysThreadMap = newMap(); /** Per-ID map. */ private final ConcurrentMap<GridCacheVersion, IgniteInternalTx> idMap = newMap(); @@ -357,7 +357,7 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter { public IgniteTxLocalAdapter newTx( boolean implicit, boolean implicitSingle, - @Nullable GridCacheContext<K, V> sysCacheCtx, + @Nullable GridCacheContext sysCacheCtx, TransactionConcurrency concurrency, TransactionIsolation isolation, long timeout, @@ -677,8 +677,8 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter { /** * @return User transaction for current thread. */ - @Nullable public IgniteInternalTx userTx(GridCacheContext<K, V> cctx) { - IgniteInternalTx<K, V> tx = tx(cctx, Thread.currentThread().getId()); + @Nullable public IgniteInternalTx userTx(GridCacheContext cctx) { + IgniteInternalTx tx = tx(cctx, Thread.currentThread().getId()); return tx != null && tx.user() && tx.state() == ACTIVE ? tx : null; } @@ -696,7 +696,7 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter { * @return Transaction for thread with given ID. */ @SuppressWarnings({"unchecked"}) - private <T> T tx(GridCacheContext<K, V> cctx, long threadId) { + private <T> T tx(GridCacheContext cctx, long threadId) { if (cctx == null || !cctx.system()) return (T)threadMap.get(threadId); @@ -1406,7 +1406,7 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter { /** * @param tx Transaction to clear. */ - private void clearThreadMap(IgniteInternalTx<K, V> tx) { + private void clearThreadMap(IgniteInternalTx tx) { if (tx.local() && !tx.dht()) { if (!tx.system()) threadMap.remove(tx.threadId(), tx); @@ -1416,8 +1416,8 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter { if (cacheId != null) sysThreadMap.remove(new TxThreadKey(tx.threadId(), cacheId), tx); else { - for (Iterator<IgniteInternalTx<K, V>> it = sysThreadMap.values().iterator(); it.hasNext(); ) { - IgniteInternalTx<K, V> txx = it.next(); + for (Iterator<IgniteInternalTx> it = sysThreadMap.values().iterator(); it.hasNext(); ) { + IgniteInternalTx txx = it.next(); if (tx == txx) { it.remove(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b288fa5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java index 66ffe61..ef13bba 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java @@ -142,7 +142,7 @@ public class IgniteCacheSystemTransactionsSelfTest extends GridCacheAbstractSelf for (int i = 0; i < gridCount(); i++) { IgniteKernal kernal = (IgniteKernal)grid(i); - IgniteTxManager<Object, Object> tm = kernal.context().cache().context().tm(); + IgniteTxManager tm = kernal.context().cache().context().tm(); Map map = U.field(tm, "threadMap"); @@ -173,7 +173,7 @@ public class IgniteCacheSystemTransactionsSelfTest extends GridCacheAbstractSelf Object key = vals[i]; Object val = vals[i + 1]; - GridCacheEntryEx<Object, Object> entry = cache.peekEx(key); + GridCacheEntryEx entry = cache.peekEx(key); if (entry != null) { assertFalse("Entry is locked [g=" + g + ", cacheName=" + cacheName + ", entry=" + entry + ']',
