IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/112c567c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/112c567c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/112c567c Branch: refs/heads/ignite-426 Commit: 112c567cb780fc04a0d81c9b8b1e1f60cd2fbabf Parents: 9781ea4 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Wed Jul 29 17:58:33 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Wed Jul 29 17:58:33 2015 -0700 ---------------------------------------------------------------------- .../dht/atomic/GridNearAtomicUpdateRequest.java | 48 +++++++------------- .../atomic/GridNearAtomicUpdateResponse.java | 20 ++------ 2 files changed, 20 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/112c567c/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 734cf6d..86c5ab8 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 @@ -666,60 +666,54 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri writer.incrementState(); case 16: -// if (!writer.writeInt("part", part)) -// return false; - - writer.incrementState(); - - case 17: if (!writer.writeBoolean("retval", retval)) return false; writer.incrementState(); - case 18: + case 17: if (!writer.writeBoolean("skipStore", skipStore)) return false; writer.incrementState(); - case 19: + case 18: if (!writer.writeUuid("subjId", subjId)) return false; writer.incrementState(); - case 20: + case 19: if (!writer.writeByte("syncMode", syncMode != null ? (byte)syncMode.ordinal() : -1)) return false; writer.incrementState(); - case 21: + case 20: if (!writer.writeInt("taskNameHash", taskNameHash)) return false; writer.incrementState(); - case 22: + case 21: if (!writer.writeBoolean("topLocked", topLocked)) return false; writer.incrementState(); - case 23: + case 22: if (!writer.writeMessage("topVer", topVer)) return false; writer.incrementState(); - case 24: + case 23: if (!writer.writeMessage("updateVer", updateVer)) return false; writer.incrementState(); - case 25: + case 24: if (!writer.writeCollection("vals", vals, MessageCollectionItemType.MSG)) return false; @@ -850,14 +844,6 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri reader.incrementState(); case 16: -// part = reader.readInt("part"); -// -// if (!reader.isLastRead()) -// return false; - - reader.incrementState(); - - case 17: retval = reader.readBoolean("retval"); if (!reader.isLastRead()) @@ -865,7 +851,7 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri reader.incrementState(); - case 18: + case 17: skipStore = reader.readBoolean("skipStore"); if (!reader.isLastRead()) @@ -873,7 +859,7 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri reader.incrementState(); - case 19: + case 18: subjId = reader.readUuid("subjId"); if (!reader.isLastRead()) @@ -881,7 +867,7 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri reader.incrementState(); - case 20: + case 19: byte syncModeOrd; syncModeOrd = reader.readByte("syncMode"); @@ -893,7 +879,7 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri reader.incrementState(); - case 21: + case 20: taskNameHash = reader.readInt("taskNameHash"); if (!reader.isLastRead()) @@ -901,7 +887,7 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri reader.incrementState(); - case 22: + case 21: topLocked = reader.readBoolean("topLocked"); if (!reader.isLastRead()) @@ -909,7 +895,7 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri reader.incrementState(); - case 23: + case 22: topVer = reader.readMessage("topVer"); if (!reader.isLastRead()) @@ -917,7 +903,7 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri reader.incrementState(); - case 24: + case 23: updateVer = reader.readMessage("updateVer"); if (!reader.isLastRead()) @@ -925,7 +911,7 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri reader.incrementState(); - case 25: + case 24: vals = reader.readCollection("vals", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -945,7 +931,7 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 26; + return 25; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/112c567c/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 2b30536..8e1bee2 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 @@ -485,18 +485,12 @@ public class GridNearAtomicUpdateResponse extends GridCacheMessage implements Gr writer.incrementState(); case 12: -// if (!writer.writeInt("part", part)) -// return false; - - writer.incrementState(); - - case 13: if (!writer.writeCollection("remapKeys", remapKeys, MessageCollectionItemType.MSG)) return false; writer.incrementState(); - case 14: + case 13: if (!writer.writeMessage("ret", ret)) return false; @@ -591,14 +585,6 @@ public class GridNearAtomicUpdateResponse extends GridCacheMessage implements Gr reader.incrementState(); case 12: -// part = reader.readInt("part"); -// -// if (!reader.isLastRead()) -// return false; - - reader.incrementState(); - - case 13: remapKeys = reader.readCollection("remapKeys", MessageCollectionItemType.MSG); if (!reader.isLastRead()) @@ -606,7 +592,7 @@ public class GridNearAtomicUpdateResponse extends GridCacheMessage implements Gr reader.incrementState(); - case 14: + case 13: ret = reader.readMessage("ret"); if (!reader.isLastRead()) @@ -626,7 +612,7 @@ public class GridNearAtomicUpdateResponse extends GridCacheMessage implements Gr /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 15; + return 14; } /** {@inheritDoc} */
