IGNITE-45 - WIP Rebuilt 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/55a9c501 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/55a9c501 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/55a9c501 Branch: refs/heads/ignite-45 Commit: 55a9c501c4a643596a6ac0dada9dfbb7279bd8b7 Parents: c083c91 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Tue Mar 3 16:05:17 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Tue Mar 3 16:05:17 2015 -0800 ---------------------------------------------------------------------- .../affinity/AffinityTopologyVersion.java | 83 ++++++++++++++------ .../cache/GridCacheEvictionRequest.java | 4 +- .../distributed/GridCacheTtlUpdateRequest.java | 4 +- .../dht/GridDhtAffinityAssignmentRequest.java | 4 +- .../dht/GridDhtAffinityAssignmentResponse.java | 4 +- .../distributed/dht/GridDhtLockRequest.java | 4 +- .../distributed/dht/GridDhtTxFinishRequest.java | 4 +- .../dht/GridDhtTxPrepareRequest.java | 4 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 4 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 4 +- .../dht/preloader/GridDhtForceKeysRequest.java | 4 +- .../GridDhtPartitionDemandMessage.java | 4 +- .../preloader/GridDhtPartitionExchangeId.java | 4 +- .../preloader/GridDhtPartitionsFullMessage.java | 4 +- .../distributed/near/GridNearGetRequest.java | 4 +- .../distributed/near/GridNearGetResponse.java | 4 +- .../distributed/near/GridNearLockRequest.java | 4 +- .../near/GridNearTxFinishRequest.java | 4 +- .../near/GridNearTxPrepareRequest.java | 4 +- 19 files changed, 96 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55a9c501/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java index 12e3f8f..e276253 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java @@ -47,7 +47,15 @@ public class AffinityTopologyVersion implements Comparable<AffinityTopologyVersi } /** - * @param topVer Version. + * @param topVer Topology version. + */ + public AffinityTopologyVersion(long topVer) { + this.topVer = topVer; + } + + /** + * @param topVer Topology version. + * @param minorTopVer Minor topology version. */ public AffinityTopologyVersion( long topVer, @@ -108,14 +116,60 @@ public class AffinityTopologyVersion implements Comparable<AffinityTopologyVersi /** {@inheritDoc} */ @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { - // TODO: implement. - return false; + writer.setBuffer(buf); + + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(directType(), fieldsCount())) + return false; + + writer.onHeaderWritten(); + } + + switch (writer.state()) { + case 0: + if (!writer.writeInt("minorTopVer", minorTopVer)) + return false; + + writer.incrementState(); + + case 1: + if (!writer.writeLong("topVer", topVer)) + return false; + + writer.incrementState(); + + } + + return true; } /** {@inheritDoc} */ @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) { - // TODO: implement. - return false; + reader.setBuffer(buf); + + if (!reader.beforeMessageRead()) + return false; + + switch (reader.state()) { + case 0: + minorTopVer = reader.readInt("minorTopVer"); + + if (!reader.isLastRead()) + return false; + + reader.incrementState(); + + case 1: + topVer = reader.readLong("topVer"); + + if (!reader.isLastRead()) + return false; + + reader.incrementState(); + + } + + return true; } /** {@inheritDoc} */ @@ -125,24 +179,7 @@ public class AffinityTopologyVersion implements Comparable<AffinityTopologyVersi /** {@inheritDoc} */ @Override public byte fieldsCount() { - // TODO: implement. - return 0; - } - - /** - * @param msgWriter Message writer. - */ - public boolean writeTo(MessageWriter msgWriter) { - return msgWriter.writeLong("topVer.idx", topVer); - } - - /** - * @param msgReader Message reader. - */ - public static AffinityTopologyVersion readFrom(MessageReader msgReader) { - long topVer = msgReader.readLong("topVer.idx"); - - return new AffinityTopologyVersion(topVer, 0); + return 2; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55a9c501/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java index 8f32c33..1344495 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java @@ -169,7 +169,7 @@ public class GridCacheEvictionRequest<K, V> extends GridCacheMessage<K, V> imple writer.incrementState(); case 5: - if (!topVer.writeTo(writer)) + if (!writer.writeMessage("topVer", topVer)) return false; writer.incrementState(); @@ -207,7 +207,7 @@ public class GridCacheEvictionRequest<K, V> extends GridCacheMessage<K, V> imple reader.incrementState(); case 5: - topVer = AffinityTopologyVersion.readFrom(reader); + topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55a9c501/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java index 1e8ba38..89f46ec 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java @@ -217,7 +217,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> { writer.incrementState(); case 6: - if (!topVer.writeTo(writer)) + if (!writer.writeMessage("topVer", topVer)) return false; writer.incrementState(); @@ -275,7 +275,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> { reader.incrementState(); case 6: - topVer = AffinityTopologyVersion.readFrom(reader); + topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55a9c501/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java index 52fb062..4dc43e9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java @@ -89,7 +89,7 @@ public class GridDhtAffinityAssignmentRequest<K, V> extends GridCacheMessage<K, switch (writer.state()) { case 3: - if (!topVer.writeTo(writer)) + if (!writer.writeMessage("topVer", topVer)) return false; writer.incrementState(); @@ -111,7 +111,7 @@ public class GridDhtAffinityAssignmentRequest<K, V> extends GridCacheMessage<K, switch (reader.state()) { case 3: - topVer = AffinityTopologyVersion.readFrom(reader); + topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55a9c501/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java index 2e32632..ff3eb8a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java @@ -136,7 +136,7 @@ public class GridDhtAffinityAssignmentResponse<K, V> extends GridCacheMessage<K, writer.incrementState(); case 4: - if (!topVer.writeTo(writer)) + if (!writer.writeMessage("topVer", topVer)) return false; writer.incrementState(); @@ -166,7 +166,7 @@ public class GridDhtAffinityAssignmentResponse<K, V> extends GridCacheMessage<K, reader.incrementState(); case 4: - topVer = AffinityTopologyVersion.readFrom(reader); + topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55a9c501/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 c7f5d85..0e0cde7 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 @@ -401,7 +401,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { writer.incrementState(); case 30: - if (!topVer.writeTo(writer)) + if (!writer.writeMessage("topVer", topVer)) return false; writer.incrementState(); @@ -487,7 +487,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { reader.incrementState(); case 30: - topVer = AffinityTopologyVersion.readFrom(reader); + topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55a9c501/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 3daace5..6d6446f 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 @@ -282,7 +282,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest writer.incrementState(); case 26: - if (!topVer.writeTo(writer)) + if (!writer.writeMessage("topVer", topVer)) return false; writer.incrementState(); @@ -370,7 +370,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest reader.incrementState(); case 26: - topVer = AffinityTopologyVersion.readFrom(reader); + topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55a9c501/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 8d894ec..c913137 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 @@ -396,7 +396,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque writer.incrementState(); case 34: - if (!topVer.writeTo(writer)) + if (!writer.writeMessage("topVer", topVer)) return false; writer.incrementState(); @@ -506,7 +506,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque reader.incrementState(); case 34: - topVer = AffinityTopologyVersion.readFrom(reader); + topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55a9c501/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java index 685c466..25c5862 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java @@ -779,7 +779,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp writer.incrementState(); case 19: - if (!topVer.writeTo(writer)) + if (!writer.writeMessage("topVer", topVer)) return false; writer.incrementState(); @@ -951,7 +951,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp reader.incrementState(); case 19: - topVer = AffinityTopologyVersion.readFrom(reader); + topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55a9c501/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java index 7457b0b..f782402 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java @@ -643,7 +643,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im writer.incrementState(); case 19: - if (!topVer.writeTo(writer)) + if (!writer.writeMessage("topVer", topVer)) return false; writer.incrementState(); @@ -813,7 +813,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im reader.incrementState(); case 19: - topVer = AffinityTopologyVersion.readFrom(reader); + topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55a9c501/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java index a17c5b74..fa6cd29 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java @@ -197,7 +197,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem writer.incrementState(); case 6: - if (!topVer.writeTo(writer)) + if (!writer.writeMessage("topVer", topVer)) return false; writer.incrementState(); @@ -243,7 +243,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem reader.incrementState(); case 6: - topVer = AffinityTopologyVersion.readFrom(reader); + topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55a9c501/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java index 84b376a..b609197 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java @@ -219,7 +219,7 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V> writer.incrementState(); case 5: - if (!topVer.writeTo(writer)) + if (!writer.writeMessage("topVer", topVer)) return false; writer.incrementState(); @@ -275,7 +275,7 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V> reader.incrementState(); case 5: - topVer = AffinityTopologyVersion.readFrom(reader); + topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55a9c501/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java index 71add90..d101efd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java @@ -173,7 +173,7 @@ public class GridDhtPartitionExchangeId implements Message, Comparable<GridDhtPa writer.incrementState(); case 2: - if (!topVer.writeTo(writer)) + if (!writer.writeMessage("topVer", topVer)) return false; writer.incrementState(); @@ -208,7 +208,7 @@ public class GridDhtPartitionExchangeId implements Message, Comparable<GridDhtPa reader.incrementState(); case 2: - topVer = AffinityTopologyVersion.readFrom(reader); + topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55a9c501/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java index b7cbf5e..fb30196 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java @@ -138,7 +138,7 @@ public class GridDhtPartitionsFullMessage<K, V> extends GridDhtPartitionsAbstrac writer.incrementState(); case 6: - if (!topVer.writeTo(writer)) + if (!writer.writeMessage("topVer", topVer)) return false; writer.incrementState(); @@ -168,7 +168,7 @@ public class GridDhtPartitionsFullMessage<K, V> extends GridDhtPartitionsAbstrac reader.incrementState(); case 6: - topVer = AffinityTopologyVersion.readFrom(reader); + topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55a9c501/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java index 30126f8..bfe6768 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java @@ -310,7 +310,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements writer.incrementState(); case 12: - if (!topVer.writeTo(writer)) + if (!writer.writeMessage("topVer", topVer)) return false; writer.incrementState(); @@ -410,7 +410,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements reader.incrementState(); case 12: - topVer = AffinityTopologyVersion.readFrom(reader); + topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55a9c501/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java index 10b7291..f8013b6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java @@ -247,7 +247,7 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements writer.incrementState(); case 8: - if (!topVer.writeTo(writer)) + if (!writer.writeMessage("topVer", topVer)) return false; writer.incrementState(); @@ -315,7 +315,7 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements reader.incrementState(); case 8: - topVer = AffinityTopologyVersion.readFrom(reader); + topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55a9c501/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 e8c071b..48608e6 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 @@ -404,7 +404,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> writer.incrementState(); case 33: - if (!topVer.writeTo(writer)) + if (!writer.writeMessage("topVer", topVer)) return false; writer.incrementState(); @@ -514,7 +514,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> reader.incrementState(); case 33: - topVer = AffinityTopologyVersion.readFrom(reader); + topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55a9c501/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 fc843df..eec5d58 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 @@ -199,7 +199,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques writer.incrementState(); case 24: - if (!topVer.writeTo(writer)) + if (!writer.writeMessage("topVer", topVer)) return false; writer.incrementState(); @@ -261,7 +261,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques reader.incrementState(); case 24: - topVer = AffinityTopologyVersion.readFrom(reader); + topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55a9c501/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 4df0bb8..4cd82ef 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 @@ -313,7 +313,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ writer.incrementState(); case 32: - if (!topVer.writeTo(writer)) + if (!writer.writeMessage("topVer", topVer)) return false; writer.incrementState(); @@ -407,7 +407,7 @@ public class GridNearTxPrepareRequest<K, V> extends GridDistributedTxPrepareRequ reader.incrementState(); case 32: - topVer = AffinityTopologyVersion.readFrom(reader); + topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) return false;
