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:24 UTC
[2/3] 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/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>() {