http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01689b1d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java index b99c69d..23c1306 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java @@ -147,7 +147,7 @@ public class GridCacheEvictionRequest<K, V> extends GridCacheMessage<K, V> imple return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -155,19 +155,19 @@ public class GridCacheEvictionRequest<K, V> extends GridCacheMessage<K, V> imple switch (writer.state()) { case 3: - if (!writer.writeField("entriesBytes", entriesBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("entriesBytes", entriesBytes)) return false; writer.incrementState(); case 4: - if (!writer.writeField("futId", futId, MessageFieldType.LONG)) + if (!writer.writeLong("futId", futId)) return false; writer.incrementState(); case 5: - if (!writer.writeField("topVer", topVer, MessageFieldType.LONG)) + if (!writer.writeLong("topVer", topVer)) return false; writer.incrementState(); @@ -186,7 +186,7 @@ public class GridCacheEvictionRequest<K, V> extends GridCacheMessage<K, V> imple switch (readState) { case 3: - entriesBytes = reader.readField("entriesBytes", MessageFieldType.BYTE_ARR); + entriesBytes = reader.readByteArray("entriesBytes"); if (!reader.isLastRead()) return false; @@ -194,7 +194,7 @@ public class GridCacheEvictionRequest<K, V> extends GridCacheMessage<K, V> imple readState++; case 4: - futId = reader.readField("futId", MessageFieldType.LONG); + futId = reader.readLong("futId"); if (!reader.isLastRead()) return false; @@ -202,7 +202,7 @@ public class GridCacheEvictionRequest<K, V> extends GridCacheMessage<K, V> imple readState++; case 5: - 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/GridCacheEvictionResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java index d73240a..b1f9902 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java @@ -136,7 +136,7 @@ public class GridCacheEvictionResponse<K, V> extends GridCacheMessage<K, V> { return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -144,19 +144,19 @@ public class GridCacheEvictionResponse<K, V> extends GridCacheMessage<K, V> { switch (writer.state()) { case 3: - if (!writer.writeField("err", err, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("err", err)) return false; writer.incrementState(); case 4: - if (!writer.writeField("futId", futId, MessageFieldType.LONG)) + if (!writer.writeLong("futId", futId)) return false; writer.incrementState(); case 5: - if (!writer.writeCollectionField("rejectedKeyBytes", rejectedKeyBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("rejectedKeyBytes", rejectedKeyBytes, MessageFieldType.BYTE_ARR)) return false; writer.incrementState(); @@ -175,7 +175,7 @@ public class GridCacheEvictionResponse<K, V> extends GridCacheMessage<K, V> { switch (readState) { case 3: - err = reader.readField("err", MessageFieldType.BOOLEAN); + err = reader.readBoolean("err"); if (!reader.isLastRead()) return false; @@ -183,7 +183,7 @@ public class GridCacheEvictionResponse<K, V> extends GridCacheMessage<K, V> { readState++; case 4: - futId = reader.readField("futId", MessageFieldType.LONG); + futId = reader.readLong("futId"); if (!reader.isLastRead()) return false; @@ -191,7 +191,7 @@ public class GridCacheEvictionResponse<K, V> extends GridCacheMessage<K, V> { readState++; case 5: - rejectedKeyBytes = reader.readCollectionField("rejectedKeyBytes", MessageFieldType.BYTE_ARR); + rejectedKeyBytes = reader.readCollection("rejectedKeyBytes", 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/GridCacheMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java index e3dc0e6..839031b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java @@ -650,7 +650,7 @@ public abstract class GridCacheMessage<K, V> extends MessageAdapter { writer.setBuffer(buf); if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -658,19 +658,19 @@ public abstract class GridCacheMessage<K, V> extends MessageAdapter { switch (writer.state()) { case 0: - if (!writer.writeField("cacheId", cacheId, MessageFieldType.INT)) + if (!writer.writeInt("cacheId", cacheId)) return false; writer.incrementState(); case 1: - if (!writer.writeField("depInfo", depInfo, MessageFieldType.MSG)) + if (!writer.writeMessage("depInfo", depInfo)) return false; writer.incrementState(); case 2: - if (!writer.writeField("msgId", msgId, MessageFieldType.LONG)) + if (!writer.writeLong("msgId", msgId)) return false; writer.incrementState(); @@ -686,7 +686,7 @@ public abstract class GridCacheMessage<K, V> extends MessageAdapter { switch (readState) { case 0: - cacheId = reader.readField("cacheId", MessageFieldType.INT); + cacheId = reader.readInt("cacheId"); if (!reader.isLastRead()) return false; @@ -694,7 +694,7 @@ public abstract class GridCacheMessage<K, V> extends MessageAdapter { readState++; case 1: - depInfo = reader.readField("depInfo", MessageFieldType.MSG); + depInfo = reader.readMessage("depInfo"); if (!reader.isLastRead()) return false; @@ -702,7 +702,7 @@ public abstract class GridCacheMessage<K, V> extends MessageAdapter { readState++; case 2: - msgId = reader.readField("msgId", MessageFieldType.LONG); + msgId = reader.readLong("msgId"); 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/GridCacheValueBytes.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytes.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytes.java index 4e5a83c..dd30b5a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytes.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytes.java @@ -124,7 +124,7 @@ public class GridCacheValueBytes extends MessageAdapter { writer.setBuffer(buf); if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -132,13 +132,13 @@ public class GridCacheValueBytes extends MessageAdapter { switch (writer.state()) { case 0: - if (!writer.writeField("bytes", bytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("bytes", bytes)) return false; writer.incrementState(); case 1: - if (!writer.writeField("plain", plain, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("plain", plain)) return false; writer.incrementState(); @@ -154,7 +154,7 @@ public class GridCacheValueBytes extends MessageAdapter { switch (readState) { case 0: - bytes = reader.readField("bytes", MessageFieldType.BYTE_ARR); + bytes = reader.readByteArray("bytes"); if (!reader.isLastRead()) return false; @@ -162,7 +162,7 @@ public class GridCacheValueBytes extends MessageAdapter { readState++; case 1: - plain = reader.readField("plain", MessageFieldType.BOOLEAN); + plain = reader.readBoolean("plain"); 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/GridCacheOptimisticCheckPreparedTxRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java index e84ae1d..d6f175e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java @@ -117,7 +117,7 @@ public class GridCacheOptimisticCheckPreparedTxRequest<K, V> extends GridDistrib return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -125,31 +125,31 @@ public class GridCacheOptimisticCheckPreparedTxRequest<K, V> extends GridDistrib switch (writer.state()) { case 8: - if (!writer.writeField("futId", futId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); case 9: - if (!writer.writeField("miniId", miniId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); case 10: - if (!writer.writeField("nearXidVer", nearXidVer, MessageFieldType.MSG)) + if (!writer.writeMessage("nearXidVer", nearXidVer)) return false; writer.incrementState(); case 11: - if (!writer.writeField("sys", sys, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("sys", sys)) return false; writer.incrementState(); case 12: - if (!writer.writeField("txNum", txNum, MessageFieldType.INT)) + if (!writer.writeInt("txNum", txNum)) return false; writer.incrementState(); @@ -168,7 +168,7 @@ public class GridCacheOptimisticCheckPreparedTxRequest<K, V> extends GridDistrib switch (readState) { case 8: - futId = reader.readField("futId", MessageFieldType.IGNITE_UUID); + futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) return false; @@ -176,7 +176,7 @@ public class GridCacheOptimisticCheckPreparedTxRequest<K, V> extends GridDistrib readState++; case 9: - miniId = reader.readField("miniId", MessageFieldType.IGNITE_UUID); + miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) return false; @@ -184,7 +184,7 @@ public class GridCacheOptimisticCheckPreparedTxRequest<K, V> extends GridDistrib readState++; case 10: - nearXidVer = reader.readField("nearXidVer", MessageFieldType.MSG); + nearXidVer = reader.readMessage("nearXidVer"); if (!reader.isLastRead()) return false; @@ -192,7 +192,7 @@ public class GridCacheOptimisticCheckPreparedTxRequest<K, V> extends GridDistrib readState++; case 11: - sys = reader.readField("sys", MessageFieldType.BOOLEAN); + sys = reader.readBoolean("sys"); if (!reader.isLastRead()) return false; @@ -200,7 +200,7 @@ public class GridCacheOptimisticCheckPreparedTxRequest<K, V> extends GridDistrib readState++; case 12: - txNum = reader.readField("txNum", MessageFieldType.INT); + txNum = reader.readInt("txNum"); 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/GridCacheOptimisticCheckPreparedTxResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java index e1a35d7..0168398 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java @@ -92,7 +92,7 @@ public class GridCacheOptimisticCheckPreparedTxResponse<K, V> extends GridDistri return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -100,19 +100,19 @@ public class GridCacheOptimisticCheckPreparedTxResponse<K, V> extends GridDistri switch (writer.state()) { case 8: - if (!writer.writeField("futId", futId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); case 9: - if (!writer.writeField("miniId", miniId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); case 10: - if (!writer.writeField("success", success, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("success", success)) return false; writer.incrementState(); @@ -131,7 +131,7 @@ public class GridCacheOptimisticCheckPreparedTxResponse<K, V> extends GridDistri switch (readState) { case 8: - futId = reader.readField("futId", MessageFieldType.IGNITE_UUID); + futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) return false; @@ -139,7 +139,7 @@ public class GridCacheOptimisticCheckPreparedTxResponse<K, V> extends GridDistri readState++; case 9: - miniId = reader.readField("miniId", MessageFieldType.IGNITE_UUID); + miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) return false; @@ -147,7 +147,7 @@ public class GridCacheOptimisticCheckPreparedTxResponse<K, V> extends GridDistri readState++; case 10: - 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/processors/cache/distributed/GridCachePessimisticCheckCommittedTxRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxRequest.java index 3538c07..b25f290 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxRequest.java @@ -147,7 +147,7 @@ public class GridCachePessimisticCheckCommittedTxRequest<K, V> extends GridDistr return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -155,43 +155,43 @@ public class GridCachePessimisticCheckCommittedTxRequest<K, V> extends GridDistr switch (writer.state()) { case 8: - if (!writer.writeField("futId", futId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); case 9: - if (!writer.writeField("miniId", miniId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); case 10: - if (!writer.writeField("nearOnlyCheck", nearOnlyCheck, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("nearOnlyCheck", nearOnlyCheck)) return false; writer.incrementState(); case 11: - if (!writer.writeField("nearXidVer", nearXidVer, MessageFieldType.MSG)) + if (!writer.writeMessage("nearXidVer", nearXidVer)) return false; writer.incrementState(); case 12: - if (!writer.writeField("originatingNodeId", originatingNodeId, MessageFieldType.UUID)) + if (!writer.writeUuid("originatingNodeId", originatingNodeId)) return false; writer.incrementState(); case 13: - if (!writer.writeField("originatingThreadId", originatingThreadId, MessageFieldType.LONG)) + if (!writer.writeLong("originatingThreadId", originatingThreadId)) return false; writer.incrementState(); case 14: - if (!writer.writeField("sys", sys, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("sys", sys)) return false; writer.incrementState(); @@ -210,7 +210,7 @@ public class GridCachePessimisticCheckCommittedTxRequest<K, V> extends GridDistr switch (readState) { case 8: - futId = reader.readField("futId", MessageFieldType.IGNITE_UUID); + futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) return false; @@ -218,7 +218,7 @@ public class GridCachePessimisticCheckCommittedTxRequest<K, V> extends GridDistr readState++; case 9: - miniId = reader.readField("miniId", MessageFieldType.IGNITE_UUID); + miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) return false; @@ -226,7 +226,7 @@ public class GridCachePessimisticCheckCommittedTxRequest<K, V> extends GridDistr readState++; case 10: - nearOnlyCheck = reader.readField("nearOnlyCheck", MessageFieldType.BOOLEAN); + nearOnlyCheck = reader.readBoolean("nearOnlyCheck"); if (!reader.isLastRead()) return false; @@ -234,7 +234,7 @@ public class GridCachePessimisticCheckCommittedTxRequest<K, V> extends GridDistr readState++; case 11: - nearXidVer = reader.readField("nearXidVer", MessageFieldType.MSG); + nearXidVer = reader.readMessage("nearXidVer"); if (!reader.isLastRead()) return false; @@ -242,7 +242,7 @@ public class GridCachePessimisticCheckCommittedTxRequest<K, V> extends GridDistr readState++; case 12: - originatingNodeId = reader.readField("originatingNodeId", MessageFieldType.UUID); + originatingNodeId = reader.readUuid("originatingNodeId"); if (!reader.isLastRead()) return false; @@ -250,7 +250,7 @@ public class GridCachePessimisticCheckCommittedTxRequest<K, V> extends GridDistr readState++; case 13: - originatingThreadId = reader.readField("originatingThreadId", MessageFieldType.LONG); + originatingThreadId = reader.readLong("originatingThreadId"); if (!reader.isLastRead()) return false; @@ -258,7 +258,7 @@ public class GridCachePessimisticCheckCommittedTxRequest<K, V> extends GridDistr readState++; case 14: - 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/processors/cache/distributed/GridCachePessimisticCheckCommittedTxResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxResponse.java index b402f18..69682cb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxResponse.java @@ -135,7 +135,7 @@ public class GridCachePessimisticCheckCommittedTxResponse<K, V> extends GridDist return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -143,25 +143,25 @@ public class GridCachePessimisticCheckCommittedTxResponse<K, V> extends GridDist switch (writer.state()) { case 8: - if (!writer.writeField("committedTxInfoBytes", committedTxInfoBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("committedTxInfoBytes", committedTxInfoBytes)) return false; writer.incrementState(); case 9: - if (!writer.writeField("futId", futId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); case 10: - if (!writer.writeField("miniId", miniId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); case 11: - if (!writer.writeField("sys", sys, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("sys", sys)) return false; writer.incrementState(); @@ -180,7 +180,7 @@ public class GridCachePessimisticCheckCommittedTxResponse<K, V> extends GridDist switch (readState) { case 8: - committedTxInfoBytes = reader.readField("committedTxInfoBytes", MessageFieldType.BYTE_ARR); + committedTxInfoBytes = reader.readByteArray("committedTxInfoBytes"); if (!reader.isLastRead()) return false; @@ -188,7 +188,7 @@ public class GridCachePessimisticCheckCommittedTxResponse<K, V> extends GridDist readState++; case 9: - futId = reader.readField("futId", MessageFieldType.IGNITE_UUID); + futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) return false; @@ -196,7 +196,7 @@ public class GridCachePessimisticCheckCommittedTxResponse<K, V> extends GridDist readState++; case 10: - miniId = reader.readField("miniId", MessageFieldType.IGNITE_UUID); + miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) return false; @@ -204,7 +204,7 @@ public class GridCachePessimisticCheckCommittedTxResponse<K, V> extends GridDist readState++; case 11: - 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/processors/cache/distributed/GridCacheTtlUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java index f057f7c..19da7fe 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java @@ -194,7 +194,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> { return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -202,37 +202,37 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> { switch (writer.state()) { case 3: - if (!writer.writeCollectionField("keysBytes", keysBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("keysBytes", keysBytes, MessageFieldType.BYTE_ARR)) return false; writer.incrementState(); case 4: - if (!writer.writeCollectionField("nearKeysBytes", nearKeysBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("nearKeysBytes", nearKeysBytes, MessageFieldType.BYTE_ARR)) return false; writer.incrementState(); case 5: - if (!writer.writeCollectionField("nearVers", nearVers, MessageFieldType.MSG)) + if (!writer.writeCollection("nearVers", nearVers, MessageFieldType.MSG)) return false; writer.incrementState(); case 6: - if (!writer.writeField("topVer", topVer, MessageFieldType.LONG)) + if (!writer.writeLong("topVer", topVer)) return false; writer.incrementState(); case 7: - if (!writer.writeField("ttl", ttl, MessageFieldType.LONG)) + if (!writer.writeLong("ttl", ttl)) return false; writer.incrementState(); case 8: - if (!writer.writeCollectionField("vers", vers, MessageFieldType.MSG)) + if (!writer.writeCollection("vers", vers, MessageFieldType.MSG)) return false; writer.incrementState(); @@ -251,7 +251,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> { switch (readState) { case 3: - keysBytes = reader.readCollectionField("keysBytes", MessageFieldType.BYTE_ARR); + keysBytes = reader.readCollection("keysBytes", MessageFieldType.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -259,7 +259,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> { readState++; case 4: - nearKeysBytes = reader.readCollectionField("nearKeysBytes", MessageFieldType.BYTE_ARR); + nearKeysBytes = reader.readCollection("nearKeysBytes", MessageFieldType.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -267,7 +267,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> { readState++; case 5: - nearVers = reader.readCollectionField("nearVers", MessageFieldType.MSG); + nearVers = reader.readCollection("nearVers", MessageFieldType.MSG); if (!reader.isLastRead()) return false; @@ -275,7 +275,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> { readState++; case 6: - topVer = reader.readField("topVer", MessageFieldType.LONG); + topVer = reader.readLong("topVer"); if (!reader.isLastRead()) return false; @@ -283,7 +283,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> { readState++; case 7: - ttl = reader.readField("ttl", MessageFieldType.LONG); + ttl = reader.readLong("ttl"); if (!reader.isLastRead()) return false; @@ -291,7 +291,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> { readState++; case 8: - vers = reader.readCollectionField("vers", MessageFieldType.MSG); + vers = reader.readCollection("vers", 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/GridDistributedBaseMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java index 9717e28..f58c520 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java @@ -247,7 +247,7 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage< return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -255,31 +255,31 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage< switch (writer.state()) { case 3: - if (!writer.writeField("candsByIdxBytes", candsByIdxBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("candsByIdxBytes", candsByIdxBytes)) return false; writer.incrementState(); case 4: - if (!writer.writeField("candsByKeyBytes", candsByKeyBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("candsByKeyBytes", candsByKeyBytes)) return false; writer.incrementState(); case 5: - if (!writer.writeCollectionField("committedVers", committedVers, MessageFieldType.MSG)) + if (!writer.writeCollection("committedVers", committedVers, MessageFieldType.MSG)) return false; writer.incrementState(); case 6: - if (!writer.writeCollectionField("rolledbackVers", rolledbackVers, MessageFieldType.MSG)) + if (!writer.writeCollection("rolledbackVers", rolledbackVers, MessageFieldType.MSG)) return false; writer.incrementState(); case 7: - if (!writer.writeField("ver", ver, MessageFieldType.MSG)) + if (!writer.writeMessage("ver", ver)) return false; writer.incrementState(); @@ -298,7 +298,7 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage< switch (readState) { case 3: - candsByIdxBytes = reader.readField("candsByIdxBytes", MessageFieldType.BYTE_ARR); + candsByIdxBytes = reader.readByteArray("candsByIdxBytes"); if (!reader.isLastRead()) return false; @@ -306,7 +306,7 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage< readState++; case 4: - candsByKeyBytes = reader.readField("candsByKeyBytes", MessageFieldType.BYTE_ARR); + candsByKeyBytes = reader.readByteArray("candsByKeyBytes"); if (!reader.isLastRead()) return false; @@ -314,7 +314,7 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage< readState++; case 5: - committedVers = reader.readCollectionField("committedVers", MessageFieldType.MSG); + committedVers = reader.readCollection("committedVers", MessageFieldType.MSG); if (!reader.isLastRead()) return false; @@ -322,7 +322,7 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage< readState++; case 6: - rolledbackVers = reader.readCollectionField("rolledbackVers", MessageFieldType.MSG); + rolledbackVers = reader.readCollection("rolledbackVers", MessageFieldType.MSG); if (!reader.isLastRead()) return false; @@ -330,7 +330,7 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage< readState++; case 7: - ver = reader.readField("ver", MessageFieldType.MSG); + ver = reader.readMessage("ver"); 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/GridDistributedLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java index 8b16f87..ed20375 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java @@ -433,7 +433,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -441,97 +441,97 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage switch (writer.state()) { case 8: - if (!writer.writeArrayField("drVersByIdx", drVersByIdx, MessageFieldType.MSG)) + if (!writer.writeObjectArray("drVersByIdx", drVersByIdx, MessageFieldType.MSG)) return false; writer.incrementState(); case 9: - if (!writer.writeField("futId", futId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); case 10: - if (!writer.writeField("grpLockKeyBytes", grpLockKeyBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("grpLockKeyBytes", grpLockKeyBytes)) return false; writer.incrementState(); case 11: - if (!writer.writeField("isInTx", isInTx, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("isInTx", isInTx)) return false; writer.incrementState(); case 12: - if (!writer.writeField("isInvalidate", isInvalidate, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("isInvalidate", isInvalidate)) return false; writer.incrementState(); case 13: - if (!writer.writeField("isRead", isRead, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("isRead", isRead)) return false; writer.incrementState(); case 14: - 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 15: - if (!writer.writeCollectionField("keyBytes", keyBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("keyBytes", keyBytes, MessageFieldType.BYTE_ARR)) return false; writer.incrementState(); case 16: - if (!writer.writeField("nearXidVer", nearXidVer, MessageFieldType.MSG)) + if (!writer.writeMessage("nearXidVer", nearXidVer)) return false; writer.incrementState(); case 17: - if (!writer.writeField("nodeId", nodeId, MessageFieldType.UUID)) + if (!writer.writeUuid("nodeId", nodeId)) return false; writer.incrementState(); case 18: - if (!writer.writeField("partLock", partLock, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("partLock", partLock)) return false; writer.incrementState(); case 19: - if (!writer.writeField("retVals", retVals, MessageFieldType.BOOLEAN_ARR)) + if (!writer.writeBooleanArray("retVals", retVals)) return false; writer.incrementState(); case 20: - if (!writer.writeField("threadId", threadId, MessageFieldType.LONG)) + if (!writer.writeLong("threadId", threadId)) return false; writer.incrementState(); case 21: - if (!writer.writeField("timeout", timeout, MessageFieldType.LONG)) + if (!writer.writeLong("timeout", timeout)) return false; writer.incrementState(); case 22: - if (!writer.writeField("txSize", txSize, MessageFieldType.INT)) + if (!writer.writeInt("txSize", txSize)) return false; writer.incrementState(); case 23: - if (!writer.writeField("writeEntriesBytes", writeEntriesBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("writeEntriesBytes", writeEntriesBytes)) return false; writer.incrementState(); @@ -550,7 +550,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage switch (readState) { case 8: - drVersByIdx = reader.readArrayField("drVersByIdx", MessageFieldType.MSG, GridCacheVersion.class); + drVersByIdx = reader.readObjectArray("drVersByIdx", MessageFieldType.MSG, GridCacheVersion.class); if (!reader.isLastRead()) return false; @@ -558,7 +558,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage readState++; case 9: - futId = reader.readField("futId", MessageFieldType.IGNITE_UUID); + futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) return false; @@ -566,7 +566,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage readState++; case 10: - grpLockKeyBytes = reader.readField("grpLockKeyBytes", MessageFieldType.BYTE_ARR); + grpLockKeyBytes = reader.readByteArray("grpLockKeyBytes"); if (!reader.isLastRead()) return false; @@ -574,7 +574,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage readState++; case 11: - isInTx = reader.readField("isInTx", MessageFieldType.BOOLEAN); + isInTx = reader.readBoolean("isInTx"); if (!reader.isLastRead()) return false; @@ -582,7 +582,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage readState++; case 12: - isInvalidate = reader.readField("isInvalidate", MessageFieldType.BOOLEAN); + isInvalidate = reader.readBoolean("isInvalidate"); if (!reader.isLastRead()) return false; @@ -590,7 +590,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage readState++; case 13: - isRead = reader.readField("isRead", MessageFieldType.BOOLEAN); + isRead = reader.readBoolean("isRead"); if (!reader.isLastRead()) return false; @@ -600,7 +600,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage case 14: byte isolationOrd; - isolationOrd = reader.readField("isolation", MessageFieldType.BYTE); + isolationOrd = reader.readByte("isolation"); if (!reader.isLastRead()) return false; @@ -610,7 +610,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage readState++; case 15: - keyBytes = reader.readCollectionField("keyBytes", MessageFieldType.BYTE_ARR); + keyBytes = reader.readCollection("keyBytes", MessageFieldType.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -618,7 +618,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage readState++; case 16: - nearXidVer = reader.readField("nearXidVer", MessageFieldType.MSG); + nearXidVer = reader.readMessage("nearXidVer"); if (!reader.isLastRead()) return false; @@ -626,7 +626,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage readState++; case 17: - nodeId = reader.readField("nodeId", MessageFieldType.UUID); + nodeId = reader.readUuid("nodeId"); if (!reader.isLastRead()) return false; @@ -634,7 +634,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage readState++; case 18: - partLock = reader.readField("partLock", MessageFieldType.BOOLEAN); + partLock = reader.readBoolean("partLock"); if (!reader.isLastRead()) return false; @@ -642,7 +642,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage readState++; case 19: - retVals = reader.readField("retVals", MessageFieldType.BOOLEAN_ARR); + retVals = reader.readBooleanArray("retVals"); if (!reader.isLastRead()) return false; @@ -650,7 +650,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage readState++; case 20: - threadId = reader.readField("threadId", MessageFieldType.LONG); + threadId = reader.readLong("threadId"); if (!reader.isLastRead()) return false; @@ -658,7 +658,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage readState++; case 21: - timeout = reader.readField("timeout", MessageFieldType.LONG); + timeout = reader.readLong("timeout"); if (!reader.isLastRead()) return false; @@ -666,7 +666,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage readState++; case 22: - txSize = reader.readField("txSize", MessageFieldType.INT); + txSize = reader.readInt("txSize"); if (!reader.isLastRead()) return false; @@ -674,7 +674,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage readState++; case 23: - writeEntriesBytes = reader.readField("writeEntriesBytes", MessageFieldType.BYTE_ARR); + writeEntriesBytes = reader.readByteArray("writeEntriesBytes"); 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/GridDistributedLockResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java index 0654e14..f02d826 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java @@ -284,7 +284,7 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -292,19 +292,19 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag switch (writer.state()) { case 8: - if (!writer.writeField("errBytes", errBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("errBytes", errBytes)) return false; writer.incrementState(); case 9: - if (!writer.writeField("futId", futId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); case 10: - if (!writer.writeCollectionField("valBytes", valBytes, MessageFieldType.MSG)) + if (!writer.writeCollection("valBytes", valBytes, MessageFieldType.MSG)) return false; writer.incrementState(); @@ -323,7 +323,7 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag switch (readState) { case 8: - errBytes = reader.readField("errBytes", MessageFieldType.BYTE_ARR); + errBytes = reader.readByteArray("errBytes"); if (!reader.isLastRead()) return false; @@ -331,7 +331,7 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag readState++; case 9: - futId = reader.readField("futId", MessageFieldType.IGNITE_UUID); + futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) return false; @@ -339,7 +339,7 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag readState++; case 10: - 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/GridDistributedTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java index 21a31e8..9896e18 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java @@ -351,7 +351,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -359,79 +359,79 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes switch (writer.state()) { case 8: - if (!writer.writeField("baseVer", baseVer, MessageFieldType.MSG)) + if (!writer.writeMessage("baseVer", baseVer)) return false; writer.incrementState(); case 9: - if (!writer.writeField("commit", commit, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("commit", commit)) return false; writer.incrementState(); case 10: - if (!writer.writeField("commitVer", commitVer, MessageFieldType.MSG)) + if (!writer.writeMessage("commitVer", commitVer)) return false; writer.incrementState(); case 11: - if (!writer.writeField("futId", futId, MessageFieldType.IGNITE_UUID)) + if (!writer.writeIgniteUuid("futId", futId)) return false; writer.incrementState(); case 12: - if (!writer.writeField("grpLockKeyBytes", grpLockKeyBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("grpLockKeyBytes", grpLockKeyBytes)) return false; writer.incrementState(); case 13: - if (!writer.writeField("invalidate", invalidate, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("invalidate", invalidate)) return false; writer.incrementState(); case 14: - if (!writer.writeCollectionField("recoveryWritesBytes", recoveryWritesBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("recoveryWritesBytes", recoveryWritesBytes, MessageFieldType.BYTE_ARR)) return false; writer.incrementState(); case 15: - if (!writer.writeField("syncCommit", syncCommit, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("syncCommit", syncCommit)) return false; writer.incrementState(); case 16: - if (!writer.writeField("syncRollback", syncRollback, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("syncRollback", syncRollback)) return false; writer.incrementState(); case 17: - if (!writer.writeField("sys", sys, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("sys", sys)) return false; writer.incrementState(); case 18: - if (!writer.writeField("threadId", threadId, MessageFieldType.LONG)) + if (!writer.writeLong("threadId", threadId)) return false; writer.incrementState(); case 19: - if (!writer.writeField("txSize", txSize, MessageFieldType.INT)) + if (!writer.writeInt("txSize", txSize)) return false; writer.incrementState(); case 20: - if (!writer.writeCollectionField("writeEntriesBytes", writeEntriesBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("writeEntriesBytes", writeEntriesBytes, MessageFieldType.BYTE_ARR)) return false; writer.incrementState(); @@ -450,7 +450,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes switch (readState) { case 8: - baseVer = reader.readField("baseVer", MessageFieldType.MSG); + baseVer = reader.readMessage("baseVer"); if (!reader.isLastRead()) return false; @@ -458,7 +458,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes readState++; case 9: - commit = reader.readField("commit", MessageFieldType.BOOLEAN); + commit = reader.readBoolean("commit"); if (!reader.isLastRead()) return false; @@ -466,7 +466,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes readState++; case 10: - commitVer = reader.readField("commitVer", MessageFieldType.MSG); + commitVer = reader.readMessage("commitVer"); if (!reader.isLastRead()) return false; @@ -474,7 +474,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes readState++; case 11: - futId = reader.readField("futId", MessageFieldType.IGNITE_UUID); + futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) return false; @@ -482,7 +482,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes readState++; case 12: - grpLockKeyBytes = reader.readField("grpLockKeyBytes", MessageFieldType.BYTE_ARR); + grpLockKeyBytes = reader.readByteArray("grpLockKeyBytes"); if (!reader.isLastRead()) return false; @@ -490,7 +490,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes readState++; case 13: - invalidate = reader.readField("invalidate", MessageFieldType.BOOLEAN); + invalidate = reader.readBoolean("invalidate"); if (!reader.isLastRead()) return false; @@ -498,7 +498,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes readState++; case 14: - recoveryWritesBytes = reader.readCollectionField("recoveryWritesBytes", MessageFieldType.BYTE_ARR); + recoveryWritesBytes = reader.readCollection("recoveryWritesBytes", MessageFieldType.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -506,7 +506,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes readState++; case 15: - syncCommit = reader.readField("syncCommit", MessageFieldType.BOOLEAN); + syncCommit = reader.readBoolean("syncCommit"); if (!reader.isLastRead()) return false; @@ -514,7 +514,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes readState++; case 16: - syncRollback = reader.readField("syncRollback", MessageFieldType.BOOLEAN); + syncRollback = reader.readBoolean("syncRollback"); if (!reader.isLastRead()) return false; @@ -522,7 +522,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes readState++; case 17: - sys = reader.readField("sys", MessageFieldType.BOOLEAN); + sys = reader.readBoolean("sys"); if (!reader.isLastRead()) return false; @@ -530,7 +530,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes readState++; case 18: - threadId = reader.readField("threadId", MessageFieldType.LONG); + threadId = reader.readLong("threadId"); if (!reader.isLastRead()) return false; @@ -538,7 +538,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes readState++; case 19: - txSize = reader.readField("txSize", MessageFieldType.INT); + txSize = reader.readInt("txSize"); if (!reader.isLastRead()) return false; @@ -546,7 +546,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes readState++; case 20: - writeEntriesBytes = reader.readCollectionField("writeEntriesBytes", MessageFieldType.BYTE_ARR); + writeEntriesBytes = reader.readCollection("writeEntriesBytes", 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/GridDistributedTxFinishResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java index b69350c..8d21c0e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java @@ -81,7 +81,7 @@ public class GridDistributedTxFinishResponse<K, V> extends GridCacheMessage<K, V return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -89,13 +89,13 @@ public class GridDistributedTxFinishResponse<K, V> extends GridCacheMessage<K, V 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.writeField("txId", txId, MessageFieldType.MSG)) + if (!writer.writeMessage("txId", txId)) return false; writer.incrementState(); @@ -114,7 +114,7 @@ public class GridDistributedTxFinishResponse<K, V> extends GridCacheMessage<K, V switch (readState) { case 3: - futId = reader.readField("futId", MessageFieldType.IGNITE_UUID); + futId = reader.readIgniteUuid("futId"); if (!reader.isLastRead()) return false; @@ -122,7 +122,7 @@ public class GridDistributedTxFinishResponse<K, V> extends GridCacheMessage<K, V readState++; case 4: - txId = reader.readField("txId", MessageFieldType.MSG); + txId = reader.readMessage("txId"); 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/GridDistributedTxPrepareRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java index 738c5ba..d685b48 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java @@ -409,7 +409,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -417,85 +417,85 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe switch (writer.state()) { case 8: - if (!writer.writeField("commitVer", commitVer, MessageFieldType.MSG)) + if (!writer.writeMessage("commitVer", commitVer)) return false; writer.incrementState(); case 9: - if (!writer.writeField("concurrency", concurrency != null ? (byte)concurrency.ordinal() : -1, MessageFieldType.BYTE)) + if (!writer.writeByte("concurrency", concurrency != null ? (byte)concurrency.ordinal() : -1)) return false; writer.incrementState(); case 10: - if (!writer.writeField("dhtVersBytes", dhtVersBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("dhtVersBytes", dhtVersBytes)) return false; writer.incrementState(); case 11: - if (!writer.writeField("grpLockKeyBytes", grpLockKeyBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("grpLockKeyBytes", grpLockKeyBytes)) return false; writer.incrementState(); case 12: - if (!writer.writeField("invalidate", invalidate, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("invalidate", invalidate)) return false; writer.incrementState(); case 13: - 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 14: - if (!writer.writeField("partLock", partLock, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("partLock", partLock)) return false; writer.incrementState(); case 15: - if (!writer.writeCollectionField("readsBytes", readsBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("readsBytes", readsBytes, MessageFieldType.BYTE_ARR)) return false; writer.incrementState(); case 16: - if (!writer.writeField("sys", sys, MessageFieldType.BOOLEAN)) + if (!writer.writeBoolean("sys", sys)) return false; writer.incrementState(); case 17: - if (!writer.writeField("threadId", threadId, MessageFieldType.LONG)) + if (!writer.writeLong("threadId", threadId)) 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.writeField("txNodesBytes", txNodesBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("txNodesBytes", txNodesBytes)) return false; writer.incrementState(); case 20: - if (!writer.writeField("txSize", txSize, MessageFieldType.INT)) + if (!writer.writeInt("txSize", txSize)) return false; writer.incrementState(); case 21: - if (!writer.writeCollectionField("writesBytes", writesBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("writesBytes", writesBytes, MessageFieldType.BYTE_ARR)) return false; writer.incrementState(); @@ -514,7 +514,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe switch (readState) { case 8: - commitVer = reader.readField("commitVer", MessageFieldType.MSG); + commitVer = reader.readMessage("commitVer"); if (!reader.isLastRead()) return false; @@ -524,7 +524,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe case 9: byte concurrencyOrd; - concurrencyOrd = reader.readField("concurrency", MessageFieldType.BYTE); + concurrencyOrd = reader.readByte("concurrency"); if (!reader.isLastRead()) return false; @@ -534,7 +534,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe readState++; case 10: - dhtVersBytes = reader.readField("dhtVersBytes", MessageFieldType.BYTE_ARR); + dhtVersBytes = reader.readByteArray("dhtVersBytes"); if (!reader.isLastRead()) return false; @@ -542,7 +542,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe readState++; case 11: - grpLockKeyBytes = reader.readField("grpLockKeyBytes", MessageFieldType.BYTE_ARR); + grpLockKeyBytes = reader.readByteArray("grpLockKeyBytes"); if (!reader.isLastRead()) return false; @@ -550,7 +550,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe readState++; case 12: - invalidate = reader.readField("invalidate", MessageFieldType.BOOLEAN); + invalidate = reader.readBoolean("invalidate"); if (!reader.isLastRead()) return false; @@ -560,7 +560,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe case 13: byte isolationOrd; - isolationOrd = reader.readField("isolation", MessageFieldType.BYTE); + isolationOrd = reader.readByte("isolation"); if (!reader.isLastRead()) return false; @@ -570,7 +570,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe readState++; case 14: - partLock = reader.readField("partLock", MessageFieldType.BOOLEAN); + partLock = reader.readBoolean("partLock"); if (!reader.isLastRead()) return false; @@ -578,7 +578,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe readState++; case 15: - readsBytes = reader.readCollectionField("readsBytes", MessageFieldType.BYTE_ARR); + readsBytes = reader.readCollection("readsBytes", MessageFieldType.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -586,7 +586,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe readState++; case 16: - sys = reader.readField("sys", MessageFieldType.BOOLEAN); + sys = reader.readBoolean("sys"); if (!reader.isLastRead()) return false; @@ -594,7 +594,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe readState++; case 17: - threadId = reader.readField("threadId", MessageFieldType.LONG); + threadId = reader.readLong("threadId"); if (!reader.isLastRead()) return false; @@ -602,7 +602,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe readState++; case 18: - timeout = reader.readField("timeout", MessageFieldType.LONG); + timeout = reader.readLong("timeout"); if (!reader.isLastRead()) return false; @@ -610,7 +610,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe readState++; case 19: - txNodesBytes = reader.readField("txNodesBytes", MessageFieldType.BYTE_ARR); + txNodesBytes = reader.readByteArray("txNodesBytes"); if (!reader.isLastRead()) return false; @@ -618,7 +618,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe readState++; case 20: - txSize = reader.readField("txSize", MessageFieldType.INT); + txSize = reader.readInt("txSize"); if (!reader.isLastRead()) return false; @@ -626,7 +626,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe readState++; case 21: - writesBytes = reader.readCollectionField("writesBytes", MessageFieldType.BYTE_ARR); + writesBytes = reader.readCollection("writesBytes", 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/GridDistributedTxPrepareResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java index 6c0ad3d..c8576a1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java @@ -156,7 +156,7 @@ public class GridDistributedTxPrepareResponse<K, V> extends GridDistributedBaseM return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -164,13 +164,13 @@ public class GridDistributedTxPrepareResponse<K, V> extends GridDistributedBaseM switch (writer.state()) { case 8: - if (!writer.writeField("candsBytes", candsBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("candsBytes", candsBytes)) return false; writer.incrementState(); case 9: - if (!writer.writeField("errBytes", errBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("errBytes", errBytes)) return false; writer.incrementState(); @@ -189,7 +189,7 @@ public class GridDistributedTxPrepareResponse<K, V> extends GridDistributedBaseM switch (readState) { case 8: - candsBytes = reader.readField("candsBytes", MessageFieldType.BYTE_ARR); + candsBytes = reader.readByteArray("candsBytes"); if (!reader.isLastRead()) return false; @@ -197,7 +197,7 @@ public class GridDistributedTxPrepareResponse<K, V> extends GridDistributedBaseM readState++; case 9: - errBytes = reader.readField("errBytes", MessageFieldType.BYTE_ARR); + errBytes = reader.readByteArray("errBytes"); 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/GridDistributedUnlockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java index 0b77dc7..8526a9e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java @@ -122,7 +122,7 @@ public class GridDistributedUnlockRequest<K, V> extends GridDistributedBaseMessa return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -130,7 +130,7 @@ public class GridDistributedUnlockRequest<K, V> extends GridDistributedBaseMessa switch (writer.state()) { case 8: - if (!writer.writeCollectionField("keyBytes", keyBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("keyBytes", keyBytes, MessageFieldType.BYTE_ARR)) return false; writer.incrementState(); @@ -149,7 +149,7 @@ public class GridDistributedUnlockRequest<K, V> extends GridDistributedBaseMessa switch (readState) { case 8: - keyBytes = reader.readCollectionField("keyBytes", MessageFieldType.BYTE_ARR); + keyBytes = reader.readCollection("keyBytes", 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/GridDhtAffinityAssignmentRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java index 6b95b8c..7a2d68c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java @@ -74,7 +74,7 @@ public class GridDhtAffinityAssignmentRequest<K, V> extends GridCacheMessage<K, return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -82,7 +82,7 @@ public class GridDhtAffinityAssignmentRequest<K, V> extends GridCacheMessage<K, switch (writer.state()) { case 3: - if (!writer.writeField("topVer", topVer, MessageFieldType.LONG)) + if (!writer.writeLong("topVer", topVer)) return false; writer.incrementState(); @@ -101,7 +101,7 @@ public class GridDhtAffinityAssignmentRequest<K, V> extends GridCacheMessage<K, switch (readState) { case 3: - 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/GridDhtAffinityAssignmentResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java index fca59fa..ea797f8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java @@ -114,7 +114,7 @@ public class GridDhtAffinityAssignmentResponse<K, V> extends GridCacheMessage<K, return false; if (!writer.isTypeWritten()) { - if (!writer.writeMessageType(directType())) + if (!writer.writeByte(null, directType())) return false; writer.onTypeWritten(); @@ -122,13 +122,13 @@ public class GridDhtAffinityAssignmentResponse<K, V> extends GridCacheMessage<K, switch (writer.state()) { case 3: - if (!writer.writeField("affAssignmentBytes", affAssignmentBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeByteArray("affAssignmentBytes", affAssignmentBytes)) return false; writer.incrementState(); case 4: - if (!writer.writeField("topVer", topVer, MessageFieldType.LONG)) + if (!writer.writeLong("topVer", topVer)) return false; writer.incrementState(); @@ -147,7 +147,7 @@ public class GridDhtAffinityAssignmentResponse<K, V> extends GridCacheMessage<K, switch (readState) { case 3: - affAssignmentBytes = reader.readField("affAssignmentBytes", MessageFieldType.BYTE_ARR); + affAssignmentBytes = reader.readByteArray("affAssignmentBytes"); if (!reader.isLastRead()) return false; @@ -155,7 +155,7 @@ public class GridDhtAffinityAssignmentResponse<K, V> extends GridCacheMessage<K, readState++; case 4: - topVer = reader.readField("topVer", MessageFieldType.LONG); + topVer = reader.readLong("topVer"); if (!reader.isLastRead()) return false;
