You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/04/13 15:34:39 UTC
[09/39] ignite git commit: Remove field updVer in
GridNearAtomicAbstractUpdateFuture. Remove parametr updVer in
GridNearAtomicSingleUpdateFuture.mapSingleUpdate,
GridNearAtomicUpdateFuture.mapSingleUpdate and
GridNearAtomicUpdateFuture.mapUpdate.
Remove field updVer in GridNearAtomicAbstractUpdateFuture. Remove parametr updVer in GridNearAtomicSingleUpdateFuture.mapSingleUpdate, GridNearAtomicUpdateFuture.mapSingleUpdate and GridNearAtomicUpdateFuture.mapUpdate.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8a96fdf1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8a96fdf1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8a96fdf1
Branch: refs/heads/ignite-4587
Commit: 8a96fdf199bf476bd417192d795fcf4d1135deb8
Parents: a61e566
Author: Max Kozlov <dr...@gmail.com>
Authored: Mon Feb 27 16:25:13 2017 +0300
Committer: Max Kozlov <dr...@gmail.com>
Committed: Mon Feb 27 16:25:13 2017 +0300
----------------------------------------------------------------------
.../atomic/GridNearAtomicAbstractUpdateFuture.java | 3 ---
.../atomic/GridNearAtomicSingleUpdateFuture.java | 17 ++++++-----------
.../dht/atomic/GridNearAtomicUpdateFuture.java | 17 ++++-------------
3 files changed, 10 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8a96fdf1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
index 0024984..c720c8b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
@@ -112,9 +112,6 @@ public abstract class GridNearAtomicAbstractUpdateFuture extends GridFutureAdapt
/** Current topology version. */
protected AffinityTopologyVersion topVer = AffinityTopologyVersion.ZERO;
- /** */
- protected GridCacheVersion updVer;
-
/** Topology version when got mapping error. */
protected AffinityTopologyVersion mapErrTopVer;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8a96fdf1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
index 964e9a5..5630ca8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
@@ -281,7 +281,6 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
new AffinityTopologyVersion(cause.topologyVersion().topologyVersion() + 1);
err = null;
- updVer = null;
}
}
}
@@ -449,14 +448,12 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
GridNearAtomicAbstractUpdateRequest singleReq0 = null;
try {
- singleReq0 = mapSingleUpdate(topVer, futVer, updVer);
+ singleReq0 = mapSingleUpdate(topVer, futVer);
synchronized (mux) {
assert this.futVer == futVer || (this.isDone() && this.error() != null);
assert this.topVer == topVer;
- this.updVer = updVer;
-
resCnt = 0;
req = singleReq0;
@@ -503,13 +500,11 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
/**
* @param topVer Topology version.
* @param futVer Future version.
- * @param updVer Update version.
* @return Request.
* @throws Exception If failed.
*/
private GridNearAtomicAbstractUpdateRequest mapSingleUpdate(AffinityTopologyVersion topVer,
- GridCacheVersion futVer,
- @Nullable GridCacheVersion updVer) throws Exception {
+ GridCacheVersion futVer) throws Exception {
if (key == null)
throw new NullPointerException("Null key.");
@@ -540,7 +535,7 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
primary.id(),
futVer,
false,
- updVer,
+ null,
topVer,
topLocked,
syncMode,
@@ -561,7 +556,7 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
primary.id(),
futVer,
false,
- updVer,
+ null,
topVer,
topLocked,
syncMode,
@@ -580,7 +575,7 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
primary.id(),
futVer,
false,
- updVer,
+ null,
topVer,
topLocked,
syncMode,
@@ -602,7 +597,7 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
primary.id(),
futVer,
false,
- updVer,
+ null,
topVer,
topLocked,
syncMode,
http://git-wip-us.apache.org/repos/asf/ignite/blob/8a96fdf1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index 5d12dce..8123335 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@ -374,8 +374,6 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu
for (Object key : failedKeys)
remapKeys.add(cctx.toCacheKeyObject(key));
-
- updVer = null;
}
}
}
@@ -629,13 +627,12 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu
if (size == 1 && !fastMap) {
assert remapKeys == null || remapKeys.size() == 1;
- singleReq0 = mapSingleUpdate(topVer, futVer, updVer);
+ singleReq0 = mapSingleUpdate(topVer, futVer);
}
else {
Map<UUID, GridNearAtomicFullUpdateRequest> pendingMappings = mapUpdate(topNodes,
topVer,
futVer,
- updVer,
remapKeys);
if (pendingMappings.size() == 1)
@@ -660,8 +657,6 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu
assert this.futVer == futVer || (this.isDone() && this.error() != null);
assert this.topVer == topVer;
- this.updVer = updVer;
-
resCnt = 0;
singleReq = singleReq0;
@@ -721,7 +716,6 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu
* @param topNodes Cache nodes.
* @param topVer Topology version.
* @param futVer Future version.
- * @param updVer Update version.
* @param remapKeys Keys to remap.
* @return Mapping.
* @throws Exception If failed.
@@ -730,7 +724,6 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu
private Map<UUID, GridNearAtomicFullUpdateRequest> mapUpdate(Collection<ClusterNode> topNodes,
AffinityTopologyVersion topVer,
GridCacheVersion futVer,
- @Nullable GridCacheVersion updVer,
@Nullable Collection<KeyCacheObject> remapKeys) throws Exception {
Iterator<?> it = null;
@@ -827,7 +820,7 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu
nodeId,
futVer,
fastMap,
- updVer,
+ null,
topVer,
topLocked,
syncMode,
@@ -859,13 +852,11 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu
/**
* @param topVer Topology version.
* @param futVer Future version.
- * @param updVer Update version.
* @return Request.
* @throws Exception If failed.
*/
private GridNearAtomicFullUpdateRequest mapSingleUpdate(AffinityTopologyVersion topVer,
- GridCacheVersion futVer,
- @Nullable GridCacheVersion updVer) throws Exception {
+ GridCacheVersion futVer) throws Exception {
Object key = F.first(keys);
Object val;
@@ -929,7 +920,7 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu
primary.id(),
futVer,
fastMap,
- updVer,
+ null,
topVer,
topLocked,
syncMode,