Ignite-9655-merge - 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/3728ac33 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3728ac33 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3728ac33 Branch: refs/heads/sprint-1 Commit: 3728ac33c367216bf170aae41988c7089f5339a1 Parents: df55ba9 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Thu Feb 12 13:49:14 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Thu Feb 12 13:49:14 2015 -0800 ---------------------------------------------------------------------- .../CommunicationMessageCodeGenerator.java | 24 ++++++++ .../distributed/GridDistributedLockRequest.java | 58 ++++++++++--------- .../GridDistributedTxFinishRequest.java | 24 ++++---- .../GridDistributedTxPrepareRequest.java | 50 ++++++++++++---- .../distributed/dht/GridDhtLockRequest.java | 36 ++++++------ .../distributed/dht/GridDhtTxFinishRequest.java | 37 ++++++------ .../dht/GridDhtTxPrepareRequest.java | 48 ++++++++-------- .../distributed/near/GridNearLockRequest.java | 48 ++++++++-------- .../near/GridNearTxFinishRequest.java | 24 ++++---- .../near/GridNearTxPrepareRequest.java | 60 ++++++++++++++------ .../near/GridNearTxPrepareResponse.java | 44 +++++++++++--- 11 files changed, 281 insertions(+), 172 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3728ac33/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java ---------------------------------------------------------------------- diff --git a/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java index f4c8d94..7a91b61 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java +++ b/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java @@ -97,6 +97,30 @@ public class CommunicationMessageCodeGenerator { try { gen.generateAll(true); + +// gen.generateAndWrite(GridDistributedLockRequest.class); +// gen.generateAndWrite(GridDistributedLockResponse.class); +// gen.generateAndWrite(GridNearLockRequest.class); +// gen.generateAndWrite(GridNearLockResponse.class); +// gen.generateAndWrite(GridDhtLockRequest.class); +// gen.generateAndWrite(GridDhtLockResponse.class); +// +// gen.generateAndWrite(GridDistributedTxPrepareRequest.class); +// gen.generateAndWrite(GridDistributedTxPrepareResponse.class); +// gen.generateAndWrite(GridNearTxPrepareRequest.class); +// gen.generateAndWrite(GridNearTxPrepareResponse.class); +// gen.generateAndWrite(GridDhtTxPrepareRequest.class); +// gen.generateAndWrite(GridDhtTxPrepareResponse.class); +// +// gen.generateAndWrite(GridDistributedTxFinishRequest.class); +// gen.generateAndWrite(GridDistributedTxFinishResponse.class); +// gen.generateAndWrite(GridNearTxFinishRequest.class); +// gen.generateAndWrite(GridNearTxFinishResponse.class); +// gen.generateAndWrite(GridDhtTxFinishRequest.class); +// gen.generateAndWrite(GridDhtTxFinishResponse.class); +// +// gen.generateAndWrite(GridCacheOptimisticCheckPreparedTxRequest.class); +// gen.generateAndWrite(GridCacheOptimisticCheckPreparedTxResponse.class); } catch (Exception e) { e.printStackTrace(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3728ac33/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 b2ed1d0..a280849 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 @@ -397,89 +397,90 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage } switch (state) { - case 9: + case 8: if (!writer.writeIgniteUuid("futId", futId)) return false; state++; - case 10: + case 9: if (!writer.writeByteArray("grpLockKeyBytes", grpLockKeyBytes)) return false; state++; - case 11: + case 10: if (!writer.writeBoolean("isInTx", isInTx)) return false; state++; - case 12: + case 11: if (!writer.writeBoolean("isInvalidate", isInvalidate)) return false; state++; - case 13: + case 12: if (!writer.writeBoolean("isRead", isRead)) return false; state++; - case 14: + case 13: if (!writer.writeEnum("isolation", isolation)) return false; state++; - case 15: + case 14: if (!writer.writeCollection("keyBytes", keyBytes, byte[].class)) return false; state++; - case 16: + case 15: if (!writer.writeMessage("nearXidVer", nearXidVer)) return false; state++; - case 17: + case 16: if (!writer.writeUuid("nodeId", nodeId)) return false; state++; - case 18: + case 17: if (!writer.writeBoolean("partLock", partLock)) return false; state++; - case 19: + case 18: if (!writer.writeBooleanArray("retVals", retVals)) return false; state++; - case 20: + case 19: if (!writer.writeLong("threadId", threadId)) return false; state++; - case 21: + case 20: if (!writer.writeLong("timeout", timeout)) return false; state++; - case 22: + case 21: if (!writer.writeInt("txSize", txSize)) return false; state++; + } return true; @@ -494,7 +495,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage return false; switch (state) { - case 9: + case 8: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -502,7 +503,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage state++; - case 10: + case 9: grpLockKeyBytes = reader.readByteArray("grpLockKeyBytes"); if (!reader.isLastRead()) @@ -510,7 +511,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage state++; - case 11: + case 10: isInTx = reader.readBoolean("isInTx"); if (!reader.isLastRead()) @@ -518,7 +519,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage state++; - case 12: + case 11: isInvalidate = reader.readBoolean("isInvalidate"); if (!reader.isLastRead()) @@ -526,7 +527,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage state++; - case 13: + case 12: isRead = reader.readBoolean("isRead"); if (!reader.isLastRead()) @@ -534,7 +535,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage state++; - case 14: + case 13: isolation = reader.readEnum("isolation", IgniteTxIsolation.class); if (!reader.isLastRead()) @@ -542,7 +543,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage state++; - case 15: + case 14: keyBytes = reader.readCollection("keyBytes", byte[].class); if (!reader.isLastRead()) @@ -550,7 +551,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage state++; - case 16: + case 15: nearXidVer = reader.readMessage("nearXidVer"); if (!reader.isLastRead()) @@ -558,7 +559,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage state++; - case 17: + case 16: nodeId = reader.readUuid("nodeId"); if (!reader.isLastRead()) @@ -566,7 +567,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage state++; - case 18: + case 17: partLock = reader.readBoolean("partLock"); if (!reader.isLastRead()) @@ -574,7 +575,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage state++; - case 19: + case 18: retVals = reader.readBooleanArray("retVals"); if (!reader.isLastRead()) @@ -582,7 +583,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage state++; - case 20: + case 19: threadId = reader.readLong("threadId"); if (!reader.isLastRead()) @@ -590,7 +591,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage state++; - case 21: + case 20: timeout = reader.readLong("timeout"); if (!reader.isLastRead()) @@ -598,13 +599,14 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage state++; - case 22: + case 21: txSize = reader.readInt("txSize"); if (!reader.isLastRead()) return false; state++; + } return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3728ac33/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 78fc317..df4cbbe 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 @@ -328,35 +328,36 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes state++; - case 15: + case 14: if (!writer.writeBoolean("syncCommit", syncCommit)) return false; state++; - case 16: + case 15: if (!writer.writeBoolean("syncRollback", syncRollback)) return false; state++; - case 17: + case 16: if (!writer.writeBoolean("sys", sys)) return false; state++; - case 18: + case 17: if (!writer.writeLong("threadId", threadId)) return false; state++; - case 19: + case 18: if (!writer.writeInt("txSize", txSize)) return false; state++; + } return true; @@ -419,7 +420,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes state++; - case 15: + case 14: syncCommit = reader.readBoolean("syncCommit"); if (!reader.isLastRead()) @@ -427,17 +428,15 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes state++; - case 16: + case 15: syncRollback = reader.readBoolean("syncRollback"); - if (buf.remaining() < 1) - return false; if (!reader.isLastRead()) return false; state++; - case 17: + case 16: sys = reader.readBoolean("sys"); if (!reader.isLastRead()) @@ -445,7 +444,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes state++; - case 18: + case 17: threadId = reader.readLong("threadId"); if (!reader.isLastRead()) @@ -453,13 +452,14 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes state++; - case 19: + case 18: txSize = reader.readInt("txSize"); if (!reader.isLastRead()) return false; state++; + } return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3728ac33/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 4140a21..065e963 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 @@ -434,7 +434,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe _clone.threadId = threadId; _clone.concurrency = concurrency; _clone.isolation = isolation; - _clone.writeVer = writeVer; + _clone.writeVer = writeVer != null ? (GridCacheVersion)writeVer.clone() : null; _clone.timeout = timeout; _clone.invalidate = invalidate; _clone.reads = reads; @@ -469,36 +469,42 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe } switch (state) { - case 9: + case 8: if (!writer.writeEnum("concurrency", concurrency)) return false; state++; - case 10: + case 9: if (!writer.writeByteArray("dhtVersBytes", dhtVersBytes)) return false; state++; - case 11: + case 10: if (!writer.writeByteArray("grpLockKeyBytes", grpLockKeyBytes)) return false; state++; - case 12: + case 11: if (!writer.writeBoolean("invalidate", invalidate)) return false; state++; - case 13: + case 12: if (!writer.writeEnum("isolation", isolation)) return false; state++; + case 13: + if (!writer.writeBoolean("onePhaseCommit", onePhaseCommit)) + return false; + + state++; + case 14: if (!writer.writeBoolean("partLock", partLock)) return false; @@ -542,6 +548,12 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe state++; case 21: + if (!writer.writeMessage("writeVer", writeVer)) + return false; + + state++; + + case 22: if (!writer.writeCollection("writesBytes", writesBytes, byte[].class)) return false; @@ -561,7 +573,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe return false; switch (state) { - case 9: + case 8: concurrency = reader.readEnum("concurrency", IgniteTxConcurrency.class); if (!reader.isLastRead()) @@ -569,7 +581,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe state++; - case 10: + case 9: dhtVersBytes = reader.readByteArray("dhtVersBytes"); if (!reader.isLastRead()) @@ -577,7 +589,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe state++; - case 11: + case 10: grpLockKeyBytes = reader.readByteArray("grpLockKeyBytes"); if (!reader.isLastRead()) @@ -585,7 +597,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe state++; - case 12: + case 11: invalidate = reader.readBoolean("invalidate"); if (!reader.isLastRead()) @@ -593,7 +605,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe state++; - case 13: + case 12: isolation = reader.readEnum("isolation", IgniteTxIsolation.class); if (!reader.isLastRead()) @@ -601,6 +613,14 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe state++; + case 13: + onePhaseCommit = reader.readBoolean("onePhaseCommit"); + + if (!reader.isLastRead()) + return false; + + state++; + case 14: partLock = reader.readBoolean("partLock"); @@ -658,6 +678,14 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe state++; case 21: + writeVer = reader.readMessage("writeVer"); + + if (!reader.isLastRead()) + return false; + + state++; + + case 22: writesBytes = reader.readCollection("writesBytes", byte[].class); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3728ac33/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 239936f..7856672 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 @@ -381,55 +381,55 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { } switch (state) { - case 24: + case 22: if (!writer.writeLong("accessTtl", accessTtl)) return false; state++; - case 25: + case 23: if (!writer.writeBitSet("invalidateEntries", invalidateEntries)) return false; state++; - case 26: + case 24: if (!writer.writeIgniteUuid("miniId", miniId)) return false; state++; - case 27: + case 25: if (!writer.writeCollection("nearKeyBytes", nearKeyBytes, byte[].class)) return false; state++; - case 28: + case 26: if (!writer.writeByteArray("ownedBytes", ownedBytes)) return false; state++; - case 29: + case 27: if (!writer.writeBitSet("preloadKeys", preloadKeys)) return false; state++; - case 30: + case 28: if (!writer.writeUuid("subjId", subjId)) return false; state++; - case 31: + case 29: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; state++; - case 32: + case 30: if (!writer.writeLong("topVer", topVer)) return false; @@ -449,7 +449,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { return false; switch (state) { - case 24: + case 22: accessTtl = reader.readLong("accessTtl"); if (!reader.isLastRead()) @@ -457,7 +457,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { state++; - case 25: + case 23: invalidateEntries = reader.readBitSet("invalidateEntries"); if (!reader.isLastRead()) @@ -465,7 +465,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { state++; - case 26: + case 24: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -473,7 +473,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { state++; - case 27: + case 25: nearKeyBytes = reader.readCollection("nearKeyBytes", byte[].class); if (!reader.isLastRead()) @@ -481,7 +481,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { state++; - case 28: + case 26: ownedBytes = reader.readByteArray("ownedBytes"); if (!reader.isLastRead()) @@ -489,7 +489,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { state++; - case 29: + case 27: preloadKeys = reader.readBitSet("preloadKeys"); if (!reader.isLastRead()) @@ -497,7 +497,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { state++; - case 30: + case 28: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -505,7 +505,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { state++; - case 31: + case 29: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -513,7 +513,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { state++; - case 32: + case 30: topVer = reader.readLong("topVer"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3728ac33/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 bc0520d..ce5157b 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 @@ -246,7 +246,6 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest _clone.topVer = topVer; _clone.pendingVers = pendingVers; _clone.writeVer = writeVer != null ? (GridCacheVersion)writeVer.clone() : null; - _clone.writeVer = writeVer; _clone.subjId = subjId; _clone.taskNameHash = taskNameHash; } @@ -267,55 +266,55 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest } switch (state) { - case 21: + case 19: if (!writer.writeEnum("isolation", isolation)) return false; state++; - case 22: + case 20: if (!writer.writeIgniteUuid("miniId", miniId)) return false; state++; - case 23: + case 21: if (!writer.writeUuid("nearNodeId", nearNodeId)) return false; state++; - case 27: + case 22: if (!writer.writeCollection("pendingVers", pendingVers, GridCacheVersion.class)) return false; state++; - case 28: + case 23: if (!writer.writeUuid("subjId", subjId)) return false; state++; - case 29: + case 24: if (!writer.writeBoolean("sysInvalidate", sysInvalidate)) return false; state++; - case 30: + case 25: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; state++; - case 31: + case 26: if (!writer.writeLong("topVer", topVer)) return false; state++; - case 33: + case 27: if (!writer.writeMessage("writeVer", writeVer)) return false; @@ -335,7 +334,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest return false; switch (state) { - case 21: + case 19: isolation = reader.readEnum("isolation", IgniteTxIsolation.class); if (!reader.isLastRead()) @@ -343,7 +342,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest state++; - case 22: + case 20: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -351,7 +350,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest state++; - case 23: + case 21: nearNodeId = reader.readUuid("nearNodeId"); if (!reader.isLastRead()) @@ -359,7 +358,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest state++; - case 27: + case 22: pendingVers = reader.readCollection("pendingVers", GridCacheVersion.class); if (!reader.isLastRead()) @@ -367,7 +366,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest state++; - case 28: + case 23: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -375,7 +374,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest state++; - case 29: + case 24: sysInvalidate = reader.readBoolean("sysInvalidate"); if (!reader.isLastRead()) @@ -383,7 +382,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest state++; - case 30: + case 25: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -391,7 +390,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest state++; - case 31: + case 26: topVer = reader.readLong("topVer"); if (!reader.isLastRead()) @@ -399,7 +398,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest state++; - case 33: + case 27: writeVer = reader.readMessage("writeVer"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3728ac33/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 ca1f3cc..3d68505 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 @@ -361,73 +361,73 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque } switch (state) { - case 22: + case 23: if (!writer.writeIgniteUuid("futId", futId)) return false; state++; - case 23: + case 24: if (!writer.writeBitSet("invalidateNearEntries", invalidateNearEntries)) return false; state++; - case 24: + case 25: if (!writer.writeBoolean("last", last)) return false; state++; - case 25: + case 26: if (!writer.writeIgniteUuid("miniId", miniId)) return false; state++; - case 26: + case 27: if (!writer.writeUuid("nearNodeId", nearNodeId)) return false; state++; - case 27: + case 28: if (!writer.writeCollection("nearWritesBytes", nearWritesBytes, byte[].class)) return false; state++; - case 28: + case 29: if (!writer.writeMessage("nearXidVer", nearXidVer)) return false; state++; - case 29: + case 30: if (!writer.writeByteArray("ownedBytes", ownedBytes)) return false; state++; - case 30: + case 31: if (!writer.writeBitSet("preloadKeys", preloadKeys)) return false; state++; - case 31: + case 32: if (!writer.writeUuid("subjId", subjId)) return false; state++; - case 32: + case 33: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; state++; - case 33: + case 34: if (!writer.writeLong("topVer", topVer)) return false; @@ -447,7 +447,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque return false; switch (state) { - case 22: + case 23: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -455,7 +455,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque state++; - case 23: + case 24: invalidateNearEntries = reader.readBitSet("invalidateNearEntries"); if (!reader.isLastRead()) @@ -463,7 +463,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque state++; - case 24: + case 25: last = reader.readBoolean("last"); if (!reader.isLastRead()) @@ -471,7 +471,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque state++; - case 25: + case 26: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -479,7 +479,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque state++; - case 26: + case 27: nearNodeId = reader.readUuid("nearNodeId"); if (!reader.isLastRead()) @@ -487,7 +487,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque state++; - case 27: + case 28: nearWritesBytes = reader.readCollection("nearWritesBytes", byte[].class); if (!reader.isLastRead()) @@ -495,7 +495,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque state++; - case 28: + case 29: nearXidVer = reader.readMessage("nearXidVer"); if (!reader.isLastRead()) @@ -503,7 +503,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque state++; - case 29: + case 30: ownedBytes = reader.readByteArray("ownedBytes"); if (!reader.isLastRead()) @@ -511,7 +511,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque state++; - case 30: + case 31: preloadKeys = reader.readBitSet("preloadKeys"); if (!reader.isLastRead()) @@ -519,7 +519,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque state++; - case 31: + case 32: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -527,7 +527,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque state++; - case 32: + case 33: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -535,7 +535,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque state++; - case 33: + case 34: topVer = reader.readLong("topVer"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3728ac33/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 79b7dfb..a87a9be 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 @@ -368,73 +368,73 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> } switch (state) { - case 24: + case 22: if (!writer.writeLong("accessTtl", accessTtl)) return false; state++; - case 25: + case 23: if (!writer.writeObjectArray("dhtVers", dhtVers, GridCacheVersion.class)) return false; state++; - case 26: + case 24: if (!writer.writeObjectArray("filterBytes", filterBytes, byte[].class)) return false; state++; - case 27: + case 25: if (!writer.writeBoolean("hasTransforms", hasTransforms)) return false; state++; - case 28: + case 26: if (!writer.writeBoolean("implicitSingleTx", implicitSingleTx)) return false; state++; - case 29: + case 27: if (!writer.writeBoolean("implicitTx", implicitTx)) return false; state++; - case 30: + case 28: if (!writer.writeIgniteUuid("miniId", miniId)) return false; state++; - case 31: + case 29: if (!writer.writeBoolean("onePhaseCommit", onePhaseCommit)) return false; state++; - case 32: + case 30: if (!writer.writeUuid("subjId", subjId)) return false; state++; - case 33: + case 31: if (!writer.writeBoolean("syncCommit", syncCommit)) return false; state++; - case 34: + case 32: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; state++; - case 35: + case 33: if (!writer.writeLong("topVer", topVer)) return false; @@ -454,7 +454,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> return false; switch (state) { - case 24: + case 22: accessTtl = reader.readLong("accessTtl"); if (!reader.isLastRead()) @@ -462,7 +462,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> state++; - case 25: + case 23: dhtVers = reader.readObjectArray("dhtVers", GridCacheVersion.class); if (!reader.isLastRead()) @@ -470,7 +470,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> state++; - case 26: + case 24: filterBytes = reader.readObjectArray("filterBytes", byte[].class); if (!reader.isLastRead()) @@ -478,7 +478,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> state++; - case 27: + case 25: hasTransforms = reader.readBoolean("hasTransforms"); if (!reader.isLastRead()) @@ -486,7 +486,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> state++; - case 28: + case 26: implicitSingleTx = reader.readBoolean("implicitSingleTx"); if (!reader.isLastRead()) @@ -494,7 +494,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> state++; - case 29: + case 27: implicitTx = reader.readBoolean("implicitTx"); if (!reader.isLastRead()) @@ -502,7 +502,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> state++; - case 30: + case 28: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -510,7 +510,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> state++; - case 31: + case 29: onePhaseCommit = reader.readBoolean("onePhaseCommit"); if (!reader.isLastRead()) @@ -518,7 +518,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> state++; - case 32: + case 30: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -526,7 +526,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> state++; - case 33: + case 31: syncCommit = reader.readBoolean("syncCommit"); if (!reader.isLastRead()) @@ -534,7 +534,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> state++; - case 34: + case 32: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -542,7 +542,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> state++; - case 35: + case 33: topVer = reader.readLong("topVer"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3728ac33/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 73aa44e..e70f0cc2 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 @@ -193,37 +193,37 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques } switch (state) { - case 21: + case 19: if (!writer.writeBoolean("explicitLock", explicitLock)) return false; state++; - case 22: + case 20: if (!writer.writeIgniteUuid("miniId", miniId)) return false; state++; - case 23: + case 21: if (!writer.writeBoolean("storeEnabled", storeEnabled)) return false; state++; - case 24: + case 22: if (!writer.writeUuid("subjId", subjId)) return false; state++; - case 25: + case 23: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; state++; - case 26: + case 24: if (!writer.writeLong("topVer", topVer)) return false; @@ -243,7 +243,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques return false; switch (state) { - case 21: + case 19: explicitLock = reader.readBoolean("explicitLock"); if (!reader.isLastRead()) @@ -251,7 +251,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques state++; - case 22: + case 20: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -259,7 +259,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques state++; - case 23: + case 21: storeEnabled = reader.readBoolean("storeEnabled"); if (!reader.isLastRead()) @@ -267,7 +267,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques state++; - case 24: + case 22: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -275,7 +275,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques state++; - case 25: + case 23: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -283,7 +283,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques state++; - case 26: + case 24: topVer = reader.readLong("topVer"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3728ac33/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 e3cb897..7acbc4f 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 @@ -287,49 +287,61 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ } switch (state) { - case 22: + case 23: if (!writer.writeIgniteUuid("futId", futId)) return false; state++; - case 23: + case 24: + if (!writer.writeBoolean("implicitSingle", implicitSingle)) + return false; + + state++; + + case 25: if (!writer.writeBoolean("last", last)) return false; state++; - case 24: + case 26: if (!writer.writeCollection("lastBackups", lastBackups, UUID.class)) return false; state++; - case 25: + case 27: if (!writer.writeIgniteUuid("miniId", miniId)) return false; state++; - case 26: + case 28: if (!writer.writeBoolean("near", near)) return false; state++; - case 27: + case 29: + if (!writer.writeBoolean("retVal", retVal)) + return false; + + state++; + + case 30: if (!writer.writeUuid("subjId", subjId)) return false; state++; - case 28: + case 31: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; state++; - case 29: + case 32: if (!writer.writeLong("topVer", topVer)) return false; @@ -349,7 +361,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ return false; switch (state) { - case 22: + case 23: futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) @@ -357,7 +369,15 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ state++; - case 23: + case 24: + implicitSingle = reader.readBoolean("implicitSingle"); + + if (!reader.isLastRead()) + return false; + + state++; + + case 25: last = reader.readBoolean("last"); if (!reader.isLastRead()) @@ -365,7 +385,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ state++; - case 24: + case 26: lastBackups = reader.readCollection("lastBackups", UUID.class); if (!reader.isLastRead()) @@ -373,7 +393,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ state++; - case 25: + case 27: miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) @@ -381,7 +401,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ state++; - case 26: + case 28: near = reader.readBoolean("near"); if (!reader.isLastRead()) @@ -389,7 +409,15 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ state++; - case 27: + case 29: + retVal = reader.readBoolean("retVal"); + + if (!reader.isLastRead()) + return false; + + state++; + + case 30: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -397,7 +425,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ state++; - case 28: + case 31: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -405,7 +433,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ state++; - case 29: + case 32: topVer = reader.readLong("topVer"); if (!reader.isLastRead()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3728ac33/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 b17a548..9ab29cc 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 @@ -334,35 +334,47 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes state++; case 11: - if (!writer.writeIgniteUuid("futId", futId)) + if (!writer.writeByteArray("filterFailedKeyBytes", filterFailedKeyBytes)) return false; state++; case 12: - if (!writer.writeCollection("invalidParts", invalidParts, int.class)) + if (!writer.writeIgniteUuid("futId", futId)) return false; state++; case 13: - if (!writer.writeIgniteUuid("miniId", miniId)) + if (!writer.writeCollection("invalidParts", invalidParts, int.class)) return false; state++; case 14: - if (!writer.writeCollection("ownedValsBytes", ownedValsBytes, byte[].class)) + if (!writer.writeIgniteUuid("miniId", miniId)) return false; state++; case 15: + if (!writer.writeCollection("ownedValsBytes", ownedValsBytes, byte[].class)) + return false; + + state++; + + case 16: if (!writer.writeCollection("pending", pending, GridCacheVersion.class)) return false; state++; + case 17: + if (!writer.writeByteArray("retValBytes", retValBytes)) + return false; + + state++; + } return true; @@ -386,7 +398,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes state++; case 11: - futId = reader.readIgniteUuid("futId"); + filterFailedKeyBytes = reader.readByteArray("filterFailedKeyBytes"); if (!reader.isLastRead()) return false; @@ -394,7 +406,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes state++; case 12: - invalidParts = reader.readCollection("invalidParts", int.class); + futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) return false; @@ -402,7 +414,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes state++; case 13: - miniId = reader.readIgniteUuid("miniId"); + invalidParts = reader.readCollection("invalidParts", int.class); if (!reader.isLastRead()) return false; @@ -410,7 +422,7 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes state++; case 14: - ownedValsBytes = reader.readCollection("ownedValsBytes", byte[].class); + miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) return false; @@ -418,6 +430,14 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes state++; case 15: + ownedValsBytes = reader.readCollection("ownedValsBytes", byte[].class); + + if (!reader.isLastRead()) + return false; + + state++; + + case 16: pending = reader.readCollection("pending", GridCacheVersion.class); if (!reader.isLastRead()) @@ -425,6 +445,14 @@ public class GridNearTxPrepareResponse<K, V> extends GridDistributedTxPrepareRes state++; + case 17: + retValBytes = reader.readByteArray("retValBytes"); + + if (!reader.isLastRead()) + return false; + + state++; + } return true;
