# gg-9791 - Communication fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1edbb8d9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1edbb8d9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1edbb8d9 Branch: refs/heads/ignite-185 Commit: 1edbb8d9cee22df6422fbc65be2250e828692eba Parents: d85b513 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Thu Feb 19 21:05:56 2015 -0800 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Thu Feb 19 21:05:56 2015 -0800 ---------------------------------------------------------------------- .../ignite/codegen/MessageCodeGenerator.java | 25 ++++++++++++++++---- .../ignite/internal/GridJobCancelRequest.java | 4 ++-- .../ignite/internal/GridJobExecuteRequest.java | 4 ++-- .../ignite/internal/GridJobExecuteResponse.java | 4 ++-- .../ignite/internal/GridJobSiblingsRequest.java | 4 ++-- .../internal/GridJobSiblingsResponse.java | 4 ++-- .../ignite/internal/GridTaskCancelRequest.java | 4 ++-- .../ignite/internal/GridTaskSessionRequest.java | 4 ++-- .../checkpoint/GridCheckpointRequest.java | 4 ++-- .../managers/communication/GridIoMessage.java | 4 ++-- .../communication/GridIoUserMessage.java | 4 ++-- .../deployment/GridDeploymentInfoBean.java | 4 ++-- .../deployment/GridDeploymentRequest.java | 4 ++-- .../deployment/GridDeploymentResponse.java | 4 ++-- .../eventstorage/GridEventStorageMessage.java | 4 ++-- .../cache/GridCacheEvictionRequest.java | 4 ++-- .../cache/GridCacheEvictionResponse.java | 4 ++-- .../processors/cache/GridCacheMessage.java | 2 +- .../processors/cache/GridCacheValueBytes.java | 4 ++-- ...idCacheOptimisticCheckPreparedTxRequest.java | 4 ++-- ...dCacheOptimisticCheckPreparedTxResponse.java | 4 ++-- .../distributed/GridCacheTtlUpdateRequest.java | 4 ++-- .../distributed/GridDistributedBaseMessage.java | 2 +- .../distributed/GridDistributedLockRequest.java | 4 ++-- .../GridDistributedLockResponse.java | 4 ++-- .../GridDistributedTxFinishRequest.java | 4 ++-- .../GridDistributedTxFinishResponse.java | 4 ++-- .../GridDistributedTxPrepareRequest.java | 4 ++-- .../GridDistributedTxPrepareResponse.java | 4 ++-- .../GridDistributedUnlockRequest.java | 4 ++-- .../dht/GridDhtAffinityAssignmentRequest.java | 4 ++-- .../dht/GridDhtAffinityAssignmentResponse.java | 4 ++-- .../distributed/dht/GridDhtLockRequest.java | 4 ++-- .../distributed/dht/GridDhtLockResponse.java | 4 ++-- .../distributed/dht/GridDhtTxFinishRequest.java | 4 ++-- .../dht/GridDhtTxFinishResponse.java | 4 ++-- .../dht/GridDhtTxPrepareRequest.java | 4 ++-- .../dht/GridDhtTxPrepareResponse.java | 4 ++-- .../distributed/dht/GridDhtUnlockRequest.java | 4 ++-- .../GridDhtAtomicDeferredUpdateResponse.java | 4 ++-- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 4 ++-- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 4 ++-- .../dht/atomic/GridNearAtomicUpdateRequest.java | 4 ++-- .../atomic/GridNearAtomicUpdateResponse.java | 4 ++-- .../dht/preloader/GridDhtForceKeysRequest.java | 4 ++-- .../dht/preloader/GridDhtForceKeysResponse.java | 4 ++-- .../GridDhtPartitionDemandMessage.java | 4 ++-- .../preloader/GridDhtPartitionExchangeId.java | 4 ++-- .../GridDhtPartitionSupplyMessage.java | 4 ++-- .../GridDhtPartitionsAbstractMessage.java | 2 +- .../preloader/GridDhtPartitionsFullMessage.java | 4 ++-- .../GridDhtPartitionsSingleMessage.java | 4 ++-- .../GridDhtPartitionsSingleRequest.java | 4 ++-- .../distributed/near/GridNearGetRequest.java | 4 ++-- .../distributed/near/GridNearGetResponse.java | 4 ++-- .../distributed/near/GridNearLockRequest.java | 4 ++-- .../distributed/near/GridNearLockResponse.java | 4 ++-- .../near/GridNearTxFinishRequest.java | 4 ++-- .../near/GridNearTxFinishResponse.java | 4 ++-- .../near/GridNearTxPrepareRequest.java | 4 ++-- .../near/GridNearTxPrepareResponse.java | 4 ++-- .../distributed/near/GridNearUnlockRequest.java | 4 ++-- .../cache/query/GridCacheQueryRequest.java | 4 ++-- .../cache/query/GridCacheQueryResponse.java | 4 ++-- .../cache/version/GridCacheVersion.java | 4 ++-- .../clock/GridClockDeltaSnapshotMessage.java | 4 ++-- .../processors/clock/GridClockDeltaVersion.java | 4 ++-- .../continuous/GridContinuousMessage.java | 4 ++-- .../dataload/GridDataLoadRequest.java | 4 ++-- .../dataload/GridDataLoadResponse.java | 4 ++-- .../processors/igfs/IgfsAckMessage.java | 4 ++-- .../internal/processors/igfs/IgfsBlockKey.java | 4 ++-- .../processors/igfs/IgfsBlocksMessage.java | 4 ++-- .../igfs/IgfsCommunicationMessage.java | 4 ++-- .../processors/igfs/IgfsDeleteMessage.java | 4 ++-- .../processors/igfs/IgfsFileAffinityRange.java | 4 ++-- .../igfs/IgfsFragmentizerRequest.java | 4 ++-- .../igfs/IgfsFragmentizerResponse.java | 4 ++-- .../processors/igfs/IgfsSyncMessage.java | 4 ++-- .../handlers/task/GridTaskResultRequest.java | 4 ++-- .../handlers/task/GridTaskResultResponse.java | 4 ++-- .../streamer/GridStreamerCancelRequest.java | 4 ++-- .../streamer/GridStreamerExecutionRequest.java | 4 ++-- .../streamer/GridStreamerResponse.java | 4 ++-- .../ignite/internal/util/GridByteArrayList.java | 4 ++-- .../ignite/internal/util/GridLongList.java | 4 ++-- .../jobstealing/JobStealingRequest.java | 4 ++-- 87 files changed, 189 insertions(+), 174 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java ---------------------------------------------------------------------- diff --git a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java index 98a079c..666ee38 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java +++ b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java @@ -119,6 +119,9 @@ public class MessageCodeGenerator { private final String srcDir; /** */ + private int totalFieldCnt; + + /** */ private List<Field> fields; /** */ @@ -225,6 +228,7 @@ public class MessageCodeGenerator { boolean writeFound = false; boolean readFound = false; + boolean fieldCntFound = false; while ((line = rdr.readLine()) != null) { if (!skip) { @@ -244,6 +248,13 @@ public class MessageCodeGenerator { readFound = true; } + else if (line.contains("public byte fieldsCount()")) { + src.add(TAB + TAB + "return " + totalFieldCnt + ";"); + + skip = true; + + fieldCntFound = true; + } } else if (line.startsWith(TAB + "}")) { src.add(line); @@ -257,6 +268,9 @@ public class MessageCodeGenerator { if (!readFound) System.out.println(" readFrom method doesn't exist."); + + if (!fieldCntFound) + System.out.println(" fieldCount method doesn't exist."); } finally { if (rdr != null) @@ -304,12 +318,14 @@ public class MessageCodeGenerator { int state = startState(cls); + totalFieldCnt = state + fields.size(); + indent = 2; boolean hasSuper = cls.getSuperclass() != BASE_CLS; - start(write, hasSuper ? "writeTo" : null, true, state + fields.size()); - start(read, hasSuper ? "readFrom" : null, false, 0); + start(write, hasSuper ? "writeTo" : null, true); + start(read, hasSuper ? "readFrom" : null, false); indent++; @@ -358,9 +374,8 @@ public class MessageCodeGenerator { * @param code Code lines. * @param superMtd Super class method name. * @param write Whether write code is generated. - * @param fieldCnt Fields count. */ - private void start(Collection<String> code, @Nullable String superMtd, boolean write, int fieldCnt) { + private void start(Collection<String> code, @Nullable String superMtd, boolean write) { assert code != null; code.add(builder().a(write ? "writer" : "reader").a(".setBuffer(").a(BUF_VAR).a(");").toString()); @@ -391,7 +406,7 @@ public class MessageCodeGenerator { indent++; - returnFalseIfFailed(code, "writer.writeHeader", "directType()", "(byte)" + fieldCnt); + returnFalseIfFailed(code, "writer.writeHeader", "directType()", "fieldsCount()"); code.add(EMPTY); code.add(builder().a("writer.onHeaderWritten();").toString()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java index da24143..c9df6a7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java @@ -114,7 +114,7 @@ public class GridJobCancelRequest extends MessageAdapter { writer.setBuffer(buf); if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)3)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -188,7 +188,7 @@ public class GridJobCancelRequest extends MessageAdapter { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 3; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java index a806e70..5b81190 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java @@ -416,7 +416,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes writer.setBuffer(buf); if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)21)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -746,7 +746,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 21; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java index 461ff57..2eaa40f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java @@ -209,7 +209,7 @@ public class GridJobExecuteResponse extends MessageAdapter implements GridTaskMe writer.setBuffer(buf); if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)7)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -339,7 +339,7 @@ public class GridJobExecuteResponse extends MessageAdapter implements GridTaskMe /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 7; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java index e43658d..553896b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java @@ -88,7 +88,7 @@ public class GridJobSiblingsRequest extends MessageAdapter { writer.setBuffer(buf); if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)2)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -148,7 +148,7 @@ public class GridJobSiblingsRequest extends MessageAdapter { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 2; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java index 0fc7027..75375cd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java @@ -81,7 +81,7 @@ public class GridJobSiblingsResponse extends MessageAdapter { writer.setBuffer(buf); if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)1)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -127,7 +127,7 @@ public class GridJobSiblingsResponse extends MessageAdapter { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 1; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java index 92ca3e9..ea53018 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java @@ -65,7 +65,7 @@ public class GridTaskCancelRequest extends MessageAdapter { writer.setBuffer(buf); if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)1)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -111,7 +111,7 @@ public class GridTaskCancelRequest extends MessageAdapter { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 1; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java index 5029eb8..91218b6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java @@ -102,7 +102,7 @@ public class GridTaskSessionRequest extends MessageAdapter implements GridTaskMe writer.setBuffer(buf); if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)3)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -176,7 +176,7 @@ public class GridTaskSessionRequest extends MessageAdapter implements GridTaskMe /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 3; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java index 4ca6894..95c94ea 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java @@ -88,7 +88,7 @@ public class GridCheckpointRequest extends MessageAdapter { writer.setBuffer(buf); if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)3)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -162,7 +162,7 @@ public class GridCheckpointRequest extends MessageAdapter { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 3; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java index d708410..28aad2b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java @@ -183,7 +183,7 @@ public class GridIoMessage extends MessageAdapter { writer.setBuffer(buf); if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)7)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -317,7 +317,7 @@ public class GridIoMessage extends MessageAdapter { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 7; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java index 533909c..417addc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java @@ -207,7 +207,7 @@ public class GridIoUserMessage extends MessageAdapter { writer.setBuffer(buf); if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)7)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -341,7 +341,7 @@ public class GridIoUserMessage extends MessageAdapter { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 7; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java index ca6847b..71154e9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java @@ -142,7 +142,7 @@ public class GridDeploymentInfoBean extends MessageAdapter implements GridDeploy writer.setBuffer(buf); if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)5)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -248,7 +248,7 @@ public class GridDeploymentInfoBean extends MessageAdapter implements GridDeploy /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 5; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java index 8d3277e..8d882a5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java @@ -160,7 +160,7 @@ public class GridDeploymentRequest extends MessageAdapter { writer.setBuffer(buf); if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)5)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -262,7 +262,7 @@ public class GridDeploymentRequest extends MessageAdapter { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 5; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java index 6e65363..5affd76 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java @@ -110,7 +110,7 @@ public class GridDeploymentResponse extends MessageAdapter { writer.setBuffer(buf); if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)3)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -184,7 +184,7 @@ public class GridDeploymentResponse extends MessageAdapter { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 3; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java index 67349f0..85ed86d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java @@ -265,7 +265,7 @@ public class GridEventStorageMessage extends MessageAdapter { writer.setBuffer(buf); if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)9)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -427,7 +427,7 @@ public class GridEventStorageMessage extends MessageAdapter { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 9; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java index 8146d2d..6fe328c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java @@ -147,7 +147,7 @@ public class GridCacheEvictionRequest<K, V> extends GridCacheMessage<K, V> imple return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)6)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -224,7 +224,7 @@ public class GridCacheEvictionRequest<K, V> extends GridCacheMessage<K, V> imple /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 6; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java index 748af3c..b3c96e3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java @@ -136,7 +136,7 @@ public class GridCacheEvictionResponse<K, V> extends GridCacheMessage<K, V> { return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)6)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -213,7 +213,7 @@ public class GridCacheEvictionResponse<K, V> extends GridCacheMessage<K, V> { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 6; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java index 1037512..fe44305 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java @@ -650,7 +650,7 @@ public abstract class GridCacheMessage<K, V> extends MessageAdapter { writer.setBuffer(buf); if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)3)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytes.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytes.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytes.java index 50bd20c..b3a16c4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytes.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytes.java @@ -124,7 +124,7 @@ public class GridCacheValueBytes extends MessageAdapter { writer.setBuffer(buf); if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)2)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -184,7 +184,7 @@ public class GridCacheValueBytes extends MessageAdapter { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 2; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java index 938520a..0dafb72 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java @@ -117,7 +117,7 @@ public class GridCacheOptimisticCheckPreparedTxRequest<K, V> extends GridDistrib return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)13)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -222,7 +222,7 @@ public class GridCacheOptimisticCheckPreparedTxRequest<K, V> extends GridDistrib /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 13; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java index 8fb67d7..a1650b2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java @@ -92,7 +92,7 @@ public class GridCacheOptimisticCheckPreparedTxResponse<K, V> extends GridDistri return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)11)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -169,7 +169,7 @@ public class GridCacheOptimisticCheckPreparedTxResponse<K, V> extends GridDistri /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 11; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java index 62360d1..9d52b9f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java @@ -189,7 +189,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> { return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)9)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -308,7 +308,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 9; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java index 068bd47..f4d64dc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java @@ -247,7 +247,7 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage< return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)8)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java index 3fb2ac2..678e83b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java @@ -353,7 +353,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)22)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -588,7 +588,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 22; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java index 21f6e36..2d4f1ae 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java @@ -284,7 +284,7 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)11)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -361,7 +361,7 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 11; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java index 7072270..9af4ef2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java @@ -253,7 +253,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)19)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -442,7 +442,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 19; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java index 15d818d..7bde39c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java @@ -81,7 +81,7 @@ public class GridDistributedTxFinishResponse<K, V> extends GridCacheMessage<K, V return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)5)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -144,7 +144,7 @@ public class GridDistributedTxFinishResponse<K, V> extends GridCacheMessage<K, V /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 5; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java index e1d6088..b4466da 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java @@ -422,7 +422,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)23)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -675,7 +675,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 23; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java index f03542b..d0838a8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java @@ -156,7 +156,7 @@ public class GridDistributedTxPrepareResponse<K, V> extends GridDistributedBaseM return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)10)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -219,7 +219,7 @@ public class GridDistributedTxPrepareResponse<K, V> extends GridDistributedBaseM /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 10; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java index 4e32adc..593d683 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java @@ -122,7 +122,7 @@ public class GridDistributedUnlockRequest<K, V> extends GridDistributedBaseMessa return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)9)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -171,7 +171,7 @@ public class GridDistributedUnlockRequest<K, V> extends GridDistributedBaseMessa /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 9; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java index e966406..3a5c1cd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java @@ -68,7 +68,7 @@ public class GridDhtAffinityAssignmentRequest<K, V> extends GridCacheMessage<K, /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 4; } /** {@inheritDoc} */ @@ -79,7 +79,7 @@ public class GridDhtAffinityAssignmentRequest<K, V> extends GridCacheMessage<K, return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)4)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java index a62fc3c..25e986b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java @@ -90,7 +90,7 @@ public class GridDhtAffinityAssignmentResponse<K, V> extends GridCacheMessage<K, /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 5; } /** @@ -119,7 +119,7 @@ public class GridDhtAffinityAssignmentResponse<K, V> extends GridCacheMessage<K, return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)5)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java index cd189f3..505ddbd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java @@ -344,7 +344,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)31)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -505,7 +505,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 31; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java index f3b11d4..ba9be82 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java @@ -206,7 +206,7 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V> return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)15)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -297,7 +297,7 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V> /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 15; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java index 43282f4..3c5ffc7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java @@ -231,7 +231,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)28)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -396,6 +396,6 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 28; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java index fbd406b..1b27c82 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java @@ -76,7 +76,7 @@ public class GridDhtTxFinishResponse<K, V> extends GridDistributedTxFinishRespon return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)6)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -125,6 +125,6 @@ public class GridDhtTxFinishResponse<K, V> extends GridDistributedTxFinishRespon /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 6; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java index ca62237..7383c4d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java @@ -321,7 +321,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)35)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -524,6 +524,6 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 35; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java index 4390cf2..ef3bc5d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java @@ -214,7 +214,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)15)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -319,6 +319,6 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 15; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java index 9b6b033..aee52b7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java @@ -111,7 +111,7 @@ public class GridDhtUnlockRequest<K, V> extends GridDistributedUnlockRequest<K, return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)10)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -160,6 +160,6 @@ public class GridDhtUnlockRequest<K, V> extends GridDistributedUnlockRequest<K, /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 10; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java index 9054d8f..0cd2dc2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java @@ -80,7 +80,7 @@ public class GridDhtAtomicDeferredUpdateResponse<K, V> extends GridCacheMessage< return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)4)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -129,6 +129,6 @@ public class GridDhtAtomicDeferredUpdateResponse<K, V> extends GridCacheMessage< /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 4; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java index 603c53b..a4f7ea8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java @@ -674,7 +674,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)23)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -993,7 +993,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 23; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java index 9165dd4..0c39d8c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java @@ -185,7 +185,7 @@ public class GridDhtAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> im return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)7)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -276,7 +276,7 @@ public class GridDhtAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> im /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 7; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java index 7062b35..28338f0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java @@ -538,7 +538,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)22)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -847,7 +847,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 22; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java index 1c783ea..7960c66 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java @@ -425,7 +425,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)14)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -614,7 +614,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 14; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java index fcbc931..7090828 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java @@ -169,7 +169,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)7)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -260,7 +260,7 @@ public class GridDhtForceKeysRequest<K, V> extends GridCacheMessage<K, V> implem /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 7; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java index 1abd6f3..1732979 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java @@ -172,7 +172,7 @@ public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> imple return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)7)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -263,7 +263,7 @@ public class GridDhtForceKeysResponse<K, V> extends GridCacheMessage<K, V> imple /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 7; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java index dc9c5a2..99e4110 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java @@ -197,7 +197,7 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V> return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)9)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -316,7 +316,7 @@ public class GridDhtPartitionDemandMessage<K, V> extends GridCacheMessage<K, V> /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 9; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java index 0c9bfb1..e0bd120 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java @@ -150,7 +150,7 @@ public class GridDhtPartitionExchangeId extends MessageAdapter implements Compar writer.setBuffer(buf); if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)3)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -224,7 +224,7 @@ public class GridDhtPartitionExchangeId extends MessageAdapter implements Compar /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 3; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java index 203822e..09b4056 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java @@ -280,7 +280,7 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V> return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)9)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -399,7 +399,7 @@ public class GridDhtPartitionSupplyMessage<K, V> extends GridCacheMessage<K, V> /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 9; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java index 315fa96..3721998 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java @@ -82,7 +82,7 @@ abstract class GridDhtPartitionsAbstractMessage<K, V> extends GridCacheMessage<K return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)5)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java index 9d1ab03..516fdd1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java @@ -123,7 +123,7 @@ public class GridDhtPartitionsFullMessage<K, V> extends GridDhtPartitionsAbstrac return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)7)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -186,7 +186,7 @@ public class GridDhtPartitionsFullMessage<K, V> extends GridDhtPartitionsAbstrac /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 7; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/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 0bfdc1c..a262894 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 @@ -102,7 +102,7 @@ public class GridDhtPartitionsSingleMessage<K, V> extends GridDhtPartitionsAbstr return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)6)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -151,7 +151,7 @@ public class GridDhtPartitionsSingleMessage<K, V> extends GridDhtPartitionsAbstr /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 6; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/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 abf4d94..9e7371d 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 @@ -52,7 +52,7 @@ public class GridDhtPartitionsSingleRequest<K, V> extends GridDhtPartitionsAbstr return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)5)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -81,7 +81,7 @@ public class GridDhtPartitionsSingleRequest<K, V> extends GridDhtPartitionsAbstr /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 5; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/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 e561fd7..44c9a59 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 @@ -246,7 +246,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)14)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -436,7 +436,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 14; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/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 8847aed..0225724 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 @@ -207,7 +207,7 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)10)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -340,7 +340,7 @@ public class GridNearGetResponse<K, V> extends GridCacheMessage<K, V> implements /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 10; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/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 248b21b..182d465 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 @@ -329,7 +329,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)34)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -532,7 +532,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 34; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/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 a4a4840..ba4c48a 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 @@ -188,7 +188,7 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)16)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -293,7 +293,7 @@ public class GridNearLockResponse<K, V> extends GridDistributedLockResponse<K, V /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 16; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/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 e567872..0b73006 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 @@ -160,7 +160,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)25)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -279,7 +279,7 @@ public class GridNearTxFinishRequest<K, V> extends GridDistributedTxFinishReques /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 25; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1edbb8d9/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 2798e7b..322014e 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 @@ -121,7 +121,7 @@ public class GridNearTxFinishResponse<K, V> extends GridDistributedTxFinishRespo return false; if (!writer.isHeaderWritten()) { - if (!writer.writeHeader(directType(), (byte)8)) + if (!writer.writeHeader(directType(), fieldsCount())) return false; writer.onHeaderWritten(); @@ -198,7 +198,7 @@ public class GridNearTxFinishResponse<K, V> extends GridDistributedTxFinishRespo /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 0; // TODO: implement. + return 8; } /** {@inheritDoc} */
