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 2017/03/14 08:00:25 UTC
[06/38] ignite git commit: ignite-4768
ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0f069f8d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0f069f8d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0f069f8d
Branch: refs/heads/ignite-4768
Commit: 0f069f8d6d24b0bea4197f3249f42c1ded8d1923
Parents: ca67537
Author: sboikov <sb...@gridgain.com>
Authored: Tue Mar 7 15:36:45 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Mar 7 15:36:45 2017 +0300
----------------------------------------------------------------------
.../near/GridNearTxPrepareRequest.java | 33 +++++---------------
1 file changed, 7 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0f069f8d/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 c9ab48f..86f7060 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
@@ -66,11 +66,6 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
/** Topology version. */
private AffinityTopologyVersion topVer;
- /** IDs of backup nodes receiving last prepare request during this prepare. */
- @GridDirectCollection(UUID.class)
- @GridToStringInclude
- private Collection<UUID> lastBackups;
-
/** Subject ID. */
private UUID subjId;
@@ -306,30 +301,24 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
writer.incrementState();
case 22:
- if (!writer.writeCollection("lastBackups", lastBackups, MessageCollectionItemType.UUID))
- return false;
-
- writer.incrementState();
-
- case 23:
if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
- case 24:
+ case 23:
if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
- case 25:
+ case 24:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
- case 26:
+ case 25:
if (!writer.writeMessage("topVer", topVer))
return false;
@@ -368,14 +357,6 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
case 22:
- lastBackups = reader.readCollection("lastBackups", MessageCollectionItemType.UUID);
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 23:
miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
@@ -383,7 +364,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
- case 24:
+ case 23:
subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
@@ -391,7 +372,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
- case 25:
+ case 24:
taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
@@ -399,7 +380,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
reader.incrementState();
- case 26:
+ case 25:
topVer = reader.readMessage("topVer");
if (!reader.isLastRead())
@@ -419,7 +400,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 27;
+ return 26;
}
/** {@inheritDoc} */