You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/03/04 14:26:47 UTC
[12/22] incubator-ignite git commit: #ignite-51: IgniteTxEntry
implements Message: IgniteTxEntry by codegen.
#ignite-51: IgniteTxEntry implements Message: IgniteTxEntry by codegen.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3d2415af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3d2415af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3d2415af
Branch: refs/heads/ignite-51
Commit: 3d2415af4b7cd77eaeeaa100de95d6a0e92ac88d
Parents: b3987e7
Author: ivasilinets <iv...@gridgain.com>
Authored: Tue Mar 3 19:23:50 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Tue Mar 3 19:23:50 2015 +0300
----------------------------------------------------------------------
.../cache/transactions/IgniteTxEntry.java | 41 +++++++++++++-------
1 file changed, 27 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d2415af/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
index fe9a087..cdfe7a6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
@@ -101,7 +101,6 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
/** Explicit lock version if there is one. */
@GridToStringInclude
- @GridDirectTransient
private GridCacheVersion explicitVer;
/** DHT version. */
@@ -798,42 +797,48 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
writer.incrementState();
case 4:
- if (!writer.writeByteArray("filterBytes", filterBytes))
+ if (!writer.writeMessage("explicitVer", explicitVer))
return false;
writer.incrementState();
case 5:
- if (!writer.writeBoolean("grpLock", grpLock))
+ if (!writer.writeByteArray("filterBytes", filterBytes))
return false;
writer.incrementState();
case 6:
- if (!writer.writeMessage("key", key))
+ if (!writer.writeBoolean("grpLock", grpLock))
return false;
writer.incrementState();
case 7:
- if (!writer.writeBoolean("transferExpiryPlc", transferExpiryPlc))
+ if (!writer.writeMessage("key", key))
return false;
writer.incrementState();
case 8:
- if (!writer.writeByteArray("transformClosBytes", transformClosBytes))
+ if (!writer.writeBoolean("transferExpiryPlc", transferExpiryPlc))
return false;
writer.incrementState();
case 9:
- if (!writer.writeLong("ttl", ttl))
+ if (!writer.writeByteArray("transformClosBytes", transformClosBytes))
return false;
writer.incrementState();
case 10:
+ if (!writer.writeLong("ttl", ttl))
+ return false;
+
+ writer.incrementState();
+
+ case 11:
if (!writer.writeMessage("val", val))
return false;
@@ -885,7 +890,7 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
reader.incrementState();
case 4:
- filterBytes = reader.readByteArray("filterBytes");
+ explicitVer = reader.readMessage("explicitVer");
if (!reader.isLastRead())
return false;
@@ -893,7 +898,7 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
reader.incrementState();
case 5:
- grpLock = reader.readBoolean("grpLock");
+ filterBytes = reader.readByteArray("filterBytes");
if (!reader.isLastRead())
return false;
@@ -901,7 +906,7 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
reader.incrementState();
case 6:
- key = reader.readMessage("key");
+ grpLock = reader.readBoolean("grpLock");
if (!reader.isLastRead())
return false;
@@ -909,7 +914,7 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
reader.incrementState();
case 7:
- transferExpiryPlc = reader.readBoolean("transferExpiryPlc");
+ key = reader.readMessage("key");
if (!reader.isLastRead())
return false;
@@ -917,7 +922,7 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
reader.incrementState();
case 8:
- transformClosBytes = reader.readByteArray("transformClosBytes");
+ transferExpiryPlc = reader.readBoolean("transferExpiryPlc");
if (!reader.isLastRead())
return false;
@@ -925,7 +930,7 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
reader.incrementState();
case 9:
- ttl = reader.readLong("ttl");
+ transformClosBytes = reader.readByteArray("transformClosBytes");
if (!reader.isLastRead())
return false;
@@ -933,6 +938,14 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
reader.incrementState();
case 10:
+ ttl = reader.readLong("ttl");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 11:
val = reader.readMessage("val");
if (!reader.isLastRead())
@@ -952,7 +965,7 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 11;
+ return 12;
}
/** {@inheritDoc} */