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:23 UTC
[04/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/90563792
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/90563792
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/90563792
Branch: refs/heads/ignite-4768
Commit: 90563792608a875b07e9298dc3f7942519c0852e
Parents: 91826bb
Author: sboikov <sb...@gridgain.com>
Authored: Tue Mar 7 10:24:41 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Mar 7 10:24:41 2017 +0300
----------------------------------------------------------------------
.../near/GridNearTxPrepareFutureAdapter.java | 8 ++--
.../near/GridNearTxPrepareResponse.java | 48 +++++---------------
2 files changed, 16 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/90563792/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
index 6b95309..e25ffdd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
@@ -189,7 +189,6 @@ public abstract class GridNearTxPrepareFutureAdapter extends
return;
assert res.error() == null : res;
- assert F.isEmpty(res.invalidPartitions()) : res;
UUID nodeId = m.node().id();
@@ -207,8 +206,11 @@ public abstract class GridNearTxPrepareFutureAdapter extends
CacheVersionedValue tup = entry.getValue();
- nearEntry.resetFromPrimary(tup.value(), tx.xidVersion(),
- tup.version(), nodeId, tx.topologyVersion());
+ nearEntry.resetFromPrimary(tup.value(),
+ tx.xidVersion(),
+ tup.version(),
+ nodeId,
+ tx.topologyVersion());
}
else if (txEntry.cached().detached()) {
GridDhtDetachedCacheEntry detachedEntry = (GridDhtDetachedCacheEntry)txEntry.cached();
http://git-wip-us.apache.org/repos/asf/ignite/blob/90563792/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
index 8812709..a374bdc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
@@ -69,11 +69,6 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
/** Write version. */
private GridCacheVersion writeVer;
- /** */
- @GridToStringInclude
- @GridDirectCollection(int.class)
- private Collection<Integer> invalidParts;
-
/** Map of owned values to set on near node. */
@GridToStringInclude
@GridDirectTransient
@@ -252,13 +247,6 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
return ownedVals != null && ownedVals.containsKey(key);
}
- /**
- * @return Invalid partitions.
- */
- public Collection<Integer> invalidPartitions() {
- return invalidParts;
- }
-
/** {@inheritDoc}
* @param ctx*/
@Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException {
@@ -380,42 +368,36 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
writer.incrementState();
case 12:
- if (!writer.writeCollection("invalidParts", invalidParts, MessageCollectionItemType.INT))
- return false;
-
- writer.incrementState();
-
- case 13:
if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
- case 14:
+ case 13:
if (!writer.writeCollection("ownedValKeys", ownedValKeys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 15:
+ case 14:
if (!writer.writeCollection("ownedValVals", ownedValVals, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 16:
+ case 15:
if (!writer.writeCollection("pending", pending, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 17:
+ case 16:
if (!writer.writeMessage("retVal", retVal))
return false;
writer.incrementState();
- case 18:
+ case 17:
if (!writer.writeMessage("writeVer", writeVer))
return false;
@@ -470,14 +452,6 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
case 12:
- invalidParts = reader.readCollection("invalidParts", MessageCollectionItemType.INT);
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
- case 13:
miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
@@ -485,7 +459,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
- case 14:
+ case 13:
ownedValKeys = reader.readCollection("ownedValKeys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -493,7 +467,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
- case 15:
+ case 14:
ownedValVals = reader.readCollection("ownedValVals", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -501,7 +475,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
- case 16:
+ case 15:
pending = reader.readCollection("pending", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -509,7 +483,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
- case 17:
+ case 16:
retVal = reader.readMessage("retVal");
if (!reader.isLastRead())
@@ -517,7 +491,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
reader.incrementState();
- case 18:
+ case 17:
writeVer = reader.readMessage("writeVer");
if (!reader.isLastRead())
@@ -537,7 +511,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 19;
+ return 18;
}
/** {@inheritDoc} */