sprint-1 - 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/a3cce254 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a3cce254 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a3cce254 Branch: refs/heads/sprint-1 Commit: a3cce2548827dac348513061c0ee3d75ac644692 Parents: ac3769b Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Sun Feb 15 00:40:07 2015 -0800 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Sun Feb 15 00:40:07 2015 -0800 ---------------------------------------------------------------------- .../distributed/GridDistributedLockRequest.java | 65 ++++++++++- .../GridDistributedTxFinishRequest.java | 20 ++++ .../GridDistributedTxPrepareRequest.java | 115 +++++++++++++++++++ .../distributed/dht/GridDhtLockRequest.java | 52 +++++++++ .../distributed/dht/GridDhtTxFinishRequest.java | 78 ++++++++++++- .../dht/GridDhtTxPrepareRequest.java | 21 +++- .../distributed/near/GridNearLockRequest.java | 46 ++++++++ .../near/GridNearTxFinishRequest.java | 39 +++++++ .../near/GridNearTxPrepareRequest.java | 59 +++++++++- .../near/GridNearTxPrepareResponse.java | 36 ++++-- 10 files changed, 514 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a3cce254/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 13832d0..cacc4e6 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 @@ -360,6 +360,12 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage } switch (writer.state()) { + case 8: + if (!writer.writeIgniteUuid("futId", futId)) + return false; + + writer.incrementState(); + case 9: if (!writer.writeByteArray("grpLockKeyBytes", grpLockKeyBytes)) return false; @@ -384,6 +390,23 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage writer.incrementState(); + case 13: + if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1)) + return false; + + writer.incrementState(); + + case 14: + if (!writer.writeCollection("keyBytes", keyBytes, Type.BYTE_ARR)) + return false; + + writer.incrementState(); + + case 15: + if (!writer.writeMessage("nearXidVer", nearXidVer)) + return false; + + writer.incrementState(); case 16: if (!writer.writeUuid("nodeId", nodeId)) @@ -421,7 +444,6 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage writer.incrementState(); - } return true; @@ -435,6 +457,21 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage return false; switch (readState) { + case 8: + futId = reader.readIgniteUuid("futId"); + + if (!reader.isLastRead()) + return false; + + readState++; + + case 9: + grpLockKeyBytes = reader.readByteArray("grpLockKeyBytes"); + + if (!reader.isLastRead()) + return false; + + readState++; case 10: isInTx = reader.readBoolean("isInTx"); @@ -460,6 +497,25 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage readState++; + case 13: + byte isolationOrd; + + isolationOrd = reader.readByte("isolation"); + + if (!reader.isLastRead()) + return false; + + isolation = IgniteTxIsolation.fromOrdinal(isolationOrd); + + readState++; + + case 14: + keyBytes = reader.readCollection("keyBytes", Type.BYTE_ARR); + + if (!reader.isLastRead()) + return false; + + readState++; case 15: nearXidVer = reader.readMessage("nearXidVer"); @@ -509,6 +565,13 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage readState++; + case 21: + txSize = reader.readInt("txSize"); + + if (!reader.isLastRead()) + return false; + + readState++; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a3cce254/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 b89ee8c..1f3c6f4 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 @@ -296,6 +296,11 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes writer.incrementState(); + case 14: + if (!writer.writeBoolean("syncCommit", syncCommit)) + return false; + + writer.incrementState(); case 15: if (!writer.writeBoolean("syncRollback", syncRollback)) @@ -382,6 +387,14 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes readState++; + case 14: + syncCommit = reader.readBoolean("syncCommit"); + + if (!reader.isLastRead()) + return false; + + readState++; + case 15: syncRollback = reader.readBoolean("syncRollback"); @@ -406,6 +419,13 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes readState++; + case 18: + txSize = reader.readInt("txSize"); + + if (!reader.isLastRead()) + return false; + + readState++; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a3cce254/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 4afe678..196a178 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 @@ -429,7 +429,41 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe } switch (writer.state()) { + case 8: + if (!writer.writeByte("concurrency", concurrency != null ? (byte)concurrency.ordinal() : -1)) + return false; + + writer.incrementState(); + + case 9: + if (!writer.writeByteArray("dhtVersBytes", dhtVersBytes)) + return false; + + writer.incrementState(); + + case 10: + if (!writer.writeByteArray("grpLockKeyBytes", grpLockKeyBytes)) + return false; + + writer.incrementState(); + + case 11: + if (!writer.writeBoolean("invalidate", invalidate)) + return false; + + writer.incrementState(); + + case 12: + if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1)) + return false; + + writer.incrementState(); + + case 13: + if (!writer.writeBoolean("onePhaseCommit", onePhaseCommit)) + return false; + writer.incrementState(); case 14: if (!writer.writeBoolean("partLock", partLock)) @@ -473,6 +507,17 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe writer.incrementState(); + case 21: + if (!writer.writeMessage("writeVer", writeVer)) + return false; + + writer.incrementState(); + + case 22: + if (!writer.writeCollection("writesBytes", writesBytes, Type.BYTE_ARR)) + return false; + + writer.incrementState(); } @@ -487,7 +532,61 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe return false; switch (readState) { + case 8: + byte concurrencyOrd; + + concurrencyOrd = reader.readByte("concurrency"); + if (!reader.isLastRead()) + return false; + + concurrency = IgniteTxConcurrency.fromOrdinal(concurrencyOrd); + + readState++; + + case 9: + dhtVersBytes = reader.readByteArray("dhtVersBytes"); + + if (!reader.isLastRead()) + return false; + + readState++; + + case 10: + grpLockKeyBytes = reader.readByteArray("grpLockKeyBytes"); + + if (!reader.isLastRead()) + return false; + + readState++; + + case 11: + invalidate = reader.readBoolean("invalidate"); + + if (!reader.isLastRead()) + return false; + + readState++; + + case 12: + byte isolationOrd; + + isolationOrd = reader.readByte("isolation"); + + if (!reader.isLastRead()) + return false; + + isolation = IgniteTxIsolation.fromOrdinal(isolationOrd); + + readState++; + + case 13: + onePhaseCommit = reader.readBoolean("onePhaseCommit"); + + if (!reader.isLastRead()) + return false; + + readState++; case 14: partLock = reader.readBoolean("partLock"); @@ -545,6 +644,22 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe readState++; + case 21: + writeVer = reader.readMessage("writeVer"); + + if (!reader.isLastRead()) + return false; + + readState++; + + case 22: + writesBytes = reader.readCollection("writesBytes", Type.BYTE_ARR); + + if (!reader.isLastRead()) + return false; + + readState++; + } return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a3cce254/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 2c5174a..5f7fb97 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 @@ -351,7 +351,29 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { } switch (writer.state()) { + case 22: + if (!writer.writeLong("accessTtl", accessTtl)) + return false; + + writer.incrementState(); + + case 23: + if (!writer.writeBitSet("invalidateEntries", invalidateEntries)) + return false; + + writer.incrementState(); + + case 24: + if (!writer.writeIgniteUuid("miniId", miniId)) + return false; + writer.incrementState(); + + case 25: + if (!writer.writeCollection("nearKeyBytes", nearKeyBytes, Type.BYTE_ARR)) + return false; + + writer.incrementState(); case 26: if (!writer.writeByteArray("ownedBytes", ownedBytes)) @@ -396,7 +418,37 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { return false; switch (readState) { + case 22: + accessTtl = reader.readLong("accessTtl"); + + if (!reader.isLastRead()) + return false; + + readState++; + + case 23: + invalidateEntries = reader.readBitSet("invalidateEntries"); + + if (!reader.isLastRead()) + return false; + + readState++; + + case 24: + miniId = reader.readIgniteUuid("miniId"); + + if (!reader.isLastRead()) + return false; + + readState++; + + case 25: + nearKeyBytes = reader.readCollection("nearKeyBytes", Type.BYTE_ARR); + if (!reader.isLastRead()) + return false; + + readState++; case 26: ownedBytes = reader.readByteArray("ownedBytes"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a3cce254/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 81d94bf..b1be2b6 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 @@ -238,6 +238,12 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest } switch (writer.state()) { + case 19: + if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1)) + return false; + + writer.incrementState(); + case 20: if (!writer.writeIgniteUuid("miniId", miniId)) return false; @@ -250,7 +256,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest writer.incrementState(); - case 27: + case 22: if (!writer.writeCollection("pendingVers", pendingVers, Type.MSG)) return false; @@ -280,7 +286,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest writer.incrementState(); - case 33: + case 27: if (!writer.writeMessage("writeVer", writeVer)) return false; @@ -299,9 +305,75 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest return false; switch (readState) { + case 19: + byte isolationOrd; + + isolationOrd = reader.readByte("isolation"); + + if (!reader.isLastRead()) + return false; + + isolation = IgniteTxIsolation.fromOrdinal(isolationOrd); + + readState++; + case 20: + miniId = reader.readIgniteUuid("miniId"); - case 33: + if (!reader.isLastRead()) + return false; + + readState++; + + case 21: + nearNodeId = reader.readUuid("nearNodeId"); + + if (!reader.isLastRead()) + return false; + + readState++; + + case 22: + pendingVers = reader.readCollection("pendingVers", Type.MSG); + + if (!reader.isLastRead()) + return false; + + readState++; + + case 23: + subjId = reader.readUuid("subjId"); + + if (!reader.isLastRead()) + return false; + + readState++; + + case 24: + sysInvalidate = reader.readBoolean("sysInvalidate"); + + if (!reader.isLastRead()) + return false; + + readState++; + + case 25: + taskNameHash = reader.readInt("taskNameHash"); + + if (!reader.isLastRead()) + return false; + + readState++; + + case 26: + topVer = reader.readLong("topVer"); + + if (!reader.isLastRead()) + return false; + + readState++; + + case 27: writeVer = reader.readMessage("writeVer"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a3cce254/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 9ab7a9f..c9fe865 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 @@ -328,7 +328,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque } switch (writer.state()) { - case 22: + case 23: if (!writer.writeIgniteUuid("futId", futId)) return false; @@ -352,7 +352,17 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque writer.incrementState(); + case 27: + if (!writer.writeUuid("nearNodeId", nearNodeId)) + return false; + + writer.incrementState(); + + case 28: + if (!writer.writeCollection("nearWritesBytes", nearWritesBytes, Type.BYTE_ARR)) + return false; + writer.incrementState(); case 29: if (!writer.writeMessage("nearXidVer", nearXidVer)) @@ -403,7 +413,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque return false; switch (readState) { - case 22: + case 23: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -443,6 +453,13 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque readState++; + case 28: + nearWritesBytes = reader.readCollection("nearWritesBytes", Type.BYTE_ARR); + + if (!reader.isLastRead()) + return false; + + readState++; case 29: nearXidVer = reader.readMessage("nearXidVer"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a3cce254/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 5d6b046..345da10 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 @@ -336,7 +336,23 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> } switch (writer.state()) { + case 22: + if (!writer.writeLong("accessTtl", accessTtl)) + return false; + writer.incrementState(); + + case 23: + if (!writer.writeObjectArray("dhtVers", dhtVers, Type.MSG)) + return false; + + writer.incrementState(); + + case 24: + if (!writer.writeObjectArray("filterBytes", filterBytes, Type.BYTE_ARR)) + return false; + + writer.incrementState(); case 25: if (!writer.writeBoolean("hasTransforms", hasTransforms)) @@ -405,7 +421,37 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> return false; switch (readState) { + case 22: + accessTtl = reader.readLong("accessTtl"); + + if (!reader.isLastRead()) + return false; + readState++; + + case 23: + dhtVers = reader.readObjectArray("dhtVers", Type.MSG, GridCacheVersion.class); + + if (!reader.isLastRead()) + return false; + + readState++; + + case 24: + filterBytes = reader.readObjectArray("filterBytes", Type.BYTE_ARR, byte[].class); + + if (!reader.isLastRead()) + return false; + + readState++; + + case 25: + hasTransforms = reader.readBoolean("hasTransforms"); + + if (!reader.isLastRead()) + return false; + + readState++; case 26: implicitSingleTx = reader.readBoolean("implicitSingleTx"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a3cce254/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 80ac73e..012a48f 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 @@ -167,6 +167,23 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques } switch (writer.state()) { + case 19: + if (!writer.writeBoolean("explicitLock", explicitLock)) + return false; + + writer.incrementState(); + + case 20: + if (!writer.writeIgniteUuid("miniId", miniId)) + return false; + + writer.incrementState(); + + case 21: + if (!writer.writeBoolean("storeEnabled", storeEnabled)) + return false; + + writer.incrementState(); case 22: if (!writer.writeUuid("subjId", subjId)) @@ -199,7 +216,29 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques return false; switch (readState) { + case 19: + explicitLock = reader.readBoolean("explicitLock"); + + if (!reader.isLastRead()) + return false; + readState++; + + case 20: + miniId = reader.readIgniteUuid("miniId"); + + if (!reader.isLastRead()) + return false; + + readState++; + + case 21: + storeEnabled = reader.readBoolean("storeEnabled"); + + if (!reader.isLastRead()) + return false; + + readState++; case 22: subjId = reader.readUuid("subjId"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a3cce254/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 247cc70..cbf906e 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 @@ -20,9 +20,8 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.distributed.*; -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.lang.*; import org.apache.ignite.internal.processors.cache.transactions.*; +import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; @@ -258,6 +257,29 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ } switch (writer.state()) { + case 23: + if (!writer.writeIgniteUuid("futId", futId)) + return false; + + writer.incrementState(); + + case 24: + if (!writer.writeBoolean("implicitSingle", implicitSingle)) + return false; + + writer.incrementState(); + + case 25: + if (!writer.writeBoolean("last", last)) + return false; + + writer.incrementState(); + + case 26: + if (!writer.writeCollection("lastBackups", lastBackups, Type.UUID)) + return false; + + writer.incrementState(); case 27: if (!writer.writeIgniteUuid("miniId", miniId)) @@ -275,7 +297,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ if (!writer.writeBoolean("retVal", retVal)) return false; - state++; + writer.incrementState(); case 30: if (!writer.writeUuid("subjId", subjId)) @@ -308,7 +330,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ return false; switch (readState) { - case 22: + case 23: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -316,7 +338,29 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ readState++; + case 24: + implicitSingle = reader.readBoolean("implicitSingle"); + if (!reader.isLastRead()) + return false; + + readState++; + + case 25: + last = reader.readBoolean("last"); + + if (!reader.isLastRead()) + return false; + + readState++; + + case 26: + lastBackups = reader.readCollection("lastBackups", Type.UUID); + + if (!reader.isLastRead()) + return false; + + readState++; case 27: miniId = reader.readIgniteUuid("miniId"); @@ -334,6 +378,13 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ readState++; + case 29: + retVal = reader.readBoolean("retVal"); + + if (!reader.isLastRead()) + return false; + + readState++; case 30: subjId = reader.readUuid("subjId"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a3cce254/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 a6bd4bc..5106f94 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 @@ -310,24 +310,30 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes writer.incrementState(); case 12: - if (!writer.writeCollection("invalidParts", invalidParts, Type.INT)) + if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); case 13: - if (!writer.writeCollection("invalidParts", invalidParts, int.class)) + if (!writer.writeCollection("invalidParts", invalidParts, Type.INT)) return false; writer.incrementState(); case 14: - if (!writer.writeCollection("ownedValsBytes", ownedValsBytes, Type.BYTE_ARR)) + if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); case 15: + if (!writer.writeCollection("ownedValsBytes", ownedValsBytes, Type.BYTE_ARR)) + return false; + + writer.incrementState(); + + case 16: if (!writer.writeCollection("pending", pending, Type.MSG)) return false; @@ -337,7 +343,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes if (!writer.writeByteArray("retValBytes", retValBytes)) return false; - state++; + writer.incrementState(); } @@ -369,7 +375,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes readState++; case 12: - invalidParts = reader.readCollection("invalidParts", Type.INT); + futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) return false; @@ -377,7 +383,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes readState++; case 13: - invalidParts = reader.readCollection("invalidParts", int.class); + invalidParts = reader.readCollection("invalidParts", Type.INT); if (!reader.isLastRead()) return false; @@ -385,7 +391,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes readState++; case 14: - ownedValsBytes = reader.readCollection("ownedValsBytes", Type.BYTE_ARR); + miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) return false; @@ -393,6 +399,14 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes readState++; case 15: + ownedValsBytes = reader.readCollection("ownedValsBytes", Type.BYTE_ARR); + + if (!reader.isLastRead()) + return false; + + readState++; + + case 16: pending = reader.readCollection("pending", Type.MSG); if (!reader.isLastRead()) @@ -400,6 +414,14 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes readState++; + case 17: + retValBytes = reader.readByteArray("retValBytes"); + + if (!reader.isLastRead()) + return false; + + readState++; + } return true;
