Revert "ignite-nio - Removing message clone" This reverts commit af8edc04c356be979e4e10c6ed3574c43a547dfa.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/01689b1d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/01689b1d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/01689b1d Branch: refs/heads/ignite-nio Commit: 01689b1d576e02179c34eb1126b41b341c40eb52 Parents: 5085e46 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Sat Feb 14 23:19:33 2015 -0800 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Sat Feb 14 23:19:33 2015 -0800 ---------------------------------------------------------------------- .../CommunicationMessageCodeGenerator.java | 2 +- .../ignite/internal/GridJobCancelRequest.java | 14 +- .../ignite/internal/GridJobExecuteRequest.java | 86 +++---- .../ignite/internal/GridJobExecuteResponse.java | 30 +-- .../ignite/internal/GridJobSiblingsRequest.java | 10 +- .../internal/GridJobSiblingsResponse.java | 6 +- .../ignite/internal/GridTaskCancelRequest.java | 6 +- .../ignite/internal/GridTaskSessionRequest.java | 14 +- .../internal/direct/DirectMessageReader.java | 219 ++++++++++++------ .../internal/direct/DirectMessageWriter.java | 179 ++++++++------- .../checkpoint/GridCheckpointRequest.java | 14 +- .../managers/communication/GridIoMessage.java | 30 +-- .../communication/GridIoUserMessage.java | 30 +-- .../deployment/GridDeploymentInfoBean.java | 22 +- .../deployment/GridDeploymentRequest.java | 22 +- .../deployment/GridDeploymentResponse.java | 14 +- .../eventstorage/GridEventStorageMessage.java | 38 ++-- .../cache/GridCacheEvictionRequest.java | 14 +- .../cache/GridCacheEvictionResponse.java | 14 +- .../processors/cache/GridCacheMessage.java | 14 +- .../processors/cache/GridCacheValueBytes.java | 10 +- ...idCacheOptimisticCheckPreparedTxRequest.java | 22 +- ...dCacheOptimisticCheckPreparedTxResponse.java | 14 +- ...CachePessimisticCheckCommittedTxRequest.java | 30 +-- ...achePessimisticCheckCommittedTxResponse.java | 18 +- .../distributed/GridCacheTtlUpdateRequest.java | 26 +-- .../distributed/GridDistributedBaseMessage.java | 22 +- .../distributed/GridDistributedLockRequest.java | 66 +++--- .../GridDistributedLockResponse.java | 14 +- .../GridDistributedTxFinishRequest.java | 54 ++--- .../GridDistributedTxFinishResponse.java | 10 +- .../GridDistributedTxPrepareRequest.java | 58 ++--- .../GridDistributedTxPrepareResponse.java | 10 +- .../GridDistributedUnlockRequest.java | 6 +- .../dht/GridDhtAffinityAssignmentRequest.java | 6 +- .../dht/GridDhtAffinityAssignmentResponse.java | 10 +- .../distributed/dht/GridDhtLockRequest.java | 38 ++-- .../distributed/dht/GridDhtLockResponse.java | 18 +- .../distributed/dht/GridDhtTxFinishRequest.java | 54 ++--- .../dht/GridDhtTxFinishResponse.java | 6 +- .../dht/GridDhtTxPrepareRequest.java | 50 ++--- .../dht/GridDhtTxPrepareResponse.java | 22 +- .../distributed/dht/GridDhtUnlockRequest.java | 6 +- .../GridDhtAtomicDeferredUpdateResponse.java | 6 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 82 +++---- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 18 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 78 +++---- .../atomic/GridNearAtomicUpdateResponse.java | 46 ++-- .../dht/preloader/GridDhtForceKeysRequest.java | 18 +- .../dht/preloader/GridDhtForceKeysResponse.java | 18 +- .../GridDhtPartitionDemandMessage.java | 26 +-- .../preloader/GridDhtPartitionExchangeId.java | 14 +- .../GridDhtPartitionSupplyMessage.java | 26 +-- .../GridDhtPartitionsAbstractMessage.java | 10 +- .../preloader/GridDhtPartitionsFullMessage.java | 10 +- .../GridDhtPartitionsSingleMessage.java | 6 +- .../GridDhtPartitionsSingleRequest.java | 2 +- .../distributed/near/GridNearGetRequest.java | 46 ++-- .../distributed/near/GridNearGetResponse.java | 30 +-- .../distributed/near/GridNearLockRequest.java | 50 ++--- .../distributed/near/GridNearLockResponse.java | 22 +- .../near/GridNearTxFinishRequest.java | 26 +-- .../near/GridNearTxFinishResponse.java | 14 +- .../near/GridNearTxPrepareRequest.java | 34 +-- .../near/GridNearTxPrepareResponse.java | 26 +-- .../distributed/near/GridNearUnlockRequest.java | 2 +- .../cache/query/GridCacheQueryRequest.java | 78 +++---- .../cache/query/GridCacheQueryResponse.java | 26 +-- .../cache/version/GridCacheVersion.java | 18 +- .../clock/GridClockDeltaSnapshotMessage.java | 10 +- .../processors/clock/GridClockDeltaVersion.java | 10 +- .../continuous/GridContinuousMessage.java | 18 +- .../dataload/GridDataLoadRequest.java | 54 ++--- .../dataload/GridDataLoadResponse.java | 14 +- .../processors/igfs/IgfsAckMessage.java | 14 +- .../internal/processors/igfs/IgfsBlockKey.java | 18 +- .../processors/igfs/IgfsBlocksMessage.java | 14 +- .../igfs/IgfsCommunicationMessage.java | 2 +- .../processors/igfs/IgfsDeleteMessage.java | 10 +- .../processors/igfs/IgfsFileAffinityRange.java | 22 +- .../igfs/IgfsFragmentizerRequest.java | 10 +- .../igfs/IgfsFragmentizerResponse.java | 6 +- .../processors/igfs/IgfsSyncMessage.java | 10 +- .../handlers/task/GridTaskResultRequest.java | 10 +- .../handlers/task/GridTaskResultResponse.java | 18 +- .../streamer/GridStreamerCancelRequest.java | 6 +- .../streamer/GridStreamerExecutionRequest.java | 30 +-- .../streamer/GridStreamerResponse.java | 10 +- .../ignite/internal/util/GridByteArrayList.java | 10 +- .../ignite/internal/util/GridLongList.java | 10 +- .../extensions/communication/MessageReader.java | 177 ++++++++++++++- .../extensions/communication/MessageWriter.java | 224 +++++++++++++++---- .../jobstealing/JobStealingRequest.java | 6 +- 93 files changed, 1599 insertions(+), 1194 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01689b1d/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java ---------------------------------------------------------------------- diff --git a/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java index aca45a8..00c30ba 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java +++ b/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java @@ -344,7 +344,7 @@ public class CommunicationMessageCodeGenerator { indent++; - returnFalseIfFailed(code, "writer.writeMessageType", "directType()"); + returnFalseIfFailed(code, "writer.writeByte", "null", "directType()"); code.add(EMPTY); code.add(builder().a("writer.onTypeWritten();").toString()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01689b1d/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java index 74e57e1..4f9baff 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java @@ -114,7 +114,7 @@ public class GridJobCancelRequest extends MessageAdapter { writer.setBuffer(buf); if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -122,19 +122,19 @@ public class GridJobCancelRequest extends MessageAdapter { switch (writer.state()) { case 0: - if (!writer.writeField("jobId", jobId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("jobId", jobId)) return false; writer.incrementState(); case 1: - if (!writer.writeField("sesId", sesId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("sesId", sesId)) return false; writer.incrementState(); case 2: - if (!writer.writeField("sys", sys, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("sys", sys)) return false; writer.incrementState(); @@ -150,7 +150,7 @@ public class GridJobCancelRequest extends MessageAdapter { switch (readState) { case 0: - jobId = reader.readField("jobId", MessageFieldType.IGNITE_UUID); + jobId = reader.readIgniteUuid("jobId"); if (!reader.isLastRead()) return false; @@ -158,7 +158,7 @@ public class GridJobCancelRequest extends MessageAdapter { readState++; case 1: - sesId = reader.readField("sesId", MessageFieldType.IGNITE_UUID); + sesId = reader.readIgniteUuid("sesId"); if (!reader.isLastRead()) return false; @@ -166,7 +166,7 @@ public class GridJobCancelRequest extends MessageAdapter { readState++; case 2: - sys = reader.readField("sys", MessageFieldType.BOOLEAN); + sys = reader.readBoolean("sys"); 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/GridJobExecuteRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java index 12b29c3..eef9f78 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java @@ -416,7 +416,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes writer.setBuffer(buf); if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -424,127 +424,127 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes switch (writer.state()) { case 0: - if (!writer.writeField("clsLdrId", clsLdrId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("clsLdrId", clsLdrId)) return false; writer.incrementState(); case 1: - if (!writer.writeField("cpSpi", cpSpi, MessageFieldType.STRING)) + if (!writer.writeString("cpSpi", cpSpi)) return false; writer.incrementState(); case 2: - if (!writer.writeField("depMode", depMode != null ? (byte)depMode.ordinal() : -1, MessageFieldType.BYTE)) + if (!writer.writeByte("depMode", depMode != null ? (byte)depMode.ordinal() : -1)) return false; writer.incrementState(); case 3: - if (!writer.writeField("dynamicSiblings", dynamicSiblings, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("dynamicSiblings", dynamicSiblings)) return false; writer.incrementState(); case 4: - if (!writer.writeField("forceLocDep", forceLocDep, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("forceLocDep", forceLocDep)) return false; writer.incrementState(); case 5: - if (!writer.writeField("internal", internal, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("internal", internal)) return false; writer.incrementState(); case 6: - if (!writer.writeField("jobAttrsBytes", jobAttrsBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("jobAttrsBytes", jobAttrsBytes)) return false; writer.incrementState(); case 7: - if (!writer.writeField("jobBytes", jobBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("jobBytes", jobBytes)) return false; writer.incrementState(); case 8: - if (!writer.writeField("jobId", jobId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("jobId", jobId)) return false; writer.incrementState(); case 9: - if (!writer.writeMapField("ldrParticipants", ldrParticipants, MessageFieldType.UUID, MessageFieldType.IGNITE_UUID)) + if (!writer.writeMap("ldrParticipants", ldrParticipants, MessageFieldType.UUID, MessageFieldType.IGNITE_UUID)) return false; writer.incrementState(); case 10: - if (!writer.writeField("sesAttrsBytes", sesAttrsBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("sesAttrsBytes", sesAttrsBytes)) return false; writer.incrementState(); case 11: - if (!writer.writeField("sesFullSup", sesFullSup, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("sesFullSup", sesFullSup)) return false; writer.incrementState(); case 12: - if (!writer.writeField("sesId", sesId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("sesId", sesId)) return false; writer.incrementState(); case 13: - if (!writer.writeField("siblingsBytes", siblingsBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("siblingsBytes", siblingsBytes)) return false; writer.incrementState(); case 14: - if (!writer.writeField("startTaskTime", startTaskTime, MessageFieldType.LONG)) + if (!writer.writeLong("startTaskTime", startTaskTime)) return false; writer.incrementState(); case 15: - if (!writer.writeField("subjId", subjId, MessageFieldType.UUID)) + if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); case 16: - if (!writer.writeField("taskClsName", taskClsName, MessageFieldType.STRING)) + if (!writer.writeString("taskClsName", taskClsName)) return false; writer.incrementState(); case 17: - if (!writer.writeField("taskName", taskName, MessageFieldType.STRING)) + if (!writer.writeString("taskName", taskName)) return false; writer.incrementState(); case 18: - if (!writer.writeField("timeout", timeout, MessageFieldType.LONG)) + if (!writer.writeLong("timeout", timeout)) return false; writer.incrementState(); case 19: - if (!writer.writeCollectionField("top", top, MessageFieldType.UUID)) + if (!writer.writeCollection("top", top, MessageFieldType.UUID)) return false; writer.incrementState(); case 20: - if (!writer.writeField("userVer", userVer, MessageFieldType.STRING)) + if (!writer.writeString("userVer", userVer)) return false; writer.incrementState(); @@ -560,7 +560,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes switch (readState) { case 0: - clsLdrId = reader.readField("clsLdrId", MessageFieldType.IGNITE_UUID); + clsLdrId = reader.readIgniteUuid("clsLdrId"); if (!reader.isLastRead()) return false; @@ -568,7 +568,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes readState++; case 1: - cpSpi = reader.readField("cpSpi", MessageFieldType.STRING); + cpSpi = reader.readString("cpSpi"); if (!reader.isLastRead()) return false; @@ -578,7 +578,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes case 2: byte depModeOrd; - depModeOrd = reader.readField("depMode", MessageFieldType.BYTE); + depModeOrd = reader.readByte("depMode"); if (!reader.isLastRead()) return false; @@ -588,7 +588,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes readState++; case 3: - dynamicSiblings = reader.readField("dynamicSiblings", MessageFieldType.BOOLEAN); + dynamicSiblings = reader.readBoolean("dynamicSiblings"); if (!reader.isLastRead()) return false; @@ -596,7 +596,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes readState++; case 4: - forceLocDep = reader.readField("forceLocDep", MessageFieldType.BOOLEAN); + forceLocDep = reader.readBoolean("forceLocDep"); if (!reader.isLastRead()) return false; @@ -604,7 +604,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes readState++; case 5: - internal = reader.readField("internal", MessageFieldType.BOOLEAN); + internal = reader.readBoolean("internal"); if (!reader.isLastRead()) return false; @@ -612,7 +612,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes readState++; case 6: - jobAttrsBytes = reader.readField("jobAttrsBytes", MessageFieldType.BYTE_ARR); + jobAttrsBytes = reader.readByteArray("jobAttrsBytes"); if (!reader.isLastRead()) return false; @@ -620,7 +620,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes readState++; case 7: - jobBytes = reader.readField("jobBytes", MessageFieldType.BYTE_ARR); + jobBytes = reader.readByteArray("jobBytes"); if (!reader.isLastRead()) return false; @@ -628,7 +628,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes readState++; case 8: - jobId = reader.readField("jobId", MessageFieldType.IGNITE_UUID); + jobId = reader.readIgniteUuid("jobId"); if (!reader.isLastRead()) return false; @@ -636,7 +636,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes readState++; case 9: - ldrParticipants = reader.readMapField("ldrParticipants", MessageFieldType.UUID, MessageFieldType.IGNITE_UUID, false); + ldrParticipants = reader.readMap("ldrParticipants", MessageFieldType.UUID, MessageFieldType.IGNITE_UUID, false); if (!reader.isLastRead()) return false; @@ -644,7 +644,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes readState++; case 10: - sesAttrsBytes = reader.readField("sesAttrsBytes", MessageFieldType.BYTE_ARR); + sesAttrsBytes = reader.readByteArray("sesAttrsBytes"); if (!reader.isLastRead()) return false; @@ -652,7 +652,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes readState++; case 11: - sesFullSup = reader.readField("sesFullSup", MessageFieldType.BOOLEAN); + sesFullSup = reader.readBoolean("sesFullSup"); if (!reader.isLastRead()) return false; @@ -660,7 +660,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes readState++; case 12: - sesId = reader.readField("sesId", MessageFieldType.IGNITE_UUID); + sesId = reader.readIgniteUuid("sesId"); if (!reader.isLastRead()) return false; @@ -668,7 +668,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes readState++; case 13: - siblingsBytes = reader.readField("siblingsBytes", MessageFieldType.BYTE_ARR); + siblingsBytes = reader.readByteArray("siblingsBytes"); if (!reader.isLastRead()) return false; @@ -676,7 +676,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes readState++; case 14: - startTaskTime = reader.readField("startTaskTime", MessageFieldType.LONG); + startTaskTime = reader.readLong("startTaskTime"); if (!reader.isLastRead()) return false; @@ -684,7 +684,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes readState++; case 15: - subjId = reader.readField("subjId", MessageFieldType.UUID); + subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) return false; @@ -692,7 +692,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes readState++; case 16: - taskClsName = reader.readField("taskClsName", MessageFieldType.STRING); + taskClsName = reader.readString("taskClsName"); if (!reader.isLastRead()) return false; @@ -700,7 +700,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes readState++; case 17: - taskName = reader.readField("taskName", MessageFieldType.STRING); + taskName = reader.readString("taskName"); if (!reader.isLastRead()) return false; @@ -708,7 +708,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes readState++; case 18: - timeout = reader.readField("timeout", MessageFieldType.LONG); + timeout = reader.readLong("timeout"); if (!reader.isLastRead()) return false; @@ -716,7 +716,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes readState++; case 19: - top = reader.readCollectionField("top", MessageFieldType.UUID); + top = reader.readCollection("top", MessageFieldType.UUID); if (!reader.isLastRead()) return false; @@ -724,7 +724,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes readState++; case 20: - userVer = reader.readField("userVer", MessageFieldType.STRING); + userVer = reader.readString("userVer"); 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/GridJobExecuteResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java index d9f0518..fb0f72d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java @@ -209,7 +209,7 @@ public class GridJobExecuteResponse extends MessageAdapter implements GridTaskMe writer.setBuffer(buf); if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -217,43 +217,43 @@ public class GridJobExecuteResponse extends MessageAdapter implements GridTaskMe switch (writer.state()) { case 0: - if (!writer.writeField("gridExBytes", gridExBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("gridExBytes", gridExBytes)) return false; writer.incrementState(); case 1: - if (!writer.writeField("isCancelled", isCancelled, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("isCancelled", isCancelled)) return false; writer.incrementState(); case 2: - if (!writer.writeField("jobAttrsBytes", jobAttrsBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("jobAttrsBytes", jobAttrsBytes)) return false; writer.incrementState(); case 3: - if (!writer.writeField("jobId", jobId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("jobId", jobId)) return false; writer.incrementState(); case 4: - if (!writer.writeField("nodeId", nodeId, MessageFieldType.UUID)) + if (!writer.writeUuid("nodeId", nodeId)) return false; writer.incrementState(); case 5: - if (!writer.writeField("resBytes", resBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("resBytes", resBytes)) return false; writer.incrementState(); case 6: - if (!writer.writeField("sesId", sesId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("sesId", sesId)) return false; writer.incrementState(); @@ -269,7 +269,7 @@ public class GridJobExecuteResponse extends MessageAdapter implements GridTaskMe switch (readState) { case 0: - gridExBytes = reader.readField("gridExBytes", MessageFieldType.BYTE_ARR); + gridExBytes = reader.readByteArray("gridExBytes"); if (!reader.isLastRead()) return false; @@ -277,7 +277,7 @@ public class GridJobExecuteResponse extends MessageAdapter implements GridTaskMe readState++; case 1: - isCancelled = reader.readField("isCancelled", MessageFieldType.BOOLEAN); + isCancelled = reader.readBoolean("isCancelled"); if (!reader.isLastRead()) return false; @@ -285,7 +285,7 @@ public class GridJobExecuteResponse extends MessageAdapter implements GridTaskMe readState++; case 2: - jobAttrsBytes = reader.readField("jobAttrsBytes", MessageFieldType.BYTE_ARR); + jobAttrsBytes = reader.readByteArray("jobAttrsBytes"); if (!reader.isLastRead()) return false; @@ -293,7 +293,7 @@ public class GridJobExecuteResponse extends MessageAdapter implements GridTaskMe readState++; case 3: - jobId = reader.readField("jobId", MessageFieldType.IGNITE_UUID); + jobId = reader.readIgniteUuid("jobId"); if (!reader.isLastRead()) return false; @@ -301,7 +301,7 @@ public class GridJobExecuteResponse extends MessageAdapter implements GridTaskMe readState++; case 4: - nodeId = reader.readField("nodeId", MessageFieldType.UUID); + nodeId = reader.readUuid("nodeId"); if (!reader.isLastRead()) return false; @@ -309,7 +309,7 @@ public class GridJobExecuteResponse extends MessageAdapter implements GridTaskMe readState++; case 5: - resBytes = reader.readField("resBytes", MessageFieldType.BYTE_ARR); + resBytes = reader.readByteArray("resBytes"); if (!reader.isLastRead()) return false; @@ -317,7 +317,7 @@ public class GridJobExecuteResponse extends MessageAdapter implements GridTaskMe readState++; case 6: - sesId = reader.readField("sesId", MessageFieldType.IGNITE_UUID); + sesId = reader.readIgniteUuid("sesId"); 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/GridJobSiblingsRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java index 3b1344b..6ef7102 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java @@ -88,7 +88,7 @@ public class GridJobSiblingsRequest extends MessageAdapter { writer.setBuffer(buf); if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -96,13 +96,13 @@ public class GridJobSiblingsRequest extends MessageAdapter { switch (writer.state()) { case 0: - if (!writer.writeField("sesId", sesId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("sesId", sesId)) return false; writer.incrementState(); case 1: - if (!writer.writeField("topicBytes", topicBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("topicBytes", topicBytes)) return false; writer.incrementState(); @@ -118,7 +118,7 @@ public class GridJobSiblingsRequest extends MessageAdapter { switch (readState) { case 0: - sesId = reader.readField("sesId", MessageFieldType.IGNITE_UUID); + sesId = reader.readIgniteUuid("sesId"); if (!reader.isLastRead()) return false; @@ -126,7 +126,7 @@ public class GridJobSiblingsRequest extends MessageAdapter { readState++; case 1: - topicBytes = reader.readField("topicBytes", MessageFieldType.BYTE_ARR); + topicBytes = reader.readByteArray("topicBytes"); 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/GridJobSiblingsResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java index 0794b5b..77032fc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java @@ -81,7 +81,7 @@ public class GridJobSiblingsResponse extends MessageAdapter { writer.setBuffer(buf); if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -89,7 +89,7 @@ public class GridJobSiblingsResponse extends MessageAdapter { switch (writer.state()) { case 0: - if (!writer.writeField("siblingsBytes", siblingsBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("siblingsBytes", siblingsBytes)) return false; writer.incrementState(); @@ -105,7 +105,7 @@ public class GridJobSiblingsResponse extends MessageAdapter { switch (readState) { case 0: - siblingsBytes = reader.readField("siblingsBytes", MessageFieldType.BYTE_ARR); + siblingsBytes = reader.readByteArray("siblingsBytes"); 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/GridTaskCancelRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java index 9fa17c4..2501522 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java @@ -65,7 +65,7 @@ public class GridTaskCancelRequest extends MessageAdapter { writer.setBuffer(buf); if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -73,7 +73,7 @@ public class GridTaskCancelRequest extends MessageAdapter { switch (writer.state()) { case 0: - if (!writer.writeField("sesId", sesId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("sesId", sesId)) return false; writer.incrementState(); @@ -89,7 +89,7 @@ public class GridTaskCancelRequest extends MessageAdapter { switch (readState) { case 0: - sesId = reader.readField("sesId", MessageFieldType.IGNITE_UUID); + sesId = reader.readIgniteUuid("sesId"); 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/GridTaskSessionRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java index a827419..214c2f1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java @@ -102,7 +102,7 @@ public class GridTaskSessionRequest extends MessageAdapter implements GridTaskMe writer.setBuffer(buf); if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -110,19 +110,19 @@ public class GridTaskSessionRequest extends MessageAdapter implements GridTaskMe switch (writer.state()) { case 0: - if (!writer.writeField("attrsBytes", attrsBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("attrsBytes", attrsBytes)) return false; writer.incrementState(); case 1: - if (!writer.writeField("jobId", jobId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("jobId", jobId)) return false; writer.incrementState(); case 2: - if (!writer.writeField("sesId", sesId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("sesId", sesId)) return false; writer.incrementState(); @@ -138,7 +138,7 @@ public class GridTaskSessionRequest extends MessageAdapter implements GridTaskMe switch (readState) { case 0: - attrsBytes = reader.readField("attrsBytes", MessageFieldType.BYTE_ARR); + attrsBytes = reader.readByteArray("attrsBytes"); if (!reader.isLastRead()) return false; @@ -146,7 +146,7 @@ public class GridTaskSessionRequest extends MessageAdapter implements GridTaskMe readState++; case 1: - jobId = reader.readField("jobId", MessageFieldType.IGNITE_UUID); + jobId = reader.readIgniteUuid("jobId"); if (!reader.isLastRead()) return false; @@ -154,7 +154,7 @@ public class GridTaskSessionRequest extends MessageAdapter implements GridTaskMe readState++; case 2: - sesId = reader.readField("sesId", MessageFieldType.IGNITE_UUID); + sesId = reader.readIgniteUuid("sesId"); 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/direct/DirectMessageReader.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java index 40123ca..0e6ef5b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java @@ -17,7 +17,9 @@ package org.apache.ignite.internal.direct; +import org.apache.ignite.lang.*; import org.apache.ignite.plugin.extensions.communication.*; +import org.jetbrains.annotations.*; import java.nio.*; import java.util.*; @@ -45,127 +47,196 @@ public class DirectMessageReader implements MessageReader { } /** {@inheritDoc} */ - @SuppressWarnings("unchecked") - @Override public <T> T readField(String name, MessageFieldType type) { - Object val; + @Override public byte readByte(String name) { + byte val = stream.readByte(); - switch (type) { - case BYTE: - val = stream.readByte(); + lastRead = stream.lastFinished(); + + return val; + } + + /** {@inheritDoc} */ + @Override public short readShort(String name) { + short val = stream.readShort(); + + lastRead = stream.lastFinished(); + + return val; + } + + /** {@inheritDoc} */ + @Override public int readInt(String name) { + int val = stream.readInt(); + + lastRead = stream.lastFinished(); + + return val; + } - break; + /** {@inheritDoc} */ + @Override public long readLong(String name) { + long val = stream.readLong(); - case SHORT: - val = stream.readShort(); + lastRead = stream.lastFinished(); - break; + return val; + } + + /** {@inheritDoc} */ + @Override public float readFloat(String name) { + float val = stream.readFloat(); - case INT: - val = stream.readInt(); + lastRead = stream.lastFinished(); + + return val; + } + + /** {@inheritDoc} */ + @Override public double readDouble(String name) { + double val = stream.readDouble(); + + lastRead = stream.lastFinished(); + + return val; + } + + /** {@inheritDoc} */ + @Override public char readChar(String name) { + char val = stream.readChar(); + + lastRead = stream.lastFinished(); + + return val; + } + + /** {@inheritDoc} */ + @Override public boolean readBoolean(String name) { + boolean val = stream.readBoolean(); + + lastRead = stream.lastFinished(); - break; + return val; + } - case LONG: - val = stream.readLong(); + /** {@inheritDoc} */ + @Nullable @Override public byte[] readByteArray(String name) { + byte[] arr = stream.readByteArray(); - break; + lastRead = stream.lastFinished(); - case FLOAT: - val = stream.readFloat(); + return arr; + } - break; + /** {@inheritDoc} */ + @Nullable @Override public short[] readShortArray(String name) { + short[] arr = stream.readShortArray(); - case DOUBLE: - val = stream.readDouble(); + lastRead = stream.lastFinished(); - break; + return arr; + } - case CHAR: - val = stream.readChar(); + /** {@inheritDoc} */ + @Nullable @Override public int[] readIntArray(String name) { + int[] arr = stream.readIntArray(); - break; + lastRead = stream.lastFinished(); - case BOOLEAN: - val = stream.readBoolean(); + return arr; + } - break; + /** {@inheritDoc} */ + @Nullable @Override public long[] readLongArray(String name) { + long[] arr = stream.readLongArray(); - case BYTE_ARR: - val = stream.readByteArray(); + lastRead = stream.lastFinished(); - break; + return arr; + } - case SHORT_ARR: - val = stream.readShortArray(); + /** {@inheritDoc} */ + @Nullable @Override public float[] readFloatArray(String name) { + float[] arr = stream.readFloatArray(); - break; + lastRead = stream.lastFinished(); - case INT_ARR: - val = stream.readIntArray(); + return arr; + } - break; + /** {@inheritDoc} */ + @Nullable @Override public double[] readDoubleArray(String name) { + double[] arr = stream.readDoubleArray(); - case LONG_ARR: - val = stream.readLongArray(); + lastRead = stream.lastFinished(); - break; + return arr; + } - case FLOAT_ARR: - val = stream.readFloatArray(); + /** {@inheritDoc} */ + @Nullable @Override public char[] readCharArray(String name) { + char[] arr = stream.readCharArray(); - break; + lastRead = stream.lastFinished(); - case DOUBLE_ARR: - val = stream.readDoubleArray(); + return arr; + } - break; + /** {@inheritDoc} */ + @Nullable @Override public boolean[] readBooleanArray(String name) { + boolean[] arr = stream.readBooleanArray(); - case CHAR_ARR: - val = stream.readCharArray(); + lastRead = stream.lastFinished(); - break; + return arr; + } - case BOOLEAN_ARR: - val = stream.readBooleanArray(); + /** {@inheritDoc} */ + @Override public String readString(String name) { + String val = stream.readString(); - break; + lastRead = stream.lastFinished(); - case STRING: - val = stream.readString(); + return val; + } - break; + /** {@inheritDoc} */ + @Override public BitSet readBitSet(String name) { + BitSet val = stream.readBitSet(); - case BIT_SET: - val = stream.readBitSet(); + lastRead = stream.lastFinished(); - break; + return val; + } - case UUID: - val = stream.readUuid(); + /** {@inheritDoc} */ + @Override public UUID readUuid(String name) { + UUID val = stream.readUuid(); - break; + lastRead = stream.lastFinished(); - case IGNITE_UUID: - val = stream.readIgniteUuid(); + return val; + } - break; + /** {@inheritDoc} */ + @Override public IgniteUuid readIgniteUuid(String name) { + IgniteUuid val = stream.readIgniteUuid(); - case MSG: - val = stream.readMessage(); + lastRead = stream.lastFinished(); - break; + return val; + } - default: - throw new IllegalStateException("Unknown field type: " + type); - } + /** {@inheritDoc} */ + @Nullable @Override public <T extends MessageAdapter> T readMessage(String name) { + T msg = stream.readMessage(); lastRead = stream.lastFinished(); - return (T)val; + return msg; } /** {@inheritDoc} */ - @Override public <T> T[] readArrayField(String name, MessageFieldType itemType, Class<T> itemCls) { + @Override public <T> T[] readObjectArray(String name, MessageFieldType itemType, Class<T> itemCls) { T[] msg = stream.readObjectArray(itemType, itemCls); lastRead = stream.lastFinished(); @@ -174,7 +245,7 @@ public class DirectMessageReader implements MessageReader { } /** {@inheritDoc} */ - @Override public <C extends Collection<?>> C readCollectionField(String name, MessageFieldType itemType) { + @Override public <C extends Collection<?>> C readCollection(String name, MessageFieldType itemType) { C col = stream.readCollection(itemType); lastRead = stream.lastFinished(); @@ -183,7 +254,7 @@ public class DirectMessageReader implements MessageReader { } /** {@inheritDoc} */ - @Override public <M extends Map<?, ?>> M readMapField(String name, MessageFieldType keyType, + @Override public <M extends Map<?, ?>> M readMap(String name, MessageFieldType keyType, MessageFieldType valType, boolean linked) { M map = stream.readMap(keyType, valType, linked); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01689b1d/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java index f4efc0a..ced0889 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java @@ -40,143 +40,168 @@ public class DirectMessageWriter implements MessageWriter { } /** {@inheritDoc} */ - @Override public boolean writeMessageType(byte msgType) { - stream.writeByte(msgType); + @Override public boolean writeByte(String name, byte val) { + stream.writeByte(val); return stream.lastFinished(); } /** {@inheritDoc} */ - @Override public boolean writeField(String name, Object val, MessageFieldType type) { - switch (type) { - case BYTE: - stream.writeByte((byte)val); + @Override public boolean writeShort(String name, short val) { + stream.writeShort(val); - break; - - case SHORT: - stream.writeShort((short)val); - - break; - - case INT: - stream.writeInt((int)val); - - break; + return stream.lastFinished(); + } - case LONG: - stream.writeLong((long)val); + /** {@inheritDoc} */ + @Override public boolean writeInt(String name, int val) { + stream.writeInt(val); - break; + return stream.lastFinished(); + } - case FLOAT: - stream.writeFloat((float)val); + /** {@inheritDoc} */ + @Override public boolean writeLong(String name, long val) { + stream.writeLong(val); - break; + return stream.lastFinished(); + } - case DOUBLE: - stream.writeDouble((double)val); + /** {@inheritDoc} */ + @Override public boolean writeFloat(String name, float val) { + stream.writeFloat(val); - break; + return stream.lastFinished(); + } - case CHAR: - stream.writeChar((char)val); + /** {@inheritDoc} */ + @Override public boolean writeDouble(String name, double val) { + stream.writeDouble(val); - break; + return stream.lastFinished(); + } - case BOOLEAN: - stream.writeBoolean((boolean)val); + /** {@inheritDoc} */ + @Override public boolean writeChar(String name, char val) { + stream.writeChar(val); - break; + return stream.lastFinished(); + } - case BYTE_ARR: - stream.writeByteArray((byte[])val); + /** {@inheritDoc} */ + @Override public boolean writeBoolean(String name, boolean val) { + stream.writeBoolean(val); - break; + return stream.lastFinished(); + } - case SHORT_ARR: - stream.writeShortArray((short[])val); + /** {@inheritDoc} */ + @Override public boolean writeByteArray(String name, @Nullable byte[] val) { + stream.writeByteArray(val); - break; + return stream.lastFinished(); + } - case INT_ARR: - stream.writeIntArray((int[])val); + /** {@inheritDoc} */ + @Override public boolean writeShortArray(String name, @Nullable short[] val) { + stream.writeShortArray(val); - break; + return stream.lastFinished(); + } - case LONG_ARR: - stream.writeLongArray((long[])val); + /** {@inheritDoc} */ + @Override public boolean writeIntArray(String name, @Nullable int[] val) { + stream.writeIntArray(val); - break; + return stream.lastFinished(); + } - case FLOAT_ARR: - stream.writeFloatArray((float[])val); + /** {@inheritDoc} */ + @Override public boolean writeLongArray(String name, @Nullable long[] val) { + stream.writeLongArray(val); - break; + return stream.lastFinished(); + } - case DOUBLE_ARR: - stream.writeDoubleArray((double[])val); + /** {@inheritDoc} */ + @Override public boolean writeFloatArray(String name, @Nullable float[] val) { + stream.writeFloatArray(val); - break; + return stream.lastFinished(); + } - case CHAR_ARR: - stream.writeCharArray((char[])val); + /** {@inheritDoc} */ + @Override public boolean writeDoubleArray(String name, @Nullable double[] val) { + stream.writeDoubleArray(val); - break; + return stream.lastFinished(); + } - case BOOLEAN_ARR: - stream.writeBooleanArray((boolean[])val); + /** {@inheritDoc} */ + @Override public boolean writeCharArray(String name, @Nullable char[] val) { + stream.writeCharArray(val); - break; + return stream.lastFinished(); + } - case STRING: - stream.writeString((String)val); + /** {@inheritDoc} */ + @Override public boolean writeBooleanArray(String name, @Nullable boolean[] val) { + stream.writeBooleanArray(val); - break; + return stream.lastFinished(); + } - case BIT_SET: - stream.writeBitSet((BitSet)val); + /** {@inheritDoc} */ + @Override public boolean writeString(String name, String val) { + stream.writeString(val); - break; + return stream.lastFinished(); + } - case UUID: - stream.writeUuid((UUID)val); + /** {@inheritDoc} */ + @Override public boolean writeBitSet(String name, BitSet val) { + stream.writeBitSet(val); - break; + return stream.lastFinished(); + } - case IGNITE_UUID: - stream.writeIgniteUuid((IgniteUuid)val); + /** {@inheritDoc} */ + @Override public boolean writeUuid(String name, UUID val) { + stream.writeUuid(val); - break; + return stream.lastFinished(); + } - case MSG: - stream.writeMessage((MessageAdapter)val, this); + /** {@inheritDoc} */ + @Override public boolean writeIgniteUuid(String name, IgniteUuid val) { + stream.writeIgniteUuid(val); - break; + return stream.lastFinished(); + } - default: - throw new IllegalStateException("Unknown field type: " + type); - } + /** {@inheritDoc} */ + @Override public boolean writeMessage(String name, @Nullable MessageAdapter msg) { + stream.writeMessage(msg, this); return stream.lastFinished(); } /** {@inheritDoc} */ - @Override public <T> boolean writeArrayField(String name, T[] arr, MessageFieldType itemType) { + @Override public <T> boolean writeObjectArray(String name, T[] arr, MessageFieldType itemType) { stream.writeObjectArray(arr, itemType, this); return stream.lastFinished(); } /** {@inheritDoc} */ - @Override public <T> boolean writeCollectionField(String name, Collection<T> col, MessageFieldType itemType) { + @Override public <T> boolean writeCollection(String name, Collection<T> col, MessageFieldType itemType) { stream.writeCollection(col, itemType, this); return stream.lastFinished(); } /** {@inheritDoc} */ - @Override public <K, V> boolean writeMapField(String name, Map<K, V> map, MessageFieldType keyType, + @Override public <K, V> boolean writeMap(String name, Map<K, V> map, MessageFieldType keyType, MessageFieldType valType) { stream.writeMap(map, keyType, valType, this); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01689b1d/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java index ec2e25c..9962c1f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java @@ -88,7 +88,7 @@ public class GridCheckpointRequest extends MessageAdapter { writer.setBuffer(buf); if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -96,19 +96,19 @@ public class GridCheckpointRequest extends MessageAdapter { switch (writer.state()) { case 0: - if (!writer.writeField("cpSpi", cpSpi, MessageFieldType.STRING)) + if (!writer.writeString("cpSpi", cpSpi)) return false; writer.incrementState(); case 1: - if (!writer.writeField("key", key, MessageFieldType.STRING)) + if (!writer.writeString("key", key)) return false; writer.incrementState(); case 2: - if (!writer.writeField("sesId", sesId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("sesId", sesId)) return false; writer.incrementState(); @@ -124,7 +124,7 @@ public class GridCheckpointRequest extends MessageAdapter { switch (readState) { case 0: - cpSpi = reader.readField("cpSpi", MessageFieldType.STRING); + cpSpi = reader.readString("cpSpi"); if (!reader.isLastRead()) return false; @@ -132,7 +132,7 @@ public class GridCheckpointRequest extends MessageAdapter { readState++; case 1: - key = reader.readField("key", MessageFieldType.STRING); + key = reader.readString("key"); if (!reader.isLastRead()) return false; @@ -140,7 +140,7 @@ public class GridCheckpointRequest extends MessageAdapter { readState++; case 2: - sesId = reader.readField("sesId", MessageFieldType.IGNITE_UUID); + sesId = reader.readIgniteUuid("sesId"); 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/managers/communication/GridIoMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java index fcbc917..a74850f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java @@ -183,7 +183,7 @@ public class GridIoMessage extends MessageAdapter { writer.setBuffer(buf); if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -191,43 +191,43 @@ public class GridIoMessage extends MessageAdapter { switch (writer.state()) { case 0: - if (!writer.writeField("msg", msg, MessageFieldType.MSG)) + if (!writer.writeMessage("msg", msg)) return false; writer.incrementState(); case 1: - if (!writer.writeField("ordered", ordered, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("ordered", ordered)) return false; writer.incrementState(); case 2: - if (!writer.writeField("plc", plc != null ? (byte)plc.ordinal() : -1, MessageFieldType.BYTE)) + if (!writer.writeByte("plc", plc != null ? (byte)plc.ordinal() : -1)) return false; writer.incrementState(); case 3: - if (!writer.writeField("skipOnTimeout", skipOnTimeout, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("skipOnTimeout", skipOnTimeout)) return false; writer.incrementState(); case 4: - if (!writer.writeField("timeout", timeout, MessageFieldType.LONG)) + if (!writer.writeLong("timeout", timeout)) return false; writer.incrementState(); case 5: - if (!writer.writeField("topicBytes", topicBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("topicBytes", topicBytes)) return false; writer.incrementState(); case 6: - if (!writer.writeField("topicOrd", topicOrd, MessageFieldType.INT)) + if (!writer.writeInt("topicOrd", topicOrd)) return false; writer.incrementState(); @@ -243,7 +243,7 @@ public class GridIoMessage extends MessageAdapter { switch (readState) { case 0: - msg = reader.readField("msg", MessageFieldType.MSG); + msg = reader.readMessage("msg"); if (!reader.isLastRead()) return false; @@ -251,7 +251,7 @@ public class GridIoMessage extends MessageAdapter { readState++; case 1: - ordered = reader.readField("ordered", MessageFieldType.BOOLEAN); + ordered = reader.readBoolean("ordered"); if (!reader.isLastRead()) return false; @@ -261,7 +261,7 @@ public class GridIoMessage extends MessageAdapter { case 2: byte plcOrd; - plcOrd = reader.readField("plc", MessageFieldType.BYTE); + plcOrd = reader.readByte("plc"); if (!reader.isLastRead()) return false; @@ -271,7 +271,7 @@ public class GridIoMessage extends MessageAdapter { readState++; case 3: - skipOnTimeout = reader.readField("skipOnTimeout", MessageFieldType.BOOLEAN); + skipOnTimeout = reader.readBoolean("skipOnTimeout"); if (!reader.isLastRead()) return false; @@ -279,7 +279,7 @@ public class GridIoMessage extends MessageAdapter { readState++; case 4: - timeout = reader.readField("timeout", MessageFieldType.LONG); + timeout = reader.readLong("timeout"); if (!reader.isLastRead()) return false; @@ -287,7 +287,7 @@ public class GridIoMessage extends MessageAdapter { readState++; case 5: - topicBytes = reader.readField("topicBytes", MessageFieldType.BYTE_ARR); + topicBytes = reader.readByteArray("topicBytes"); if (!reader.isLastRead()) return false; @@ -295,7 +295,7 @@ public class GridIoMessage extends MessageAdapter { readState++; case 6: - topicOrd = reader.readField("topicOrd", MessageFieldType.INT); + topicOrd = reader.readInt("topicOrd"); 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/managers/communication/GridIoUserMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java index 7b3d292..786f11a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java @@ -207,7 +207,7 @@ public class GridIoUserMessage extends MessageAdapter { writer.setBuffer(buf); if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -215,43 +215,43 @@ public class GridIoUserMessage extends MessageAdapter { switch (writer.state()) { case 0: - if (!writer.writeField("bodyBytes", bodyBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("bodyBytes", bodyBytes)) return false; writer.incrementState(); case 1: - if (!writer.writeField("clsLdrId", clsLdrId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("clsLdrId", clsLdrId)) return false; writer.incrementState(); case 2: - if (!writer.writeField("depClsName", depClsName, MessageFieldType.STRING)) + if (!writer.writeString("depClsName", depClsName)) return false; writer.incrementState(); case 3: - if (!writer.writeField("depMode", depMode != null ? (byte)depMode.ordinal() : -1, MessageFieldType.BYTE)) + if (!writer.writeByte("depMode", depMode != null ? (byte)depMode.ordinal() : -1)) return false; writer.incrementState(); case 4: - if (!writer.writeMapField("ldrParties", ldrParties, MessageFieldType.UUID, MessageFieldType.IGNITE_UUID)) + if (!writer.writeMap("ldrParties", ldrParties, MessageFieldType.UUID, MessageFieldType.IGNITE_UUID)) return false; writer.incrementState(); case 5: - if (!writer.writeField("topicBytes", topicBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("topicBytes", topicBytes)) return false; writer.incrementState(); case 6: - if (!writer.writeField("userVer", userVer, MessageFieldType.STRING)) + if (!writer.writeString("userVer", userVer)) return false; writer.incrementState(); @@ -267,7 +267,7 @@ public class GridIoUserMessage extends MessageAdapter { switch (readState) { case 0: - bodyBytes = reader.readField("bodyBytes", MessageFieldType.BYTE_ARR); + bodyBytes = reader.readByteArray("bodyBytes"); if (!reader.isLastRead()) return false; @@ -275,7 +275,7 @@ public class GridIoUserMessage extends MessageAdapter { readState++; case 1: - clsLdrId = reader.readField("clsLdrId", MessageFieldType.IGNITE_UUID); + clsLdrId = reader.readIgniteUuid("clsLdrId"); if (!reader.isLastRead()) return false; @@ -283,7 +283,7 @@ public class GridIoUserMessage extends MessageAdapter { readState++; case 2: - depClsName = reader.readField("depClsName", MessageFieldType.STRING); + depClsName = reader.readString("depClsName"); if (!reader.isLastRead()) return false; @@ -293,7 +293,7 @@ public class GridIoUserMessage extends MessageAdapter { case 3: byte depModeOrd; - depModeOrd = reader.readField("depMode", MessageFieldType.BYTE); + depModeOrd = reader.readByte("depMode"); if (!reader.isLastRead()) return false; @@ -303,7 +303,7 @@ public class GridIoUserMessage extends MessageAdapter { readState++; case 4: - ldrParties = reader.readMapField("ldrParties", MessageFieldType.UUID, MessageFieldType.IGNITE_UUID, false); + ldrParties = reader.readMap("ldrParties", MessageFieldType.UUID, MessageFieldType.IGNITE_UUID, false); if (!reader.isLastRead()) return false; @@ -311,7 +311,7 @@ public class GridIoUserMessage extends MessageAdapter { readState++; case 5: - topicBytes = reader.readField("topicBytes", MessageFieldType.BYTE_ARR); + topicBytes = reader.readByteArray("topicBytes"); if (!reader.isLastRead()) return false; @@ -319,7 +319,7 @@ public class GridIoUserMessage extends MessageAdapter { readState++; case 6: - userVer = reader.readField("userVer", MessageFieldType.STRING); + userVer = reader.readString("userVer"); 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/managers/deployment/GridDeploymentInfoBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java index 98f1347..59968a9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java @@ -142,7 +142,7 @@ public class GridDeploymentInfoBean extends MessageAdapter implements GridDeploy writer.setBuffer(buf); if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -150,31 +150,31 @@ public class GridDeploymentInfoBean extends MessageAdapter implements GridDeploy switch (writer.state()) { case 0: - if (!writer.writeField("clsLdrId", clsLdrId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("clsLdrId", clsLdrId)) return false; writer.incrementState(); case 1: - if (!writer.writeField("depMode", depMode != null ? (byte)depMode.ordinal() : -1, MessageFieldType.BYTE)) + if (!writer.writeByte("depMode", depMode != null ? (byte)depMode.ordinal() : -1)) return false; writer.incrementState(); case 2: - if (!writer.writeField("locDepOwner", locDepOwner, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("locDepOwner", locDepOwner)) return false; writer.incrementState(); case 3: - if (!writer.writeMapField("participants", participants, MessageFieldType.UUID, MessageFieldType.IGNITE_UUID)) + if (!writer.writeMap("participants", participants, MessageFieldType.UUID, MessageFieldType.IGNITE_UUID)) return false; writer.incrementState(); case 4: - if (!writer.writeField("userVer", userVer, MessageFieldType.STRING)) + if (!writer.writeString("userVer", userVer)) return false; writer.incrementState(); @@ -190,7 +190,7 @@ public class GridDeploymentInfoBean extends MessageAdapter implements GridDeploy switch (readState) { case 0: - clsLdrId = reader.readField("clsLdrId", MessageFieldType.IGNITE_UUID); + clsLdrId = reader.readIgniteUuid("clsLdrId"); if (!reader.isLastRead()) return false; @@ -200,7 +200,7 @@ public class GridDeploymentInfoBean extends MessageAdapter implements GridDeploy case 1: byte depModeOrd; - depModeOrd = reader.readField("depMode", MessageFieldType.BYTE); + depModeOrd = reader.readByte("depMode"); if (!reader.isLastRead()) return false; @@ -210,7 +210,7 @@ public class GridDeploymentInfoBean extends MessageAdapter implements GridDeploy readState++; case 2: - locDepOwner = reader.readField("locDepOwner", MessageFieldType.BOOLEAN); + locDepOwner = reader.readBoolean("locDepOwner"); if (!reader.isLastRead()) return false; @@ -218,7 +218,7 @@ public class GridDeploymentInfoBean extends MessageAdapter implements GridDeploy readState++; case 3: - participants = reader.readMapField("participants", MessageFieldType.UUID, MessageFieldType.IGNITE_UUID, false); + participants = reader.readMap("participants", MessageFieldType.UUID, MessageFieldType.IGNITE_UUID, false); if (!reader.isLastRead()) return false; @@ -226,7 +226,7 @@ public class GridDeploymentInfoBean extends MessageAdapter implements GridDeploy readState++; case 4: - userVer = reader.readField("userVer", MessageFieldType.STRING); + userVer = reader.readString("userVer"); 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/managers/deployment/GridDeploymentRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java index 4e720c4..7f6a7ce 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java @@ -160,7 +160,7 @@ public class GridDeploymentRequest extends MessageAdapter { writer.setBuffer(buf); if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -168,31 +168,31 @@ public class GridDeploymentRequest extends MessageAdapter { switch (writer.state()) { case 0: - if (!writer.writeField("isUndeploy", isUndeploy, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("isUndeploy", isUndeploy)) return false; writer.incrementState(); case 1: - if (!writer.writeField("ldrId", ldrId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("ldrId", ldrId)) return false; writer.incrementState(); case 2: - if (!writer.writeCollectionField("nodeIds", nodeIds, MessageFieldType.UUID)) + if (!writer.writeCollection("nodeIds", nodeIds, MessageFieldType.UUID)) return false; writer.incrementState(); case 3: - if (!writer.writeField("resTopicBytes", resTopicBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("resTopicBytes", resTopicBytes)) return false; writer.incrementState(); case 4: - if (!writer.writeField("rsrcName", rsrcName, MessageFieldType.STRING)) + if (!writer.writeString("rsrcName", rsrcName)) return false; writer.incrementState(); @@ -208,7 +208,7 @@ public class GridDeploymentRequest extends MessageAdapter { switch (readState) { case 0: - isUndeploy = reader.readField("isUndeploy", MessageFieldType.BOOLEAN); + isUndeploy = reader.readBoolean("isUndeploy"); if (!reader.isLastRead()) return false; @@ -216,7 +216,7 @@ public class GridDeploymentRequest extends MessageAdapter { readState++; case 1: - ldrId = reader.readField("ldrId", MessageFieldType.IGNITE_UUID); + ldrId = reader.readIgniteUuid("ldrId"); if (!reader.isLastRead()) return false; @@ -224,7 +224,7 @@ public class GridDeploymentRequest extends MessageAdapter { readState++; case 2: - nodeIds = reader.readCollectionField("nodeIds", MessageFieldType.UUID); + nodeIds = reader.readCollection("nodeIds", MessageFieldType.UUID); if (!reader.isLastRead()) return false; @@ -232,7 +232,7 @@ public class GridDeploymentRequest extends MessageAdapter { readState++; case 3: - resTopicBytes = reader.readField("resTopicBytes", MessageFieldType.BYTE_ARR); + resTopicBytes = reader.readByteArray("resTopicBytes"); if (!reader.isLastRead()) return false; @@ -240,7 +240,7 @@ public class GridDeploymentRequest extends MessageAdapter { readState++; case 4: - rsrcName = reader.readField("rsrcName", MessageFieldType.STRING); + rsrcName = reader.readString("rsrcName"); 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/managers/deployment/GridDeploymentResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java index 1ac8229..093f7d4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java @@ -110,7 +110,7 @@ public class GridDeploymentResponse extends MessageAdapter { writer.setBuffer(buf); if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -118,19 +118,19 @@ public class GridDeploymentResponse extends MessageAdapter { switch (writer.state()) { case 0: - if (!writer.writeField("byteSrc", byteSrc, MessageFieldType.MSG)) + if (!writer.writeMessage("byteSrc", byteSrc)) return false; writer.incrementState(); case 1: - if (!writer.writeField("errMsg", errMsg, MessageFieldType.STRING)) + if (!writer.writeString("errMsg", errMsg)) return false; writer.incrementState(); case 2: - if (!writer.writeField("success", success, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("success", success)) return false; writer.incrementState(); @@ -146,7 +146,7 @@ public class GridDeploymentResponse extends MessageAdapter { switch (readState) { case 0: - byteSrc = reader.readField("byteSrc", MessageFieldType.MSG); + byteSrc = reader.readMessage("byteSrc"); if (!reader.isLastRead()) return false; @@ -154,7 +154,7 @@ public class GridDeploymentResponse extends MessageAdapter { readState++; case 1: - errMsg = reader.readField("errMsg", MessageFieldType.STRING); + errMsg = reader.readString("errMsg"); if (!reader.isLastRead()) return false; @@ -162,7 +162,7 @@ public class GridDeploymentResponse extends MessageAdapter { readState++; case 2: - success = reader.readField("success", MessageFieldType.BOOLEAN); + success = reader.readBoolean("success"); 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/managers/eventstorage/GridEventStorageMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java index 522593c..0762849 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java @@ -265,7 +265,7 @@ public class GridEventStorageMessage extends MessageAdapter { writer.setBuffer(buf); if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -273,55 +273,55 @@ public class GridEventStorageMessage extends MessageAdapter { switch (writer.state()) { case 0: - if (!writer.writeField("clsLdrId", clsLdrId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("clsLdrId", clsLdrId)) return false; writer.incrementState(); case 1: - if (!writer.writeField("depMode", depMode != null ? (byte)depMode.ordinal() : -1, MessageFieldType.BYTE)) + if (!writer.writeByte("depMode", depMode != null ? (byte)depMode.ordinal() : -1)) return false; writer.incrementState(); case 2: - if (!writer.writeField("evtsBytes", evtsBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("evtsBytes", evtsBytes)) return false; writer.incrementState(); case 3: - if (!writer.writeField("exBytes", exBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("exBytes", exBytes)) return false; writer.incrementState(); case 4: - if (!writer.writeField("filter", filter, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("filter", filter)) return false; writer.incrementState(); case 5: - if (!writer.writeField("filterClsName", filterClsName, MessageFieldType.STRING)) + if (!writer.writeString("filterClsName", filterClsName)) return false; writer.incrementState(); case 6: - if (!writer.writeMapField("ldrParties", ldrParties, MessageFieldType.UUID, MessageFieldType.IGNITE_UUID)) + if (!writer.writeMap("ldrParties", ldrParties, MessageFieldType.UUID, MessageFieldType.IGNITE_UUID)) return false; writer.incrementState(); case 7: - if (!writer.writeField("resTopicBytes", resTopicBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("resTopicBytes", resTopicBytes)) return false; writer.incrementState(); case 8: - if (!writer.writeField("userVer", userVer, MessageFieldType.STRING)) + if (!writer.writeString("userVer", userVer)) return false; writer.incrementState(); @@ -337,7 +337,7 @@ public class GridEventStorageMessage extends MessageAdapter { switch (readState) { case 0: - clsLdrId = reader.readField("clsLdrId", MessageFieldType.IGNITE_UUID); + clsLdrId = reader.readIgniteUuid("clsLdrId"); if (!reader.isLastRead()) return false; @@ -347,7 +347,7 @@ public class GridEventStorageMessage extends MessageAdapter { case 1: byte depModeOrd; - depModeOrd = reader.readField("depMode", MessageFieldType.BYTE); + depModeOrd = reader.readByte("depMode"); if (!reader.isLastRead()) return false; @@ -357,7 +357,7 @@ public class GridEventStorageMessage extends MessageAdapter { readState++; case 2: - evtsBytes = reader.readField("evtsBytes", MessageFieldType.BYTE_ARR); + evtsBytes = reader.readByteArray("evtsBytes"); if (!reader.isLastRead()) return false; @@ -365,7 +365,7 @@ public class GridEventStorageMessage extends MessageAdapter { readState++; case 3: - exBytes = reader.readField("exBytes", MessageFieldType.BYTE_ARR); + exBytes = reader.readByteArray("exBytes"); if (!reader.isLastRead()) return false; @@ -373,7 +373,7 @@ public class GridEventStorageMessage extends MessageAdapter { readState++; case 4: - filter = reader.readField("filter", MessageFieldType.BYTE_ARR); + filter = reader.readByteArray("filter"); if (!reader.isLastRead()) return false; @@ -381,7 +381,7 @@ public class GridEventStorageMessage extends MessageAdapter { readState++; case 5: - filterClsName = reader.readField("filterClsName", MessageFieldType.STRING); + filterClsName = reader.readString("filterClsName"); if (!reader.isLastRead()) return false; @@ -389,7 +389,7 @@ public class GridEventStorageMessage extends MessageAdapter { readState++; case 6: - ldrParties = reader.readMapField("ldrParties", MessageFieldType.UUID, MessageFieldType.IGNITE_UUID, false); + ldrParties = reader.readMap("ldrParties", MessageFieldType.UUID, MessageFieldType.IGNITE_UUID, false); if (!reader.isLastRead()) return false; @@ -397,7 +397,7 @@ public class GridEventStorageMessage extends MessageAdapter { readState++; case 7: - resTopicBytes = reader.readField("resTopicBytes", MessageFieldType.BYTE_ARR); + resTopicBytes = reader.readByteArray("resTopicBytes"); if (!reader.isLastRead()) return false; @@ -405,7 +405,7 @@ public class GridEventStorageMessage extends MessageAdapter { readState++; case 8: - userVer = reader.readField("userVer", MessageFieldType.STRING); + userVer = reader.readString("userVer"); if (!reader.isLastRead()) return false;
