GG-9900 - Portable marshaller refactoring
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f7f9e658 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f7f9e658 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f7f9e658 Branch: refs/heads/ignite-471 Commit: f7f9e658397a8aa42e4f067f19b0fad265ec92ae Parents: db9ed05 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Wed Mar 11 18:48:42 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Wed Mar 11 18:48:42 2015 -0700 ---------------------------------------------------------------------- .../ignite/codegen/MessageCodeGenerator.java | 21 +++++++++++++---- .../ignite/internal/GridJobExecuteRequest.java | 24 ++++++++++---------- .../ignite/internal/GridJobExecuteResponse.java | 18 +++++++-------- .../ignite/internal/GridJobSiblingsRequest.java | 6 ++--- .../internal/GridJobSiblingsResponse.java | 6 ++--- .../ignite/internal/GridTaskSessionRequest.java | 6 ++--- .../managers/communication/GridIoMessage.java | 6 ++--- .../communication/GridIoUserMessage.java | 12 +++++----- .../deployment/GridDeploymentRequest.java | 6 ++--- .../eventstorage/GridEventStorageMessage.java | 24 ++++++++++---------- .../cache/CacheEntryPredicateAdapter.java | 20 +++++++++++----- .../cache/CacheEntryPredicateContainsValue.java | 6 +++++ .../cache/CacheEntrySerializablePredicate.java | 6 ++--- .../cache/CacheInvokeDirectResult.java | 6 ++--- .../processors/cache/CacheObjectAdapter.java | 6 ++--- .../processors/cache/GridCacheEntryInfo.java | 6 ++--- .../distributed/GridDistributedBaseMessage.java | 12 +++++----- .../GridDistributedLockResponse.java | 6 ++--- .../GridDistributedTxPrepareRequest.java | 12 +++++----- .../GridDistributedTxPrepareResponse.java | 12 +++++----- .../dht/GridDhtAffinityAssignmentResponse.java | 6 ++--- .../distributed/dht/GridDhtLockRequest.java | 6 ++--- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 12 +++++----- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 6 ++--- .../dht/atomic/GridNearAtomicUpdateRequest.java | 14 ++++++------ .../atomic/GridNearAtomicUpdateResponse.java | 6 ++--- .../GridDhtPartitionDemandMessage.java | 6 ++--- .../preloader/GridDhtPartitionsFullMessage.java | 6 ++--- .../GridDhtPartitionsSingleMessage.java | 6 ++--- .../distributed/near/GridNearGetResponse.java | 6 ++--- .../near/GridNearTxFinishResponse.java | 6 ++--- .../cache/query/GridCacheQueryRequest.java | 24 ++++++++++---------- .../cache/query/GridCacheQueryResponse.java | 14 ++++++------ .../cache/transactions/IgniteTxEntry.java | 12 +++++----- .../version/GridCacheRawVersionedEntry.java | 12 +++------- .../continuous/GridContinuousMessage.java | 6 ++--- .../dataload/GridDataLoadRequest.java | 12 +++++----- .../dataload/GridDataLoadResponse.java | 6 ++--- .../processors/igfs/IgfsAckMessage.java | 6 ++--- .../processors/igfs/IgfsDeleteMessage.java | 6 ++--- .../handlers/task/GridTaskResultRequest.java | 6 ++--- .../handlers/task/GridTaskResultResponse.java | 6 ++--- .../streamer/GridStreamerExecutionRequest.java | 6 ++--- .../streamer/GridStreamerResponse.java | 6 ++--- 44 files changed, 222 insertions(+), 201 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 3de8326..a5e343e 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 @@ -18,7 +18,6 @@ package org.apache.ignite.codegen; import org.apache.ignite.internal.*; -import org.apache.ignite.internal.processors.dataload.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.plugin.extensions.communication.*; @@ -27,6 +26,7 @@ import org.jetbrains.annotations.*; import java.io.*; import java.lang.reflect.*; import java.net.*; +import java.nio.*; import java.util.*; import static java.lang.reflect.Modifier.*; @@ -85,6 +85,7 @@ public class MessageCodeGenerator { TYPES.put(double[].class, MessageCollectionItemType.DOUBLE_ARR); TYPES.put(char[].class, MessageCollectionItemType.CHAR_ARR); TYPES.put(boolean[].class, MessageCollectionItemType.BOOLEAN_ARR); + TYPES.put(ByteBuffer.class, MessageCollectionItemType.BYTE_BUF); TYPES.put(String.class, MessageCollectionItemType.STRING); TYPES.put(BitSet.class, MessageCollectionItemType.BIT_SET); TYPES.put(UUID.class, MessageCollectionItemType.UUID); @@ -140,7 +141,7 @@ public class MessageCodeGenerator { MessageCodeGenerator gen = new MessageCodeGenerator(srcDir); - gen.generateAndWrite(IgniteDataLoaderEntry.class); + gen.generateAll(true); // gen.generateAndWrite(GridDistributedLockRequest.class); // gen.generateAndWrite(GridDistributedLockResponse.class); @@ -301,8 +302,16 @@ public class MessageCodeGenerator { private void generate(Class<? extends Message> cls) throws Exception { assert cls != null; - if (cls.isAnnotationPresent(IgniteCodeGeneratingFail.class)) - throw new IllegalStateException("@IgniteCodeGeneratingFail is provided for class: " + cls.getName()); + if (cls.isInterface()) + return; + + if (cls.isAnnotationPresent(IgniteCodeGeneratingFail.class)) { + System.out.println(" @IgniteCodeGeneratingFail is provided for class: " + cls.getName()); + + return; + +// throw new IllegalStateException("@IgniteCodeGeneratingFail is provided for class: " + cls.getName()); + } write.clear(); read.clear(); @@ -558,6 +567,8 @@ public class MessageCodeGenerator { returnFalseIfFailed(write, "writer.writeCharArray", field, name); else if (type == boolean[].class) returnFalseIfFailed(write, "writer.writeBooleanArray", field, name); + else if (type == ByteBuffer.class) + returnFalseIfFailed(write, "writer.writeByteBuffer", field, name); else if (type == String.class) returnFalseIfFailed(write, "writer.writeString", field, name); else if (type == BitSet.class) @@ -640,6 +651,8 @@ public class MessageCodeGenerator { returnFalseIfReadFailed(name, "reader.readCharArray", field); else if (type == boolean[].class) returnFalseIfReadFailed(name, "reader.readBooleanArray", field); + else if (type == ByteBuffer.class) + returnFalseIfReadFailed(name, "reader.readByteBuffer", field); else if (type == String.class) returnFalseIfReadFailed(name, "reader.readString", field); else if (type == BitSet.class) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 18f942b..85989ff 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 @@ -460,14 +460,14 @@ public class GridJobExecuteRequest implements Message, GridTaskMessage { writer.incrementState(); case 6: -// if (!writer.writeByteArray("jobAttrsBytes", jobAttrsBytes)) -// return false; + if (!writer.writeByteBuffer("jobAttrsBytes", jobAttrsBytes)) + return false; writer.incrementState(); case 7: -// if (!writer.writeByteArray("jobBytes", jobBytes)) -// return false; + if (!writer.writeByteBuffer("jobBytes", jobBytes)) + return false; writer.incrementState(); @@ -484,8 +484,8 @@ public class GridJobExecuteRequest implements Message, GridTaskMessage { writer.incrementState(); case 10: -// if (!writer.writeByteArray("sesAttrsBytes", sesAttrsBytes)) -// return false; + if (!writer.writeByteBuffer("sesAttrsBytes", sesAttrsBytes)) + return false; writer.incrementState(); @@ -502,8 +502,8 @@ public class GridJobExecuteRequest implements Message, GridTaskMessage { writer.incrementState(); case 13: -// if (!writer.writeByteArray("siblingsBytes", siblingsBytes)) -// return false; + if (!writer.writeByteBuffer("siblingsBytes", siblingsBytes)) + return false; writer.incrementState(); @@ -615,7 +615,7 @@ public class GridJobExecuteRequest implements Message, GridTaskMessage { reader.incrementState(); case 6: -// jobAttrsBytes = reader.readByteArray("jobAttrsBytes"); + jobAttrsBytes = reader.readByteBuffer("jobAttrsBytes"); if (!reader.isLastRead()) return false; @@ -623,7 +623,7 @@ public class GridJobExecuteRequest implements Message, GridTaskMessage { reader.incrementState(); case 7: -// jobBytes = reader.readByteArray("jobBytes"); + jobBytes = reader.readByteBuffer("jobBytes"); if (!reader.isLastRead()) return false; @@ -647,7 +647,7 @@ public class GridJobExecuteRequest implements Message, GridTaskMessage { reader.incrementState(); case 10: -// sesAttrsBytes = reader.readByteArray("sesAttrsBytes"); + sesAttrsBytes = reader.readByteBuffer("sesAttrsBytes"); if (!reader.isLastRead()) return false; @@ -671,7 +671,7 @@ public class GridJobExecuteRequest implements Message, GridTaskMessage { reader.incrementState(); case 13: -// siblingsBytes = reader.readByteArray("siblingsBytes"); + siblingsBytes = reader.readByteBuffer("siblingsBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 daa602d..8f46395 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 @@ -217,8 +217,8 @@ public class GridJobExecuteResponse implements Message, GridTaskMessage { switch (writer.state()) { case 0: -// if (!writer.writeByteArray("gridExBytes", gridExBytes)) -// return false; + if (!writer.writeByteBuffer("gridExBytes", gridExBytes)) + return false; writer.incrementState(); @@ -229,8 +229,8 @@ public class GridJobExecuteResponse implements Message, GridTaskMessage { writer.incrementState(); case 2: -// if (!writer.writeByteArray("jobAttrsBytes", jobAttrsBytes)) -// return false; + if (!writer.writeByteBuffer("jobAttrsBytes", jobAttrsBytes)) + return false; writer.incrementState(); @@ -247,8 +247,8 @@ public class GridJobExecuteResponse implements Message, GridTaskMessage { writer.incrementState(); case 5: -// if (!writer.writeByteArray("resBytes", resBytes)) -// return false; + if (!writer.writeByteBuffer("resBytes", resBytes)) + return false; writer.incrementState(); @@ -272,7 +272,7 @@ public class GridJobExecuteResponse implements Message, GridTaskMessage { switch (reader.state()) { case 0: -// gridExBytes = reader.readByteArray("gridExBytes"); + gridExBytes = reader.readByteBuffer("gridExBytes"); if (!reader.isLastRead()) return false; @@ -288,7 +288,7 @@ public class GridJobExecuteResponse implements Message, GridTaskMessage { reader.incrementState(); case 2: -// jobAttrsBytes = reader.readByteArray("jobAttrsBytes"); + jobAttrsBytes = reader.readByteBuffer("jobAttrsBytes"); if (!reader.isLastRead()) return false; @@ -312,7 +312,7 @@ public class GridJobExecuteResponse implements Message, GridTaskMessage { reader.incrementState(); case 5: -// resBytes = reader.readByteArray("resBytes"); + resBytes = reader.readByteBuffer("resBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 cb90583..945a2cf 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 @@ -102,8 +102,8 @@ public class GridJobSiblingsRequest implements Message { writer.incrementState(); case 1: -// if (!writer.writeByteArray("topicBytes", topicBytes)) -// return false; + if (!writer.writeByteBuffer("topicBytes", topicBytes)) + return false; writer.incrementState(); @@ -129,7 +129,7 @@ public class GridJobSiblingsRequest implements Message { reader.incrementState(); case 1: -// topicBytes = reader.readByteArray("topicBytes"); + topicBytes = reader.readByteBuffer("topicBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 98de00e..86236a0 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 @@ -90,8 +90,8 @@ public class GridJobSiblingsResponse implements Message { switch (writer.state()) { case 0: -// if (!writer.writeByteArray("siblingsBytes", siblingsBytes)) -// return false; + if (!writer.writeByteBuffer("siblingsBytes", siblingsBytes)) + return false; writer.incrementState(); @@ -109,7 +109,7 @@ public class GridJobSiblingsResponse implements Message { switch (reader.state()) { case 0: -// siblingsBytes = reader.readByteArray("siblingsBytes"); + siblingsBytes = reader.readByteBuffer("siblingsBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 c5ea60e..d753195 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 @@ -110,8 +110,8 @@ public class GridTaskSessionRequest implements Message, GridTaskMessage { switch (writer.state()) { case 0: -// if (!writer.writeByteArray("attrsBytes", attrsBytes)) -// return false; + if (!writer.writeByteBuffer("attrsBytes", attrsBytes)) + return false; writer.incrementState(); @@ -141,7 +141,7 @@ public class GridTaskSessionRequest implements Message, GridTaskMessage { switch (reader.state()) { case 0: -// attrsBytes = reader.readByteArray("attrsBytes"); + attrsBytes = reader.readByteBuffer("attrsBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 a0a411b..82b1a27 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 @@ -221,8 +221,8 @@ public class GridIoMessage implements Message { writer.incrementState(); case 5: -// if (!writer.writeByteArray("topicBytes", topicBytes)) -// return false; + if (!writer.writeByteBuffer("topicBytes", topicBytes)) + return false; writer.incrementState(); @@ -290,7 +290,7 @@ public class GridIoMessage implements Message { reader.incrementState(); case 5: -// topicBytes = reader.readByteArray("topicBytes"); + topicBytes = reader.readByteBuffer("topicBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 3ad4db1..456cb3d 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 @@ -215,8 +215,8 @@ public class GridIoUserMessage implements Message { switch (writer.state()) { case 0: -// if (!writer.writeByteArray("bodyBytes", bodyBytes)) -// return false; + if (!writer.writeByteBuffer("bodyBytes", bodyBytes)) + return false; writer.incrementState(); @@ -245,8 +245,8 @@ public class GridIoUserMessage implements Message { writer.incrementState(); case 5: -// if (!writer.writeByteArray("topicBytes", topicBytes)) -// return false; + if (!writer.writeByteBuffer("topicBytes", topicBytes)) + return false; writer.incrementState(); @@ -270,7 +270,7 @@ public class GridIoUserMessage implements Message { switch (reader.state()) { case 0: -// bodyBytes = reader.readByteArray("bodyBytes"); + bodyBytes = reader.readByteBuffer("bodyBytes"); if (!reader.isLastRead()) return false; @@ -314,7 +314,7 @@ public class GridIoUserMessage implements Message { reader.incrementState(); case 5: -// topicBytes = reader.readByteArray("topicBytes"); + topicBytes = reader.readByteBuffer("topicBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 1db8401..27180c4 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 @@ -186,8 +186,8 @@ public class GridDeploymentRequest implements Message { writer.incrementState(); case 3: -// if (!writer.writeByteArray("resTopicBytes", resTopicBytes)) -// return false; + if (!writer.writeByteBuffer("resTopicBytes", resTopicBytes)) + return false; writer.incrementState(); @@ -235,7 +235,7 @@ public class GridDeploymentRequest implements Message { reader.incrementState(); case 3: -// resTopicBytes = reader.readByteArray("resTopicBytes"); + resTopicBytes = reader.readByteBuffer("resTopicBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 065d1ff..de3a529 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 @@ -285,20 +285,20 @@ public class GridEventStorageMessage implements Message { writer.incrementState(); case 2: -// if (!writer.writeByteArray("evtsBytes", evtsBytes)) -// return false; + if (!writer.writeByteBuffer("evtsBytes", evtsBytes)) + return false; writer.incrementState(); case 3: -// if (!writer.writeByteArray("exBytes", exBytes)) -// return false; + if (!writer.writeByteBuffer("exBytes", exBytes)) + return false; writer.incrementState(); case 4: -// if (!writer.writeByteArray("filter", filter)) -// return false; + if (!writer.writeByteBuffer("filter", filter)) + return false; writer.incrementState(); @@ -315,8 +315,8 @@ public class GridEventStorageMessage implements Message { writer.incrementState(); case 7: -// if (!writer.writeByteArray("resTopicBytes", resTopicBytes)) -// return false; + if (!writer.writeByteBuffer("resTopicBytes", resTopicBytes)) + return false; writer.incrementState(); @@ -360,7 +360,7 @@ public class GridEventStorageMessage implements Message { reader.incrementState(); case 2: -// evtsBytes = reader.readByteArray("evtsBytes"); + evtsBytes = reader.readByteBuffer("evtsBytes"); if (!reader.isLastRead()) return false; @@ -368,7 +368,7 @@ public class GridEventStorageMessage implements Message { reader.incrementState(); case 3: -// exBytes = reader.readByteArray("exBytes"); + exBytes = reader.readByteBuffer("exBytes"); if (!reader.isLastRead()) return false; @@ -376,7 +376,7 @@ public class GridEventStorageMessage implements Message { reader.incrementState(); case 4: -// filter = reader.readByteArray("filter"); + filter = reader.readByteBuffer("filter"); if (!reader.isLastRead()) return false; @@ -400,7 +400,7 @@ public class GridEventStorageMessage implements Message { reader.incrementState(); case 7: -// resTopicBytes = reader.readByteArray("resTopicBytes"); + resTopicBytes = reader.readByteBuffer("resTopicBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java index dad6d6b..c5b20b4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java @@ -54,23 +54,31 @@ public abstract class CacheEntryPredicateAdapter implements CacheEntryPredicate /** {@inheritDoc} */ @Override public byte fieldsCount() { - assert false : this; - return 0; } /** {@inheritDoc} */ @Override public boolean readFrom(ByteBuffer buf, MessageReader reader) { - assert false : this; + reader.setBuffer(buf); + + if (!reader.beforeMessageRead()) + return false; - return false; + return true; } /** {@inheritDoc} */ @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { - assert false : this; + writer.setBuffer(buf); + + if (!writer.isHeaderWritten()) { + if (!writer.writeHeader(directType(), fieldsCount())) + return false; + + writer.onHeaderWritten(); + } - return false; + return true; } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java index 14018cd..c9fdf9f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java @@ -75,6 +75,9 @@ public class CacheEntryPredicateContainsValue extends CacheEntryPredicateAdapter @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { writer.setBuffer(buf); + if (!super.writeTo(buf, writer)) + return false; + if (!writer.isHeaderWritten()) { if (!writer.writeHeader(directType(), fieldsCount())) return false; @@ -101,6 +104,9 @@ public class CacheEntryPredicateContainsValue extends CacheEntryPredicateAdapter if (!reader.beforeMessageRead()) return false; + if (!super.readFrom(buf, reader)) + return false; + switch (reader.state()) { case 0: val = reader.readMessage("val"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java index b007465..229e22a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java @@ -109,8 +109,8 @@ public class CacheEntrySerializablePredicate implements CacheEntryPredicate { switch (writer.state()) { case 0: -// if (!writer.writeByteArray("bytes", bytes)) -// return false; + if (!writer.writeByteBuffer("bytes", bytes)) + return false; writer.incrementState(); @@ -128,7 +128,7 @@ public class CacheEntrySerializablePredicate implements CacheEntryPredicate { switch (reader.state()) { case 0: -// bytes = reader.readByteArray("bytes"); + bytes = reader.readByteBuffer("bytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java index d7b697c..5cb58e5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java @@ -142,8 +142,8 @@ public class CacheInvokeDirectResult implements Message { switch (writer.state()) { case 0: -// if (!writer.writeByteArray("errBytes", errBytes)) -// return false; + if (!writer.writeByteBuffer("errBytes", errBytes)) + return false; writer.incrementState(); @@ -173,7 +173,7 @@ public class CacheInvokeDirectResult implements Message { switch (reader.state()) { case 0: -// errBytes = reader.readByteArray("errBytes"); + errBytes = reader.readByteBuffer("errBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java index c6dc767..6ba1de3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java @@ -71,7 +71,7 @@ public abstract class CacheObjectAdapter implements CacheObject, Externalizable switch (reader.state()) { case 0: -// valBytes = reader.readByteArray("valBytes"); + valBytes = reader.readByteBuffer("valBytes"); if (!reader.isLastRead()) return false; @@ -96,8 +96,8 @@ public abstract class CacheObjectAdapter implements CacheObject, Externalizable switch (writer.state()) { case 0: -// if (!writer.writeByteArray("valBytes", valBytes)) -// return false; + if (!writer.writeByteBuffer("valBytes", valBytes)) + return false; writer.incrementState(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java index 69ff9ff..1bbce6d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java @@ -223,8 +223,8 @@ public class GridCacheEntryInfo implements Message { writer.incrementState(); case 3: -// if (!writer.writeByteArray("keyBytes", keyBytes)) -// return false; + if (!writer.writeByteBuffer("keyBytes", keyBytes)) + return false; writer.incrementState(); @@ -284,7 +284,7 @@ public class GridCacheEntryInfo implements Message { reader.incrementState(); case 3: -// keyBytes = reader.readByteArray("keyBytes"); + keyBytes = reader.readByteBuffer("keyBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 ad22c6a..9dd55c5 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 @@ -257,14 +257,14 @@ public abstract class GridDistributedBaseMessage extends GridCacheMessage implem switch (writer.state()) { case 3: -// if (!writer.writeByteArray("candsByIdxBytes", candsByIdxBytes)) -// return false; + if (!writer.writeByteBuffer("candsByIdxBytes", candsByIdxBytes)) + return false; writer.incrementState(); case 4: -// if (!writer.writeByteArray("candsByKeyBytes", candsByKeyBytes)) -// return false; + if (!writer.writeByteBuffer("candsByKeyBytes", candsByKeyBytes)) + return false; writer.incrementState(); @@ -303,7 +303,7 @@ public abstract class GridDistributedBaseMessage extends GridCacheMessage implem switch (reader.state()) { case 3: -// candsByIdxBytes = reader.readByteArray("candsByIdxBytes"); + candsByIdxBytes = reader.readByteBuffer("candsByIdxBytes"); if (!reader.isLastRead()) return false; @@ -311,7 +311,7 @@ public abstract class GridDistributedBaseMessage extends GridCacheMessage implem reader.incrementState(); case 4: -// candsByKeyBytes = reader.readByteArray("candsByKeyBytes"); + candsByKeyBytes = reader.readByteBuffer("candsByKeyBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 2869fe5..790e369 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 @@ -244,8 +244,8 @@ public class GridDistributedLockResponse extends GridDistributedBaseMessage { switch (writer.state()) { case 8: -// if (!writer.writeByteArray("errBytes", errBytes)) -// return false; + if (!writer.writeByteBuffer("errBytes", errBytes)) + return false; writer.incrementState(); @@ -278,7 +278,7 @@ public class GridDistributedLockResponse extends GridDistributedBaseMessage { switch (reader.state()) { case 8: -// errBytes = reader.readByteArray("errBytes"); + errBytes = reader.readByteBuffer("errBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 b3d8d4a..aba9e86 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 @@ -397,8 +397,8 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage writer.incrementState(); case 11: -// if (!writer.writeByteArray("grpLockKeyBytes", grpLockKeyBytes)) -// return false; + if (!writer.writeByteBuffer("grpLockKeyBytes", grpLockKeyBytes)) + return false; writer.incrementState(); @@ -457,8 +457,8 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage writer.incrementState(); case 21: -// if (!writer.writeByteArray("txNodesBytes", txNodesBytes)) -// return false; + if (!writer.writeByteBuffer("txNodesBytes", txNodesBytes)) + return false; writer.incrementState(); @@ -525,7 +525,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage reader.incrementState(); case 11: -// grpLockKeyBytes = reader.readByteArray("grpLockKeyBytes"); + grpLockKeyBytes = reader.readByteBuffer("grpLockKeyBytes"); if (!reader.isLastRead()) return false; @@ -613,7 +613,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage reader.incrementState(); case 21: -// txNodesBytes = reader.readByteArray("txNodesBytes"); + txNodesBytes = reader.readByteBuffer("txNodesBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 67fcb47..31d3ee9 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 @@ -164,14 +164,14 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage switch (writer.state()) { case 8: -// if (!writer.writeByteArray("candsBytes", candsBytes)) -// return false; + if (!writer.writeByteBuffer("candsBytes", candsBytes)) + return false; writer.incrementState(); case 9: -// if (!writer.writeByteArray("errBytes", errBytes)) -// return false; + if (!writer.writeByteBuffer("errBytes", errBytes)) + return false; writer.incrementState(); @@ -192,7 +192,7 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage switch (reader.state()) { case 8: -// candsBytes = reader.readByteArray("candsBytes"); + candsBytes = reader.readByteBuffer("candsBytes"); if (!reader.isLastRead()) return false; @@ -200,7 +200,7 @@ public class GridDistributedTxPrepareResponse extends GridDistributedBaseMessage reader.incrementState(); case 9: -// errBytes = reader.readByteArray("errBytes"); + errBytes = reader.readByteBuffer("errBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 9802421..d365612 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 @@ -127,8 +127,8 @@ public class GridDhtAffinityAssignmentResponse extends GridCacheMessage { switch (writer.state()) { case 3: -// if (!writer.writeByteArray("affAssignmentBytes", affAssignmentBytes)) -// return false; + if (!writer.writeByteBuffer("affAssignmentBytes", affAssignmentBytes)) + return false; writer.incrementState(); @@ -155,7 +155,7 @@ public class GridDhtAffinityAssignmentResponse extends GridCacheMessage { switch (reader.state()) { case 3: -// affAssignmentBytes = reader.readByteArray("affAssignmentBytes"); + affAssignmentBytes = reader.readByteBuffer("affAssignmentBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 3182b91..0abc20f 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 @@ -352,8 +352,8 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { writer.incrementState(); case 26: -// if (!writer.writeByteArray("ownedBytes", ownedBytes)) -// return false; + if (!writer.writeByteBuffer("ownedBytes", ownedBytes)) + return false; writer.incrementState(); @@ -430,7 +430,7 @@ public class GridDhtLockRequest extends GridDistributedLockRequest { reader.incrementState(); case 26: -// ownedBytes = reader.readByteArray("ownedBytes"); + ownedBytes = reader.readByteBuffer("ownedBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 86e9fa6..be848b4 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 @@ -594,7 +594,7 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements Grid writer.incrementState(); case 5: - if (!writer.writeCollection("entryProcessorsBytes", entryProcessorsBytes, MessageCollectionItemType.BYTE_ARR)) + if (!writer.writeCollection("entryProcessorsBytes", entryProcessorsBytes, MessageCollectionItemType.BYTE_BUF)) return false; writer.incrementState(); @@ -612,7 +612,7 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements Grid writer.incrementState(); case 8: - if (!writer.writeObjectArray("invokeArgsBytes", invokeArgsBytes, MessageCollectionItemType.BYTE_ARR)) + if (!writer.writeObjectArray("invokeArgsBytes", invokeArgsBytes, MessageCollectionItemType.BYTE_BUF)) return false; writer.incrementState(); @@ -624,7 +624,7 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements Grid writer.incrementState(); case 10: - if (!writer.writeCollection("nearEntryProcessorsBytes", nearEntryProcessorsBytes, MessageCollectionItemType.BYTE_ARR)) + if (!writer.writeCollection("nearEntryProcessorsBytes", nearEntryProcessorsBytes, MessageCollectionItemType.BYTE_BUF)) return false; writer.incrementState(); @@ -734,7 +734,7 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements Grid reader.incrementState(); case 5: - entryProcessorsBytes = reader.readCollection("entryProcessorsBytes", MessageCollectionItemType.BYTE_ARR); + entryProcessorsBytes = reader.readCollection("entryProcessorsBytes", MessageCollectionItemType.BYTE_BUF); if (!reader.isLastRead()) return false; @@ -758,7 +758,7 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements Grid reader.incrementState(); case 8: -// invokeArgsBytes = reader.readObjectArray("invokeArgsBytes", MessageCollectionItemType.BYTE_ARR, byte[].class); + invokeArgsBytes = reader.readObjectArray("invokeArgsBytes", MessageCollectionItemType.BYTE_BUF, ByteBuffer.class); if (!reader.isLastRead()) return false; @@ -774,7 +774,7 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements Grid reader.incrementState(); case 10: - nearEntryProcessorsBytes = reader.readCollection("nearEntryProcessorsBytes", MessageCollectionItemType.BYTE_ARR); + nearEntryProcessorsBytes = reader.readCollection("nearEntryProcessorsBytes", MessageCollectionItemType.BYTE_BUF); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 4f8d759..142c7bc 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 @@ -181,8 +181,8 @@ public class GridDhtAtomicUpdateResponse extends GridCacheMessage implements Gri switch (writer.state()) { case 3: -// if (!writer.writeByteArray("errBytes", errBytes)) -// return false; + if (!writer.writeByteBuffer("errBytes", errBytes)) + return false; writer.incrementState(); @@ -221,7 +221,7 @@ public class GridDhtAtomicUpdateResponse extends GridCacheMessage implements Gri switch (reader.state()) { case 3: -// errBytes = reader.readByteArray("errBytes"); + errBytes = reader.readByteBuffer("errBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 4b90ee9..cc75414 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 @@ -586,14 +586,14 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri writer.incrementState(); case 6: - if (!writer.writeCollection("entryProcessorsBytes", entryProcessorsBytes, MessageCollectionItemType.BYTE_ARR)) + if (!writer.writeCollection("entryProcessorsBytes", entryProcessorsBytes, MessageCollectionItemType.BYTE_BUF)) return false; writer.incrementState(); case 7: -// if (!writer.writeByteArray("expiryPlcBytes", expiryPlcBytes)) -// return false; + if (!writer.writeByteBuffer("expiryPlcBytes", expiryPlcBytes)) + return false; writer.incrementState(); @@ -628,7 +628,7 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri writer.incrementState(); case 13: - if (!writer.writeObjectArray("invokeArgsBytes", invokeArgsBytes, MessageCollectionItemType.BYTE_ARR)) + if (!writer.writeObjectArray("invokeArgsBytes", invokeArgsBytes, MessageCollectionItemType.BYTE_BUF)) return false; writer.incrementState(); @@ -728,7 +728,7 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri reader.incrementState(); case 6: - entryProcessorsBytes = reader.readCollection("entryProcessorsBytes", MessageCollectionItemType.BYTE_ARR); + entryProcessorsBytes = reader.readCollection("entryProcessorsBytes", MessageCollectionItemType.BYTE_BUF); if (!reader.isLastRead()) return false; @@ -736,7 +736,7 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri reader.incrementState(); case 7: -// expiryPlcBytes = reader.readByteArray("expiryPlcBytes"); + expiryPlcBytes = reader.readByteBuffer("expiryPlcBytes"); if (!reader.isLastRead()) return false; @@ -784,7 +784,7 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri reader.incrementState(); case 13: -// invokeArgsBytes = reader.readObjectArray("invokeArgsBytes", MessageCollectionItemType.BYTE_ARR, byte[].class); + invokeArgsBytes = reader.readObjectArray("invokeArgsBytes", MessageCollectionItemType.BYTE_BUF, ByteBuffer.class); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 1d51cc7..5017ee4 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 @@ -421,8 +421,8 @@ public class GridNearAtomicUpdateResponse extends GridCacheMessage implements Gr switch (writer.state()) { case 3: -// if (!writer.writeByteArray("errBytes", errBytes)) -// return false; + if (!writer.writeByteBuffer("errBytes", errBytes)) + return false; writer.incrementState(); @@ -503,7 +503,7 @@ public class GridNearAtomicUpdateResponse extends GridCacheMessage implements Gr switch (reader.state()) { case 3: -// errBytes = reader.readByteArray("errBytes"); + errBytes = reader.readByteBuffer("errBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 13d3a21..245703e 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 @@ -223,8 +223,8 @@ public class GridDhtPartitionDemandMessage extends GridCacheMessage { writer.incrementState(); case 6: -// if (!writer.writeByteArray("topicBytes", topicBytes)) -// return false; + if (!writer.writeByteBuffer("topicBytes", topicBytes)) + return false; writer.incrementState(); @@ -281,7 +281,7 @@ public class GridDhtPartitionDemandMessage extends GridCacheMessage { reader.incrementState(); case 6: -// topicBytes = reader.readByteArray("topicBytes"); + topicBytes = reader.readByteBuffer("topicBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 7008b80..996deba 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 @@ -131,8 +131,8 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa switch (writer.state()) { case 5: -// if (!writer.writeByteArray("partsBytes", partsBytes)) -// return false; + if (!writer.writeByteBuffer("partsBytes", partsBytes)) + return false; writer.incrementState(); @@ -159,7 +159,7 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa switch (reader.state()) { case 5: -// partsBytes = reader.readByteArray("partsBytes"); + partsBytes = reader.readByteBuffer("partsBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 851ffc0..ec352a1 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 @@ -110,8 +110,8 @@ public class GridDhtPartitionsSingleMessage extends GridDhtPartitionsAbstractMes switch (writer.state()) { case 5: -// if (!writer.writeByteArray("partsBytes", partsBytes)) -// return false; + if (!writer.writeByteBuffer("partsBytes", partsBytes)) + return false; writer.incrementState(); @@ -132,7 +132,7 @@ public class GridDhtPartitionsSingleMessage extends GridDhtPartitionsAbstractMes switch (reader.state()) { case 5: -// partsBytes = reader.readByteArray("partsBytes"); + partsBytes = reader.readByteBuffer("partsBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 b25f4bd..db106a1 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 @@ -220,8 +220,8 @@ public class GridNearGetResponse extends GridCacheMessage implements GridCacheDe writer.incrementState(); case 4: -// if (!writer.writeByteArray("errBytes", errBytes)) -// return false; + if (!writer.writeByteBuffer("errBytes", errBytes)) + return false; writer.incrementState(); @@ -280,7 +280,7 @@ public class GridNearGetResponse extends GridCacheMessage implements GridCacheDe reader.incrementState(); case 4: -// errBytes = reader.readByteArray("errBytes"); + errBytes = reader.readByteBuffer("errBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 0c53a09..9168fb8 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 @@ -129,8 +129,8 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse { switch (writer.state()) { case 5: -// if (!writer.writeByteArray("errBytes", errBytes)) -// return false; + if (!writer.writeByteBuffer("errBytes", errBytes)) + return false; writer.incrementState(); @@ -163,7 +163,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse { switch (reader.state()) { case 5: -// errBytes = reader.readByteArray("errBytes"); + errBytes = reader.readByteBuffer("errBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 03fa54e..146589a 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 @@ -436,8 +436,8 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache writer.incrementState(); case 4: -// if (!writer.writeByteArray("argsBytes", argsBytes)) -// return false; + if (!writer.writeByteBuffer("argsBytes", argsBytes)) + return false; writer.incrementState(); @@ -496,8 +496,8 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache writer.incrementState(); case 14: -// if (!writer.writeByteArray("keyValFilterBytes", keyValFilterBytes)) -// return false; + if (!writer.writeByteBuffer("keyValFilterBytes", keyValFilterBytes)) + return false; writer.incrementState(); @@ -508,8 +508,8 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache writer.incrementState(); case 16: -// if (!writer.writeByteArray("rdcBytes", rdcBytes)) -// return false; + if (!writer.writeByteBuffer("rdcBytes", rdcBytes)) + return false; writer.incrementState(); @@ -526,8 +526,8 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache writer.incrementState(); case 19: -// if (!writer.writeByteArray("transBytes", transBytes)) -// return false; + if (!writer.writeByteBuffer("transBytes", transBytes)) + return false; writer.incrementState(); @@ -562,7 +562,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache reader.incrementState(); case 4: -// argsBytes = reader.readByteArray("argsBytes"); + argsBytes = reader.readByteBuffer("argsBytes"); if (!reader.isLastRead()) return false; @@ -642,7 +642,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache reader.incrementState(); case 14: -// keyValFilterBytes = reader.readByteArray("keyValFilterBytes"); + keyValFilterBytes = reader.readByteBuffer("keyValFilterBytes"); if (!reader.isLastRead()) return false; @@ -658,7 +658,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache reader.incrementState(); case 16: -// rdcBytes = reader.readByteArray("rdcBytes"); + rdcBytes = reader.readByteBuffer("rdcBytes"); if (!reader.isLastRead()) return false; @@ -682,7 +682,7 @@ public class GridCacheQueryRequest extends GridCacheMessage implements GridCache reader.incrementState(); case 19: -// transBytes = reader.readByteArray("transBytes"); + transBytes = reader.readByteBuffer("transBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 82612f8..b178068 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 @@ -217,14 +217,14 @@ public class GridCacheQueryResponse extends GridCacheMessage implements GridCach switch (writer.state()) { case 3: - if (!writer.writeCollection("dataBytes", dataBytes, MessageCollectionItemType.BYTE_ARR)) + if (!writer.writeCollection("dataBytes", dataBytes, MessageCollectionItemType.BYTE_BUF)) return false; writer.incrementState(); case 4: -// if (!writer.writeByteArray("errBytes", errBytes)) -// return false; + if (!writer.writeByteBuffer("errBytes", errBytes)) + return false; writer.incrementState(); @@ -241,7 +241,7 @@ public class GridCacheQueryResponse extends GridCacheMessage implements GridCach writer.incrementState(); case 7: - if (!writer.writeCollection("metaDataBytes", metaDataBytes, MessageCollectionItemType.BYTE_ARR)) + if (!writer.writeCollection("metaDataBytes", metaDataBytes, MessageCollectionItemType.BYTE_BUF)) return false; writer.incrementState(); @@ -269,7 +269,7 @@ public class GridCacheQueryResponse extends GridCacheMessage implements GridCach switch (reader.state()) { case 3: - dataBytes = reader.readCollection("dataBytes", MessageCollectionItemType.BYTE_ARR); + dataBytes = reader.readCollection("dataBytes", MessageCollectionItemType.BYTE_BUF); if (!reader.isLastRead()) return false; @@ -277,7 +277,7 @@ public class GridCacheQueryResponse extends GridCacheMessage implements GridCach reader.incrementState(); case 4: -// errBytes = reader.readByteArray("errBytes"); + errBytes = reader.readByteBuffer("errBytes"); if (!reader.isLastRead()) return false; @@ -301,7 +301,7 @@ public class GridCacheQueryResponse extends GridCacheMessage implements GridCach reader.incrementState(); case 7: - metaDataBytes = reader.readCollection("metaDataBytes", MessageCollectionItemType.BYTE_ARR); + metaDataBytes = reader.readCollection("metaDataBytes", MessageCollectionItemType.BYTE_BUF); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 fb9e32a..37b683f 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 @@ -794,8 +794,8 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message { writer.incrementState(); case 3: -// if (!writer.writeByteArray("expiryPlcBytes", expiryPlcBytes)) -// return false; + if (!writer.writeByteBuffer("expiryPlcBytes", expiryPlcBytes)) + return false; writer.incrementState(); @@ -825,8 +825,8 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message { writer.incrementState(); case 8: -// if (!writer.writeByteArray("transformClosBytes", transformClosBytes)) -// return false; + if (!writer.writeByteBuffer("transformClosBytes", transformClosBytes)) + return false; writer.incrementState(); @@ -880,7 +880,7 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message { reader.incrementState(); case 3: -// expiryPlcBytes = reader.readByteArray("expiryPlcBytes"); + expiryPlcBytes = reader.readByteBuffer("expiryPlcBytes"); if (!reader.isLastRead()) return false; @@ -920,7 +920,7 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message { reader.incrementState(); case 8: -// transformClosBytes = reader.readByteArray("transformClosBytes"); + transformClosBytes = reader.readByteBuffer("transformClosBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 57371d5..05da318 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 @@ -288,7 +288,7 @@ public class GridCacheRawVersionedEntry<K, V> extends IgniteDataLoaderEntry impl reader.incrementState(); case 4: -// valBytes = reader.readByteArray("valBytes"); + valBytes = reader.readByteBuffer("valBytes"); if (!reader.isLastRead()) return false; @@ -305,17 +305,11 @@ public class GridCacheRawVersionedEntry<K, V> extends IgniteDataLoaderEntry impl } - assert key != null; - assert !(val != null && valBytes != null); - return true; } /** {@inheritDoc} */ @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) { - assert key != null; - assert !(val != null && valBytes != null); - writer.setBuffer(buf); if (!super.writeTo(buf, writer)) @@ -342,8 +336,8 @@ public class GridCacheRawVersionedEntry<K, V> extends IgniteDataLoaderEntry impl writer.incrementState(); case 4: -// if (!writer.writeByteArray("valBytes", valBytes)) -// return false; + if (!writer.writeByteBuffer("valBytes", valBytes)) + return false; writer.incrementState(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 f788ad7..a71c552 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 @@ -160,8 +160,8 @@ public class GridContinuousMessage implements Message { switch (writer.state()) { case 0: -// if (!writer.writeByteArray("dataBytes", dataBytes)) -// return false; + if (!writer.writeByteBuffer("dataBytes", dataBytes)) + return false; writer.incrementState(); @@ -203,7 +203,7 @@ public class GridContinuousMessage implements Message { switch (reader.state()) { case 0: -// dataBytes = reader.readByteArray("dataBytes"); + dataBytes = reader.readByteBuffer("dataBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadRequest.java index e7d0f65..497e1d1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadRequest.java @@ -284,8 +284,8 @@ public class GridDataLoadRequest implements Message { writer.incrementState(); case 8: -// if (!writer.writeByteArray("resTopicBytes", resTopicBytes)) -// return false; + if (!writer.writeByteBuffer("resTopicBytes", resTopicBytes)) + return false; writer.incrementState(); @@ -302,8 +302,8 @@ public class GridDataLoadRequest implements Message { writer.incrementState(); case 11: -// if (!writer.writeByteArray("updaterBytes", updaterBytes)) -// return false; + if (!writer.writeByteBuffer("updaterBytes", updaterBytes)) + return false; writer.incrementState(); @@ -395,7 +395,7 @@ public class GridDataLoadRequest implements Message { reader.incrementState(); case 8: -// resTopicBytes = reader.readByteArray("resTopicBytes"); + resTopicBytes = reader.readByteBuffer("resTopicBytes"); if (!reader.isLastRead()) return false; @@ -419,7 +419,7 @@ public class GridDataLoadRequest implements Message { reader.incrementState(); case 11: -// updaterBytes = reader.readByteArray("updaterBytes"); + updaterBytes = reader.readByteBuffer("updaterBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadResponse.java index c926382..9613369 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadResponse.java @@ -95,8 +95,8 @@ public class GridDataLoadResponse implements Message { switch (writer.state()) { case 0: -// if (!writer.writeByteArray("errBytes", errBytes)) -// return false; + if (!writer.writeByteBuffer("errBytes", errBytes)) + return false; writer.incrementState(); @@ -126,7 +126,7 @@ public class GridDataLoadResponse implements Message { switch (reader.state()) { case 0: -// errBytes = reader.readByteArray("errBytes"); + errBytes = reader.readByteBuffer("errBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 ffe00e8..ea4f821 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 @@ -118,8 +118,8 @@ public class IgfsAckMessage extends IgfsCommunicationMessage { switch (writer.state()) { case 0: -// if (!writer.writeByteArray("errBytes", errBytes)) -// return false; + if (!writer.writeByteBuffer("errBytes", errBytes)) + return false; writer.incrementState(); @@ -152,7 +152,7 @@ public class IgfsAckMessage extends IgfsCommunicationMessage { switch (reader.state()) { case 0: -// errBytes = reader.readByteArray("errBytes"); + errBytes = reader.readByteBuffer("errBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 a000509..471851a 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 @@ -122,8 +122,8 @@ public class IgfsDeleteMessage extends IgfsCommunicationMessage { switch (writer.state()) { case 0: -// if (!writer.writeByteArray("errBytes", errBytes)) -// return false; + if (!writer.writeByteBuffer("errBytes", errBytes)) + return false; writer.incrementState(); @@ -150,7 +150,7 @@ public class IgfsDeleteMessage extends IgfsCommunicationMessage { switch (reader.state()) { case 0: -// errBytes = reader.readByteArray("errBytes"); + errBytes = reader.readByteBuffer("errBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 1418b1a..45ffd7c 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 @@ -117,8 +117,8 @@ public class GridTaskResultRequest implements Message { writer.incrementState(); case 1: -// if (!writer.writeByteArray("topicBytes", topicBytes)) -// return false; + if (!writer.writeByteBuffer("topicBytes", topicBytes)) + return false; writer.incrementState(); @@ -144,7 +144,7 @@ public class GridTaskResultRequest implements Message { reader.incrementState(); case 1: -// topicBytes = reader.readByteArray("topicBytes"); + topicBytes = reader.readByteBuffer("topicBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7f9e658/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 7c8fdc0..d0616bb 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 @@ -147,8 +147,8 @@ public class GridTaskResultResponse implements Message { writer.incrementState(); case 3: -// if (!writer.writeByteArray("resBytes", resBytes)) -// return false; + if (!writer.writeByteBuffer("resBytes", resBytes)) + return false; writer.incrementState(); @@ -190,7 +190,7 @@ public class GridTaskResultResponse implements Message { reader.incrementState(); case 3: -// resBytes = reader.readByteArray("resBytes"); + resBytes = reader.readByteBuffer("resBytes"); if (!reader.isLastRead()) return false;
