#ignite-797: remove partLock from GridDistributedLockRequest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/00c2afdc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/00c2afdc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/00c2afdc Branch: refs/heads/ignite-797 Commit: 00c2afdcb7f01a3e2853827f89d57cfecb678d10 Parents: 75c5da7 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri May 15 12:52:28 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri May 15 12:52:28 2015 +0300 ---------------------------------------------------------------------- .../distributed/GridDistributedLockRequest.java | 42 +++------------ .../distributed/dht/GridDhtLockFuture.java | 1 - .../distributed/dht/GridDhtLockRequest.java | 41 +++++++------- .../dht/GridDhtTransactionalCacheAdapter.java | 2 +- .../colocated/GridDhtColocatedLockFuture.java | 1 - .../distributed/near/GridNearLockFuture.java | 1 - .../distributed/near/GridNearLockRequest.java | 57 ++++++++++---------- 7 files changed, 54 insertions(+), 91 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00c2afdc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java index 7a5fe6a..c5ac847 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java @@ -82,9 +82,6 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { /** Key count. */ private int txSize; - /** Partition lock flag. Only if group-lock transaction. */ - private boolean partLock; - /** * Additional flags. * GridCacheUtils.SKIP_STORE_FLAG_MASK - for skipStore flag value. @@ -112,8 +109,6 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { * @param timeout Lock timeout. * @param keyCnt Number of keys. * @param txSize Expected transaction size. - * @param partLock {@code True} if this is a group-lock transaction request and whole partition is - * locked. * @param skipStore Skip store flag. */ public GridDistributedLockRequest( @@ -130,7 +125,6 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { long timeout, int keyCnt, int txSize, - boolean partLock, boolean skipStore ) { super(lockVer, keyCnt); @@ -150,7 +144,6 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { this.isInvalidate = isInvalidate; this.timeout = timeout; this.txSize = txSize; - this.partLock = partLock; retVals = new boolean[keyCnt]; @@ -288,13 +281,6 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { } /** - * @return {@code True} if partition is locked in group-lock transaction. - */ - public boolean partitionLock() { - return partLock; - } - - /** * @return Max lock wait time. */ public long timeout() { @@ -390,30 +376,24 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { writer.incrementState(); case 17: - if (!writer.writeBoolean("partLock", partLock)) - return false; - - writer.incrementState(); - - case 18: if (!writer.writeBooleanArray("retVals", retVals)) return false; writer.incrementState(); - case 19: + case 18: if (!writer.writeLong("threadId", threadId)) return false; writer.incrementState(); - case 20: + case 19: if (!writer.writeLong("timeout", timeout)) return false; writer.incrementState(); - case 21: + case 20: if (!writer.writeInt("txSize", txSize)) return false; @@ -512,14 +492,6 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { reader.incrementState(); case 17: - partLock = reader.readBoolean("partLock"); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - - case 18: retVals = reader.readBooleanArray("retVals"); if (!reader.isLastRead()) @@ -527,7 +499,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 19: + case 18: threadId = reader.readLong("threadId"); if (!reader.isLastRead()) @@ -535,7 +507,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 20: + case 19: timeout = reader.readLong("timeout"); if (!reader.isLastRead()) @@ -543,7 +515,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { reader.incrementState(); - case 21: + case 20: txSize = reader.readInt("txSize"); if (!reader.isLastRead()) @@ -563,7 +535,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 22; + return 21; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00c2afdc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java index dc47702..c57eded 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java @@ -833,7 +833,6 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo cnt, 0, inTx() ? tx.size() : cnt, - inTx() && tx.partitionLock(), inTx() ? tx.subjectId() : null, inTx() ? tx.taskNameHash() : 0, read ? accessTtl : -1L, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00c2afdc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java index ca384a9..94ec718 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java @@ -100,7 +100,6 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { * @param dhtCnt DHT count. * @param nearCnt Near count. * @param txSize Expected transaction size. - * @param partLock {@code True} if partition lock. * @param subjId Subject ID. * @param taskNameHash Task name hash code. * @param accessTtl TTL for read operation. @@ -123,7 +122,6 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { int dhtCnt, int nearCnt, int txSize, - boolean partLock, @Nullable UUID subjId, int taskNameHash, long accessTtl, @@ -142,7 +140,6 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { timeout, dhtCnt == 0 ? nearCnt : dhtCnt, txSize, - partLock, skipStore); this.topVer = topVer; @@ -327,55 +324,55 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { } switch (writer.state()) { - case 22: + case 21: if (!writer.writeLong("accessTtl", accessTtl)) return false; writer.incrementState(); - case 23: + case 22: if (!writer.writeBitSet("invalidateEntries", invalidateEntries)) return false; writer.incrementState(); - case 24: + case 23: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 25: + case 24: if (!writer.writeCollection("nearKeys", nearKeys, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 26: + case 25: if (!writer.writeByteArray("ownedBytes", ownedBytes)) return false; writer.incrementState(); - case 27: + case 26: if (!writer.writeBitSet("preloadKeys", preloadKeys)) return false; writer.incrementState(); - case 28: + case 27: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 29: + case 28: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 30: + case 29: if (!writer.writeMessage("topVer", topVer)) return false; @@ -397,7 +394,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { return false; switch (reader.state()) { - case 22: + case 21: accessTtl = reader.readLong("accessTtl"); if (!reader.isLastRead()) @@ -405,7 +402,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 23: + case 22: invalidateEntries = reader.readBitSet("invalidateEntries"); if (!reader.isLastRead()) @@ -413,7 +410,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 24: + case 23: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -421,7 +418,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 25: + case 24: nearKeys = reader.readCollection("nearKeys", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -429,7 +426,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 26: + case 25: ownedBytes = reader.readByteArray("ownedBytes"); if (!reader.isLastRead()) @@ -437,7 +434,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 27: + case 26: preloadKeys = reader.readBitSet("preloadKeys"); if (!reader.isLastRead()) @@ -445,7 +442,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 28: + case 27: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -453,7 +450,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 29: + case 28: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -461,7 +458,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 30: + case 29: topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) @@ -481,7 +478,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 31; + return 30; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00c2afdc/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 a7444e7..af787e2 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,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach false, req.txSize(), null, - req.partitionLock(), + false, null, req.subjectId(), req.taskNameHash()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00c2afdc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java index ae386d3..2f716a6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java @@ -754,7 +754,6 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity mappedKeys.size(), inTx() ? tx.size() : mappedKeys.size(), inTx() && tx.syncCommit(), - inTx() && tx.partitionLock(), inTx() ? tx.subjectId() : null, inTx() ? tx.taskNameHash() : 0, read ? accessTtl : -1L, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00c2afdc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java index 76949a8..272e012 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java @@ -890,7 +890,6 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B mappedKeys.size(), inTx() ? tx.size() : mappedKeys.size(), inTx() && tx.syncCommit(), - inTx() && tx.partitionLock(), inTx() ? tx.subjectId() : null, inTx() ? tx.taskNameHash() : 0, read ? accessTtl : -1L, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00c2afdc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java index 07cba15..e71dd65 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java @@ -104,7 +104,6 @@ public class GridNearLockRequest extends GridDistributedLockRequest { * @param keyCnt Number of keys. * @param txSize Expected transaction size. * @param syncCommit Synchronous commit flag. - * @param partLock If partition is locked. * @param subjId Subject ID. * @param taskNameHash Task name hash code. * @param accessTtl TTL for read operation. @@ -128,7 +127,6 @@ public class GridNearLockRequest extends GridDistributedLockRequest { int keyCnt, int txSize, boolean syncCommit, - boolean partLock, @Nullable UUID subjId, int taskNameHash, long accessTtl, @@ -148,7 +146,6 @@ public class GridNearLockRequest extends GridDistributedLockRequest { timeout, keyCnt, txSize, - partLock, skipStore); assert topVer.compareTo(AffinityTopologyVersion.ZERO) > 0; @@ -352,79 +349,79 @@ public class GridNearLockRequest extends GridDistributedLockRequest { } switch (writer.state()) { - case 22: + case 21: if (!writer.writeLong("accessTtl", accessTtl)) return false; writer.incrementState(); - case 23: + case 22: if (!writer.writeObjectArray("dhtVers", dhtVers, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 24: + case 23: if (!writer.writeObjectArray("filter", filter, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 25: + case 24: if (!writer.writeBoolean("hasTransforms", hasTransforms)) return false; writer.incrementState(); - case 26: + case 25: if (!writer.writeBoolean("implicitSingleTx", implicitSingleTx)) return false; writer.incrementState(); - case 27: + case 26: if (!writer.writeBoolean("implicitTx", implicitTx)) return false; writer.incrementState(); - case 28: + case 27: if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); - case 29: + case 28: if (!writer.writeBoolean("onePhaseCommit", onePhaseCommit)) return false; writer.incrementState(); - case 30: + case 29: if (!writer.writeBoolean("retVal", retVal)) return false; writer.incrementState(); - case 31: + case 30: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 32: + case 31: if (!writer.writeBoolean("syncCommit", syncCommit)) return false; writer.incrementState(); - case 33: + case 32: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 34: + case 33: if (!writer.writeMessage("topVer", topVer)) return false; @@ -446,7 +443,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { return false; switch (reader.state()) { - case 22: + case 21: accessTtl = reader.readLong("accessTtl"); if (!reader.isLastRead()) @@ -454,7 +451,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 23: + case 22: dhtVers = reader.readObjectArray("dhtVers", MessageCollectionItemType.MSG, GridCacheVersion.class); if (!reader.isLastRead()) @@ -462,7 +459,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 24: + case 23: filter = reader.readObjectArray("filter", MessageCollectionItemType.MSG, CacheEntryPredicate.class); if (!reader.isLastRead()) @@ -470,7 +467,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 25: + case 24: hasTransforms = reader.readBoolean("hasTransforms"); if (!reader.isLastRead()) @@ -478,7 +475,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 26: + case 25: implicitSingleTx = reader.readBoolean("implicitSingleTx"); if (!reader.isLastRead()) @@ -486,7 +483,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 27: + case 26: implicitTx = reader.readBoolean("implicitTx"); if (!reader.isLastRead()) @@ -494,7 +491,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 28: + case 27: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -502,7 +499,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 29: + case 28: onePhaseCommit = reader.readBoolean("onePhaseCommit"); if (!reader.isLastRead()) @@ -510,7 +507,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 30: + case 29: retVal = reader.readBoolean("retVal"); if (!reader.isLastRead()) @@ -518,7 +515,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 31: + case 30: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -526,7 +523,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 32: + case 31: syncCommit = reader.readBoolean("syncCommit"); if (!reader.isLastRead()) @@ -534,7 +531,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 33: + case 32: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -542,7 +539,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { reader.incrementState(); - case 34: + case 33: topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) @@ -562,7 +559,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 35; + return 34; } /** {@inheritDoc} */
