http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/947723c9/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java index 9932132..3b052d0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java @@ -114,27 +114,30 @@ public class GridClockDeltaVersion extends MessageAdapter implements Comparable< /** {@inheritDoc} */ @Override public boolean writeTo(ByteBuffer buf) { + MessageWriteState state = MessageWriteState.get(); + MessageWriter writer = state.writer(); + writer.setBuffer(buf); - if (!typeWritten) { + if (!state.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - typeWritten = true; + state.setTypeWritten(); } - switch (state) { + switch (state.index()) { case 0: if (!writer.writeLong("topVer", topVer)) return false; - state++; + state.increment(); case 1: if (!writer.writeLong("ver", ver)) return false; - state++; + state.increment(); } @@ -145,14 +148,14 @@ public class GridClockDeltaVersion extends MessageAdapter implements Comparable< @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); - switch (state) { + switch (readState) { case 0: topVer = reader.readLong("topVer"); if (!reader.isLastRead()) return false; - state++; + readState++; case 1: ver = reader.readLong("ver"); @@ -160,7 +163,7 @@ public class GridClockDeltaVersion extends MessageAdapter implements Comparable< if (!reader.isLastRead()) return false; - state++; + readState++; } @@ -175,11 +178,7 @@ public class GridClockDeltaVersion extends MessageAdapter implements Comparable< /** {@inheritDoc} */ @SuppressWarnings("CloneDoesntCallSuperClone") @Override public MessageAdapter clone() { - GridClockDeltaVersion _clone = new GridClockDeltaVersion(); - - clone0(_clone); - - return _clone; + throw new UnsupportedOperationException(); } /** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/947723c9/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 e005a9b..3b0ee9f 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 @@ -133,11 +133,7 @@ public class GridContinuousMessage extends MessageAdapter { /** {@inheritDoc} */ @SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"}) @Override public MessageAdapter clone() { - GridContinuousMessage _clone = new GridContinuousMessage(); - - clone0(_clone); - - return _clone; + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @@ -154,39 +150,42 @@ public class GridContinuousMessage extends MessageAdapter { /** {@inheritDoc} */ @SuppressWarnings("fallthrough") @Override public boolean writeTo(ByteBuffer buf) { + MessageWriteState state = MessageWriteState.get(); + MessageWriter writer = state.writer(); + writer.setBuffer(buf); - if (!typeWritten) { + if (!state.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - typeWritten = true; + state.setTypeWritten(); } - switch (state) { + switch (state.index()) { case 0: if (!writer.writeByteArray("dataBytes", dataBytes)) return false; - state++; + state.increment(); case 1: if (!writer.writeIgniteUuid("futId", futId)) return false; - state++; + state.increment(); case 2: if (!writer.writeUuid("routineId", routineId)) return false; - state++; + state.increment(); case 3: if (!writer.writeEnum("type", type)) return false; - state++; + state.increment(); } @@ -198,14 +197,14 @@ public class GridContinuousMessage extends MessageAdapter { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); - switch (state) { + switch (readState) { case 0: dataBytes = reader.readByteArray("dataBytes"); if (!reader.isLastRead()) return false; - state++; + readState++; case 1: futId = reader.readIgniteUuid("futId"); @@ -213,7 +212,7 @@ public class GridContinuousMessage extends MessageAdapter { if (!reader.isLastRead()) return false; - state++; + readState++; case 2: routineId = reader.readUuid("routineId"); @@ -221,7 +220,7 @@ public class GridContinuousMessage extends MessageAdapter { if (!reader.isLastRead()) return false; - state++; + readState++; case 3: type = reader.readEnum("type", GridContinuousMessageType.class); @@ -229,7 +228,7 @@ public class GridContinuousMessage extends MessageAdapter { if (!reader.isLastRead()) return false; - state++; + readState++; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/947723c9/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 169fe46..fe9da6c 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 @@ -224,93 +224,96 @@ public class GridDataLoadRequest extends MessageAdapter { /** {@inheritDoc} */ @Override public boolean writeTo(ByteBuffer buf) { + MessageWriteState state = MessageWriteState.get(); + MessageWriter writer = state.writer(); + writer.setBuffer(buf); - if (!typeWritten) { + if (!state.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - typeWritten = true; + state.setTypeWritten(); } - switch (state) { + switch (state.index()) { case 0: if (!writer.writeString("cacheName", cacheName)) return false; - state++; + state.increment(); case 1: if (!writer.writeIgniteUuid("clsLdrId", clsLdrId)) return false; - state++; + state.increment(); case 2: if (!writer.writeByteArray("colBytes", colBytes)) return false; - state++; + state.increment(); case 3: if (!writer.writeEnum("depMode", depMode)) return false; - state++; + state.increment(); case 4: if (!writer.writeBoolean("forceLocDep", forceLocDep)) return false; - state++; + state.increment(); case 5: if (!writer.writeBoolean("ignoreDepOwnership", ignoreDepOwnership)) return false; - state++; + state.increment(); case 6: if (!writer.writeMap("ldrParticipants", ldrParticipants, UUID.class, IgniteUuid.class)) return false; - state++; + state.increment(); case 7: if (!writer.writeLong("reqId", reqId)) return false; - state++; + state.increment(); case 8: if (!writer.writeByteArray("resTopicBytes", resTopicBytes)) return false; - state++; + state.increment(); case 9: if (!writer.writeString("sampleClsName", sampleClsName)) return false; - state++; + state.increment(); case 10: if (!writer.writeBoolean("skipStore", skipStore)) return false; - state++; + state.increment(); case 11: if (!writer.writeByteArray("updaterBytes", updaterBytes)) return false; - state++; + state.increment(); case 12: if (!writer.writeString("userVer", userVer)) return false; - state++; + state.increment(); } @@ -321,14 +324,14 @@ public class GridDataLoadRequest extends MessageAdapter { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); - switch (state) { + switch (readState) { case 0: cacheName = reader.readString("cacheName"); if (!reader.isLastRead()) return false; - state++; + readState++; case 1: clsLdrId = reader.readIgniteUuid("clsLdrId"); @@ -336,7 +339,7 @@ public class GridDataLoadRequest extends MessageAdapter { if (!reader.isLastRead()) return false; - state++; + readState++; case 2: colBytes = reader.readByteArray("colBytes"); @@ -344,7 +347,7 @@ public class GridDataLoadRequest extends MessageAdapter { if (!reader.isLastRead()) return false; - state++; + readState++; case 3: depMode = reader.readEnum("depMode", DeploymentMode.class); @@ -352,7 +355,7 @@ public class GridDataLoadRequest extends MessageAdapter { if (!reader.isLastRead()) return false; - state++; + readState++; case 4: forceLocDep = reader.readBoolean("forceLocDep"); @@ -360,7 +363,7 @@ public class GridDataLoadRequest extends MessageAdapter { if (!reader.isLastRead()) return false; - state++; + readState++; case 5: ignoreDepOwnership = reader.readBoolean("ignoreDepOwnership"); @@ -368,7 +371,7 @@ public class GridDataLoadRequest extends MessageAdapter { if (!reader.isLastRead()) return false; - state++; + readState++; case 6: ldrParticipants = reader.readMap("ldrParticipants", UUID.class, IgniteUuid.class, false); @@ -376,7 +379,7 @@ public class GridDataLoadRequest extends MessageAdapter { if (!reader.isLastRead()) return false; - state++; + readState++; case 7: reqId = reader.readLong("reqId"); @@ -384,7 +387,7 @@ public class GridDataLoadRequest extends MessageAdapter { if (!reader.isLastRead()) return false; - state++; + readState++; case 8: resTopicBytes = reader.readByteArray("resTopicBytes"); @@ -392,7 +395,7 @@ public class GridDataLoadRequest extends MessageAdapter { if (!reader.isLastRead()) return false; - state++; + readState++; case 9: sampleClsName = reader.readString("sampleClsName"); @@ -400,7 +403,7 @@ public class GridDataLoadRequest extends MessageAdapter { if (!reader.isLastRead()) return false; - state++; + readState++; case 10: skipStore = reader.readBoolean("skipStore"); @@ -408,7 +411,7 @@ public class GridDataLoadRequest extends MessageAdapter { if (!reader.isLastRead()) return false; - state++; + readState++; case 11: updaterBytes = reader.readByteArray("updaterBytes"); @@ -416,7 +419,7 @@ public class GridDataLoadRequest extends MessageAdapter { if (!reader.isLastRead()) return false; - state++; + readState++; case 12: userVer = reader.readString("userVer"); @@ -424,7 +427,7 @@ public class GridDataLoadRequest extends MessageAdapter { if (!reader.isLastRead()) return false; - state++; + readState++; } @@ -438,11 +441,7 @@ public class GridDataLoadRequest extends MessageAdapter { /** {@inheritDoc} */ @Override public MessageAdapter clone() { - GridDataLoadRequest _clone = new GridDataLoadRequest(); - - clone0(_clone); - - return _clone; + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/947723c9/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 8676e7e..b6c8586 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 @@ -85,11 +85,7 @@ public class GridDataLoadResponse extends MessageAdapter { /** {@inheritDoc} */ @SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"}) @Override public MessageAdapter clone() { - GridDataLoadResponse _clone = new GridDataLoadResponse(); - - clone0(_clone); - - return _clone; + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @@ -104,33 +100,36 @@ public class GridDataLoadResponse extends MessageAdapter { /** {@inheritDoc} */ @SuppressWarnings("all") @Override public boolean writeTo(ByteBuffer buf) { + MessageWriteState state = MessageWriteState.get(); + MessageWriter writer = state.writer(); + writer.setBuffer(buf); - if (!typeWritten) { + if (!state.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - typeWritten = true; + state.setTypeWritten(); } - switch (state) { + switch (state.index()) { case 0: if (!writer.writeByteArray("errBytes", errBytes)) return false; - state++; + state.increment(); case 1: if (!writer.writeBoolean("forceLocDep", forceLocDep)) return false; - state++; + state.increment(); case 2: if (!writer.writeLong("reqId", reqId)) return false; - state++; + state.increment(); } @@ -142,14 +141,14 @@ public class GridDataLoadResponse extends MessageAdapter { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); - switch (state) { + switch (readState) { case 0: errBytes = reader.readByteArray("errBytes"); if (!reader.isLastRead()) return false; - state++; + readState++; case 1: forceLocDep = reader.readBoolean("forceLocDep"); @@ -157,7 +156,7 @@ public class GridDataLoadResponse extends MessageAdapter { if (!reader.isLastRead()) return false; - state++; + readState++; case 2: reqId = reader.readLong("reqId"); @@ -165,7 +164,7 @@ public class GridDataLoadResponse extends MessageAdapter { if (!reader.isLastRead()) return false; - state++; + readState++; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/947723c9/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 e1051c6..04ff8c6 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 @@ -105,11 +105,7 @@ public class IgfsAckMessage extends IgfsCommunicationMessage { /** {@inheritDoc} */ @SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"}) @Override public MessageAdapter clone() { - IgfsAckMessage _clone = new IgfsAckMessage(); - - clone0(_clone); - - return _clone; + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @@ -127,36 +123,39 @@ public class IgfsAckMessage extends IgfsCommunicationMessage { /** {@inheritDoc} */ @SuppressWarnings("all") @Override public boolean writeTo(ByteBuffer buf) { + MessageWriteState state = MessageWriteState.get(); + MessageWriter writer = state.writer(); + writer.setBuffer(buf); if (!super.writeTo(buf)) return false; - if (!typeWritten) { + if (!state.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - typeWritten = true; + state.setTypeWritten(); } - switch (state) { + switch (state.index()) { case 0: if (!writer.writeByteArray("errBytes", errBytes)) return false; - state++; + state.increment(); case 1: if (!writer.writeIgniteUuid("fileId", fileId)) return false; - state++; + state.increment(); case 2: if (!writer.writeLong("id", id)) return false; - state++; + state.increment(); } @@ -171,14 +170,14 @@ public class IgfsAckMessage extends IgfsCommunicationMessage { if (!super.readFrom(buf)) return false; - switch (state) { + switch (readState) { case 0: errBytes = reader.readByteArray("errBytes"); if (!reader.isLastRead()) return false; - state++; + readState++; case 1: fileId = reader.readIgniteUuid("fileId"); @@ -186,7 +185,7 @@ public class IgfsAckMessage extends IgfsCommunicationMessage { if (!reader.isLastRead()) return false; - state++; + readState++; case 2: id = reader.readLong("id"); @@ -194,7 +193,7 @@ public class IgfsAckMessage extends IgfsCommunicationMessage { if (!reader.isLastRead()) return false; - state++; + readState++; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/947723c9/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java index 304095c..9e9e05e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlockKey.java @@ -160,11 +160,7 @@ public final class IgfsBlockKey extends MessageAdapter implements Externalizable /** {@inheritDoc} */ @SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"}) @Override public MessageAdapter clone() { - IgfsBlockKey _clone = new IgfsBlockKey(); - - clone0(_clone); - - return _clone; + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @@ -180,39 +176,42 @@ public final class IgfsBlockKey extends MessageAdapter implements Externalizable /** {@inheritDoc} */ @SuppressWarnings("fallthrough") @Override public boolean writeTo(ByteBuffer buf) { + MessageWriteState state = MessageWriteState.get(); + MessageWriter writer = state.writer(); + writer.setBuffer(buf); - if (!typeWritten) { + if (!state.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - typeWritten = true; + state.setTypeWritten(); } - switch (state) { + switch (state.index()) { case 0: if (!writer.writeIgniteUuid("affKey", affKey)) return false; - state++; + state.increment(); case 1: if (!writer.writeLong("blockId", blockId)) return false; - state++; + state.increment(); case 2: if (!writer.writeBoolean("evictExclude", evictExclude)) return false; - state++; + state.increment(); case 3: if (!writer.writeIgniteUuid("fileId", fileId)) return false; - state++; + state.increment(); } @@ -224,14 +223,14 @@ public final class IgfsBlockKey extends MessageAdapter implements Externalizable @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); - switch (state) { + switch (readState) { case 0: affKey = reader.readIgniteUuid("affKey"); if (!reader.isLastRead()) return false; - state++; + readState++; case 1: blockId = reader.readLong("blockId"); @@ -239,7 +238,7 @@ public final class IgfsBlockKey extends MessageAdapter implements Externalizable if (!reader.isLastRead()) return false; - state++; + readState++; case 2: evictExclude = reader.readBoolean("evictExclude"); @@ -247,7 +246,7 @@ public final class IgfsBlockKey extends MessageAdapter implements Externalizable if (!reader.isLastRead()) return false; - state++; + readState++; case 3: fileId = reader.readIgniteUuid("fileId"); @@ -255,7 +254,7 @@ public final class IgfsBlockKey extends MessageAdapter implements Externalizable if (!reader.isLastRead()) return false; - state++; + readState++; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/947723c9/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java index 3880b18..46ffe5f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsBlocksMessage.java @@ -86,11 +86,7 @@ public class IgfsBlocksMessage extends IgfsCommunicationMessage { /** {@inheritDoc} */ @SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"}) @Override public MessageAdapter clone() { - IgfsBlocksMessage _clone = new IgfsBlocksMessage(); - - clone0(_clone); - - return _clone; + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @@ -107,36 +103,39 @@ public class IgfsBlocksMessage extends IgfsCommunicationMessage { /** {@inheritDoc} */ @SuppressWarnings("all") @Override public boolean writeTo(ByteBuffer buf) { + MessageWriteState state = MessageWriteState.get(); + MessageWriter writer = state.writer(); + writer.setBuffer(buf); if (!super.writeTo(buf)) return false; - if (!typeWritten) { + if (!state.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - typeWritten = true; + state.setTypeWritten(); } - switch (state) { + switch (state.index()) { case 0: if (!writer.writeMap("blocks", blocks, IgfsBlockKey.class, byte[].class)) return false; - state++; + state.increment(); case 1: if (!writer.writeIgniteUuid("fileId", fileId)) return false; - state++; + state.increment(); case 2: if (!writer.writeLong("id", id)) return false; - state++; + state.increment(); } @@ -151,14 +150,14 @@ public class IgfsBlocksMessage extends IgfsCommunicationMessage { if (!super.readFrom(buf)) return false; - switch (state) { + switch (readState) { case 0: blocks = reader.readMap("blocks", IgfsBlockKey.class, byte[].class, false); if (!reader.isLastRead()) return false; - state++; + readState++; case 1: fileId = reader.readIgniteUuid("fileId"); @@ -166,7 +165,7 @@ public class IgfsBlocksMessage extends IgfsCommunicationMessage { if (!reader.isLastRead()) return false; - state++; + readState++; case 2: id = reader.readLong("id"); @@ -174,7 +173,7 @@ public class IgfsBlocksMessage extends IgfsCommunicationMessage { if (!reader.isLastRead()) return false; - state++; + readState++; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/947723c9/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java index 04ce635..ab5ec3b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsCommunicationMessage.java @@ -54,13 +54,16 @@ public abstract class IgfsCommunicationMessage extends MessageAdapter { /** {@inheritDoc} */ @Override public boolean writeTo(ByteBuffer buf) { + MessageWriteState state = MessageWriteState.get(); + MessageWriter writer = state.writer(); + writer.setBuffer(buf); - if (!typeWritten) { + if (!state.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - typeWritten = true; + state.setTypeWritten(); } return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/947723c9/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 537fd25..1322983 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 @@ -109,11 +109,7 @@ public class IgfsDeleteMessage extends IgfsCommunicationMessage { /** {@inheritDoc} */ @SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"}) @Override public MessageAdapter clone() { - IgfsDeleteMessage _clone = new IgfsDeleteMessage(); - - clone0(_clone); - - return _clone; + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @@ -130,30 +126,33 @@ public class IgfsDeleteMessage extends IgfsCommunicationMessage { /** {@inheritDoc} */ @SuppressWarnings("all") @Override public boolean writeTo(ByteBuffer buf) { + MessageWriteState state = MessageWriteState.get(); + MessageWriter writer = state.writer(); + writer.setBuffer(buf); if (!super.writeTo(buf)) return false; - if (!typeWritten) { + if (!state.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - typeWritten = true; + state.setTypeWritten(); } - switch (state) { + switch (state.index()) { case 0: if (!writer.writeByteArray("errBytes", errBytes)) return false; - state++; + state.increment(); case 1: if (!writer.writeIgniteUuid("id", id)) return false; - state++; + state.increment(); } @@ -168,14 +167,14 @@ public class IgfsDeleteMessage extends IgfsCommunicationMessage { if (!super.readFrom(buf)) return false; - switch (state) { + switch (readState) { case 0: errBytes = reader.readByteArray("errBytes"); if (!reader.isLastRead()) return false; - state++; + readState++; case 1: id = reader.readIgniteUuid("id"); @@ -183,7 +182,7 @@ public class IgfsDeleteMessage extends IgfsCommunicationMessage { if (!reader.isLastRead()) return false; - state++; + readState++; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/947723c9/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java index c04345a..c6b2d48 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileAffinityRange.java @@ -265,11 +265,7 @@ public class IgfsFileAffinityRange extends MessageAdapter implements Externaliza /** {@inheritDoc} */ @SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"}) @Override public MessageAdapter clone() { - IgfsFileAffinityRange _clone = new IgfsFileAffinityRange(); - - clone0(_clone); - - return _clone; + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @@ -286,45 +282,48 @@ public class IgfsFileAffinityRange extends MessageAdapter implements Externaliza /** {@inheritDoc} */ @SuppressWarnings("fallthrough") @Override public boolean writeTo(ByteBuffer buf) { + MessageWriteState state = MessageWriteState.get(); + MessageWriter writer = state.writer(); + writer.setBuffer(buf); - if (!typeWritten) { + if (!state.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - typeWritten = true; + state.setTypeWritten(); } - switch (state) { + switch (state.index()) { case 0: if (!writer.writeIgniteUuid("affKey", affKey)) return false; - state++; + state.increment(); case 1: if (!writer.writeBoolean("done", done)) return false; - state++; + state.increment(); case 2: if (!writer.writeLong("endOff", endOff)) return false; - state++; + state.increment(); case 3: if (!writer.writeLong("startOff", startOff)) return false; - state++; + state.increment(); case 4: if (!writer.writeInt("status", status)) return false; - state++; + state.increment(); } @@ -336,14 +335,14 @@ public class IgfsFileAffinityRange extends MessageAdapter implements Externaliza @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); - switch (state) { + switch (readState) { case 0: affKey = reader.readIgniteUuid("affKey"); if (!reader.isLastRead()) return false; - state++; + readState++; case 1: done = reader.readBoolean("done"); @@ -351,7 +350,7 @@ public class IgfsFileAffinityRange extends MessageAdapter implements Externaliza if (!reader.isLastRead()) return false; - state++; + readState++; case 2: endOff = reader.readLong("endOff"); @@ -359,7 +358,7 @@ public class IgfsFileAffinityRange extends MessageAdapter implements Externaliza if (!reader.isLastRead()) return false; - state++; + readState++; case 3: startOff = reader.readLong("startOff"); @@ -367,7 +366,7 @@ public class IgfsFileAffinityRange extends MessageAdapter implements Externaliza if (!reader.isLastRead()) return false; - state++; + readState++; case 4: status = reader.readInt("status"); @@ -375,7 +374,7 @@ public class IgfsFileAffinityRange extends MessageAdapter implements Externaliza if (!reader.isLastRead()) return false; - state++; + readState++; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/947723c9/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java index aaf7c2f..e1960b5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerRequest.java @@ -81,11 +81,7 @@ public class IgfsFragmentizerRequest extends IgfsCommunicationMessage { /** {@inheritDoc} */ @SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"}) @Override public MessageAdapter clone() { - IgfsFragmentizerRequest _clone = new IgfsFragmentizerRequest(); - - clone0(_clone); - - return _clone; + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @@ -101,30 +97,33 @@ public class IgfsFragmentizerRequest extends IgfsCommunicationMessage { /** {@inheritDoc} */ @SuppressWarnings("all") @Override public boolean writeTo(ByteBuffer buf) { + MessageWriteState state = MessageWriteState.get(); + MessageWriter writer = state.writer(); + writer.setBuffer(buf); if (!super.writeTo(buf)) return false; - if (!typeWritten) { + if (!state.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - typeWritten = true; + state.setTypeWritten(); } - switch (state) { + switch (state.index()) { case 0: if (!writer.writeIgniteUuid("fileId", fileId)) return false; - state++; + state.increment(); case 1: if (!writer.writeCollection("fragmentRanges", fragmentRanges, IgfsFileAffinityRange.class)) return false; - state++; + state.increment(); } @@ -139,14 +138,14 @@ public class IgfsFragmentizerRequest extends IgfsCommunicationMessage { if (!super.readFrom(buf)) return false; - switch (state) { + switch (readState) { case 0: fileId = reader.readIgniteUuid("fileId"); if (!reader.isLastRead()) return false; - state++; + readState++; case 1: fragmentRanges = reader.readCollection("fragmentRanges", IgfsFileAffinityRange.class); @@ -154,7 +153,7 @@ public class IgfsFragmentizerRequest extends IgfsCommunicationMessage { if (!reader.isLastRead()) return false; - state++; + readState++; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/947723c9/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java index d9dd02b..0b4956d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerResponse.java @@ -57,11 +57,7 @@ public class IgfsFragmentizerResponse extends IgfsCommunicationMessage { /** {@inheritDoc} */ @SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"}) @Override public MessageAdapter clone() { - IgfsFragmentizerResponse _clone = new IgfsFragmentizerResponse(); - - clone0(_clone); - - return _clone; + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @@ -76,24 +72,27 @@ public class IgfsFragmentizerResponse extends IgfsCommunicationMessage { /** {@inheritDoc} */ @SuppressWarnings("all") @Override public boolean writeTo(ByteBuffer buf) { + MessageWriteState state = MessageWriteState.get(); + MessageWriter writer = state.writer(); + writer.setBuffer(buf); if (!super.writeTo(buf)) return false; - if (!typeWritten) { + if (!state.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - typeWritten = true; + state.setTypeWritten(); } - switch (state) { + switch (state.index()) { case 0: if (!writer.writeIgniteUuid("fileId", fileId)) return false; - state++; + state.increment(); } @@ -108,14 +107,14 @@ public class IgfsFragmentizerResponse extends IgfsCommunicationMessage { if (!super.readFrom(buf)) return false; - switch (state) { + switch (readState) { case 0: fileId = reader.readIgniteUuid("fileId"); if (!reader.isLastRead()) return false; - state++; + readState++; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/947723c9/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSyncMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSyncMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSyncMessage.java index 9f45205..ded1f3e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSyncMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSyncMessage.java @@ -74,11 +74,7 @@ public class IgfsSyncMessage extends IgfsCommunicationMessage { /** {@inheritDoc} */ @SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"}) @Override public MessageAdapter clone() { - IgfsSyncMessage _clone = new IgfsSyncMessage(); - - clone0(_clone); - - return _clone; + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @@ -94,30 +90,33 @@ public class IgfsSyncMessage extends IgfsCommunicationMessage { /** {@inheritDoc} */ @SuppressWarnings("all") @Override public boolean writeTo(ByteBuffer buf) { + MessageWriteState state = MessageWriteState.get(); + MessageWriter writer = state.writer(); + writer.setBuffer(buf); if (!super.writeTo(buf)) return false; - if (!typeWritten) { + if (!state.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - typeWritten = true; + state.setTypeWritten(); } - switch (state) { + switch (state.index()) { case 0: if (!writer.writeLong("order", order)) return false; - state++; + state.increment(); case 1: if (!writer.writeBoolean("res", res)) return false; - state++; + state.increment(); } @@ -132,14 +131,14 @@ public class IgfsSyncMessage extends IgfsCommunicationMessage { if (!super.readFrom(buf)) return false; - switch (state) { + switch (readState) { case 0: order = reader.readLong("order"); if (!reader.isLastRead()) return false; - state++; + readState++; case 1: res = reader.readBoolean("res"); @@ -147,7 +146,7 @@ public class IgfsSyncMessage extends IgfsCommunicationMessage { if (!reader.isLastRead()) return false; - state++; + readState++; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/947723c9/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 637fa80..ab14f1f 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 @@ -101,11 +101,7 @@ public class GridTaskResultRequest extends MessageAdapter { /** {@inheritDoc} */ @SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"}) @Override public MessageAdapter clone() { - GridTaskResultRequest _clone = new GridTaskResultRequest(); - - clone0(_clone); - - return _clone; + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @@ -120,27 +116,30 @@ public class GridTaskResultRequest extends MessageAdapter { /** {@inheritDoc} */ @SuppressWarnings("all") @Override public boolean writeTo(ByteBuffer buf) { + MessageWriteState state = MessageWriteState.get(); + MessageWriter writer = state.writer(); + writer.setBuffer(buf); - if (!typeWritten) { + if (!state.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - typeWritten = true; + state.setTypeWritten(); } - switch (state) { + switch (state.index()) { case 0: if (!writer.writeIgniteUuid("taskId", taskId)) return false; - state++; + state.increment(); case 1: if (!writer.writeByteArray("topicBytes", topicBytes)) return false; - state++; + state.increment(); } @@ -152,14 +151,14 @@ public class GridTaskResultRequest extends MessageAdapter { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); - switch (state) { + switch (readState) { case 0: taskId = reader.readIgniteUuid("taskId"); if (!reader.isLastRead()) return false; - state++; + readState++; case 1: topicBytes = reader.readByteArray("topicBytes"); @@ -167,7 +166,7 @@ public class GridTaskResultRequest extends MessageAdapter { if (!reader.isLastRead()) return false; - state++; + readState++; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/947723c9/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 384cfb3..5eaac0d 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 @@ -119,11 +119,7 @@ public class GridTaskResultResponse extends MessageAdapter { /** {@inheritDoc} */ @SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"}) @Override public MessageAdapter clone() { - GridTaskResultResponse _clone = new GridTaskResultResponse(); - - clone0(_clone); - - return _clone; + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @@ -140,39 +136,42 @@ public class GridTaskResultResponse extends MessageAdapter { /** {@inheritDoc} */ @SuppressWarnings("all") @Override public boolean writeTo(ByteBuffer buf) { + MessageWriteState state = MessageWriteState.get(); + MessageWriter writer = state.writer(); + writer.setBuffer(buf); - if (!typeWritten) { + if (!state.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - typeWritten = true; + state.setTypeWritten(); } - switch (state) { + switch (state.index()) { case 0: if (!writer.writeString("err", err)) return false; - state++; + state.increment(); case 1: if (!writer.writeBoolean("finished", finished)) return false; - state++; + state.increment(); case 2: if (!writer.writeBoolean("found", found)) return false; - state++; + state.increment(); case 3: if (!writer.writeByteArray("resBytes", resBytes)) return false; - state++; + state.increment(); } @@ -184,14 +183,14 @@ public class GridTaskResultResponse extends MessageAdapter { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); - switch (state) { + switch (readState) { case 0: err = reader.readString("err"); if (!reader.isLastRead()) return false; - state++; + readState++; case 1: finished = reader.readBoolean("finished"); @@ -199,7 +198,7 @@ public class GridTaskResultResponse extends MessageAdapter { if (!reader.isLastRead()) return false; - state++; + readState++; case 2: found = reader.readBoolean("found"); @@ -207,7 +206,7 @@ public class GridTaskResultResponse extends MessageAdapter { if (!reader.isLastRead()) return false; - state++; + readState++; case 3: resBytes = reader.readByteArray("resBytes"); @@ -215,7 +214,7 @@ public class GridTaskResultResponse extends MessageAdapter { if (!reader.isLastRead()) return false; - state++; + readState++; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/947723c9/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerCancelRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerCancelRequest.java index 4f67c3a..b7e0c6e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerCancelRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerCancelRequest.java @@ -57,11 +57,7 @@ public class GridStreamerCancelRequest extends MessageAdapter { /** {@inheritDoc} */ @SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"}) @Override public MessageAdapter clone() { - GridStreamerCancelRequest _clone = new GridStreamerCancelRequest(); - - clone0(_clone); - - return _clone; + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @@ -74,21 +70,24 @@ public class GridStreamerCancelRequest extends MessageAdapter { /** {@inheritDoc} */ @SuppressWarnings("all") @Override public boolean writeTo(ByteBuffer buf) { + MessageWriteState state = MessageWriteState.get(); + MessageWriter writer = state.writer(); + writer.setBuffer(buf); - if (!typeWritten) { + if (!state.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - typeWritten = true; + state.setTypeWritten(); } - switch (state) { + switch (state.index()) { case 0: if (!writer.writeIgniteUuid("cancelledFutId", cancelledFutId)) return false; - state++; + state.increment(); } @@ -100,14 +99,14 @@ public class GridStreamerCancelRequest extends MessageAdapter { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); - switch (state) { + switch (readState) { case 0: cancelledFutId = reader.readIgniteUuid("cancelledFutId"); if (!reader.isLastRead()) return false; - state++; + readState++; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/947723c9/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerExecutionRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerExecutionRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerExecutionRequest.java index a4bc2bb..56ae75a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerExecutionRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerExecutionRequest.java @@ -152,11 +152,7 @@ public class GridStreamerExecutionRequest extends MessageAdapter { /** {@inheritDoc} */ @SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"}) @Override public MessageAdapter clone() { - GridStreamerExecutionRequest _clone = new GridStreamerExecutionRequest(); - - clone0(_clone); - - return _clone; + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @@ -175,57 +171,60 @@ public class GridStreamerExecutionRequest extends MessageAdapter { /** {@inheritDoc} */ @SuppressWarnings("all") @Override public boolean writeTo(ByteBuffer buf) { + MessageWriteState state = MessageWriteState.get(); + MessageWriter writer = state.writer(); + writer.setBuffer(buf); - if (!typeWritten) { + if (!state.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - typeWritten = true; + state.setTypeWritten(); } - switch (state) { + switch (state.index()) { case 0: if (!writer.writeByteArray("batchBytes", batchBytes)) return false; - state++; + state.increment(); case 1: if (!writer.writeIgniteUuid("clsLdrId", clsLdrId)) return false; - state++; + state.increment(); case 2: if (!writer.writeEnum("depMode", depMode)) return false; - state++; + state.increment(); case 3: if (!writer.writeBoolean("forceLocDep", forceLocDep)) return false; - state++; + state.increment(); case 4: if (!writer.writeMap("ldrParticipants", ldrParticipants, UUID.class, IgniteUuid.class)) return false; - state++; + state.increment(); case 5: if (!writer.writeString("sampleClsName", sampleClsName)) return false; - state++; + state.increment(); case 6: if (!writer.writeString("userVer", userVer)) return false; - state++; + state.increment(); } @@ -237,14 +236,14 @@ public class GridStreamerExecutionRequest extends MessageAdapter { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); - switch (state) { + switch (readState) { case 0: batchBytes = reader.readByteArray("batchBytes"); if (!reader.isLastRead()) return false; - state++; + readState++; case 1: clsLdrId = reader.readIgniteUuid("clsLdrId"); @@ -252,7 +251,7 @@ public class GridStreamerExecutionRequest extends MessageAdapter { if (!reader.isLastRead()) return false; - state++; + readState++; case 2: depMode = reader.readEnum("depMode", DeploymentMode.class); @@ -260,7 +259,7 @@ public class GridStreamerExecutionRequest extends MessageAdapter { if (!reader.isLastRead()) return false; - state++; + readState++; case 3: forceLocDep = reader.readBoolean("forceLocDep"); @@ -268,7 +267,7 @@ public class GridStreamerExecutionRequest extends MessageAdapter { if (!reader.isLastRead()) return false; - state++; + readState++; case 4: ldrParticipants = reader.readMap("ldrParticipants", UUID.class, IgniteUuid.class, false); @@ -276,7 +275,7 @@ public class GridStreamerExecutionRequest extends MessageAdapter { if (!reader.isLastRead()) return false; - state++; + readState++; case 5: sampleClsName = reader.readString("sampleClsName"); @@ -284,7 +283,7 @@ public class GridStreamerExecutionRequest extends MessageAdapter { if (!reader.isLastRead()) return false; - state++; + readState++; case 6: userVer = reader.readString("userVer"); @@ -292,7 +291,7 @@ public class GridStreamerExecutionRequest extends MessageAdapter { if (!reader.isLastRead()) return false; - state++; + readState++; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/947723c9/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerResponse.java index fc6da7f..785b850 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/GridStreamerResponse.java @@ -77,11 +77,7 @@ public class GridStreamerResponse extends MessageAdapter { /** {@inheritDoc} */ @SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"}) @Override public MessageAdapter clone() { - GridStreamerResponse _clone = new GridStreamerResponse(); - - clone0(_clone); - - return _clone; + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @@ -95,27 +91,30 @@ public class GridStreamerResponse extends MessageAdapter { /** {@inheritDoc} */ @SuppressWarnings("all") @Override public boolean writeTo(ByteBuffer buf) { + MessageWriteState state = MessageWriteState.get(); + MessageWriter writer = state.writer(); + writer.setBuffer(buf); - if (!typeWritten) { + if (!state.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - typeWritten = true; + state.setTypeWritten(); } - switch (state) { + switch (state.index()) { case 0: if (!writer.writeByteArray("errBytes", errBytes)) return false; - state++; + state.increment(); case 1: if (!writer.writeIgniteUuid("futId", futId)) return false; - state++; + state.increment(); } @@ -127,14 +126,14 @@ public class GridStreamerResponse extends MessageAdapter { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); - switch (state) { + switch (readState) { case 0: errBytes = reader.readByteArray("errBytes"); if (!reader.isLastRead()) return false; - state++; + readState++; case 1: futId = reader.readIgniteUuid("futId"); @@ -142,7 +141,7 @@ public class GridStreamerResponse extends MessageAdapter { if (!reader.isLastRead()) return false; - state++; + readState++; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/947723c9/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java index d9252a1..43db36c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java @@ -408,27 +408,30 @@ public class GridByteArrayList extends MessageAdapter implements Externalizable /** {@inheritDoc} */ @Override public boolean writeTo(ByteBuffer buf) { + MessageWriteState state = MessageWriteState.get(); + MessageWriter writer = state.writer(); + writer.setBuffer(buf); - if (!typeWritten) { + if (!state.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - typeWritten = true; + state.setTypeWritten(); } - switch (state) { + switch (state.index()) { case 0: if (!writer.writeByteArray("data", data)) return false; - state++; + state.increment(); case 1: if (!writer.writeInt("size", size)) return false; - state++; + state.increment(); } @@ -439,14 +442,14 @@ public class GridByteArrayList extends MessageAdapter implements Externalizable @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); - switch (state) { + switch (readState) { case 0: data = reader.readByteArray("data"); if (!reader.isLastRead()) return false; - state++; + readState++; case 1: size = reader.readInt("size"); @@ -454,7 +457,7 @@ public class GridByteArrayList extends MessageAdapter implements Externalizable if (!reader.isLastRead()) return false; - state++; + readState++; } @@ -469,11 +472,7 @@ public class GridByteArrayList extends MessageAdapter implements Externalizable /** {@inheritDoc} */ @SuppressWarnings("CloneDoesntCallSuperClone") @Override public MessageAdapter clone() { - GridByteArrayList _clone = new GridByteArrayList(); - - clone0(_clone); - - return _clone; + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/947723c9/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java index 731dd5e..cd37648 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java @@ -506,27 +506,30 @@ public class GridLongList extends MessageAdapter implements Externalizable { /** {@inheritDoc} */ @Override public boolean writeTo(ByteBuffer buf) { + MessageWriteState state = MessageWriteState.get(); + MessageWriter writer = state.writer(); + writer.setBuffer(buf); - if (!typeWritten) { + if (!state.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - typeWritten = true; + state.setTypeWritten(); } - switch (state) { + switch (state.index()) { case 0: if (!writer.writeLongArray("arr", arr)) return false; - state++; + state.increment(); case 1: if (!writer.writeInt("idx", idx)) return false; - state++; + state.increment(); } @@ -537,14 +540,14 @@ public class GridLongList extends MessageAdapter implements Externalizable { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); - switch (state) { + switch (readState) { case 0: arr = reader.readLongArray("arr"); if (!reader.isLastRead()) return false; - state++; + readState++; case 1: idx = reader.readInt("idx"); @@ -552,7 +555,7 @@ public class GridLongList extends MessageAdapter implements Externalizable { if (!reader.isLastRead()) return false; - state++; + readState++; } @@ -567,11 +570,7 @@ public class GridLongList extends MessageAdapter implements Externalizable { /** {@inheritDoc} */ @SuppressWarnings("CloneDoesntCallSuperClone") @Override public MessageAdapter clone() { - GridLongList _clone = new GridLongList(); - - clone0(_clone); - - return _clone; + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/947723c9/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java index 8f0366a..54f647b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java @@ -1883,7 +1883,7 @@ public class GridNioServer<T> { private void resetMessage(GridSelectorNioSessionImpl ses) { assert commMsg != null; - commMsg = commMsg.clone(); +// commMsg = commMsg.clone(); this.ses = ses; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/947723c9/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageAdapter.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageAdapter.java index 73db3ec..02280c2 100644 --- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageAdapter.java @@ -24,30 +24,12 @@ import java.nio.*; * Base class for all communication messages. */ public abstract class MessageAdapter implements Serializable, Cloneable { - // TODO: remove - protected MessageWriter writer; - /** Message reader. */ protected MessageReader reader; - /** Whether message type is already written. */ - protected boolean typeWritten; - - /** Current write/read state. */ - protected int state; - /** Current read state. */ protected int readState; -// /** -// * @param writer Message writer. -// */ -// public final void setWriter(MessageWriter writer) { -// assert writer != null; -// -// WRITER.set(writer); -// } - /** * @param reader Message reader. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/947723c9/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java index 9a3a0f0..bfa49e9 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingRequest.java @@ -57,11 +57,7 @@ public class JobStealingRequest extends MessageAdapter { /** {@inheritDoc} */ @SuppressWarnings({"CloneDoesntCallSuperClone", "CloneCallsConstructors"}) @Override public MessageAdapter clone() { - JobStealingRequest _clone = new JobStealingRequest(); - - clone0(_clone); - - return _clone; + throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @@ -74,21 +70,24 @@ public class JobStealingRequest extends MessageAdapter { /** {@inheritDoc} */ @SuppressWarnings("all") @Override public boolean writeTo(ByteBuffer buf) { + MessageWriteState state = MessageWriteState.get(); + MessageWriter writer = state.writer(); + writer.setBuffer(buf); - if (!typeWritten) { + if (!state.isTypeWritten()) { if (!writer.writeByte(null, directType())) return false; - typeWritten = true; + state.setTypeWritten(); } - switch (state) { + switch (state.index()) { case 0: if (!writer.writeInt("delta", delta)) return false; - state++; + state.increment(); } @@ -100,14 +99,14 @@ public class JobStealingRequest extends MessageAdapter { @Override public boolean readFrom(ByteBuffer buf) { reader.setBuffer(buf); - switch (state) { + switch (readState) { case 0: delta = reader.readInt("delta"); if (!reader.isLastRead()) return false; - state++; + readState++; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/947723c9/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java index a26b617..58cd389 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridCommunicationSendMessageSelfTest.java @@ -156,9 +156,10 @@ public class GridCommunicationSendMessageSelfTest extends GridCommonAbstractTest /** {@inheritDoc} */ @Override public boolean writeTo(ByteBuffer buf) { - writer.setBuffer(buf); - - return writer.writeByte(null, directType()); +// writer.setBuffer(buf); +// +// return writer.writeByte(null, directType()); + return true; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/947723c9/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java index 9089e7c..505809e 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/GridTestMessage.java @@ -116,40 +116,40 @@ public class GridTestMessage extends MessageAdapter { /** {@inheritDoc} */ @SuppressWarnings("fallthrough") @Override public boolean writeTo(ByteBuffer buf) { - writer.setBuffer(buf); - - if (!typeWritten) { - if (!writer.writeByte(null, directType())) - return false; - - typeWritten = true; - } - - switch (state) { - case 0: - if (!writer.writeUuid(null, srcNodeId)) - return false; - - state++; - - case 1: - if (!writer.writeLong(null, msgId)) - return false; - - state++; - - case 2: - if (!writer.writeLong(null, resId)) - return false; - - state++; - - case 3: - if (!writer.writeByteArray(null, payload)) - return false; - - state++; - } +// writer.setBuffer(buf); +// +// if (!typeWritten) { +// if (!writer.writeByte(null, directType())) +// return false; +// +// typeWritten = true; +// } +// +// switch (state) { +// case 0: +// if (!writer.writeUuid(null, srcNodeId)) +// return false; +// +// state++; +// +// case 1: +// if (!writer.writeLong(null, msgId)) +// return false; +// +// state++; +// +// case 2: +// if (!writer.writeLong(null, resId)) +// return false; +// +// state++; +// +// case 3: +// if (!writer.writeByteArray(null, payload)) +// return false; +// +// state++; +// } return true; } @@ -157,41 +157,41 @@ public class GridTestMessage extends MessageAdapter { /** {@inheritDoc} */ @SuppressWarnings("fallthrough") @Override public boolean readFrom(ByteBuffer buf) { - reader.setBuffer(buf); - - switch (state) { - case 0: - srcNodeId = reader.readUuid(null); - - if (!reader.isLastRead()) - return false; - - state++; - - case 1: - msgId = reader.readLong(null); - - if (!reader.isLastRead()) - return false; - - state++; - - case 2: - resId = reader.readLong(null); - - if (!reader.isLastRead()) - return false; - - state++; - - case 3: - payload = reader.readByteArray(null); - - if (!reader.isLastRead()) - return false; - - state++; - } +// reader.setBuffer(buf); +// +// switch (state) { +// case 0: +// srcNodeId = reader.readUuid(null); +// +// if (!reader.isLastRead()) +// return false; +// +// state++; +// +// case 1: +// msgId = reader.readLong(null); +// +// if (!reader.isLastRead()) +// return false; +// +// state++; +// +// case 2: +// resId = reader.readLong(null); +// +// if (!reader.isLastRead()) +// return false; +// +// state++; +// +// case 3: +// payload = reader.readByteArray(null); +// +// if (!reader.isLastRead()) +// return false; +// +// state++; +// } return true; }
