Repository: ignite Updated Branches: refs/heads/ignite-3477-merge2.0 faf07d8b7 -> 2333c6649
Merge remote-tracking branch 'remotes/origin/ignite-2.0' into ignite-3477-merge2.0 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2333c664 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2333c664 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2333c664 Branch: refs/heads/ignite-3477-merge2.0 Commit: 2333c6649df5d8326a86b068de5101c32d886e1b Parents: faf07d8 Author: sboikov <sboi...@gridgain.com> Authored: Wed Feb 15 15:51:42 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Feb 15 15:51:42 2017 +0300 ---------------------------------------------------------------------- .../distributed/near/GridNearGetRequest.java | 48 +++++++++++++------- .../near/GridNearSingleGetRequest.java | 4 +- 2 files changed, 32 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2333c664/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 c5aec19..12b5204 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 @@ -374,54 +374,60 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep writer.incrementState(); case 8: - if (!writer.writeCollection("partIds", partIds, MessageCollectionItemType.INT)) + if (!writer.writeIgniteUuid("miniId", miniId)) return false; writer.incrementState(); case 9: - if (!writer.writeBoolean("readThrough", readThrough)) + if (!writer.writeCollection("partIds", partIds, MessageCollectionItemType.INT)) return false; writer.incrementState(); case 10: - if (!writer.writeBoolean("recovery", recovery)) + if (!writer.writeBoolean("readThrough", readThrough)) return false; writer.incrementState(); case 11: - if (!writer.writeBoolean("reload", reload)) + if (!writer.writeBoolean("recovery", recovery)) return false; writer.incrementState(); case 12: - if (!writer.writeBoolean("skipVals", skipVals)) + if (!writer.writeBoolean("reload", reload)) return false; writer.incrementState(); case 13: - if (!writer.writeUuid("subjId", subjId)) + if (!writer.writeBoolean("skipVals", skipVals)) return false; writer.incrementState(); case 14: - if (!writer.writeInt("taskNameHash", taskNameHash)) + if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); case 15: - if (!writer.writeMessage("topVer", topVer)) + if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); case 16: + if (!writer.writeMessage("topVer", topVer)) + return false; + + writer.incrementState(); + + case 17: if (!writer.writeMessage("ver", ver)) return false; @@ -484,7 +490,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep reader.incrementState(); case 8: - partIds = reader.readCollection("partIds", MessageCollectionItemType.INT); + miniId = reader.readIgniteUuid("miniId"); if (!reader.isLastRead()) return false; @@ -492,7 +498,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep reader.incrementState(); case 9: - readThrough = reader.readBoolean("readThrough"); + partIds = reader.readCollection("partIds", MessageCollectionItemType.INT); if (!reader.isLastRead()) return false; @@ -500,7 +506,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep reader.incrementState(); case 10: - recovery = reader.readBoolean("recovery"); + readThrough = reader.readBoolean("readThrough"); if (!reader.isLastRead()) return false; @@ -508,7 +514,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep reader.incrementState(); case 11: - reload = reader.readBoolean("reload"); + recovery = reader.readBoolean("recovery"); if (!reader.isLastRead()) return false; @@ -516,7 +522,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep reader.incrementState(); case 12: - skipVals = reader.readBoolean("skipVals"); + reload = reader.readBoolean("reload"); if (!reader.isLastRead()) return false; @@ -524,7 +530,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep reader.incrementState(); case 13: - subjId = reader.readUuid("subjId"); + skipVals = reader.readBoolean("skipVals"); if (!reader.isLastRead()) return false; @@ -532,7 +538,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep reader.incrementState(); case 14: - taskNameHash = reader.readInt("taskNameHash"); + subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) return false; @@ -540,7 +546,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep reader.incrementState(); case 15: - topVer = reader.readMessage("topVer"); + taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) return false; @@ -548,6 +554,14 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep reader.incrementState(); case 16: + topVer = reader.readMessage("topVer"); + + if (!reader.isLastRead()) + return false; + + reader.incrementState(); + + case 17: ver = reader.readMessage("ver"); if (!reader.isLastRead()) @@ -567,7 +581,7 @@ public class GridNearGetRequest extends GridCacheMessage implements GridCacheDep /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 17; + return 18; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/2333c664/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java index 5f094c8..be8d2b5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java @@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import java.nio.ByteBuffer; import java.util.UUID; import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.internal.IgniteCodeGeneratingFail; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.GridCacheContext; import org.apache.ignite.internal.processors.cache.GridCacheDeployable; @@ -38,7 +37,6 @@ import static org.apache.ignite.internal.processors.cache.GridCacheUtils.SKIP_ST /** * */ -@IgniteCodeGeneratingFail // partId read should not be generated by MessageCodeGenerator. public class GridNearSingleGetRequest extends GridCacheMessage implements GridCacheDeployable { /** */ private static final long serialVersionUID = 0L; @@ -325,7 +323,7 @@ public class GridNearSingleGetRequest extends GridCacheMessage implements GridCa reader.incrementState(); case 8: - partId = reader.readInt("partId", -1); + partId = reader.readInt("partId"); if (!reader.isLastRead()) return false;
