http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01689b1d/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 20f9cc3..5455a7c 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 @@ -348,7 +348,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -356,55 +356,55 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { switch (writer.state()) { case 24: - if (!writer.writeField("accessTtl", accessTtl, MessageFieldType.LONG)) + if (!writer.writeLong("accessTtl", accessTtl)) return false; writer.incrementState(); case 25: - if (!writer.writeField("invalidateEntries", invalidateEntries, MessageFieldType.BIT_SET)) + if (!writer.writeBitSet("invalidateEntries", invalidateEntries)) return false; writer.incrementState(); case 26: - if (!writer.writeField("miniId", miniId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); case 27: - if (!writer.writeCollectionField("nearKeyBytes", nearKeyBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("nearKeyBytes", nearKeyBytes, MessageFieldType.BYTE_ARR)) return false; writer.incrementState(); case 28: - if (!writer.writeField("ownedBytes", ownedBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("ownedBytes", ownedBytes)) return false; writer.incrementState(); case 29: - if (!writer.writeField("preloadKeys", preloadKeys, MessageFieldType.BIT_SET)) + if (!writer.writeBitSet("preloadKeys", preloadKeys)) return false; writer.incrementState(); case 30: - if (!writer.writeField("subjId", subjId, MessageFieldType.UUID)) + if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); case 31: - if (!writer.writeField("taskNameHash", taskNameHash, MessageFieldType.INT)) + if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); case 32: - if (!writer.writeField("topVer", topVer, MessageFieldType.LONG)) + if (!writer.writeLong("topVer", topVer)) return false; writer.incrementState(); @@ -423,7 +423,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { switch (readState) { case 24: - accessTtl = reader.readField("accessTtl", MessageFieldType.LONG); + accessTtl = reader.readLong("accessTtl"); if (!reader.isLastRead()) return false; @@ -431,7 +431,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { readState++; case 25: - invalidateEntries = reader.readField("invalidateEntries", MessageFieldType.BIT_SET); + invalidateEntries = reader.readBitSet("invalidateEntries"); if (!reader.isLastRead()) return false; @@ -439,7 +439,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { readState++; case 26: - miniId = reader.readField("miniId", MessageFieldType.IGNITE_UUID); + miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) return false; @@ -447,7 +447,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { readState++; case 27: - nearKeyBytes = reader.readCollectionField("nearKeyBytes", MessageFieldType.BYTE_ARR); + nearKeyBytes = reader.readCollection("nearKeyBytes", MessageFieldType.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -455,7 +455,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { readState++; case 28: - ownedBytes = reader.readField("ownedBytes", MessageFieldType.BYTE_ARR); + ownedBytes = reader.readByteArray("ownedBytes"); if (!reader.isLastRead()) return false; @@ -463,7 +463,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { readState++; case 29: - preloadKeys = reader.readField("preloadKeys", MessageFieldType.BIT_SET); + preloadKeys = reader.readBitSet("preloadKeys"); if (!reader.isLastRead()) return false; @@ -471,7 +471,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { readState++; case 30: - subjId = reader.readField("subjId", MessageFieldType.UUID); + subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) return false; @@ -479,7 +479,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { readState++; case 31: - taskNameHash = reader.readField("taskNameHash", MessageFieldType.INT); + taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) return false; @@ -487,7 +487,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { readState++; case 32: - topVer = reader.readField("topVer", MessageFieldType.LONG); + topVer = reader.readLong("topVer"); if (!reader.isLastRead()) return false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01689b1d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java index 7619de0..038bdda 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java @@ -206,7 +206,7 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V> return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -214,25 +214,25 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V> switch (writer.state()) { case 11: - if (!writer.writeCollectionField("invalidParts", invalidParts, MessageFieldType.INT)) + if (!writer.writeCollection("invalidParts", invalidParts, MessageFieldType.INT)) return false; writer.incrementState(); case 12: - if (!writer.writeField("miniId", miniId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); case 13: - if (!writer.writeCollectionField("nearEvictedBytes", nearEvictedBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("nearEvictedBytes", nearEvictedBytes, MessageFieldType.BYTE_ARR)) return false; writer.incrementState(); case 14: - if (!writer.writeCollectionField("preloadEntriesBytes", preloadEntriesBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("preloadEntriesBytes", preloadEntriesBytes, MessageFieldType.BYTE_ARR)) return false; writer.incrementState(); @@ -251,7 +251,7 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V> switch (readState) { case 11: - invalidParts = reader.readCollectionField("invalidParts", MessageFieldType.INT); + invalidParts = reader.readCollection("invalidParts", MessageFieldType.INT); if (!reader.isLastRead()) return false; @@ -259,7 +259,7 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V> readState++; case 12: - miniId = reader.readField("miniId", MessageFieldType.IGNITE_UUID); + miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) return false; @@ -267,7 +267,7 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V> readState++; case 13: - nearEvictedBytes = reader.readCollectionField("nearEvictedBytes", MessageFieldType.BYTE_ARR); + nearEvictedBytes = reader.readCollection("nearEvictedBytes", MessageFieldType.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -275,7 +275,7 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V> readState++; case 14: - preloadEntriesBytes = reader.readCollectionField("preloadEntriesBytes", MessageFieldType.BYTE_ARR); + preloadEntriesBytes = reader.readCollection("preloadEntriesBytes", MessageFieldType.BYTE_ARR); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01689b1d/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 7ec40ed..e67535a 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 @@ -355,7 +355,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -363,79 +363,79 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest switch (writer.state()) { case 21: - if (!writer.writeField("isolation", isolation != null ? (byte)isolation.ordinal() : -1, MessageFieldType.BYTE)) + if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1)) return false; writer.incrementState(); case 22: - if (!writer.writeField("miniId", miniId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); case 23: - if (!writer.writeField("nearNodeId", nearNodeId, MessageFieldType.UUID)) + if (!writer.writeUuid("nearNodeId", nearNodeId)) return false; writer.incrementState(); case 24: - if (!writer.writeField("nearTtls", nearTtls, MessageFieldType.MSG)) + if (!writer.writeMessage("nearTtls", nearTtls)) return false; writer.incrementState(); case 25: - if (!writer.writeCollectionField("nearWritesBytes", nearWritesBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("nearWritesBytes", nearWritesBytes, MessageFieldType.BYTE_ARR)) return false; writer.incrementState(); case 26: - if (!writer.writeField("onePhaseCommit", onePhaseCommit, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("onePhaseCommit", onePhaseCommit)) return false; writer.incrementState(); case 27: - if (!writer.writeCollectionField("pendingVers", pendingVers, MessageFieldType.MSG)) + if (!writer.writeCollection("pendingVers", pendingVers, MessageFieldType.MSG)) return false; writer.incrementState(); case 28: - if (!writer.writeField("subjId", subjId, MessageFieldType.UUID)) + if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); case 29: - if (!writer.writeField("sysInvalidate", sysInvalidate, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("sysInvalidate", sysInvalidate)) return false; writer.incrementState(); case 30: - if (!writer.writeField("taskNameHash", taskNameHash, MessageFieldType.INT)) + if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); case 31: - if (!writer.writeField("topVer", topVer, MessageFieldType.LONG)) + if (!writer.writeLong("topVer", topVer)) return false; writer.incrementState(); case 32: - if (!writer.writeField("ttls", ttls, MessageFieldType.MSG)) + if (!writer.writeMessage("ttls", ttls)) return false; writer.incrementState(); case 33: - if (!writer.writeField("writeVer", writeVer, MessageFieldType.MSG)) + if (!writer.writeMessage("writeVer", writeVer)) return false; writer.incrementState(); @@ -456,7 +456,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest case 21: byte isolationOrd; - isolationOrd = reader.readField("isolation", MessageFieldType.BYTE); + isolationOrd = reader.readByte("isolation"); if (!reader.isLastRead()) return false; @@ -466,7 +466,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest readState++; case 22: - miniId = reader.readField("miniId", MessageFieldType.IGNITE_UUID); + miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) return false; @@ -474,7 +474,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest readState++; case 23: - nearNodeId = reader.readField("nearNodeId", MessageFieldType.UUID); + nearNodeId = reader.readUuid("nearNodeId"); if (!reader.isLastRead()) return false; @@ -482,7 +482,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest readState++; case 24: - nearTtls = reader.readField("nearTtls", MessageFieldType.MSG); + nearTtls = reader.readMessage("nearTtls"); if (!reader.isLastRead()) return false; @@ -490,7 +490,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest readState++; case 25: - nearWritesBytes = reader.readCollectionField("nearWritesBytes", MessageFieldType.BYTE_ARR); + nearWritesBytes = reader.readCollection("nearWritesBytes", MessageFieldType.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -498,7 +498,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest readState++; case 26: - onePhaseCommit = reader.readField("onePhaseCommit", MessageFieldType.BOOLEAN); + onePhaseCommit = reader.readBoolean("onePhaseCommit"); if (!reader.isLastRead()) return false; @@ -506,7 +506,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest readState++; case 27: - pendingVers = reader.readCollectionField("pendingVers", MessageFieldType.MSG); + pendingVers = reader.readCollection("pendingVers", MessageFieldType.MSG); if (!reader.isLastRead()) return false; @@ -514,7 +514,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest readState++; case 28: - subjId = reader.readField("subjId", MessageFieldType.UUID); + subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) return false; @@ -522,7 +522,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest readState++; case 29: - sysInvalidate = reader.readField("sysInvalidate", MessageFieldType.BOOLEAN); + sysInvalidate = reader.readBoolean("sysInvalidate"); if (!reader.isLastRead()) return false; @@ -530,7 +530,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest readState++; case 30: - taskNameHash = reader.readField("taskNameHash", MessageFieldType.INT); + taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) return false; @@ -538,7 +538,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest readState++; case 31: - topVer = reader.readField("topVer", MessageFieldType.LONG); + topVer = reader.readLong("topVer"); if (!reader.isLastRead()) return false; @@ -546,7 +546,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest readState++; case 32: - ttls = reader.readField("ttls", MessageFieldType.MSG); + ttls = reader.readMessage("ttls"); if (!reader.isLastRead()) return false; @@ -554,7 +554,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest readState++; case 33: - writeVer = reader.readField("writeVer", MessageFieldType.MSG); + writeVer = reader.readMessage("writeVer"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01689b1d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java index d869b44..c2595c8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java @@ -76,7 +76,7 @@ public class GridDhtTxFinishResponse<K, V> extends GridDistributedTxFinishRespon return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -84,7 +84,7 @@ public class GridDhtTxFinishResponse<K, V> extends GridDistributedTxFinishRespon switch (writer.state()) { case 5: - if (!writer.writeField("miniId", miniId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); @@ -103,7 +103,7 @@ public class GridDhtTxFinishResponse<K, V> extends GridDistributedTxFinishRespon switch (readState) { case 5: - miniId = reader.readField("miniId", MessageFieldType.IGNITE_UUID); + miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01689b1d/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 aa13f06..bcf2e7d 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 @@ -319,7 +319,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -327,73 +327,73 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque switch (writer.state()) { case 22: - if (!writer.writeField("futId", futId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); case 23: - if (!writer.writeField("invalidateNearEntries", invalidateNearEntries, MessageFieldType.BIT_SET)) + if (!writer.writeBitSet("invalidateNearEntries", invalidateNearEntries)) return false; writer.incrementState(); case 24: - if (!writer.writeField("last", last, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("last", last)) return false; writer.incrementState(); case 25: - if (!writer.writeField("miniId", miniId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); case 26: - if (!writer.writeField("nearNodeId", nearNodeId, MessageFieldType.UUID)) + if (!writer.writeUuid("nearNodeId", nearNodeId)) return false; writer.incrementState(); case 27: - if (!writer.writeCollectionField("nearWritesBytes", nearWritesBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("nearWritesBytes", nearWritesBytes, MessageFieldType.BYTE_ARR)) return false; writer.incrementState(); case 28: - if (!writer.writeField("nearXidVer", nearXidVer, MessageFieldType.MSG)) + if (!writer.writeMessage("nearXidVer", nearXidVer)) return false; writer.incrementState(); case 29: - if (!writer.writeField("ownedBytes", ownedBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("ownedBytes", ownedBytes)) return false; writer.incrementState(); case 30: - if (!writer.writeField("preloadKeys", preloadKeys, MessageFieldType.BIT_SET)) + if (!writer.writeBitSet("preloadKeys", preloadKeys)) return false; writer.incrementState(); case 31: - if (!writer.writeField("subjId", subjId, MessageFieldType.UUID)) + if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); case 32: - if (!writer.writeField("taskNameHash", taskNameHash, MessageFieldType.INT)) + if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); case 33: - if (!writer.writeField("topVer", topVer, MessageFieldType.LONG)) + if (!writer.writeLong("topVer", topVer)) return false; writer.incrementState(); @@ -412,7 +412,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque switch (readState) { case 22: - futId = reader.readField("futId", MessageFieldType.IGNITE_UUID); + futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) return false; @@ -420,7 +420,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque readState++; case 23: - invalidateNearEntries = reader.readField("invalidateNearEntries", MessageFieldType.BIT_SET); + invalidateNearEntries = reader.readBitSet("invalidateNearEntries"); if (!reader.isLastRead()) return false; @@ -428,7 +428,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque readState++; case 24: - last = reader.readField("last", MessageFieldType.BOOLEAN); + last = reader.readBoolean("last"); if (!reader.isLastRead()) return false; @@ -436,7 +436,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque readState++; case 25: - miniId = reader.readField("miniId", MessageFieldType.IGNITE_UUID); + miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) return false; @@ -444,7 +444,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque readState++; case 26: - nearNodeId = reader.readField("nearNodeId", MessageFieldType.UUID); + nearNodeId = reader.readUuid("nearNodeId"); if (!reader.isLastRead()) return false; @@ -452,7 +452,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque readState++; case 27: - nearWritesBytes = reader.readCollectionField("nearWritesBytes", MessageFieldType.BYTE_ARR); + nearWritesBytes = reader.readCollection("nearWritesBytes", MessageFieldType.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -460,7 +460,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque readState++; case 28: - nearXidVer = reader.readField("nearXidVer", MessageFieldType.MSG); + nearXidVer = reader.readMessage("nearXidVer"); if (!reader.isLastRead()) return false; @@ -468,7 +468,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque readState++; case 29: - ownedBytes = reader.readField("ownedBytes", MessageFieldType.BYTE_ARR); + ownedBytes = reader.readByteArray("ownedBytes"); if (!reader.isLastRead()) return false; @@ -476,7 +476,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque readState++; case 30: - preloadKeys = reader.readField("preloadKeys", MessageFieldType.BIT_SET); + preloadKeys = reader.readBitSet("preloadKeys"); if (!reader.isLastRead()) return false; @@ -484,7 +484,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque readState++; case 31: - subjId = reader.readField("subjId", MessageFieldType.UUID); + subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) return false; @@ -492,7 +492,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque readState++; case 32: - taskNameHash = reader.readField("taskNameHash", MessageFieldType.INT); + taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) return false; @@ -500,7 +500,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque readState++; case 33: - topVer = reader.readField("topVer", MessageFieldType.LONG); + topVer = reader.readLong("topVer"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01689b1d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java index d783485..e3a3a0d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java @@ -212,7 +212,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -220,31 +220,31 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp switch (writer.state()) { case 10: - if (!writer.writeField("futId", futId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); case 11: - if (!writer.writeCollectionField("invalidParts", invalidParts, MessageFieldType.INT)) + if (!writer.writeCollection("invalidParts", invalidParts, MessageFieldType.INT)) return false; writer.incrementState(); case 12: - if (!writer.writeField("miniId", miniId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); case 13: - if (!writer.writeCollectionField("nearEvictedBytes", nearEvictedBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("nearEvictedBytes", nearEvictedBytes, MessageFieldType.BYTE_ARR)) return false; writer.incrementState(); case 14: - if (!writer.writeCollectionField("preloadEntriesBytes", preloadEntriesBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("preloadEntriesBytes", preloadEntriesBytes, MessageFieldType.BYTE_ARR)) return false; writer.incrementState(); @@ -263,7 +263,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp switch (readState) { case 10: - futId = reader.readField("futId", MessageFieldType.IGNITE_UUID); + futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) return false; @@ -271,7 +271,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp readState++; case 11: - invalidParts = reader.readCollectionField("invalidParts", MessageFieldType.INT); + invalidParts = reader.readCollection("invalidParts", MessageFieldType.INT); if (!reader.isLastRead()) return false; @@ -279,7 +279,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp readState++; case 12: - miniId = reader.readField("miniId", MessageFieldType.IGNITE_UUID); + miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) return false; @@ -287,7 +287,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp readState++; case 13: - nearEvictedBytes = reader.readCollectionField("nearEvictedBytes", MessageFieldType.BYTE_ARR); + nearEvictedBytes = reader.readCollection("nearEvictedBytes", MessageFieldType.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -295,7 +295,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp readState++; case 14: - preloadEntriesBytes = reader.readCollectionField("preloadEntriesBytes", MessageFieldType.BYTE_ARR); + preloadEntriesBytes = reader.readCollection("preloadEntriesBytes", MessageFieldType.BYTE_ARR); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01689b1d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java index 0e5b9d5..5c8efbe 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java @@ -111,7 +111,7 @@ public class GridDhtUnlockRequest<K, V> extends GridDistributedUnlockRequest<K, return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -119,7 +119,7 @@ public class GridDhtUnlockRequest<K, V> extends GridDistributedUnlockRequest<K, switch (writer.state()) { case 9: - if (!writer.writeCollectionField("nearKeyBytes", nearKeyBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("nearKeyBytes", nearKeyBytes, MessageFieldType.BYTE_ARR)) return false; writer.incrementState(); @@ -138,7 +138,7 @@ public class GridDhtUnlockRequest<K, V> extends GridDistributedUnlockRequest<K, switch (readState) { case 9: - nearKeyBytes = reader.readCollectionField("nearKeyBytes", MessageFieldType.BYTE_ARR); + nearKeyBytes = reader.readCollection("nearKeyBytes", MessageFieldType.BYTE_ARR); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01689b1d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java index 5a1216f..77d858b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java @@ -80,7 +80,7 @@ public class GridDhtAtomicDeferredUpdateResponse<K, V> extends GridCacheMessage< return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -88,7 +88,7 @@ public class GridDhtAtomicDeferredUpdateResponse<K, V> extends GridCacheMessage< switch (writer.state()) { case 3: - if (!writer.writeCollectionField("futVers", futVers, MessageFieldType.MSG)) + if (!writer.writeCollection("futVers", futVers, MessageFieldType.MSG)) return false; writer.incrementState(); @@ -107,7 +107,7 @@ public class GridDhtAtomicDeferredUpdateResponse<K, V> extends GridCacheMessage< switch (readState) { case 3: - futVers = reader.readCollectionField("futVers", MessageFieldType.MSG); + futVers = reader.readCollection("futVers", MessageFieldType.MSG); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01689b1d/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 80906fd..2f33351 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 @@ -688,7 +688,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -696,121 +696,121 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp switch (writer.state()) { case 3: - if (!writer.writeField("drExpireTimes", drExpireTimes, MessageFieldType.MSG)) + if (!writer.writeMessage("drExpireTimes", drExpireTimes)) return false; writer.incrementState(); case 4: - if (!writer.writeCollectionField("drVers", drVers, MessageFieldType.MSG)) + if (!writer.writeCollection("drVers", drVers, MessageFieldType.MSG)) return false; writer.incrementState(); case 5: - if (!writer.writeCollectionField("entryProcessorsBytes", entryProcessorsBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("entryProcessorsBytes", entryProcessorsBytes, MessageFieldType.BYTE_ARR)) return false; writer.incrementState(); case 6: - if (!writer.writeField("forceTransformBackups", forceTransformBackups, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("forceTransformBackups", forceTransformBackups)) return false; writer.incrementState(); case 7: - if (!writer.writeField("futVer", futVer, MessageFieldType.MSG)) + if (!writer.writeMessage("futVer", futVer)) return false; writer.incrementState(); case 8: - if (!writer.writeArrayField("invokeArgsBytes", invokeArgsBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeObjectArray("invokeArgsBytes", invokeArgsBytes, MessageFieldType.BYTE_ARR)) return false; writer.incrementState(); case 9: - if (!writer.writeCollectionField("keyBytes", keyBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("keyBytes", keyBytes, MessageFieldType.BYTE_ARR)) return false; writer.incrementState(); case 10: - if (!writer.writeCollectionField("nearEntryProcessorsBytes", nearEntryProcessorsBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("nearEntryProcessorsBytes", nearEntryProcessorsBytes, MessageFieldType.BYTE_ARR)) return false; writer.incrementState(); case 11: - if (!writer.writeField("nearExpireTimes", nearExpireTimes, MessageFieldType.MSG)) + if (!writer.writeMessage("nearExpireTimes", nearExpireTimes)) return false; writer.incrementState(); case 12: - if (!writer.writeCollectionField("nearKeyBytes", nearKeyBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("nearKeyBytes", nearKeyBytes, MessageFieldType.BYTE_ARR)) return false; writer.incrementState(); case 13: - if (!writer.writeField("nearTtls", nearTtls, MessageFieldType.MSG)) + if (!writer.writeMessage("nearTtls", nearTtls)) return false; writer.incrementState(); case 14: - if (!writer.writeCollectionField("nearValBytes", nearValBytes, MessageFieldType.MSG)) + if (!writer.writeCollection("nearValBytes", nearValBytes, MessageFieldType.MSG)) return false; writer.incrementState(); case 15: - if (!writer.writeField("nodeId", nodeId, MessageFieldType.UUID)) + if (!writer.writeUuid("nodeId", nodeId)) return false; writer.incrementState(); case 16: - if (!writer.writeField("subjId", subjId, MessageFieldType.UUID)) + if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); case 17: - if (!writer.writeField("syncMode", syncMode != null ? (byte)syncMode.ordinal() : -1, MessageFieldType.BYTE)) + if (!writer.writeByte("syncMode", syncMode != null ? (byte)syncMode.ordinal() : -1)) return false; writer.incrementState(); case 18: - if (!writer.writeField("taskNameHash", taskNameHash, MessageFieldType.INT)) + if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); case 19: - if (!writer.writeField("topVer", topVer, MessageFieldType.LONG)) + if (!writer.writeLong("topVer", topVer)) return false; writer.incrementState(); case 20: - if (!writer.writeField("ttls", ttls, MessageFieldType.MSG)) + if (!writer.writeMessage("ttls", ttls)) return false; writer.incrementState(); case 21: - if (!writer.writeCollectionField("valBytes", valBytes, MessageFieldType.MSG)) + if (!writer.writeCollection("valBytes", valBytes, MessageFieldType.MSG)) return false; writer.incrementState(); case 22: - if (!writer.writeField("writeVer", writeVer, MessageFieldType.MSG)) + if (!writer.writeMessage("writeVer", writeVer)) return false; writer.incrementState(); @@ -829,7 +829,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp switch (readState) { case 3: - drExpireTimes = reader.readField("drExpireTimes", MessageFieldType.MSG); + drExpireTimes = reader.readMessage("drExpireTimes"); if (!reader.isLastRead()) return false; @@ -837,7 +837,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp readState++; case 4: - drVers = reader.readCollectionField("drVers", MessageFieldType.MSG); + drVers = reader.readCollection("drVers", MessageFieldType.MSG); if (!reader.isLastRead()) return false; @@ -845,7 +845,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp readState++; case 5: - entryProcessorsBytes = reader.readCollectionField("entryProcessorsBytes", MessageFieldType.BYTE_ARR); + entryProcessorsBytes = reader.readCollection("entryProcessorsBytes", MessageFieldType.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -853,7 +853,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp readState++; case 6: - forceTransformBackups = reader.readField("forceTransformBackups", MessageFieldType.BOOLEAN); + forceTransformBackups = reader.readBoolean("forceTransformBackups"); if (!reader.isLastRead()) return false; @@ -861,7 +861,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp readState++; case 7: - futVer = reader.readField("futVer", MessageFieldType.MSG); + futVer = reader.readMessage("futVer"); if (!reader.isLastRead()) return false; @@ -869,7 +869,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp readState++; case 8: - invokeArgsBytes = reader.readArrayField("invokeArgsBytes", MessageFieldType.BYTE_ARR, byte[].class); + invokeArgsBytes = reader.readObjectArray("invokeArgsBytes", MessageFieldType.BYTE_ARR, byte[].class); if (!reader.isLastRead()) return false; @@ -877,7 +877,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp readState++; case 9: - keyBytes = reader.readCollectionField("keyBytes", MessageFieldType.BYTE_ARR); + keyBytes = reader.readCollection("keyBytes", MessageFieldType.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -885,7 +885,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp readState++; case 10: - nearEntryProcessorsBytes = reader.readCollectionField("nearEntryProcessorsBytes", MessageFieldType.BYTE_ARR); + nearEntryProcessorsBytes = reader.readCollection("nearEntryProcessorsBytes", MessageFieldType.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -893,7 +893,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp readState++; case 11: - nearExpireTimes = reader.readField("nearExpireTimes", MessageFieldType.MSG); + nearExpireTimes = reader.readMessage("nearExpireTimes"); if (!reader.isLastRead()) return false; @@ -901,7 +901,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp readState++; case 12: - nearKeyBytes = reader.readCollectionField("nearKeyBytes", MessageFieldType.BYTE_ARR); + nearKeyBytes = reader.readCollection("nearKeyBytes", MessageFieldType.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -909,7 +909,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp readState++; case 13: - nearTtls = reader.readField("nearTtls", MessageFieldType.MSG); + nearTtls = reader.readMessage("nearTtls"); if (!reader.isLastRead()) return false; @@ -917,7 +917,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp readState++; case 14: - nearValBytes = reader.readCollectionField("nearValBytes", MessageFieldType.MSG); + nearValBytes = reader.readCollection("nearValBytes", MessageFieldType.MSG); if (!reader.isLastRead()) return false; @@ -925,7 +925,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp readState++; case 15: - nodeId = reader.readField("nodeId", MessageFieldType.UUID); + nodeId = reader.readUuid("nodeId"); if (!reader.isLastRead()) return false; @@ -933,7 +933,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp readState++; case 16: - subjId = reader.readField("subjId", MessageFieldType.UUID); + subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) return false; @@ -943,7 +943,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp case 17: byte syncModeOrd; - syncModeOrd = reader.readField("syncMode", MessageFieldType.BYTE); + syncModeOrd = reader.readByte("syncMode"); if (!reader.isLastRead()) return false; @@ -953,7 +953,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp readState++; case 18: - taskNameHash = reader.readField("taskNameHash", MessageFieldType.INT); + taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) return false; @@ -961,7 +961,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp readState++; case 19: - topVer = reader.readField("topVer", MessageFieldType.LONG); + topVer = reader.readLong("topVer"); if (!reader.isLastRead()) return false; @@ -969,7 +969,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp readState++; case 20: - ttls = reader.readField("ttls", MessageFieldType.MSG); + ttls = reader.readMessage("ttls"); if (!reader.isLastRead()) return false; @@ -977,7 +977,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp readState++; case 21: - valBytes = reader.readCollectionField("valBytes", MessageFieldType.MSG); + valBytes = reader.readCollection("valBytes", MessageFieldType.MSG); if (!reader.isLastRead()) return false; @@ -985,7 +985,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp readState++; case 22: - writeVer = reader.readField("writeVer", MessageFieldType.MSG); + writeVer = reader.readMessage("writeVer"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01689b1d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java index a1034b7..0bf33ea 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java @@ -185,7 +185,7 @@ public class GridDhtAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> im return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -193,25 +193,25 @@ public class GridDhtAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> im switch (writer.state()) { case 3: - if (!writer.writeField("errBytes", errBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("errBytes", errBytes)) return false; writer.incrementState(); case 4: - if (!writer.writeField("failedKeysBytes", failedKeysBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("failedKeysBytes", failedKeysBytes)) return false; writer.incrementState(); case 5: - if (!writer.writeField("futVer", futVer, MessageFieldType.MSG)) + if (!writer.writeMessage("futVer", futVer)) return false; writer.incrementState(); case 6: - if (!writer.writeCollectionField("nearEvictedBytes", nearEvictedBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("nearEvictedBytes", nearEvictedBytes, MessageFieldType.BYTE_ARR)) return false; writer.incrementState(); @@ -230,7 +230,7 @@ public class GridDhtAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> im switch (readState) { case 3: - errBytes = reader.readField("errBytes", MessageFieldType.BYTE_ARR); + errBytes = reader.readByteArray("errBytes"); if (!reader.isLastRead()) return false; @@ -238,7 +238,7 @@ public class GridDhtAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> im readState++; case 4: - failedKeysBytes = reader.readField("failedKeysBytes", MessageFieldType.BYTE_ARR); + failedKeysBytes = reader.readByteArray("failedKeysBytes"); if (!reader.isLastRead()) return false; @@ -246,7 +246,7 @@ public class GridDhtAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> im readState++; case 5: - futVer = reader.readField("futVer", MessageFieldType.MSG); + futVer = reader.readMessage("futVer"); if (!reader.isLastRead()) return false; @@ -254,7 +254,7 @@ public class GridDhtAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> im readState++; case 6: - nearEvictedBytes = reader.readCollectionField("nearEvictedBytes", MessageFieldType.BYTE_ARR); + nearEvictedBytes = reader.readCollection("nearEvictedBytes", MessageFieldType.BYTE_ARR); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01689b1d/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 63816ba..50c1e5e 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 @@ -550,7 +550,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -558,115 +558,115 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im switch (writer.state()) { case 3: - if (!writer.writeField("drExpireTimes", drExpireTimes, MessageFieldType.MSG)) + if (!writer.writeMessage("drExpireTimes", drExpireTimes)) return false; writer.incrementState(); case 4: - if (!writer.writeField("drTtls", drTtls, MessageFieldType.MSG)) + if (!writer.writeMessage("drTtls", drTtls)) return false; writer.incrementState(); case 5: - if (!writer.writeCollectionField("drVers", drVers, MessageFieldType.MSG)) + if (!writer.writeCollection("drVers", drVers, MessageFieldType.MSG)) return false; writer.incrementState(); case 6: - if (!writer.writeField("expiryPlcBytes", expiryPlcBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("expiryPlcBytes", expiryPlcBytes)) return false; writer.incrementState(); case 7: - if (!writer.writeField("fastMap", fastMap, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("fastMap", fastMap)) return false; writer.incrementState(); case 8: - if (!writer.writeArrayField("filterBytes", filterBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeObjectArray("filterBytes", filterBytes, MessageFieldType.BYTE_ARR)) return false; writer.incrementState(); case 9: - if (!writer.writeField("forceTransformBackups", forceTransformBackups, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("forceTransformBackups", forceTransformBackups)) return false; writer.incrementState(); case 10: - if (!writer.writeField("futVer", futVer, MessageFieldType.MSG)) + if (!writer.writeMessage("futVer", futVer)) return false; writer.incrementState(); case 11: - if (!writer.writeField("hasPrimary", hasPrimary, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("hasPrimary", hasPrimary)) return false; writer.incrementState(); case 12: - if (!writer.writeArrayField("invokeArgsBytes", invokeArgsBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeObjectArray("invokeArgsBytes", invokeArgsBytes, MessageFieldType.BYTE_ARR)) return false; writer.incrementState(); case 13: - if (!writer.writeCollectionField("keyBytes", keyBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("keyBytes", keyBytes, MessageFieldType.BYTE_ARR)) return false; writer.incrementState(); case 14: - if (!writer.writeField("op", op != null ? (byte)op.ordinal() : -1, MessageFieldType.BYTE)) + if (!writer.writeByte("op", op != null ? (byte)op.ordinal() : -1)) return false; writer.incrementState(); case 15: - if (!writer.writeField("retval", retval, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("retval", retval)) return false; writer.incrementState(); case 16: - if (!writer.writeField("subjId", subjId, MessageFieldType.UUID)) + if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); case 17: - if (!writer.writeField("syncMode", syncMode != null ? (byte)syncMode.ordinal() : -1, MessageFieldType.BYTE)) + if (!writer.writeByte("syncMode", syncMode != null ? (byte)syncMode.ordinal() : -1)) return false; writer.incrementState(); case 18: - if (!writer.writeField("taskNameHash", taskNameHash, MessageFieldType.INT)) + if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); case 19: - if (!writer.writeField("topVer", topVer, MessageFieldType.LONG)) + if (!writer.writeLong("topVer", topVer)) return false; writer.incrementState(); case 20: - if (!writer.writeField("updateVer", updateVer, MessageFieldType.MSG)) + if (!writer.writeMessage("updateVer", updateVer)) return false; writer.incrementState(); case 21: - if (!writer.writeCollectionField("valBytes", valBytes, MessageFieldType.MSG)) + if (!writer.writeCollection("valBytes", valBytes, MessageFieldType.MSG)) return false; writer.incrementState(); @@ -685,7 +685,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im switch (readState) { case 3: - drExpireTimes = reader.readField("drExpireTimes", MessageFieldType.MSG); + drExpireTimes = reader.readMessage("drExpireTimes"); if (!reader.isLastRead()) return false; @@ -693,7 +693,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im readState++; case 4: - drTtls = reader.readField("drTtls", MessageFieldType.MSG); + drTtls = reader.readMessage("drTtls"); if (!reader.isLastRead()) return false; @@ -701,7 +701,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im readState++; case 5: - drVers = reader.readCollectionField("drVers", MessageFieldType.MSG); + drVers = reader.readCollection("drVers", MessageFieldType.MSG); if (!reader.isLastRead()) return false; @@ -709,7 +709,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im readState++; case 6: - expiryPlcBytes = reader.readField("expiryPlcBytes", MessageFieldType.BYTE_ARR); + expiryPlcBytes = reader.readByteArray("expiryPlcBytes"); if (!reader.isLastRead()) return false; @@ -717,7 +717,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im readState++; case 7: - fastMap = reader.readField("fastMap", MessageFieldType.BOOLEAN); + fastMap = reader.readBoolean("fastMap"); if (!reader.isLastRead()) return false; @@ -725,7 +725,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im readState++; case 8: - filterBytes = reader.readArrayField("filterBytes", MessageFieldType.BYTE_ARR, byte[].class); + filterBytes = reader.readObjectArray("filterBytes", MessageFieldType.BYTE_ARR, byte[].class); if (!reader.isLastRead()) return false; @@ -733,7 +733,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im readState++; case 9: - forceTransformBackups = reader.readField("forceTransformBackups", MessageFieldType.BOOLEAN); + forceTransformBackups = reader.readBoolean("forceTransformBackups"); if (!reader.isLastRead()) return false; @@ -741,7 +741,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im readState++; case 10: - futVer = reader.readField("futVer", MessageFieldType.MSG); + futVer = reader.readMessage("futVer"); if (!reader.isLastRead()) return false; @@ -749,7 +749,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im readState++; case 11: - hasPrimary = reader.readField("hasPrimary", MessageFieldType.BOOLEAN); + hasPrimary = reader.readBoolean("hasPrimary"); if (!reader.isLastRead()) return false; @@ -757,7 +757,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im readState++; case 12: - invokeArgsBytes = reader.readArrayField("invokeArgsBytes", MessageFieldType.BYTE_ARR, byte[].class); + invokeArgsBytes = reader.readObjectArray("invokeArgsBytes", MessageFieldType.BYTE_ARR, byte[].class); if (!reader.isLastRead()) return false; @@ -765,7 +765,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im readState++; case 13: - keyBytes = reader.readCollectionField("keyBytes", MessageFieldType.BYTE_ARR); + keyBytes = reader.readCollection("keyBytes", MessageFieldType.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -775,7 +775,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im case 14: byte opOrd; - opOrd = reader.readField("op", MessageFieldType.BYTE); + opOrd = reader.readByte("op"); if (!reader.isLastRead()) return false; @@ -785,7 +785,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im readState++; case 15: - retval = reader.readField("retval", MessageFieldType.BOOLEAN); + retval = reader.readBoolean("retval"); if (!reader.isLastRead()) return false; @@ -793,7 +793,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im readState++; case 16: - subjId = reader.readField("subjId", MessageFieldType.UUID); + subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) return false; @@ -803,7 +803,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im case 17: byte syncModeOrd; - syncModeOrd = reader.readField("syncMode", MessageFieldType.BYTE); + syncModeOrd = reader.readByte("syncMode"); if (!reader.isLastRead()) return false; @@ -813,7 +813,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im readState++; case 18: - taskNameHash = reader.readField("taskNameHash", MessageFieldType.INT); + taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) return false; @@ -821,7 +821,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im readState++; case 19: - topVer = reader.readField("topVer", MessageFieldType.LONG); + topVer = reader.readLong("topVer"); if (!reader.isLastRead()) return false; @@ -829,7 +829,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im readState++; case 20: - updateVer = reader.readField("updateVer", MessageFieldType.MSG); + updateVer = reader.readMessage("updateVer"); if (!reader.isLastRead()) return false; @@ -837,7 +837,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im readState++; case 21: - valBytes = reader.readCollectionField("valBytes", MessageFieldType.MSG); + valBytes = reader.readCollection("valBytes", MessageFieldType.MSG); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01689b1d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java index 817de0c..7912a07 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java @@ -425,7 +425,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -433,67 +433,67 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i switch (writer.state()) { case 3: - if (!writer.writeField("errBytes", errBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("errBytes", errBytes)) return false; writer.incrementState(); case 4: - if (!writer.writeField("failedKeysBytes", failedKeysBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("failedKeysBytes", failedKeysBytes)) return false; writer.incrementState(); case 5: - if (!writer.writeField("futVer", futVer, MessageFieldType.MSG)) + if (!writer.writeMessage("futVer", futVer)) return false; writer.incrementState(); case 6: - if (!writer.writeField("nearExpireTimes", nearExpireTimes, MessageFieldType.MSG)) + if (!writer.writeMessage("nearExpireTimes", nearExpireTimes)) return false; writer.incrementState(); case 7: - if (!writer.writeCollectionField("nearSkipIdxs", nearSkipIdxs, MessageFieldType.INT)) + if (!writer.writeCollection("nearSkipIdxs", nearSkipIdxs, MessageFieldType.INT)) return false; writer.incrementState(); case 8: - if (!writer.writeField("nearTtls", nearTtls, MessageFieldType.MSG)) + if (!writer.writeMessage("nearTtls", nearTtls)) return false; writer.incrementState(); case 9: - if (!writer.writeCollectionField("nearValBytes", nearValBytes, MessageFieldType.MSG)) + if (!writer.writeCollection("nearValBytes", nearValBytes, MessageFieldType.MSG)) return false; writer.incrementState(); case 10: - if (!writer.writeCollectionField("nearValsIdxs", nearValsIdxs, MessageFieldType.INT)) + if (!writer.writeCollection("nearValsIdxs", nearValsIdxs, MessageFieldType.INT)) return false; writer.incrementState(); case 11: - if (!writer.writeField("nearVer", nearVer, MessageFieldType.MSG)) + if (!writer.writeMessage("nearVer", nearVer)) return false; writer.incrementState(); case 12: - if (!writer.writeField("remapKeysBytes", remapKeysBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("remapKeysBytes", remapKeysBytes)) return false; writer.incrementState(); case 13: - if (!writer.writeField("retValBytes", retValBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("retValBytes", retValBytes)) return false; writer.incrementState(); @@ -512,7 +512,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i switch (readState) { case 3: - errBytes = reader.readField("errBytes", MessageFieldType.BYTE_ARR); + errBytes = reader.readByteArray("errBytes"); if (!reader.isLastRead()) return false; @@ -520,7 +520,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i readState++; case 4: - failedKeysBytes = reader.readField("failedKeysBytes", MessageFieldType.BYTE_ARR); + failedKeysBytes = reader.readByteArray("failedKeysBytes"); if (!reader.isLastRead()) return false; @@ -528,7 +528,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i readState++; case 5: - futVer = reader.readField("futVer", MessageFieldType.MSG); + futVer = reader.readMessage("futVer"); if (!reader.isLastRead()) return false; @@ -536,7 +536,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i readState++; case 6: - nearExpireTimes = reader.readField("nearExpireTimes", MessageFieldType.MSG); + nearExpireTimes = reader.readMessage("nearExpireTimes"); if (!reader.isLastRead()) return false; @@ -544,7 +544,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i readState++; case 7: - nearSkipIdxs = reader.readCollectionField("nearSkipIdxs", MessageFieldType.INT); + nearSkipIdxs = reader.readCollection("nearSkipIdxs", MessageFieldType.INT); if (!reader.isLastRead()) return false; @@ -552,7 +552,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i readState++; case 8: - nearTtls = reader.readField("nearTtls", MessageFieldType.MSG); + nearTtls = reader.readMessage("nearTtls"); if (!reader.isLastRead()) return false; @@ -560,7 +560,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i readState++; case 9: - nearValBytes = reader.readCollectionField("nearValBytes", MessageFieldType.MSG); + nearValBytes = reader.readCollection("nearValBytes", MessageFieldType.MSG); if (!reader.isLastRead()) return false; @@ -568,7 +568,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i readState++; case 10: - nearValsIdxs = reader.readCollectionField("nearValsIdxs", MessageFieldType.INT); + nearValsIdxs = reader.readCollection("nearValsIdxs", MessageFieldType.INT); if (!reader.isLastRead()) return false; @@ -576,7 +576,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i readState++; case 11: - nearVer = reader.readField("nearVer", MessageFieldType.MSG); + nearVer = reader.readMessage("nearVer"); if (!reader.isLastRead()) return false; @@ -584,7 +584,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i readState++; case 12: - remapKeysBytes = reader.readField("remapKeysBytes", MessageFieldType.BYTE_ARR); + remapKeysBytes = reader.readByteArray("remapKeysBytes"); if (!reader.isLastRead()) return false; @@ -592,7 +592,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i readState++; case 13: - retValBytes = reader.readField("retValBytes", MessageFieldType.BYTE_ARR); + retValBytes = reader.readByteArray("retValBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01689b1d/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 5bc1582..2e6e728 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 @@ -169,7 +169,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -177,25 +177,25 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem switch (writer.state()) { case 3: - if (!writer.writeField("futId", futId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); case 4: - if (!writer.writeCollectionField("keyBytes", keyBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("keyBytes", keyBytes, MessageFieldType.BYTE_ARR)) return false; writer.incrementState(); case 5: - if (!writer.writeField("miniId", miniId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); case 6: - if (!writer.writeField("topVer", topVer, MessageFieldType.LONG)) + if (!writer.writeLong("topVer", topVer)) return false; writer.incrementState(); @@ -214,7 +214,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem switch (readState) { case 3: - futId = reader.readField("futId", MessageFieldType.IGNITE_UUID); + futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) return false; @@ -222,7 +222,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem readState++; case 4: - keyBytes = reader.readCollectionField("keyBytes", MessageFieldType.BYTE_ARR); + keyBytes = reader.readCollection("keyBytes", MessageFieldType.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -230,7 +230,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem readState++; case 5: - miniId = reader.readField("miniId", MessageFieldType.IGNITE_UUID); + miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) return false; @@ -238,7 +238,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem readState++; case 6: - topVer = reader.readField("topVer", MessageFieldType.LONG); + topVer = reader.readLong("topVer"); if (!reader.isLastRead()) return false;
