IGNITE-3579: Changed communication message type to short. This closes #1501.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/906b6926 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/906b6926 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/906b6926 Branch: refs/heads/master Commit: 906b69268bda1db93485e9bee7913b07ae4e5a0c Parents: 88b6124 Author: tledkov-gridgain <[email protected]> Authored: Mon Mar 27 12:54:10 2017 +0300 Committer: devozerov <[email protected]> Committed: Mon Mar 27 12:54:12 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/GridJobCancelRequest.java | 2 +- .../ignite/internal/GridJobExecuteRequest.java | 2 +- .../ignite/internal/GridJobExecuteResponse.java | 2 +- .../ignite/internal/GridJobSiblingsRequest.java | 2 +- .../internal/GridJobSiblingsResponse.java | 2 +- .../ignite/internal/GridTaskCancelRequest.java | 2 +- .../ignite/internal/GridTaskSessionRequest.java | 2 +- .../internal/binary/BinaryEnumObjectImpl.java | 2 +- .../internal/binary/BinaryObjectImpl.java | 2 +- .../binary/BinaryObjectOffheapImpl.java | 2 +- .../internal/direct/DirectMessageWriter.java | 4 +- .../stream/v1/DirectByteBufferStreamImplV1.java | 8 +- .../stream/v2/DirectByteBufferStreamImplV2.java | 9 +- .../checkpoint/GridCheckpointRequest.java | 2 +- .../managers/communication/GridIoMessage.java | 2 +- .../communication/GridIoMessageFactory.java | 6 +- .../communication/GridIoUserMessage.java | 2 +- .../communication/IgniteIoTestMessage.java | 2 +- .../deployment/GridDeploymentInfoBean.java | 2 +- .../deployment/GridDeploymentRequest.java | 2 +- .../deployment/GridDeploymentResponse.java | 2 +- .../eventstorage/GridEventStorageMessage.java | 2 +- .../affinity/AffinityTopologyVersion.java | 2 +- .../cache/CacheEntryInfoCollection.java | 2 +- .../cache/CacheEntryPredicateAdapter.java | 2 +- .../cache/CacheEntryPredicateContainsValue.java | 2 +- .../cache/CacheEntrySerializablePredicate.java | 2 +- .../processors/cache/CacheEvictionEntry.java | 2 +- .../cache/CacheInvokeDirectResult.java | 2 +- .../cache/CacheObjectByteArrayImpl.java | 2 +- .../processors/cache/CacheObjectImpl.java | 2 +- .../processors/cache/GridCacheEntryInfo.java | 2 +- .../cache/GridCacheEvictionRequest.java | 2 +- .../cache/GridCacheEvictionResponse.java | 2 +- .../processors/cache/GridCacheReturn.java | 2 +- .../processors/cache/KeyCacheObjectImpl.java | 2 +- .../distributed/GridCacheTtlUpdateRequest.java | 2 +- .../distributed/GridCacheTxRecoveryRequest.java | 2 +- .../GridCacheTxRecoveryResponse.java | 2 +- .../distributed/GridDistributedLockRequest.java | 2 +- .../GridDistributedLockResponse.java | 2 +- .../GridDistributedTxFinishRequest.java | 2 +- .../GridDistributedTxFinishResponse.java | 2 +- .../GridDistributedTxPrepareRequest.java | 2 +- .../GridDistributedTxPrepareResponse.java | 2 +- .../GridDistributedUnlockRequest.java | 2 +- .../dht/GridDhtAffinityAssignmentRequest.java | 2 +- .../dht/GridDhtAffinityAssignmentResponse.java | 2 +- .../distributed/dht/GridDhtLockRequest.java | 2 +- .../distributed/dht/GridDhtLockResponse.java | 2 +- .../distributed/dht/GridDhtTxFinishRequest.java | 2 +- .../dht/GridDhtTxFinishResponse.java | 2 +- .../dht/GridDhtTxOnePhaseCommitAckRequest.java | 2 +- .../dht/GridDhtTxPrepareRequest.java | 2 +- .../dht/GridDhtTxPrepareResponse.java | 2 +- .../distributed/dht/GridDhtUnlockRequest.java | 2 +- .../GridDhtAtomicDeferredUpdateResponse.java | 2 +- .../dht/atomic/GridDhtAtomicNearResponse.java | 2 +- .../GridDhtAtomicSingleUpdateRequest.java | 2 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 2 +- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 2 +- .../GridNearAtomicCheckUpdateRequest.java | 2 +- .../atomic/GridNearAtomicFullUpdateRequest.java | 2 +- ...GridNearAtomicSingleUpdateFilterRequest.java | 2 +- ...GridNearAtomicSingleUpdateInvokeRequest.java | 2 +- .../GridNearAtomicSingleUpdateRequest.java | 2 +- .../atomic/GridNearAtomicUpdateResponse.java | 2 +- .../dht/atomic/NearCacheUpdates.java | 2 +- .../distributed/dht/atomic/UpdateErrors.java | 2 +- .../dht/preloader/GridDhtForceKeysRequest.java | 2 +- .../dht/preloader/GridDhtForceKeysResponse.java | 2 +- .../GridDhtPartitionDemandMessage.java | 2 +- .../preloader/GridDhtPartitionExchangeId.java | 2 +- .../GridDhtPartitionSupplyMessage.java | 2 +- .../GridDhtPartitionSupplyMessageV2.java | 2 +- .../preloader/GridDhtPartitionsFullMessage.java | 2 +- .../GridDhtPartitionsSingleMessage.java | 2 +- .../GridDhtPartitionsSingleRequest.java | 2 +- .../distributed/near/CacheVersionedValue.java | 2 +- .../distributed/near/GridNearGetRequest.java | 2 +- .../distributed/near/GridNearGetResponse.java | 2 +- .../distributed/near/GridNearLockRequest.java | 2 +- .../distributed/near/GridNearLockResponse.java | 2 +- .../near/GridNearSingleGetRequest.java | 2 +- .../near/GridNearSingleGetResponse.java | 2 +- .../near/GridNearTxFinishRequest.java | 2 +- .../near/GridNearTxFinishResponse.java | 2 +- .../near/GridNearTxPrepareRequest.java | 2 +- .../near/GridNearTxPrepareResponse.java | 2 +- .../distributed/near/GridNearUnlockRequest.java | 2 +- .../cache/query/GridCacheQueryRequest.java | 2 +- .../cache/query/GridCacheQueryResponse.java | 2 +- .../cache/query/GridCacheSqlQuery.java | 2 +- .../CacheContinuousQueryBatchAck.java | 2 +- .../continuous/CacheContinuousQueryEntry.java | 2 +- .../cache/transactions/IgniteTxEntry.java | 2 +- .../cache/transactions/IgniteTxKey.java | 2 +- .../cache/transactions/TxEntryValueHolder.java | 2 +- .../processors/cache/transactions/TxLock.java | 2 +- .../cache/transactions/TxLockList.java | 2 +- .../cache/transactions/TxLocksRequest.java | 2 +- .../cache/transactions/TxLocksResponse.java | 2 +- .../version/GridCacheRawVersionedEntry.java | 2 +- .../cache/version/GridCacheVersion.java | 2 +- .../cache/version/GridCacheVersionEx.java | 2 +- .../clock/GridClockDeltaSnapshotMessage.java | 2 +- .../processors/clock/GridClockDeltaVersion.java | 2 +- .../continuous/GridContinuousMessage.java | 2 +- .../datastreamer/DataStreamerEntry.java | 2 +- .../datastreamer/DataStreamerRequest.java | 2 +- .../datastreamer/DataStreamerResponse.java | 2 +- .../internal/processors/hadoop/HadoopJobId.java | 2 +- .../shuffle/HadoopDirectShuffleMessage.java | 2 +- .../hadoop/shuffle/HadoopShuffleAck.java | 2 +- .../shuffle/HadoopShuffleFinishRequest.java | 2 +- .../shuffle/HadoopShuffleFinishResponse.java | 2 +- .../hadoop/shuffle/HadoopShuffleMessage.java | 2 +- .../processors/igfs/IgfsAckMessage.java | 2 +- .../internal/processors/igfs/IgfsBlockKey.java | 3 +- .../processors/igfs/IgfsBlocksMessage.java | 2 +- .../processors/igfs/IgfsDeleteMessage.java | 2 +- .../processors/igfs/IgfsFileAffinityRange.java | 2 +- .../igfs/IgfsFragmentizerRequest.java | 2 +- .../igfs/IgfsFragmentizerResponse.java | 2 +- .../processors/igfs/IgfsSyncMessage.java | 2 +- .../MissingMappingRequestMessage.java | 2 +- .../MissingMappingResponseMessage.java | 2 +- .../messages/GridQueryCancelRequest.java | 2 +- .../twostep/messages/GridQueryFailResponse.java | 2 +- .../messages/GridQueryNextPageRequest.java | 2 +- .../messages/GridQueryNextPageResponse.java | 2 +- .../h2/twostep/messages/GridQueryRequest.java | 2 +- .../handlers/task/GridTaskResultRequest.java | 2 +- .../handlers/task/GridTaskResultResponse.java | 2 +- .../ignite/internal/util/GridByteArrayList.java | 2 +- .../ignite/internal/util/GridLongList.java | 2 +- .../internal/util/GridMessageCollection.java | 2 +- .../internal/util/UUIDCollectionMessage.java | 2 +- .../internal/util/nio/GridDirectParser.java | 12 +- .../extensions/communication/Message.java | 5 +- .../communication/MessageFactory.java | 2 +- .../extensions/communication/MessageWriter.java | 5 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 2 +- .../jobstealing/JobStealingRequest.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 131 +++++++++++++------ .../internal/GridAffinityNoCacheSelfTest.java | 2 +- ...ByteBufferStreamImplV2ByteOrderSelfTest.java | 2 +- ...GridManagerLocalMessageListenerSelfTest.java | 2 +- .../GridCommunicationSendMessageSelfTest.java | 83 ++++++++++-- .../communication/GridIoManagerSelfTest.java | 2 +- .../GridCacheConditionalDeploymentSelfTest.java | 4 +- .../nio/IgniteExceptionInNioWorkerSelfTest.java | 2 +- .../communication/GridTestMessage.java | 2 +- .../communication/GridCacheMessageSelfTest.java | 20 +-- .../spi/communication/GridTestMessage.java | 4 +- .../ignite/util/GridMessageCollectionTest.java | 5 +- .../query/h2/twostep/msg/GridH2Array.java | 2 +- .../query/h2/twostep/msg/GridH2Boolean.java | 2 +- .../query/h2/twostep/msg/GridH2Byte.java | 2 +- .../query/h2/twostep/msg/GridH2Bytes.java | 2 +- .../query/h2/twostep/msg/GridH2CacheObject.java | 2 +- .../query/h2/twostep/msg/GridH2Date.java | 2 +- .../query/h2/twostep/msg/GridH2Decimal.java | 2 +- .../query/h2/twostep/msg/GridH2Double.java | 2 +- .../query/h2/twostep/msg/GridH2Float.java | 2 +- .../query/h2/twostep/msg/GridH2Geometry.java | 2 +- .../h2/twostep/msg/GridH2IndexRangeRequest.java | 2 +- .../twostep/msg/GridH2IndexRangeResponse.java | 2 +- .../query/h2/twostep/msg/GridH2Integer.java | 2 +- .../query/h2/twostep/msg/GridH2JavaObject.java | 2 +- .../query/h2/twostep/msg/GridH2Long.java | 2 +- .../query/h2/twostep/msg/GridH2Null.java | 2 +- .../h2/twostep/msg/GridH2QueryRequest.java | 2 +- .../query/h2/twostep/msg/GridH2RowMessage.java | 2 +- .../query/h2/twostep/msg/GridH2RowRange.java | 2 +- .../h2/twostep/msg/GridH2RowRangeBounds.java | 2 +- .../query/h2/twostep/msg/GridH2Short.java | 2 +- .../query/h2/twostep/msg/GridH2String.java | 2 +- .../query/h2/twostep/msg/GridH2Time.java | 2 +- .../query/h2/twostep/msg/GridH2Timestamp.java | 2 +- .../query/h2/twostep/msg/GridH2Uuid.java | 2 +- .../twostep/msg/GridH2ValueMessageFactory.java | 2 +- .../h2/GridIndexingSpiAbstractSelfTest.java | 2 +- 183 files changed, 379 insertions(+), 258 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/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 c9ce023..aaa69ea 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 @@ -188,7 +188,7 @@ public class GridJobCancelRequest implements Message { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 0; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/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 ed431d8..a7e8309 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 @@ -837,7 +837,7 @@ public class GridJobExecuteRequest implements Message { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 1; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/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 9724bc0..312435e 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 @@ -376,7 +376,7 @@ public class GridJobExecuteResponse implements Message { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 2; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/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 6fe6237..8a11cef 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 @@ -148,7 +148,7 @@ public class GridJobSiblingsRequest implements Message { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 3; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/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 727e79b..3911446 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 @@ -128,7 +128,7 @@ public class GridJobSiblingsResponse implements Message { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 4; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/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 41ea281..273d0a7 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 @@ -111,7 +111,7 @@ public class GridTaskCancelRequest implements Message { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 5; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/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 15baac0..dbac893 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 @@ -176,7 +176,7 @@ public class GridTaskSessionRequest implements Message { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 6; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java index 3318988..47e0392 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java @@ -286,7 +286,7 @@ public class BinaryEnumObjectImpl implements BinaryObjectEx, Externalizable, Cac } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 119; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java index 6fe1a3b..03e5632 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java @@ -635,7 +635,7 @@ public final class BinaryObjectImpl extends BinaryObjectExImpl implements Extern } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 113; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java index 3f095f7..d3ee6f7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java @@ -453,7 +453,7 @@ public class BinaryObjectOffheapImpl extends BinaryObjectExImpl implements Exter } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { throw new UnsupportedOperationException(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/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 28993c6..3ce4dfe 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 @@ -66,10 +66,10 @@ public class DirectMessageWriter implements MessageWriter { } /** {@inheritDoc} */ - @Override public boolean writeHeader(byte type, byte fieldCnt) { + @Override public boolean writeHeader(short type, byte fieldCnt) { DirectByteBufferStream stream = state.item().stream; - stream.writeByte(type); + stream.writeShort(type); return stream.lastFinished(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v1/DirectByteBufferStreamImplV1.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v1/DirectByteBufferStreamImplV1.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v1/DirectByteBufferStreamImplV1.java index 2187945..dccf725 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v1/DirectByteBufferStreamImplV1.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v1/DirectByteBufferStreamImplV1.java @@ -506,7 +506,7 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream { lastFinished = false; } else - writeByte(Byte.MIN_VALUE); + writeShort(Short.MIN_VALUE); } /** {@inheritDoc} */ @@ -808,15 +808,15 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream { @SuppressWarnings("unchecked") @Override public <T extends Message> T readMessage(MessageReader reader) { if (!msgTypeDone) { - if (!buf.hasRemaining()) { + if (buf.remaining() < Message.DIRECT_TYPE_SIZE) { lastFinished = false; return null; } - byte type = readByte(); + short type = readShort(); - msg = type == Byte.MIN_VALUE ? null : msgFactory.create(type); + msg = type == Short.MIN_VALUE ? null : msgFactory.create(type); msgTypeDone = true; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java index d7dc990..9464186 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java @@ -653,7 +653,7 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream { lastFinished = false; } else - writeByte(Byte.MIN_VALUE); + writeShort(Short.MIN_VALUE); } /** {@inheritDoc} */ @@ -1133,15 +1133,15 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream { @SuppressWarnings("unchecked") @Override public <T extends Message> T readMessage(MessageReader reader) { if (!msgTypeDone) { - if (!buf.hasRemaining()) { + if (buf.remaining() < Message.DIRECT_TYPE_SIZE) { lastFinished = false; return null; } - byte type = readByte(); + short type = readShort(); - msg = type == Byte.MIN_VALUE ? null : msgFactory.create(type); + msg = type == Short.MIN_VALUE ? null : msgFactory.create(type); msgTypeDone = true; } @@ -1356,6 +1356,7 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream { * @param off Offset. * @param len Length. * @param typeSize Primitive type size in bytes. Needs for byte reverse. + * @param shiftCnt Shift for length. * @return Whether array was fully written. */ private boolean writeArrayLE(Object arr, long off, int len, int typeSize, int shiftCnt) { http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/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 95bf05b..ddb4f26 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 @@ -162,7 +162,7 @@ public class GridCheckpointRequest implements Message { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 7; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/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 b1a26e9..2ad4a0b 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 @@ -313,7 +313,7 @@ public class GridIoMessage implements Message { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 8; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java index 07e8941..1d84ead 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java @@ -160,7 +160,7 @@ import org.jsr166.ConcurrentHashMap8; */ public class GridIoMessageFactory implements MessageFactory { /** Custom messages registry. Used for test purposes. */ - private static final Map<Byte, IgniteOutClosure<Message>> CUSTOM = new ConcurrentHashMap8<>(); + private static final Map<Short, IgniteOutClosure<Message>> CUSTOM = new ConcurrentHashMap8<>(); /** Extensions. */ private final MessageFactory[] ext; @@ -173,7 +173,7 @@ public class GridIoMessageFactory implements MessageFactory { } /** {@inheritDoc} */ - @Override public Message create(byte type) { + @Override public Message create(short type) { Message msg = null; switch (type) { @@ -895,7 +895,7 @@ public class GridIoMessageFactory implements MessageFactory { * @param type Message type. * @param c Message producer. */ - public static void registerCustom(byte type, IgniteOutClosure<Message> c) { + public static void registerCustom(short type, IgniteOutClosure<Message> c) { assert c != null; CUSTOM.put(type, c); http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/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 9d03d3e..332a9de 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 @@ -345,7 +345,7 @@ public class GridIoUserMessage implements Message { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 9; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java index 77aaa09..98278ba 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java @@ -214,7 +214,7 @@ public class IgniteIoTestMessage implements Message { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return -43; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/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 00ca67c..68f45da 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 @@ -253,7 +253,7 @@ public class GridDeploymentInfoBean implements Message, GridDeploymentInfo, Exte } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 10; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/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 72873b7..729cf4c 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 @@ -265,7 +265,7 @@ public class GridDeploymentRequest implements Message { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 11; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/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 7a81f5a..d1b0384 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 @@ -184,7 +184,7 @@ public class GridDeploymentResponse implements Message { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 12; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/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 8b06831..515500b 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 @@ -432,7 +432,7 @@ public class GridEventStorageMessage implements Message { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 13; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java index 80f0078..f564e28 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java @@ -190,7 +190,7 @@ public class AffinityTopologyVersion implements Comparable<AffinityTopologyVersi } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 111; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java index 93bebec..49f77fa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java @@ -108,7 +108,7 @@ public class CacheEntryInfoCollection implements Message { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 92; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java index 3d56ee3..2822411 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java @@ -50,7 +50,7 @@ public abstract class CacheEntryPredicateAdapter implements CacheEntryPredicate } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { assert false : this; return 0; http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java index 3db8ae8..76806a4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java @@ -127,7 +127,7 @@ public class CacheEntryPredicateContainsValue extends CacheEntryPredicateAdapter } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 98; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java index 623fc4b..9057e41 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java @@ -148,7 +148,7 @@ public class CacheEntrySerializablePredicate implements CacheEntryPredicate { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 99; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java index dae103a..2717b1e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java @@ -83,7 +83,7 @@ public class CacheEvictionEntry implements Message { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 97; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java index cc453f9..05b3c86 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java @@ -133,7 +133,7 @@ public class CacheInvokeDirectResult implements Message { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 93; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java index 0416f09..6e9ab24 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java @@ -154,7 +154,7 @@ public class CacheObjectByteArrayImpl implements CacheObject, Externalizable { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 105; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java index be04d6b..accde29 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java @@ -115,7 +115,7 @@ public class CacheObjectImpl extends CacheObjectAdapter { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 89; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java index f281227..e50fbfe 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java @@ -328,7 +328,7 @@ public class GridCacheEntryInfo implements Message { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 91; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/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 09652a9..cb454f8 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 @@ -232,7 +232,7 @@ public class GridCacheEvictionRequest extends GridCacheMessage implements GridCa } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 14; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/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 ebaee6a..69ec09f 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 @@ -209,7 +209,7 @@ public class GridCacheEvictionResponse extends GridCacheMessage { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 15; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java index c5d4066..551d70d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheReturn.java @@ -351,7 +351,7 @@ public class GridCacheReturn implements Externalizable, Message { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 88; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java index 48797b8..b9efab1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java @@ -118,7 +118,7 @@ public class KeyCacheObjectImpl extends CacheObjectAdapter implements KeyCacheOb } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 90; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/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 8177c98..5d1885e 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 @@ -319,7 +319,7 @@ public class GridCacheTtlUpdateRequest extends GridCacheMessage { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 20; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java index 76f39b0..45d1f1a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java @@ -254,7 +254,7 @@ public class GridCacheTxRecoveryRequest extends GridDistributedBaseMessage { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 16; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java index c087a3d..a9ac26b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java @@ -193,7 +193,7 @@ public class GridCacheTxRecoveryResponse extends GridDistributedBaseMessage impl } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 17; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/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 48c01f0..b1c2c27 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 @@ -554,7 +554,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 21; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/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 ceba71d..4b21896 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 @@ -285,7 +285,7 @@ public class GridDistributedLockResponse extends GridDistributedBaseMessage { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 22; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/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 ab9f0ff..ea9336b 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 @@ -547,7 +547,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage i } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 23; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/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 2c446c3..561c292 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 @@ -213,7 +213,7 @@ public class GridDistributedTxFinishResponse extends GridCacheMessage { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 24; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/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 acf6bc8..4b11414f 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 @@ -675,7 +675,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 25; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/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 53a1391..7cd3ad8 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 @@ -242,7 +242,7 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 26; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/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 be7ecf8..ca2bdab 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 @@ -158,7 +158,7 @@ public class GridDistributedUnlockRequest extends GridDistributedBaseMessage { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 27; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/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 6959906..94f11ed 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 @@ -69,7 +69,7 @@ public class GridDhtAffinityAssignmentRequest extends GridCacheMessage { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 28; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/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 cad1617..52dd190 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 @@ -189,7 +189,7 @@ public class GridDhtAffinityAssignmentResponse extends GridCacheMessage { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 29; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java index 50167d8..1f81764 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java @@ -521,7 +521,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 30; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java index 63e3309..ea6ca06 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java @@ -285,7 +285,7 @@ public class GridDhtLockResponse extends GridDistributedLockResponse { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 31; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java index d9b3ae7..90f3687 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java @@ -464,7 +464,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 32; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java index bc9503f..d777a22 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java @@ -237,7 +237,7 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 33; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java index 0c8ae69..c483408 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java @@ -123,7 +123,7 @@ public class GridDhtTxOnePhaseCommitAckRequest extends GridCacheMessage { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return -27; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java index 8898803..c7c4280 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java @@ -538,7 +538,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 34; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java index fba68ce..5dcb98c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java @@ -335,7 +335,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 35; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java index 752df54..5671d7f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java @@ -149,7 +149,7 @@ public class GridDhtUnlockRequest extends GridDistributedUnlockRequest { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 36; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java index 9fe183f..92ef149 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java @@ -155,7 +155,7 @@ public class GridDhtAtomicDeferredUpdateResponse extends GridCacheMessage implem } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 37; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java index 08a7e28..74b7885 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java @@ -165,7 +165,7 @@ public class GridDhtAtomicNearResponse extends GridCacheMessage { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return -45; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java index 6b92c02..852beec 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java @@ -443,7 +443,7 @@ public class GridDhtAtomicSingleUpdateRequest extends GridDhtAtomicAbstractUpdat } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return -36; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java index 6b8af8d..d8e7f24 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java @@ -774,7 +774,7 @@ public class GridDhtAtomicUpdateRequest extends GridDhtAtomicAbstractUpdateReque } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 38; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java index ab7aa6c..693d658 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java @@ -255,7 +255,7 @@ public class GridDhtAtomicUpdateResponse extends GridCacheMessage implements Gri } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 39; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java index 4d0726a..54c9723 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java @@ -95,7 +95,7 @@ public class GridNearAtomicCheckUpdateRequest extends GridCacheMessage { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return -47; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java index ade9976..9c27135 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java @@ -606,7 +606,7 @@ public class GridNearAtomicFullUpdateRequest extends GridNearAtomicAbstractUpdat } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 40; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java index c32501a..849a1a7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java @@ -203,7 +203,7 @@ public class GridNearAtomicSingleUpdateFilterRequest extends GridNearAtomicSingl } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 127; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java index 298ea05..9733440 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java @@ -291,7 +291,7 @@ public class GridNearAtomicSingleUpdateInvokeRequest extends GridNearAtomicSingl } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 126; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java index 14c70aa..cce8305 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java @@ -316,7 +316,7 @@ public class GridNearAtomicSingleUpdateRequest extends GridNearAtomicAbstractSin } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 125; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java index 8b52ba8..eba7b3a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java @@ -522,7 +522,7 @@ public class GridNearAtomicUpdateResponse extends GridCacheMessage implements Gr } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 41; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/NearCacheUpdates.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/NearCacheUpdates.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/NearCacheUpdates.java index a340a62..76b8bc3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/NearCacheUpdates.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/NearCacheUpdates.java @@ -314,7 +314,7 @@ public class NearCacheUpdates implements Message { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return -48; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java index 1d415c8..83ac1af 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/UpdateErrors.java @@ -201,7 +201,7 @@ public class UpdateErrors implements Message { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return -46; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java index 15243d5..d129ae8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java @@ -245,7 +245,7 @@ public class GridDhtForceKeysRequest extends GridCacheMessage implements GridCac } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 42; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java index 8d90158..c4c57a7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java @@ -305,7 +305,7 @@ public class GridDhtForceKeysResponse extends GridCacheMessage implements GridCa } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 43; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java index bb952d4..dad1b93 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java @@ -322,7 +322,7 @@ public class GridDhtPartitionDemandMessage extends GridCacheMessage { } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 44; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java index 976405e..012634e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java @@ -233,7 +233,7 @@ public class GridDhtPartitionExchangeId implements Message, Comparable<GridDhtPa } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 87; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java index 7a07f9a..cc30321 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java @@ -393,7 +393,7 @@ public class GridDhtPartitionSupplyMessage extends GridCacheMessage implements G } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 45; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java index 4451cbc..2294582 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java @@ -365,7 +365,7 @@ public class GridDhtPartitionSupplyMessageV2 extends GridCacheMessage implements } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 114; } http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java index 90d6242..8a7adfc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java @@ -365,7 +365,7 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa } /** {@inheritDoc} */ - @Override public byte directType() { + @Override public short directType() { return 46; }
