IGNITE-45 - Regenerated messages.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/25e1fbda Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/25e1fbda Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/25e1fbda Branch: refs/heads/ignite-45 Commit: 25e1fbdaffe27692dbe6f4592aece5d9d325c59e Parents: b85d95f Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Wed Mar 11 15:41:53 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Wed Mar 11 15:41:53 2015 -0700 ---------------------------------------------------------------------- .../ignite/codegen/MessageCodeGenerator.java | 3 +++ .../cache/CacheEntryPredicateAdapter.java | 20 ++++++++++++++------ .../cache/CacheEntryPredicateContainsValue.java | 6 ++++++ .../distributed/dht/GridDhtTxFinishRequest.java | 4 ++++ .../dht/GridDhtTxPrepareRequest.java | 4 ++++ .../dht/atomic/GridNearAtomicUpdateRequest.java | 5 +++++ .../distributed/near/GridNearGetRequest.java | 5 +++++ .../near/GridNearTxFinishRequest.java | 5 +++++ .../near/GridNearTxPrepareRequest.java | 5 +++++ 9 files changed, 51 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25e1fbda/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..6d41521 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 @@ -301,6 +301,9 @@ public class MessageCodeGenerator { private void generate(Class<? extends Message> cls) throws Exception { assert cls != null; + if (cls.isInterface()) + return; + if (cls.isAnnotationPresent(IgniteCodeGeneratingFail.class)) throw new IllegalStateException("@IgniteCodeGeneratingFail is provided for class: " + cls.getName()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25e1fbda/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/25e1fbda/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/25e1fbda/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java index dadadec..d20a7c3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java @@ -284,6 +284,8 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { writer.incrementState(); case 27: + if (!writer.writeMessage("topVer", topVer)) + return false; writer.incrementState(); @@ -370,6 +372,8 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); case 27: + topVer = reader.readMessage("topVer"); + if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25e1fbda/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java index 5c7b074..c033273 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java @@ -410,6 +410,8 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { writer.incrementState(); case 37: + if (!writer.writeMessage("topVer", topVer)) + return false; writer.incrementState(); @@ -526,6 +528,8 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); case 37: + topVer = reader.readMessage("topVer"); + if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25e1fbda/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 157966f..b19338a 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 @@ -671,6 +671,9 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri writer.incrementState(); case 20: + if (!writer.writeMessage("topVer", topVer)) + return false; + writer.incrementState(); case 21: @@ -846,6 +849,8 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri reader.incrementState(); case 20: + topVer = reader.readMessage("topVer"); + if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25e1fbda/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java index ca8bb31..93c869d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java @@ -336,6 +336,9 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep writer.incrementState(); case 13: + if (!writer.writeMessage("topVer", topVer)) + return false; + writer.incrementState(); case 14: @@ -441,6 +444,8 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep reader.incrementState(); case 13: + topVer = reader.readMessage("topVer"); + if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25e1fbda/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java index adb2b10..7b0b811 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java @@ -201,6 +201,9 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest { writer.incrementState(); case 25: + if (!writer.writeMessage("topVer", topVer)) + return false; + writer.incrementState(); } @@ -260,6 +263,8 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest { reader.incrementState(); case 25: + topVer = reader.readMessage("topVer"); + if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25e1fbda/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java index 85c9452..846022c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java @@ -313,6 +313,9 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { writer.incrementState(); case 34: + if (!writer.writeMessage("topVer", topVer)) + return false; + writer.incrementState(); } @@ -404,6 +407,8 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { reader.incrementState(); case 34: + topVer = reader.readMessage("topVer"); + if (!reader.isLastRead()) return false;
