Renamed fields to change fields write order (to preserve backward compatibility).
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fa427dce Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fa427dce Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fa427dce Branch: refs/heads/ignite-2236 Commit: fa427dce25061b3c85be04f83debb452e60f08a2 Parents: c4ff711 Author: sboikov <[email protected]> Authored: Fri Jan 15 11:17:30 2016 +0300 Committer: sboikov <[email protected]> Committed: Fri Jan 15 11:17:30 2016 +0300 ---------------------------------------------------------------------- .../continuous/CacheContinuousQueryEntry.java | 70 ++++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fa427dce/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java index 4d3786a..bcc2576 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java @@ -84,17 +84,17 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message { private GridDeploymentInfo depInfo; /** Partition. */ - private int part; + private int _part; /** Update counter. */ - private long updateCntr; + private long _updateCntr; /** Flags. */ private byte flags; /** */ @GridToStringInclude - private AffinityTopologyVersion topVer; + private AffinityTopologyVersion _topVer; /** Filtered events. */ private GridLongList filteredEvts; @@ -134,9 +134,9 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message { this.key = key; this.newVal = newVal; this.oldVal = oldVal; - this.part = part; - this.updateCntr = updateCntr; - this.topVer = topVer; + this._part = part; + this._updateCntr = updateCntr; + this._topVer = topVer; this.keepBinary = keepBinary; } @@ -144,7 +144,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message { * @return Topology version if applicable. */ @Nullable AffinityTopologyVersion topologyVersion() { - return topVer; + return _topVer; } /** @@ -165,14 +165,14 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message { * @return Partition. */ int partition() { - return part; + return _part; } /** * @return Update counter. */ long updateCounter() { - return updateCntr; + return _updateCntr; } /** @@ -310,67 +310,67 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message { switch (writer.state()) { case 0: - if (!writer.writeInt("cacheId", cacheId)) + if (!writer.writeInt("_part", _part)) return false; writer.incrementState(); case 1: - if (!writer.writeByte("evtType", evtType != null ? (byte)evtType.ordinal() : -1)) + if (!writer.writeMessage("_topVer", _topVer)) return false; writer.incrementState(); case 2: - if (!writer.writeMessage("filteredEvts", filteredEvts)) + if (!writer.writeLong("_updateCntr", _updateCntr)) return false; writer.incrementState(); case 3: - if (!writer.writeByte("flags", flags)) + if (!writer.writeInt("cacheId", cacheId)) return false; writer.incrementState(); case 4: - if (!writer.writeBoolean("keepBinary", keepBinary)) + if (!writer.writeByte("evtType", evtType != null ? (byte)evtType.ordinal() : -1)) return false; writer.incrementState(); case 5: - if (!writer.writeMessage("key", key)) + if (!writer.writeMessage("filteredEvts", filteredEvts)) return false; writer.incrementState(); case 6: - if (!writer.writeMessage("newVal", newVal)) + if (!writer.writeByte("flags", flags)) return false; writer.incrementState(); case 7: - if (!writer.writeMessage("oldVal", oldVal)) + if (!writer.writeBoolean("keepBinary", keepBinary)) return false; writer.incrementState(); case 8: - if (!writer.writeInt("part", part)) + if (!writer.writeMessage("key", key)) return false; writer.incrementState(); case 9: - if (!writer.writeMessage("topVer", topVer)) + if (!writer.writeMessage("newVal", newVal)) return false; writer.incrementState(); case 10: - if (!writer.writeLong("updateCntr", updateCntr)) + if (!writer.writeMessage("oldVal", oldVal)) return false; writer.incrementState(); @@ -389,7 +389,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message { switch (reader.state()) { case 0: - cacheId = reader.readInt("cacheId"); + _part = reader.readInt("_part"); if (!reader.isLastRead()) return false; @@ -397,19 +397,15 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message { reader.incrementState(); case 1: - byte evtTypeOrd; - - evtTypeOrd = reader.readByte("evtType"); + _topVer = reader.readMessage("_topVer"); if (!reader.isLastRead()) return false; - evtType = eventTypeFromOrdinal(evtTypeOrd); - reader.incrementState(); case 2: - filteredEvts = reader.readMessage("filteredEvts"); + _updateCntr = reader.readLong("_updateCntr"); if (!reader.isLastRead()) return false; @@ -417,7 +413,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message { reader.incrementState(); case 3: - flags = reader.readByte("flags"); + cacheId = reader.readInt("cacheId"); if (!reader.isLastRead()) return false; @@ -425,15 +421,19 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message { reader.incrementState(); case 4: - keepBinary = reader.readBoolean("keepBinary"); + byte evtTypeOrd; + + evtTypeOrd = reader.readByte("evtType"); if (!reader.isLastRead()) return false; + evtType = eventTypeFromOrdinal(evtTypeOrd); + reader.incrementState(); case 5: - key = reader.readMessage("key"); + filteredEvts = reader.readMessage("filteredEvts"); if (!reader.isLastRead()) return false; @@ -441,7 +441,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message { reader.incrementState(); case 6: - newVal = reader.readMessage("newVal"); + flags = reader.readByte("flags"); if (!reader.isLastRead()) return false; @@ -449,7 +449,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message { reader.incrementState(); case 7: - oldVal = reader.readMessage("oldVal"); + keepBinary = reader.readBoolean("keepBinary"); if (!reader.isLastRead()) return false; @@ -457,7 +457,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message { reader.incrementState(); case 8: - part = reader.readInt("part"); + key = reader.readMessage("key"); if (!reader.isLastRead()) return false; @@ -465,7 +465,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message { reader.incrementState(); case 9: - topVer = reader.readMessage("topVer"); + newVal = reader.readMessage("newVal"); if (!reader.isLastRead()) return false; @@ -473,7 +473,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message { reader.incrementState(); case 10: - updateCntr = reader.readLong("updateCntr"); + oldVal = reader.readMessage("oldVal"); if (!reader.isLastRead()) return false;
