You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/03/29 14:02:31 UTC
[07/50] [abbrv] ignite git commit: IGNITE-3579: Changed communication
message type to short. This closes #1501.
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();
}