You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/03/27 09:54:23 UTC
[1/3] ignite git commit: IGNITE-3579: Changed communication message
type to short. This closes #1501.
Repository: ignite
Updated Branches:
refs/heads/master 88b61246f -> 906b69268
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
index 8cbb596..8d0dd0e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java
@@ -47,7 +47,10 @@ public class GridCommunicationSendMessageSelfTest extends GridCommonAbstractTest
private static final int SAMPLE_CNT = 1;
/** */
- private static final byte DIRECT_TYPE = -127;
+ private static final short DIRECT_TYPE = -127;
+
+ /** */
+ private static final short DIRECT_TYPE_OVER_BYTE = 1000;
/** */
private int bufSize;
@@ -58,6 +61,11 @@ public class GridCommunicationSendMessageSelfTest extends GridCommonAbstractTest
return new TestMessage();
}
});
+ GridIoMessageFactory.registerCustom(DIRECT_TYPE_OVER_BYTE, new CO<Message>() {
+ @Override public Message apply() {
+ return new TestOverByteIdMessage();
+ }
+ });
}
/** {@inheritDoc} */
@@ -86,7 +94,21 @@ public class GridCommunicationSendMessageSelfTest extends GridCommonAbstractTest
try {
startGridsMultiThreaded(2);
- doSend();
+ doSend(new TestMessage(), TestMessage.class);
+ }
+ finally {
+ stopAllGrids();
+ }
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testSendMessageOverByteId() throws Exception {
+ try {
+ startGridsMultiThreaded(2);
+
+ doSend(new TestOverByteIdMessage(), TestOverByteIdMessage.class);
}
finally {
stopAllGrids();
@@ -102,7 +124,7 @@ public class GridCommunicationSendMessageSelfTest extends GridCommonAbstractTest
try {
startGridsMultiThreaded(2);
- doSend();
+ doSend(new TestMessage(), TestMessage.class);
}
finally {
stopAllGrids();
@@ -110,11 +132,14 @@ public class GridCommunicationSendMessageSelfTest extends GridCommonAbstractTest
}
/**
+ * @param msg Message to send.
+ * @param msgCls Message class to check the received message.
+ *
* @throws Exception If failed.
*/
- private void doSend() throws Exception {
- GridIoManager mgr0 = ((IgniteKernal)grid(0)).context().io();
- GridIoManager mgr1 = ((IgniteKernal)grid(1)).context().io();
+ private void doSend(Message msg, final Class<?> msgCls) throws Exception {
+ GridIoManager mgr0 = grid(0).context().io();
+ GridIoManager mgr1 = grid(1).context().io();
String topic = "test-topic";
@@ -122,14 +147,15 @@ public class GridCommunicationSendMessageSelfTest extends GridCommonAbstractTest
mgr1.addMessageListener(topic, new GridMessageListener() {
@Override public void onMessage(UUID nodeId, Object msg) {
- latch.countDown();
+ if (msgCls.isInstance(msg))
+ latch.countDown();
}
});
long time = System.nanoTime();
for (int i = 1; i <= SAMPLE_CNT; i++) {
- mgr0.sendToCustomTopic(grid(1).localNode(), topic, new TestMessage(), GridIoPolicy.PUBLIC_POOL);
+ mgr0.sendToCustomTopic(grid(1).localNode(), topic, msg, GridIoPolicy.PUBLIC_POOL);
if (i % 500 == 0)
info("Sent messages count: " + i);
@@ -150,7 +176,10 @@ public class GridCommunicationSendMessageSelfTest extends GridCommonAbstractTest
@Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
writer.setBuffer(buf);
- return writer.writeByte(null, directType());
+ if (!writer.writeHeader(directType(), (byte)0))
+ return false;
+
+ return true;
}
/** {@inheritDoc} */
@@ -164,7 +193,7 @@ public class GridCommunicationSendMessageSelfTest extends GridCommonAbstractTest
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return DIRECT_TYPE;
}
@@ -173,4 +202,38 @@ public class GridCommunicationSendMessageSelfTest extends GridCommonAbstractTest
return 0;
}
}
+
+ /** */
+ private static class TestOverByteIdMessage implements Message {
+ /** {@inheritDoc} */
+ @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
+ writer.setBuffer(buf);
+
+ if (!writer.writeHeader(directType(), (byte)0))
+ return false;
+
+ return true;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void onAckReceived() {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
+ return true;
+ }
+
+ /** {@inheritDoc} */
+ @Override public short directType() {
+ return DIRECT_TYPE_OVER_BYTE;
+ }
+
+ /** {@inheritDoc} */
+ @Override public byte fieldsCount() {
+ return 0;
+ }
+ }
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
index f4257a0..3f6318f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java
@@ -234,7 +234,7 @@ public class GridIoManagerSelfTest extends GridCommonAbstractTest {
}
/** {@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/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
index 929d53a..8fdd752 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
@@ -173,9 +173,9 @@ public class GridCacheConditionalDeploymentSelfTest extends GridCommonAbstractTe
*/
public static class TestMessage extends GridCacheMessage implements GridCacheDeployable {
/** */
- public static final byte DIRECT_TYPE = (byte)302;
+ public static final short DIRECT_TYPE = 302;
- @Override public byte directType() {
+ @Override public short directType() {
return DIRECT_TYPE;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/test/java/org/apache/ignite/internal/util/nio/IgniteExceptionInNioWorkerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/IgniteExceptionInNioWorkerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/IgniteExceptionInNioWorkerSelfTest.java
index e0540ec..9af3f8c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/IgniteExceptionInNioWorkerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/IgniteExceptionInNioWorkerSelfTest.java
@@ -92,7 +92,7 @@ public class IgniteExceptionInNioWorkerSelfTest extends GridCommonAbstractTest {
private boolean fail = true;
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
if (fail) {
fail = false;
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java
index 748ec4a..593acd4 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridTestMessage.java
@@ -127,7 +127,7 @@ class GridTestMessage implements Message, Externalizable {
}
/** {@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/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java
index 0a08b3a..f24881e 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridCacheMessageSelfTest.java
@@ -202,7 +202,7 @@ public class GridCacheMessageSelfTest extends GridCommonAbstractTest {
/** */
private static class TestMessage extends GridCacheMessage {
/** */
- public static final byte DIRECT_TYPE = (byte)202;
+ public static final short DIRECT_TYPE = 202;
/** */
@GridDirectCollection(TestMessage1.class)
@@ -228,7 +228,7 @@ public class GridCacheMessageSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return DIRECT_TYPE;
}
@@ -293,7 +293,7 @@ public class GridCacheMessageSelfTest extends GridCommonAbstractTest {
*/
static class TestMessage1 extends GridCacheMessage {
/** */
- public static final byte DIRECT_TYPE = (byte) 203;
+ public static final short DIRECT_TYPE = 203;
/** Body. */
private String body;
@@ -302,11 +302,11 @@ public class GridCacheMessageSelfTest extends GridCommonAbstractTest {
private Message msg;
/**
- * @param mes Message.
+ * @param msg Message.
+ * @param body Message body.
*/
- public void init(Message mes, String body) {
- this.msg = mes;
-
+ public void init(Message msg, String body) {
+ this.msg = msg;
this.body = body;
}
@@ -330,7 +330,7 @@ public class GridCacheMessageSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return DIRECT_TYPE;
}
@@ -409,7 +409,7 @@ public class GridCacheMessageSelfTest extends GridCommonAbstractTest {
*/
static class TestMessage2 extends GridCacheMessage {
/** */
- public static final byte DIRECT_TYPE = (byte) 205;
+ public static final short DIRECT_TYPE = 205;
/** Node id. */
private UUID nodeId;
@@ -467,7 +467,7 @@ public class GridCacheMessageSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return DIRECT_TYPE;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java
index 808ff85..ee8a08f 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java
@@ -29,7 +29,7 @@ import org.apache.ignite.plugin.extensions.communication.MessageWriter;
*/
public class GridTestMessage implements Message {
/** */
- public static final byte DIRECT_TYPE = (byte)200;
+ public static final short DIRECT_TYPE = 200;
/** */
private UUID srcNodeId;
@@ -181,7 +181,7 @@ public class GridTestMessage implements Message {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return DIRECT_TYPE;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/test/java/org/apache/ignite/util/GridMessageCollectionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridMessageCollectionTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridMessageCollectionTest.java
index 44df767..1353881 100644
--- a/modules/core/src/test/java/org/apache/ignite/util/GridMessageCollectionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/util/GridMessageCollectionTest.java
@@ -112,7 +112,10 @@ public class GridMessageCollectionTest extends TestCase {
buf.flip();
- byte type = buf.get();
+ byte b0 = buf.get();
+ byte b1 = buf.get();
+
+ short type = (short)((b1 & 0xFF) << 8 | b0 & 0xFF);
assertEquals(m.directType(), type);
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Array.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Array.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Array.java
index 571f9ac..57d8de2 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Array.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Array.java
@@ -119,7 +119,7 @@ public class GridH2Array extends GridH2ValueMessage {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return -18;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Boolean.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Boolean.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Boolean.java
index edd404e..eaa2c69 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Boolean.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Boolean.java
@@ -103,7 +103,7 @@ public class GridH2Boolean extends GridH2ValueMessage {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return -5;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Byte.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Byte.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Byte.java
index 894794e..daf806a 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Byte.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Byte.java
@@ -103,7 +103,7 @@ public class GridH2Byte extends GridH2ValueMessage {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return -6;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Bytes.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Bytes.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Bytes.java
index 29a52be..ed3c528 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Bytes.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Bytes.java
@@ -105,7 +105,7 @@ public class GridH2Bytes extends GridH2ValueMessage {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return -16;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2CacheObject.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2CacheObject.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2CacheObject.java
index 942ab7c..d0e8cb6 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2CacheObject.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2CacheObject.java
@@ -138,7 +138,7 @@ public class GridH2CacheObject extends GridH2ValueMessage {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return -22;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Date.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Date.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Date.java
index 8025257..a576b5c 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Date.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Date.java
@@ -105,7 +105,7 @@ public class GridH2Date extends GridH2ValueMessage {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return -14;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Decimal.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Decimal.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Decimal.java
index a3ad444..2faa3e1 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Decimal.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Decimal.java
@@ -127,7 +127,7 @@ public class GridH2Decimal extends GridH2ValueMessage {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return -10;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Double.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Double.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Double.java
index 2ceea8d..0dfa9f6 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Double.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Double.java
@@ -103,7 +103,7 @@ public class GridH2Double extends GridH2ValueMessage {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return -11;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Float.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Float.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Float.java
index 6923470..fb6e5e4 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Float.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Float.java
@@ -103,7 +103,7 @@ public class GridH2Float extends GridH2ValueMessage {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return -12;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Geometry.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Geometry.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Geometry.java
index 88aba55..581e88f 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Geometry.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Geometry.java
@@ -126,7 +126,7 @@ public class GridH2Geometry extends GridH2ValueMessage {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return -21;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java
index b2548cc..b030632 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeRequest.java
@@ -245,7 +245,7 @@ public class GridH2IndexRangeRequest implements Message {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return -30;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java
index 4d3db12..4fe660c 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2IndexRangeResponse.java
@@ -318,7 +318,7 @@ public class GridH2IndexRangeResponse implements Message {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return -31;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Integer.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Integer.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Integer.java
index 7c6046c..a1a5ba3 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Integer.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Integer.java
@@ -103,7 +103,7 @@ public class GridH2Integer extends GridH2ValueMessage {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return -8;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2JavaObject.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2JavaObject.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2JavaObject.java
index b989171..16131d5 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2JavaObject.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2JavaObject.java
@@ -105,7 +105,7 @@ public class GridH2JavaObject extends GridH2ValueMessage {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return -19;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Long.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Long.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Long.java
index 3d360f0..466378d 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Long.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Long.java
@@ -103,7 +103,7 @@ public class GridH2Long extends GridH2ValueMessage {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return -9;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Null.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Null.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Null.java
index 50a49ba..38c4561 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Null.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Null.java
@@ -74,7 +74,7 @@ public class GridH2Null extends GridH2ValueMessage {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return -4;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
index 0aa788b..f2f9a31 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2QueryRequest.java
@@ -429,7 +429,7 @@ public class GridH2QueryRequest implements Message, GridCacheQueryMarshallable {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return -33;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowMessage.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowMessage.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowMessage.java
index 59c548d..8aeb6c1 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowMessage.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowMessage.java
@@ -95,7 +95,7 @@ public class GridH2RowMessage implements Message {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return -32;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRange.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRange.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRange.java
index bc8aa75..3a7e6ac 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRange.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRange.java
@@ -160,7 +160,7 @@ public class GridH2RowRange implements Message {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return -34;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRangeBounds.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRangeBounds.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRangeBounds.java
index e32e449..28dd124 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRangeBounds.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2RowRangeBounds.java
@@ -167,7 +167,7 @@ public class GridH2RowRangeBounds implements Message {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return -35;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Short.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Short.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Short.java
index ebeca9d..f8dca69 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Short.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Short.java
@@ -103,7 +103,7 @@ public class GridH2Short extends GridH2ValueMessage {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return -7;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2String.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2String.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2String.java
index f2f9fdc..2f58d62 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2String.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2String.java
@@ -105,7 +105,7 @@ public class GridH2String extends GridH2ValueMessage {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return -17;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Time.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Time.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Time.java
index 172d695..bc79e40 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Time.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Time.java
@@ -106,7 +106,7 @@ public class GridH2Time extends GridH2ValueMessage {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return -13;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Timestamp.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Timestamp.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Timestamp.java
index b020799..a07442b 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Timestamp.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Timestamp.java
@@ -123,7 +123,7 @@ public class GridH2Timestamp extends GridH2ValueMessage {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return -15;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Uuid.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Uuid.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Uuid.java
index fa9360b..4a6cc68 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Uuid.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2Uuid.java
@@ -123,7 +123,7 @@ public class GridH2Uuid extends GridH2ValueMessage {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return -20;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessageFactory.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessageFactory.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessageFactory.java
index aa84e4b..3a825f7 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessageFactory.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2ValueMessageFactory.java
@@ -32,7 +32,7 @@ import org.jetbrains.annotations.Nullable;
*/
public class GridH2ValueMessageFactory implements MessageFactory {
/** {@inheritDoc} */
- @Nullable @Override public Message create(byte type) {
+ @Nullable @Override public Message create(short type) {
switch (type) {
case -4:
return GridH2Null.INSTANCE;
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
index 2d99010..6b745ab 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java
@@ -707,7 +707,7 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
throw new UnsupportedOperationException();
}
[2/3] ignite git commit: IGNITE-3579: Changed communication message
type to short. This closes #1501.
Posted by vo...@apache.org.
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/GridDhtPartitionsSingleMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
index bf08f0a..d65e405 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
@@ -327,7 +327,7 @@ public class GridDhtPartitionsSingleMessage extends GridDhtPartitionsAbstractMes
}
/** {@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/preloader/GridDhtPartitionsSingleRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java
index 850b6d8..b162790 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java
@@ -75,7 +75,7 @@ public class GridDhtPartitionsSingleRequest extends GridDhtPartitionsAbstractMes
}
/** {@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/near/CacheVersionedValue.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java
index 186ffc1..9670f8a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java
@@ -161,7 +161,7 @@ public class CacheVersionedValue implements Message {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 102;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
index 79c71b3..48ac543 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
@@ -522,7 +522,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 49;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java
index 049431e..50af754 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java
@@ -348,7 +348,7 @@ public class GridNearGetResponse extends GridCacheMessage implements GridCacheDe
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 50;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
index 48b508b..4815fcf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
@@ -500,7 +500,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 51;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
index b10591d..e88f0a0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
@@ -314,7 +314,7 @@ public class GridNearLockResponse extends GridDistributedLockResponse {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 52;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java
index 994172b..02d2148 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java
@@ -412,7 +412,7 @@ public class GridNearSingleGetRequest extends GridCacheMessage implements GridCa
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 116;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java
index bbc968d..554fca1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java
@@ -303,7 +303,7 @@ public class GridNearSingleGetResponse extends GridCacheMessage implements GridC
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 117;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
index 05c1f3e..dc32263 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
@@ -207,7 +207,7 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 53;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
index 310e90d..e3dcbf8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
@@ -197,7 +197,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 54;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
index 5b0807f..41e6d70 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
@@ -393,7 +393,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 55;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
index 66fe902..ceab1f1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
@@ -506,7 +506,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 56;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java
index c32a844..2b49889 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java
@@ -79,7 +79,7 @@ public class GridNearUnlockRequest extends GridDistributedUnlockRequest {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 57;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
index 3baafec..bc32c60 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
@@ -805,7 +805,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 58;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java
index 8492c38..4036a10 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java
@@ -346,7 +346,7 @@ public class GridCacheQueryResponse extends GridCacheMessage implements GridCach
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 59;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
index c4bb205..ea07fb7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheSqlQuery.java
@@ -301,7 +301,7 @@ public class GridCacheSqlQuery implements Message, GridCacheQueryMarshallable {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 112;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java
index 26e2b05..4dd7978 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryBatchAck.java
@@ -151,7 +151,7 @@ public class CacheContinuousQueryBatchAck extends GridCacheMessage {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 118;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
index 366a1e0..2cc6678 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
@@ -334,7 +334,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 96;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
index e1d12af..35eab18 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
@@ -1211,7 +1211,7 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 100;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java
index 2c07854..efcb48b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java
@@ -178,7 +178,7 @@ public class IgniteTxKey implements Message {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 94;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java
index 916e4af..a0d9058 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java
@@ -238,7 +238,7 @@ public class TxEntryValueHolder implements Message {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 101;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLock.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLock.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLock.java
index af85735..c0e229f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLock.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLock.java
@@ -209,7 +209,7 @@ public class TxLock implements Message {
}
/** {@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/transactions/TxLockList.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLockList.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLockList.java
index 8b1c2dd..566f341 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLockList.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLockList.java
@@ -118,7 +118,7 @@ public class TxLockList implements Message {
}
/** {@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/transactions/TxLocksRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksRequest.java
index 20afcc6..d1d6afd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksRequest.java
@@ -189,7 +189,7 @@ public class TxLocksRequest 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/transactions/TxLocksResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksResponse.java
index fa6afdd..b7ca832 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxLocksResponse.java
@@ -302,7 +302,7 @@ public class TxLocksResponse extends GridCacheMessage {
}
/** {@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/version/GridCacheRawVersionedEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
index b7c96b4..57b69d4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java
@@ -261,7 +261,7 @@ public class GridCacheRawVersionedEntry<K, V> extends DataStreamerEntry implemen
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 103;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
index ccc17e5..d84e4da 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java
@@ -338,7 +338,7 @@ public class GridCacheVersion implements Message, Comparable<GridCacheVersion>,
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 86;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
index c89b941..f15a545 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java
@@ -84,7 +84,7 @@ public class GridCacheVersionEx extends GridCacheVersion {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 104;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java
index 11a0ed7..4306d7e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java
@@ -138,7 +138,7 @@ public class GridClockDeltaSnapshotMessage implements Message {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 60;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java
index 310fd50..19c75e6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java
@@ -178,7 +178,7 @@ public class GridClockDeltaVersion implements Message, Comparable<GridClockDelta
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 83;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java
index 91918c3..ec04ac3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousMessage.java
@@ -261,7 +261,7 @@ public class GridContinuousMessage implements Message {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 61;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerEntry.java
index c66e08f..27a4520 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerEntry.java
@@ -162,7 +162,7 @@ public class DataStreamerEntry implements Map.Entry<KeyCacheObject, CacheObject>
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 95;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java
index bd26d58..b4cbf66 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java
@@ -508,7 +508,7 @@ public class DataStreamerRequest implements Message {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 62;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerResponse.java
index 7d1307a..4cb46e1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerResponse.java
@@ -161,7 +161,7 @@ public class DataStreamerResponse implements Message {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 63;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobId.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobId.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobId.java
index 761b904..2a83f0e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobId.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/HadoopJobId.java
@@ -125,7 +125,7 @@ public class HadoopJobId implements Message, GridCacheInternal, Externalizable {
}
/** {@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/hadoop/shuffle/HadoopDirectShuffleMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopDirectShuffleMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopDirectShuffleMessage.java
index f596100..561966d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopDirectShuffleMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopDirectShuffleMessage.java
@@ -226,7 +226,7 @@ public class HadoopDirectShuffleMessage implements Message, HadoopMessage {
}
/** {@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/hadoop/shuffle/HadoopShuffleAck.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleAck.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleAck.java
index 9a03f99..f2891af 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleAck.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleAck.java
@@ -135,7 +135,7 @@ public class HadoopShuffleAck implements HadoopMessage, Message {
}
/** {@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/hadoop/shuffle/HadoopShuffleFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleFinishRequest.java
index f568c2e..d482cba 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleFinishRequest.java
@@ -135,7 +135,7 @@ public class HadoopShuffleFinishRequest implements Message, HadoopMessage {
}
/** {@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/hadoop/shuffle/HadoopShuffleFinishResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleFinishResponse.java
index 4b7c93b..ea2a012 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleFinishResponse.java
@@ -109,7 +109,7 @@ public class HadoopShuffleFinishResponse implements Message, HadoopMessage {
}
/** {@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/hadoop/shuffle/HadoopShuffleMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleMessage.java
index af54dcc..0ffea01 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleMessage.java
@@ -301,7 +301,7 @@ public class HadoopShuffleMessage implements Message, HadoopMessage {
}
/** {@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/igfs/IgfsAckMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAckMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAckMessage.java
index 275e7eb..5ae3fed 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAckMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAckMessage.java
@@ -187,7 +187,7 @@ public class IgfsAckMessage extends IgfsCommunicationMessage {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 64;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java
index 414f6b0..736525d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java
@@ -30,7 +30,6 @@ import org.apache.ignite.binary.BinaryReader;
import org.apache.ignite.binary.BinaryWriter;
import org.apache.ignite.binary.Binarylizable;
import org.apache.ignite.internal.binary.BinaryUtils;
-import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
@@ -285,7 +284,7 @@ public final class IgfsBlockKey implements IgfsBaseBlockKey, Message, Externaliz
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 65;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java
index 8b963fd..2ec54b2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java
@@ -168,7 +168,7 @@ public class IgfsBlocksMessage extends IgfsCommunicationMessage {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 66;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java
index 3224c20..b5e9666 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteMessage.java
@@ -177,7 +177,7 @@ public class IgfsDeleteMessage extends IgfsCommunicationMessage {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 67;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java
index 194869e..1e1a757 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java
@@ -403,7 +403,7 @@ public class IgfsFileAffinityRange implements Message, Externalizable, Binaryliz
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 68;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java
index 752c913..bb605b8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java
@@ -149,7 +149,7 @@ public class IgfsFragmentizerRequest extends IgfsCommunicationMessage {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 69;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java
index afb07bf..76793bf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java
@@ -110,7 +110,7 @@ public class IgfsFragmentizerResponse extends IgfsCommunicationMessage {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 70;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSyncMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSyncMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSyncMessage.java
index ff9660a..2b32084 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSyncMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSyncMessage.java
@@ -141,7 +141,7 @@ public class IgfsSyncMessage extends IgfsCommunicationMessage {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 71;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java
index a42072a..75787a0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingRequestMessage.java
@@ -115,7 +115,7 @@ public class MissingMappingRequestMessage implements Message {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 78;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java
index 33f892b..c5513b6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/MissingMappingResponseMessage.java
@@ -127,7 +127,7 @@ public class MissingMappingResponseMessage implements Message {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 79;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java
index 6706ab9..1ced7bc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryCancelRequest.java
@@ -109,7 +109,7 @@ public class GridQueryCancelRequest implements Message {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 106;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java
index 0baf6ea..8bbe149 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryFailResponse.java
@@ -167,7 +167,7 @@ public class GridQueryFailResponse implements Message {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 107;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java
index acea084..10782c6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageRequest.java
@@ -185,7 +185,7 @@ public class GridQueryNextPageRequest implements Message {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 108;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java
index e85c00b..fe8b34a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java
@@ -302,7 +302,7 @@ public class GridQueryNextPageResponse implements Message {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 109;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java
index 6e42f1c..8314549 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java
@@ -357,7 +357,7 @@ public class GridQueryRequest implements Message, GridCacheQueryMarshallable {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 110;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java
index 19a8597..b8b4edb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultRequest.java
@@ -163,7 +163,7 @@ public class GridTaskResultRequest implements Message {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 76;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java
index a542432..b9bb27c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskResultResponse.java
@@ -209,7 +209,7 @@ public class GridTaskResultResponse implements Message {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 77;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java
index e1469e8..0200d77 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java
@@ -478,7 +478,7 @@ public class GridByteArrayList implements Message, Externalizable {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 84;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java
index a8b9bf3..09fb098 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java
@@ -576,7 +576,7 @@ public class GridLongList implements Message, Externalizable {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 85;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
index 9220037..bb8ddfb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridMessageCollection.java
@@ -131,7 +131,7 @@ public final class GridMessageCollection<M extends Message> implements Message {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 124;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/util/UUIDCollectionMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/UUIDCollectionMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/util/UUIDCollectionMessage.java
index 7773e7b..5efb072 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/UUIDCollectionMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/UUIDCollectionMessage.java
@@ -125,7 +125,7 @@ public class UUIDCollectionMessage implements Message {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 115;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDirectParser.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDirectParser.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDirectParser.java
index 5a02662..9e423bb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDirectParser.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridDirectParser.java
@@ -72,12 +72,18 @@ public class GridDirectParser implements GridNioParser {
Message msg = ses.removeMeta(MSG_META_KEY);
try {
- if (msg == null && buf.hasRemaining())
- msg = msgFactory.create(buf.get());
+ if (msg == null && buf.remaining() >= Message.DIRECT_TYPE_SIZE) {
+ byte b0 = buf.get();
+ byte b1 = buf.get();
+
+ short type = (short)((b1 & 0xFF) << 8 | b0 & 0xFF);
+
+ msg = msgFactory.create(type);
+ }
boolean finished = false;
- if (buf.hasRemaining()) {
+ if (msg != null && buf.hasRemaining()) {
if (reader != null)
reader.setCurrentReadClass(msg.getClass());
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java
index acf0dbb..eba9e08 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/Message.java
@@ -24,6 +24,9 @@ import java.nio.ByteBuffer;
* Base class for all communication messages.
*/
public interface Message extends Serializable {
+ /** Direct type size in bytes. */
+ public int DIRECT_TYPE_SIZE = 2;
+
/**
* Writes this message to provided byte buffer.
*
@@ -47,7 +50,7 @@ public interface Message extends Serializable {
*
* @return Message type.
*/
- public byte directType();
+ public short directType();
/**
* Gets fields count.
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java
index bfae912..1e9998c 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageFactory.java
@@ -37,5 +37,5 @@ public interface MessageFactory extends Extension {
* @param type Message type.
* @return Message instance.
*/
- @Nullable public Message create(byte type);
+ @Nullable public Message create(short type);
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
index bc2478b..982aef5 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
@@ -48,9 +48,10 @@ public interface MessageWriter {
* Writes message header.
*
* @param type Message type.
- * @param fieldCnt Fields count.�
+ * @param fieldCnt Fields count.
+ * @return {@code true} if successfully. Otherwise returns {@code false}.
*/
- public boolean writeHeader(byte type, byte fieldCnt);
+ public boolean writeHeader(short type, byte fieldCnt);
/**
* Writes {@code byte} value.
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
index 3e66bcb..ab14a57 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
@@ -728,7 +728,7 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement
if (msgFactory0 == null) {
msgFactory0 = new MessageFactory() {
- @Nullable @Override public Message create(byte type) {
+ @Nullable @Override public Message create(short type) {
throw new IgniteException("Failed to read message, node is not started.");
}
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java
index 1c1e5e7..6ecb145 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java
@@ -105,7 +105,7 @@ public class JobStealingRequest implements Message {
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return 82;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index fe915e5..2dc7598 100755
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -330,13 +330,13 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
};
/** Node ID message type. */
- public static final byte NODE_ID_MSG_TYPE = -1;
+ public static final short NODE_ID_MSG_TYPE = -1;
- /** */
- public static final byte RECOVERY_LAST_ID_MSG_TYPE = -2;
+ /** Recovery last received ID message type. */
+ public static final short RECOVERY_LAST_ID_MSG_TYPE = -2;
- /** */
- public static final byte HANDSHAKE_MSG_TYPE = -3;
+ /** Handshake message type. */
+ public static final short HANDSHAKE_MSG_TYPE = -3;
/** */
private ConnectGateway connectGate;
@@ -1956,7 +1956,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
MessageFactory msgFactory = new MessageFactory() {
private MessageFactory impl;
- @Nullable @Override public Message create(byte type) {
+ @Nullable @Override public Message create(short type) {
if (impl == null)
impl = getSpiContext().messageFactory();
@@ -3094,7 +3094,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
ByteBuffer handBuff = sslHnd.applicationBuffer();
- if (handBuff.remaining() < 17) {
+ if (handBuff.remaining() < NodeIdMessage.MESSAGE_FULL_SIZE) {
buf = ByteBuffer.allocate(1000);
int read = ch.read(buf);
@@ -3110,9 +3110,9 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
buf = handBuff;
}
else {
- buf = ByteBuffer.allocate(17);
+ buf = ByteBuffer.allocate(NodeIdMessage.MESSAGE_FULL_SIZE);
- for (int i = 0; i < 17; ) {
+ for (int i = 0; i < NodeIdMessage.MESSAGE_FULL_SIZE; ) {
int read = ch.read(buf);
if (read == -1)
@@ -3122,7 +3122,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
}
}
- UUID rmtNodeId0 = U.bytesToUuid(buf.array(), 1);
+ UUID rmtNodeId0 = U.bytesToUuid(buf.array(), Message.DIRECT_TYPE_SIZE);
if (!rmtNodeId.equals(rmtNodeId0))
throw new IgniteCheckedException("Remote node ID is not as expected [expected=" + rmtNodeId +
@@ -3147,7 +3147,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
if (recovery != null) {
HandshakeMessage msg;
- int msgSize = 33;
+ int msgSize = HandshakeMessage.MESSAGE_FULL_SIZE;
if (handshakeConnIdx != null) {
msg = new HandshakeMessage2(locNode.id(),
@@ -3207,7 +3207,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
buf.order(ByteOrder.nativeOrder());
- for (int i = 0; i < 9; ) {
+ for (int i = 0; i < RecoveryLastReceivedMessage.MESSAGE_FULL_SIZE; ) {
int read = ch.read(buf);
if (read == -1)
@@ -3223,10 +3223,10 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
buf.clear();
}
- rcvCnt = decode.getLong(1);
+ rcvCnt = decode.getLong(Message.DIRECT_TYPE_SIZE);
- if (decode.limit() > 9) {
- decode.position(9);
+ if (decode.limit() > RecoveryLastReceivedMessage.MESSAGE_FULL_SIZE) {
+ decode.position(RecoveryLastReceivedMessage.MESSAGE_FULL_SIZE);
sslMeta.decodedBuffer(decode);
}
@@ -3237,11 +3237,11 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
sslMeta.encodedBuffer(inBuf);
}
else {
- buf = ByteBuffer.allocate(9);
+ buf = ByteBuffer.allocate(RecoveryLastReceivedMessage.MESSAGE_FULL_SIZE);
buf.order(ByteOrder.nativeOrder());
- for (int i = 0; i < 9; ) {
+ for (int i = 0; i < RecoveryLastReceivedMessage.MESSAGE_FULL_SIZE; ) {
int read = ch.read(buf);
if (read == -1)
@@ -3251,7 +3251,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
i += read;
}
- rcvCnt = buf.getLong(1);
+ rcvCnt = buf.getLong(Message.DIRECT_TYPE_SIZE);
}
if (log.isDebugEnabled())
@@ -3498,6 +3498,29 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
}
/**
+ * Write message type to output stream.
+ *
+ * @param os Output stream.
+ * @param type Message type.
+ * @throws IOException On error.
+ */
+ private static void writeMessageType(OutputStream os, short type) throws IOException {
+ os.write((byte)(type & 0xFF));
+ os.write((byte)((type >> 8) & 0xFF));
+ }
+
+ /**
+ * Write message type to byte buffer.
+ *
+ * @param buf Byte buffer.
+ * @param type Message type.
+ */
+ private static void writeMessageType(ByteBuffer buf, short type) {
+ buf.put((byte)(type & 0xFF));
+ buf.put((byte)((type >> 8) & 0xFF));
+ }
+
+ /**
*
*/
private class ShmemWorker extends GridWorker {
@@ -3519,7 +3542,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
MessageFactory msgFactory = new MessageFactory() {
private MessageFactory impl;
- @Nullable @Override public Message create(byte type) {
+ @Nullable @Override public Message create(short type) {
if (impl == null)
impl = getSpiContext().messageFactory();
@@ -3933,12 +3956,12 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
@Override public void applyx(InputStream in, OutputStream out) throws IgniteCheckedException {
try {
// Handshake.
- byte[] b = new byte[17];
+ byte[] b = new byte[NodeIdMessage.MESSAGE_FULL_SIZE];
int n = 0;
- while (n < 17) {
- int cnt = in.read(b, n, 17 - n);
+ while (n < NodeIdMessage.MESSAGE_FULL_SIZE) {
+ int cnt = in.read(b, n, NodeIdMessage.MESSAGE_FULL_SIZE - n);
if (cnt < 0)
throw new IgniteCheckedException("Failed to get remote node ID (end of stream reached)");
@@ -3947,7 +3970,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
}
// First 4 bytes are for length.
- UUID id = U.bytesToUuid(b, 1);
+ UUID id = U.bytesToUuid(b, Message.DIRECT_TYPE_SIZE);
if (!rmtNodeId.equals(id))
throw new IgniteCheckedException("Remote node ID is not as expected [expected=" + rmtNodeId +
@@ -3975,7 +3998,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
NodeIdMessage msg = new NodeIdMessage(id);
out.write(U.IGNITE_HEADER);
- out.write(NODE_ID_MSG_TYPE);
+ writeMessageType(out, NODE_ID_MSG_TYPE);
out.write(msg.nodeIdBytes);
out.flush();
@@ -3997,6 +4020,12 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
/** */
private static final long serialVersionUID = 0L;
+ /** Message body size in bytes. */
+ private static final int MESSAGE_SIZE = 32;
+
+ /** Full message size (with message type) in bytes. */
+ public static final int MESSAGE_FULL_SIZE = MESSAGE_SIZE + DIRECT_TYPE_SIZE;
+
/** */
private UUID nodeId;
@@ -4062,10 +4091,10 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
/** {@inheritDoc} */
@Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
- if (buf.remaining() < 33)
+ if (buf.remaining() < MESSAGE_FULL_SIZE)
return false;
- buf.put(directType());
+ writeMessageType(buf, directType());
byte[] bytes = U.uuidToBytes(nodeId);
@@ -4082,10 +4111,10 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
/** {@inheritDoc} */
@Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
- if (buf.remaining() < 32)
+ if (buf.remaining() < MESSAGE_SIZE)
return false;
- byte[] nodeIdBytes = new byte[16];
+ byte[] nodeIdBytes = new byte[NodeIdMessage.MESSAGE_SIZE];
buf.get(nodeIdBytes);
@@ -4099,7 +4128,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return HANDSHAKE_MSG_TYPE;
}
@@ -4145,7 +4174,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return -44;
}
@@ -4194,6 +4223,12 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
/** */
private static final long serialVersionUID = 0L;
+ /** Message body size in bytes. */
+ private static final int MESSAGE_SIZE = 8;
+
+ /** Full message size (with message type) in bytes. */
+ public static final int MESSAGE_FULL_SIZE = MESSAGE_SIZE + DIRECT_TYPE_SIZE;
+
/** */
private long rcvCnt;
@@ -4225,10 +4260,10 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
/** {@inheritDoc} */
@Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
- if (buf.remaining() < 9)
+ if (buf.remaining() < MESSAGE_FULL_SIZE)
return false;
- buf.put(RECOVERY_LAST_ID_MSG_TYPE);
+ writeMessageType(buf, directType());
buf.putLong(rcvCnt);
@@ -4237,7 +4272,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
/** {@inheritDoc} */
@Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
- if (buf.remaining() < 8)
+ if (buf.remaining() < MESSAGE_SIZE)
return false;
rcvCnt = buf.getLong();
@@ -4246,7 +4281,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return RECOVERY_LAST_ID_MSG_TYPE;
}
@@ -4269,6 +4304,12 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
/** */
private static final long serialVersionUID = 0L;
+ /** Message body size (with message type) in bytes. */
+ private static final int MESSAGE_SIZE = 16;
+
+ /** Full message size (with message type) in bytes. */
+ public static final int MESSAGE_FULL_SIZE = MESSAGE_SIZE + DIRECT_TYPE_SIZE;
+
/** */
private byte[] nodeIdBytes;
@@ -4288,11 +4329,14 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
nodeIdBytes = U.uuidToBytes(nodeId);
- nodeIdBytesWithType = new byte[nodeIdBytes.length + 1];
+ assert nodeIdBytes.length == MESSAGE_SIZE : "Node ID size must be " + MESSAGE_SIZE;
- nodeIdBytesWithType[0] = NODE_ID_MSG_TYPE;
+ nodeIdBytesWithType = new byte[MESSAGE_FULL_SIZE];
- System.arraycopy(nodeIdBytes, 0, nodeIdBytesWithType, 1, nodeIdBytes.length);
+ nodeIdBytesWithType[0] = (byte)(NODE_ID_MSG_TYPE & 0xFF);
+ nodeIdBytesWithType[1] = (byte)((NODE_ID_MSG_TYPE >> 8) & 0xFF);
+
+ System.arraycopy(nodeIdBytes, 0, nodeIdBytesWithType, 2, nodeIdBytes.length);
}
/** {@inheritDoc} */
@@ -4302,12 +4346,13 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
/** {@inheritDoc} */
@Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
- assert nodeIdBytes.length == 16;
+ assert nodeIdBytes.length == MESSAGE_SIZE;
- if (buf.remaining() < 17)
+ if (buf.remaining() < MESSAGE_FULL_SIZE)
return false;
- buf.put(NODE_ID_MSG_TYPE);
+ writeMessageType(buf, directType());
+
buf.put(nodeIdBytes);
return true;
@@ -4315,10 +4360,10 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
/** {@inheritDoc} */
@Override public boolean readFrom(ByteBuffer buf, MessageReader reader) {
- if (buf.remaining() < 16)
+ if (buf.remaining() < MESSAGE_SIZE)
return false;
- nodeIdBytes = new byte[16];
+ nodeIdBytes = new byte[MESSAGE_SIZE];
buf.get(nodeIdBytes);
@@ -4326,7 +4371,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
}
/** {@inheritDoc} */
- @Override public byte directType() {
+ @Override public short directType() {
return NODE_ID_MSG_TYPE;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityNoCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityNoCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityNoCacheSelfTest.java
index 9cf14ce..6091d9b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityNoCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityNoCacheSelfTest.java
@@ -287,7 +287,7 @@ public class GridAffinityNoCacheSelfTest extends GridCommonAbstractTest {
}
/** {@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/test/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2ByteOrderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2ByteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2ByteOrderSelfTest.java
index d96f796..1f4f14f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2ByteOrderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2ByteOrderSelfTest.java
@@ -60,7 +60,7 @@ public class DirectByteBufferStreamImplV2ByteOrderSelfTest extends TestCase {
super.setUp();
stream = new DirectByteBufferStreamImplV2(new MessageFactory() {
- @Nullable @Override public Message create(byte type) {
+ @Nullable @Override public Message create(short type) {
return null;
}
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/906b6926/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerLocalMessageListenerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerLocalMessageListenerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerLocalMessageListenerSelfTest.java
index 418ba6b..5e85b62 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerLocalMessageListenerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/GridManagerLocalMessageListenerSelfTest.java
@@ -50,7 +50,7 @@ public class GridManagerLocalMessageListenerSelfTest extends GridCommonAbstractT
private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
/** */
- private static final byte DIRECT_TYPE = (byte)210;
+ private static final short DIRECT_TYPE = 210;
static {
GridIoMessageFactory.registerCustom(DIRECT_TYPE, new CO<Message>() {
[3/3] ignite git commit: IGNITE-3579: Changed communication message
type to short. This closes #1501.
Posted by vo...@apache.org.
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 <tl...@gridgain.com>
Authored: Mon Mar 27 12:54:10 2017 +0300
Committer: devozerov <vo...@gridgain.com>
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;
}