#ingite-9655 - Regenerated messages.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8bc80265 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8bc80265 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8bc80265 Branch: refs/heads/ingite-9655-merge Commit: 8bc802657d411208e2cbb719e1d7a20ecb721785 Parents: ebcbb95 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Thu Jan 29 12:20:44 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Thu Jan 29 12:20:44 2015 -0800 ---------------------------------------------------------------------- .../distributed/GridDistributedLockRequest.java | 58 ++++----- .../GridDistributedTxFinishRequest.java | 28 +++-- .../GridDistributedTxPrepareRequest.java | 119 +++++++++---------- .../distributed/dht/GridDhtLockRequest.java | 59 ++++----- .../distributed/dht/GridDhtTxFinishRequest.java | 98 +++++++-------- .../dht/GridDhtTxPrepareRequest.java | 48 ++++---- .../distributed/near/GridNearLockRequest.java | 79 ++++++------ .../near/GridNearTxFinishRequest.java | 46 +++---- .../near/GridNearTxPrepareRequest.java | 63 +++++++--- .../near/GridNearTxPrepareResponse.java | 52 ++++++-- 10 files changed, 361 insertions(+), 289 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc80265/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 52967ea..09a11d4 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 @@ -396,43 +396,43 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage } switch (commState.idx) { - case 9: + case 8: if (!commState.putGridUuid(futId)) return false; commState.idx++; - case 10: + case 9: if (!commState.putByteArray(grpLockKeyBytes)) return false; commState.idx++; - case 11: + case 10: if (!commState.putBoolean(isInTx)) return false; commState.idx++; - case 12: + case 11: if (!commState.putBoolean(isInvalidate)) return false; commState.idx++; - case 13: + case 12: if (!commState.putBoolean(isRead)) return false; commState.idx++; - case 14: + case 13: if (!commState.putEnum(isolation)) return false; commState.idx++; - case 15: + case 14: if (keyBytes != null) { if (commState.it == null) { if (!commState.putInt(keyBytes.size())) @@ -459,47 +459,48 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage commState.idx++; - case 16: + case 15: if (!commState.putCacheVersion(nearXidVer)) return false; commState.idx++; - case 17: + case 16: if (!commState.putUuid(nodeId)) return false; commState.idx++; - case 18: + case 17: if (!commState.putBoolean(partLock)) return false; commState.idx++; - case 19: + case 18: if (!commState.putBooleanArray(retVals)) return false; commState.idx++; - case 20: + case 19: if (!commState.putLong(threadId)) return false; commState.idx++; - case 21: + case 20: if (!commState.putLong(timeout)) return false; commState.idx++; - case 22: + case 21: if (!commState.putInt(txSize)) return false; commState.idx++; + } return true; @@ -514,7 +515,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage return false; switch (commState.idx) { - case 9: + case 8: IgniteUuid futId0 = commState.getGridUuid(); if (futId0 == GRID_UUID_NOT_READ) @@ -524,7 +525,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage commState.idx++; - case 10: + case 9: byte[] grpLockKeyBytes0 = commState.getByteArray(); if (grpLockKeyBytes0 == BYTE_ARR_NOT_READ) @@ -534,7 +535,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage commState.idx++; - case 11: + case 10: if (buf.remaining() < 1) return false; @@ -542,7 +543,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage commState.idx++; - case 12: + case 11: if (buf.remaining() < 1) return false; @@ -550,7 +551,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage commState.idx++; - case 13: + case 12: if (buf.remaining() < 1) return false; @@ -558,7 +559,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage commState.idx++; - case 14: + case 13: if (buf.remaining() < 1) return false; @@ -568,7 +569,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage commState.idx++; - case 15: + case 14: if (commState.readSize == -1) { if (buf.remaining() < 4) return false; @@ -597,7 +598,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage commState.idx++; - case 16: + case 15: GridCacheVersion nearXidVer0 = commState.getCacheVersion(); if (nearXidVer0 == CACHE_VER_NOT_READ) @@ -607,7 +608,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage commState.idx++; - case 17: + case 16: UUID nodeId0 = commState.getUuid(); if (nodeId0 == UUID_NOT_READ) @@ -617,7 +618,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage commState.idx++; - case 18: + case 17: if (buf.remaining() < 1) return false; @@ -625,7 +626,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage commState.idx++; - case 19: + case 18: boolean[] retVals0 = commState.getBooleanArray(); if (retVals0 == BOOLEAN_ARR_NOT_READ) @@ -635,7 +636,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage commState.idx++; - case 20: + case 19: if (buf.remaining() < 8) return false; @@ -643,7 +644,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage commState.idx++; - case 21: + case 20: if (buf.remaining() < 8) return false; @@ -651,13 +652,14 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage commState.idx++; - case 22: + case 21: if (buf.remaining() < 4) return false; txSize = commState.getInt(); commState.idx++; + } return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc80265/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 6966987..88d5b35 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 @@ -266,6 +266,8 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes _clone.commitVer = commitVer; _clone.invalidate = invalidate; _clone.commit = commit; + _clone.syncCommit = syncCommit; + _clone.syncRollback = syncRollback; _clone.baseVer = baseVer; _clone.txSize = txSize; _clone.grpLockKey = grpLockKey; @@ -337,6 +339,12 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes commState.idx++; + case 16: + if (!commState.putBoolean(sys)) + return false; + + commState.idx++; + case 17: if (!commState.putLong(threadId)) return false; @@ -349,11 +357,6 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes commState.idx++; - case 20: - if (!commState.putBoolean(sys)) - return false; - - commState.idx++; } return true; @@ -440,6 +443,14 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes commState.idx++; + case 16: + if (buf.remaining() < 1) + return false; + + sys = commState.getBoolean(); + + commState.idx++; + case 17: if (buf.remaining() < 8) return false; @@ -456,13 +467,6 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes commState.idx++; - case 20: - if (buf.remaining() < 1) - return false; - - sys = commState.getBoolean(); - - commState.idx++; } return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc80265/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 5fc3607..5bb0a97 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 @@ -163,28 +163,6 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe } /** - * Clones write entries so that near entries are not passed to DHT cache. - */ - public void cloneEntries() { - if (F.isEmpty(writes)) - return; - - Collection<IgniteTxEntry<K, V>> cp = new ArrayList<>(writes.size()); - - for (IgniteTxEntry<K, V> e : writes) { - GridCacheContext<K, V> cacheCtx = e.context(); - - // Clone only if it is a near cache. - if (cacheCtx.isNear()) - cp.add(e.cleanCopy(cacheCtx.nearTx().dht().context())); - else - cp.add(e); - } - - writes = cp; - } - - /** * @return Transaction nodes mapping. */ public Map<UUID, Collection<UUID>> transactionNodes() { @@ -470,6 +448,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe _clone.txSize = txSize; _clone.txNodes = txNodes; _clone.txNodesBytes = txNodesBytes; + _clone.onePhaseCommit = onePhaseCommit; _clone.sys = sys; } @@ -490,37 +469,37 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe switch (commState.idx) { case 8: - if (!commState.putCacheVersion(writeVer)) + if (!commState.putEnum(concurrency)) return false; commState.idx++; case 9: - if (!commState.putEnum(concurrency)) + if (!commState.putByteArray(dhtVersBytes)) return false; commState.idx++; case 10: - if (!commState.putByteArray(dhtVersBytes)) + if (!commState.putByteArray(grpLockKeyBytes)) return false; commState.idx++; case 11: - if (!commState.putByteArray(grpLockKeyBytes)) + if (!commState.putBoolean(invalidate)) return false; commState.idx++; case 12: - if (!commState.putBoolean(invalidate)) + if (!commState.putEnum(isolation)) return false; commState.idx++; case 13: - if (!commState.putEnum(isolation)) + if (!commState.putBoolean(onePhaseCommit)) return false; commState.idx++; @@ -559,30 +538,42 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe commState.idx++; case 16: - if (!commState.putLong(threadId)) + if (!commState.putBoolean(sys)) return false; commState.idx++; case 17: - if (!commState.putLong(timeout)) + if (!commState.putLong(threadId)) return false; commState.idx++; case 18: - if (!commState.putByteArray(txNodesBytes)) + if (!commState.putLong(timeout)) return false; commState.idx++; case 19: - if (!commState.putInt(txSize)) + if (!commState.putByteArray(txNodesBytes)) return false; commState.idx++; case 20: + if (!commState.putInt(txSize)) + return false; + + commState.idx++; + + case 21: + if (!commState.putCacheVersion(writeVer)) + return false; + + commState.idx++; + + case 22: if (writesBytes != null) { if (commState.it == null) { if (!commState.putInt(writesBytes.size())) @@ -609,11 +600,6 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe commState.idx++; - case 21: - if (!commState.putBoolean(sys)) - return false; - - commState.idx++; } return true; @@ -629,16 +615,6 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe switch (commState.idx) { case 8: - GridCacheVersion commitVer0 = commState.getCacheVersion(); - - if (commitVer0 == CACHE_VER_NOT_READ) - return false; - - writeVer = commitVer0; - - commState.idx++; - - case 9: if (buf.remaining() < 1) return false; @@ -648,7 +624,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe commState.idx++; - case 10: + case 9: byte[] dhtVersBytes0 = commState.getByteArray(); if (dhtVersBytes0 == BYTE_ARR_NOT_READ) @@ -658,7 +634,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe commState.idx++; - case 11: + case 10: byte[] grpLockKeyBytes0 = commState.getByteArray(); if (grpLockKeyBytes0 == BYTE_ARR_NOT_READ) @@ -668,7 +644,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe commState.idx++; - case 12: + case 11: if (buf.remaining() < 1) return false; @@ -676,7 +652,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe commState.idx++; - case 13: + case 12: if (buf.remaining() < 1) return false; @@ -686,6 +662,14 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe commState.idx++; + case 13: + if (buf.remaining() < 1) + return false; + + onePhaseCommit = commState.getBoolean(); + + commState.idx++; + case 14: if (buf.remaining() < 1) return false; @@ -724,6 +708,14 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe commState.idx++; case 16: + if (buf.remaining() < 1) + return false; + + sys = commState.getBoolean(); + + commState.idx++; + + case 17: if (buf.remaining() < 8) return false; @@ -731,7 +723,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe commState.idx++; - case 17: + case 18: if (buf.remaining() < 8) return false; @@ -739,7 +731,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe commState.idx++; - case 18: + case 19: byte[] txNodesBytes0 = commState.getByteArray(); if (txNodesBytes0 == BYTE_ARR_NOT_READ) @@ -749,7 +741,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe commState.idx++; - case 19: + case 20: if (buf.remaining() < 4) return false; @@ -757,7 +749,17 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe commState.idx++; - case 20: + case 21: + GridCacheVersion writeVer0 = commState.getCacheVersion(); + + if (writeVer0 == CACHE_VER_NOT_READ) + return false; + + writeVer = writeVer0; + + commState.idx++; + + case 22: if (commState.readSize == -1) { if (buf.remaining() < 4) return false; @@ -786,13 +788,6 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe commState.idx++; - case 21: - if (buf.remaining() < 1) - return false; - - sys = commState.getBoolean(); - - commState.idx++; } return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc80265/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 050748a..73a3c36 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 @@ -383,19 +383,25 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { } switch (commState.idx) { - case 24: + case 22: + if (!commState.putLong(accessTtl)) + return false; + + commState.idx++; + + case 23: if (!commState.putBitSet(invalidateEntries)) return false; commState.idx++; - case 25: + case 24: if (!commState.putGridUuid(miniId)) return false; commState.idx++; - case 26: + case 25: if (nearKeyBytes != null) { if (commState.it == null) { if (!commState.putInt(nearKeyBytes.size())) @@ -422,42 +428,36 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { commState.idx++; - case 27: + case 26: if (!commState.putByteArray(ownedBytes)) return false; commState.idx++; - case 28: + case 27: if (!commState.putLong(topVer)) return false; commState.idx++; - case 29: + case 28: if (!commState.putUuid(subjId)) return false; commState.idx++; - case 30: + case 29: if (!commState.putInt(taskNameHash)) return false; commState.idx++; - case 31: + case 30: if (!commState.putBitSet(preloadKeys)) return false; commState.idx++; - case 32: - if (!commState.putLong(accessTtl)) - return false; - - commState.idx++; - } return true; @@ -472,7 +472,15 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { return false; switch (commState.idx) { - case 24: + case 22: + if (buf.remaining() < 8) + return false; + + accessTtl = commState.getLong(); + + commState.idx++; + + case 23: BitSet invalidateEntries0 = commState.getBitSet(); if (invalidateEntries0 == BIT_SET_NOT_READ) @@ -482,7 +490,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { commState.idx++; - case 25: + case 24: IgniteUuid miniId0 = commState.getGridUuid(); if (miniId0 == GRID_UUID_NOT_READ) @@ -492,7 +500,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { commState.idx++; - case 26: + case 25: if (commState.readSize == -1) { if (buf.remaining() < 4) return false; @@ -521,7 +529,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { commState.idx++; - case 27: + case 26: byte[] ownedBytes0 = commState.getByteArray(); if (ownedBytes0 == BYTE_ARR_NOT_READ) @@ -531,7 +539,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { commState.idx++; - case 28: + case 27: if (buf.remaining() < 8) return false; @@ -539,7 +547,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { commState.idx++; - case 29: + case 28: UUID subjId0 = commState.getUuid(); if (subjId0 == UUID_NOT_READ) @@ -549,7 +557,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { commState.idx++; - case 30: + case 29: if (buf.remaining() < 4) return false; @@ -557,7 +565,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { commState.idx++; - case 31: + case 30: BitSet preloadKeys0 = commState.getBitSet(); if (preloadKeys0 == BIT_SET_NOT_READ) @@ -567,13 +575,6 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { commState.idx++; - case 32: - if (buf.remaining() < 8) - return false; - - accessTtl = commState.getLong(); - - commState.idx++; } return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc80265/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java index 323a2de..ebbddc8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java @@ -327,25 +327,31 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest } switch (commState.idx) { - case 21: + case 19: if (!commState.putEnum(isolation)) return false; commState.idx++; - case 22: + case 20: if (!commState.putGridUuid(miniId)) return false; commState.idx++; - case 23: + case 21: if (!commState.putUuid(nearNodeId)) return false; commState.idx++; - case 26: + case 22: + if (!commState.putLongList(nearTtls)) + return false; + + commState.idx++; + + case 23: if (pendingVers != null) { if (commState.it == null) { if (!commState.putInt(pendingVers.size())) @@ -372,44 +378,38 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest commState.idx++; - case 27: + case 24: if (!commState.putBoolean(sysInvalidate)) return false; commState.idx++; - case 28: + case 25: if (!commState.putLong(topVer)) return false; commState.idx++; - case 29: - if (!commState.putCacheVersion(writeVer)) - return false; - - commState.idx++; - - case 30: - if (!commState.putUuid(subjId)) + case 26: + if (!commState.putLongList(ttls)) return false; commState.idx++; - case 31: - if (!commState.putInt(taskNameHash)) + case 27: + if (!commState.putCacheVersion(writeVer)) return false; commState.idx++; - case 32: - if (!commState.putLongList(ttls)) + case 28: + if (!commState.putUuid(subjId)) return false; commState.idx++; - case 33: - if (!commState.putLongList(nearTtls)) + case 29: + if (!commState.putInt(taskNameHash)) return false; commState.idx++; @@ -428,7 +428,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest return false; switch (commState.idx) { - case 21: + case 19: if (buf.remaining() < 1) return false; @@ -438,7 +438,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest commState.idx++; - case 22: + case 20: IgniteUuid miniId0 = commState.getGridUuid(); if (miniId0 == GRID_UUID_NOT_READ) @@ -448,7 +448,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest commState.idx++; - case 23: + case 21: UUID nearNodeId0 = commState.getUuid(); if (nearNodeId0 == UUID_NOT_READ) @@ -458,7 +458,17 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest commState.idx++; - case 26: + case 22: + GridLongList nearTtls0 = commState.getLongList(); + + if (nearTtls0 == LONG_LIST_NOT_READ) + return false; + + nearTtls = nearTtls0; + + commState.idx++; + + case 23: if (commState.readSize == -1) { if (buf.remaining() < 4) return false; @@ -487,7 +497,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest commState.idx++; - case 27: + case 24: if (buf.remaining() < 1) return false; @@ -495,7 +505,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest commState.idx++; - case 28: + case 25: if (buf.remaining() < 8) return false; @@ -503,7 +513,17 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest commState.idx++; - case 29: + case 26: + GridLongList ttls0 = commState.getLongList(); + + if (ttls0 == LONG_LIST_NOT_READ) + return false; + + ttls = ttls0; + + commState.idx++; + + case 27: GridCacheVersion writeVer0 = commState.getCacheVersion(); if (writeVer0 == CACHE_VER_NOT_READ) @@ -513,7 +533,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest commState.idx++; - case 30: + case 28: UUID subjId0 = commState.getUuid(); if (subjId0 == UUID_NOT_READ) @@ -523,7 +543,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest commState.idx++; - case 31: + case 29: if (buf.remaining() < 4) return false; @@ -531,26 +551,6 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest commState.idx++; - case 32: - GridLongList ttls0 = commState.getLongList(); - - if (ttls0 == LONG_LIST_NOT_READ) - return false; - - ttls = ttls0; - - commState.idx++; - - case 33: - GridLongList nearTtls0 = commState.getLongList(); - - if (nearTtls0 == LONG_LIST_NOT_READ) - return false; - - nearTtls = nearTtls0; - - commState.idx++; - } return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc80265/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 31e563c..f4ef374 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 @@ -363,37 +363,37 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque } switch (commState.idx) { - case 22: + case 23: if (!commState.putGridUuid(futId)) return false; commState.idx++; - case 23: + case 24: if (!commState.putBitSet(invalidateNearEntries)) return false; commState.idx++; - case 24: + case 25: if (!commState.putBoolean(last)) return false; commState.idx++; - case 25: + case 26: if (!commState.putGridUuid(miniId)) return false; commState.idx++; - case 26: + case 27: if (!commState.putUuid(nearNodeId)) return false; commState.idx++; - case 27: + case 28: if (nearWritesBytes != null) { if (commState.it == null) { if (!commState.putInt(nearWritesBytes.size())) @@ -420,37 +420,37 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque commState.idx++; - case 28: + case 29: if (!commState.putCacheVersion(nearXidVer)) return false; commState.idx++; - case 29: + case 30: if (!commState.putByteArray(ownedBytes)) return false; commState.idx++; - case 30: + case 31: if (!commState.putLong(topVer)) return false; commState.idx++; - case 31: + case 32: if (!commState.putUuid(subjId)) return false; commState.idx++; - case 32: + case 33: if (!commState.putInt(taskNameHash)) return false; commState.idx++; - case 33: + case 34: if (!commState.putBitSet(preloadKeys)) return false; @@ -470,7 +470,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque return false; switch (commState.idx) { - case 22: + case 23: IgniteUuid futId0 = commState.getGridUuid(); if (futId0 == GRID_UUID_NOT_READ) @@ -480,7 +480,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque commState.idx++; - case 23: + case 24: BitSet invalidateNearEntries0 = commState.getBitSet(); if (invalidateNearEntries0 == BIT_SET_NOT_READ) @@ -490,7 +490,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque commState.idx++; - case 24: + case 25: if (buf.remaining() < 1) return false; @@ -498,7 +498,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque commState.idx++; - case 25: + case 26: IgniteUuid miniId0 = commState.getGridUuid(); if (miniId0 == GRID_UUID_NOT_READ) @@ -508,7 +508,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque commState.idx++; - case 26: + case 27: UUID nearNodeId0 = commState.getUuid(); if (nearNodeId0 == UUID_NOT_READ) @@ -518,7 +518,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque commState.idx++; - case 27: + case 28: if (commState.readSize == -1) { if (buf.remaining() < 4) return false; @@ -547,7 +547,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque commState.idx++; - case 28: + case 29: GridCacheVersion nearXidVer0 = commState.getCacheVersion(); if (nearXidVer0 == CACHE_VER_NOT_READ) @@ -557,7 +557,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque commState.idx++; - case 29: + case 30: byte[] ownedBytes0 = commState.getByteArray(); if (ownedBytes0 == BYTE_ARR_NOT_READ) @@ -567,7 +567,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque commState.idx++; - case 30: + case 31: if (buf.remaining() < 8) return false; @@ -575,7 +575,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque commState.idx++; - case 31: + case 32: UUID subjId0 = commState.getUuid(); if (subjId0 == UUID_NOT_READ) @@ -585,7 +585,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque commState.idx++; - case 32: + case 33: if (buf.remaining() < 4) return false; @@ -593,7 +593,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque commState.idx++; - case 33: + case 34: BitSet preloadKeys0 = commState.getBitSet(); if (preloadKeys0 == BIT_SET_NOT_READ) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc80265/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 d9cb028..6cc5a80 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 @@ -375,7 +375,13 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> } switch (commState.idx) { - case 24: + case 22: + if (!commState.putLong(accessTtl)) + return false; + + commState.idx++; + + case 23: if (dhtVers != null) { if (commState.it == null) { if (!commState.putInt(dhtVers.length)) @@ -402,7 +408,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> commState.idx++; - case 25: + case 24: if (filterBytes != null) { if (commState.it == null) { if (!commState.putInt(filterBytes.length)) @@ -429,30 +435,36 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> commState.idx++; - case 26: + case 25: if (!commState.putBoolean(implicitSingleTx)) return false; commState.idx++; - case 27: + case 26: if (!commState.putBoolean(implicitTx)) return false; commState.idx++; - case 28: + case 27: if (!commState.putGridUuid(miniId)) return false; commState.idx++; - case 29: + case 28: if (!commState.putBoolean(onePhaseCommit)) return false; commState.idx++; + case 29: + if (!commState.putBoolean(syncCommit)) + return false; + + commState.idx++; + case 30: if (!commState.putLong(topVer)) return false; @@ -477,18 +489,6 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> commState.idx++; - case 34: - if (!commState.putBoolean(syncCommit)) - return false; - - commState.idx++; - - case 35: - if (!commState.putLong(accessTtl)) - return false; - - commState.idx++; - } return true; @@ -503,7 +503,15 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> return false; switch (commState.idx) { - case 24: + case 22: + if (buf.remaining() < 8) + return false; + + accessTtl = commState.getLong(); + + commState.idx++; + + case 23: if (commState.readSize == -1) { if (buf.remaining() < 4) return false; @@ -532,7 +540,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> commState.idx++; - case 25: + case 24: if (commState.readSize == -1) { if (buf.remaining() < 4) return false; @@ -561,7 +569,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> commState.idx++; - case 26: + case 25: if (buf.remaining() < 1) return false; @@ -569,7 +577,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> commState.idx++; - case 27: + case 26: if (buf.remaining() < 1) return false; @@ -577,7 +585,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> commState.idx++; - case 28: + case 27: IgniteUuid miniId0 = commState.getGridUuid(); if (miniId0 == GRID_UUID_NOT_READ) @@ -587,7 +595,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> commState.idx++; - case 29: + case 28: if (buf.remaining() < 1) return false; @@ -595,6 +603,14 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> commState.idx++; + case 29: + if (buf.remaining() < 1) + return false; + + syncCommit = commState.getBoolean(); + + commState.idx++; + case 30: if (buf.remaining() < 8) return false; @@ -629,21 +645,6 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> commState.idx++; - case 34: - if (buf.remaining() < 1) - return false; - - syncCommit = commState.getBoolean(); - - commState.idx++; - - case 35: - if (buf.remaining() < 8) - return false; - - accessTtl = commState.getLong(); - - commState.idx++; } return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc80265/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java index 48f72e2..8017039 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java @@ -196,41 +196,42 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques } switch (commState.idx) { - case 21: + case 19: if (!commState.putBoolean(explicitLock)) return false; commState.idx++; - case 22: + case 20: if (!commState.putGridUuid(miniId)) return false; commState.idx++; - case 23: - if (!commState.putLong(topVer)) + case 21: + if (!commState.putBoolean(storeEnabled)) return false; commState.idx++; - case 24: - if (!commState.putUuid(subjId)) + case 22: + if (!commState.putLong(topVer)) return false; commState.idx++; - case 25: - if (!commState.putInt(taskNameHash)) + case 23: + if (!commState.putUuid(subjId)) return false; commState.idx++; - case 26: - if (!commState.putBoolean(storeEnabled)) + case 24: + if (!commState.putInt(taskNameHash)) return false; commState.idx++; + } return true; @@ -245,7 +246,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques return false; switch (commState.idx) { - case 21: + case 19: if (buf.remaining() < 1) return false; @@ -253,7 +254,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques commState.idx++; - case 22: + case 20: IgniteUuid miniId0 = commState.getGridUuid(); if (miniId0 == GRID_UUID_NOT_READ) @@ -263,7 +264,15 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques commState.idx++; - case 23: + case 21: + if (buf.remaining() < 1) + return false; + + storeEnabled = commState.getBoolean(); + + commState.idx++; + + case 22: if (buf.remaining() < 8) return false; @@ -271,7 +280,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques commState.idx++; - case 24: + case 23: UUID subjId0 = commState.getUuid(); if (subjId0 == UUID_NOT_READ) @@ -281,7 +290,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques commState.idx++; - case 25: + case 24: if (buf.remaining() < 4) return false; @@ -289,13 +298,6 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques commState.idx++; - case 26: - if (buf.remaining() < 1) - return false; - - storeEnabled = commState.getBoolean(); - - commState.idx++; } return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc80265/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 045bcf9..497ed5f 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 @@ -262,9 +262,12 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ _clone.futId = futId; _clone.miniId = miniId; + _clone.near = near; _clone.topVer = topVer; _clone.last = last; _clone.lastBackups = lastBackups; + _clone.retVal = retVal; + _clone.implicitSingle = implicitSingle; _clone.subjId = subjId; _clone.taskNameHash = taskNameHash; } @@ -285,19 +288,25 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ } switch (commState.idx) { - case 22: + case 23: if (!commState.putGridUuid(futId)) return false; commState.idx++; - case 23: + case 24: + if (!commState.putBoolean(implicitSingle)) + return false; + + commState.idx++; + + case 25: if (!commState.putBoolean(last)) return false; commState.idx++; - case 24: + case 26: if (lastBackups != null) { if (commState.it == null) { if (!commState.putInt(lastBackups.size())) @@ -324,31 +333,37 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ commState.idx++; - case 25: + case 27: if (!commState.putGridUuid(miniId)) return false; commState.idx++; - case 26: + case 28: if (!commState.putBoolean(near)) return false; commState.idx++; - case 27: + case 29: + if (!commState.putBoolean(retVal)) + return false; + + commState.idx++; + + case 30: if (!commState.putLong(topVer)) return false; commState.idx++; - case 28: + case 31: if (!commState.putUuid(subjId)) return false; commState.idx++; - case 29: + case 32: if (!commState.putInt(taskNameHash)) return false; @@ -368,7 +383,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ return false; switch (commState.idx) { - case 22: + case 23: IgniteUuid futId0 = commState.getGridUuid(); if (futId0 == GRID_UUID_NOT_READ) @@ -378,7 +393,15 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ commState.idx++; - case 23: + case 24: + if (buf.remaining() < 1) + return false; + + implicitSingle = commState.getBoolean(); + + commState.idx++; + + case 25: if (buf.remaining() < 1) return false; @@ -386,7 +409,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ commState.idx++; - case 24: + case 26: if (commState.readSize == -1) { if (buf.remaining() < 4) return false; @@ -415,7 +438,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ commState.idx++; - case 25: + case 27: IgniteUuid miniId0 = commState.getGridUuid(); if (miniId0 == GRID_UUID_NOT_READ) @@ -425,7 +448,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ commState.idx++; - case 26: + case 28: if (buf.remaining() < 1) return false; @@ -433,7 +456,15 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ commState.idx++; - case 27: + case 29: + if (buf.remaining() < 1) + return false; + + retVal = commState.getBoolean(); + + commState.idx++; + + case 30: if (buf.remaining() < 8) return false; @@ -441,7 +472,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ commState.idx++; - case 28: + case 31: UUID subjId0 = commState.getUuid(); if (subjId0 == UUID_NOT_READ) @@ -451,7 +482,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ commState.idx++; - case 29: + case 32: if (buf.remaining() < 4) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bc80265/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java index 4321f83..8f794a1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java @@ -304,6 +304,10 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes _clone.invalidParts = invalidParts; _clone.ownedVals = ownedVals; _clone.ownedValsBytes = ownedValsBytes; + _clone.retVal = retVal; + _clone.retValBytes = retValBytes; + _clone.filterFailedKeys = filterFailedKeys; + _clone.filterFailedKeyBytes = filterFailedKeyBytes; } /** {@inheritDoc} */ @@ -329,12 +333,18 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes commState.idx++; case 11: - if (!commState.putGridUuid(futId)) + if (!commState.putByteArray(filterFailedKeyBytes)) return false; commState.idx++; case 12: + if (!commState.putGridUuid(futId)) + return false; + + commState.idx++; + + case 13: if (invalidParts != null) { if (commState.it == null) { if (!commState.putInt(invalidParts.size())) @@ -361,13 +371,13 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes commState.idx++; - case 13: + case 14: if (!commState.putGridUuid(miniId)) return false; commState.idx++; - case 14: + case 15: if (ownedValsBytes != null) { if (commState.it == null) { if (!commState.putInt(ownedValsBytes.size())) @@ -394,7 +404,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes commState.idx++; - case 15: + case 16: if (pending != null) { if (commState.it == null) { if (!commState.putInt(pending.size())) @@ -421,6 +431,12 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes commState.idx++; + case 17: + if (!commState.putByteArray(retValBytes)) + return false; + + commState.idx++; + } return true; @@ -446,6 +462,16 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes commState.idx++; case 11: + byte[] filterFailedKeyBytes0 = commState.getByteArray(); + + if (filterFailedKeyBytes0 == BYTE_ARR_NOT_READ) + return false; + + filterFailedKeyBytes = filterFailedKeyBytes0; + + commState.idx++; + + case 12: IgniteUuid futId0 = commState.getGridUuid(); if (futId0 == GRID_UUID_NOT_READ) @@ -455,7 +481,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes commState.idx++; - case 12: + case 13: if (commState.readSize == -1) { if (buf.remaining() < 4) return false; @@ -484,7 +510,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes commState.idx++; - case 13: + case 14: IgniteUuid miniId0 = commState.getGridUuid(); if (miniId0 == GRID_UUID_NOT_READ) @@ -494,7 +520,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes commState.idx++; - case 14: + case 15: if (commState.readSize == -1) { if (buf.remaining() < 4) return false; @@ -523,7 +549,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes commState.idx++; - case 15: + case 16: if (commState.readSize == -1) { if (buf.remaining() < 4) return false; @@ -552,6 +578,16 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes commState.idx++; + case 17: + byte[] retValBytes0 = commState.getByteArray(); + + if (retValBytes0 == BYTE_ARR_NOT_READ) + return false; + + retValBytes = retValBytes0; + + commState.idx++; + } return true;
