You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/02/25 13:31:50 UTC
[51/51] [abbrv] ignite git commit: Review.
Review.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/80245665
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/80245665
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/80245665
Branch: refs/heads/ignite-2523
Commit: 8024566596002acf950aae5047f5c388bc5b256e
Parents: 0a04244
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Feb 25 15:30:48 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Feb 25 15:30:48 2016 +0300
----------------------------------------------------------------------
.../dht/atomic/GridDhtAtomicCache.java | 26 +++++++++++++-------
.../GridDhtAtomicMultipleUpdateRequest.java | 3 ++-
.../GridDhtAtomicMultipleUpdateResponse.java | 3 ++-
.../GridDhtAtomicSingleUpdateRequest.java | 3 ++-
.../GridDhtAtomicSingleUpdateResponse.java | 3 ++-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 3 +--
.../GridNearAtomicMultipleUpdateRequest.java | 4 +--
.../GridNearAtomicMultipleUpdateResponse.java | 3 ++-
.../GridNearAtomicSingleUpdateRequest.java | 4 +--
.../GridNearAtomicSingleUpdateResponse.java | 4 +--
.../dht/atomic/GridNearAtomicUpdateFuture.java | 12 +++------
11 files changed, 38 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/80245665/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index d1423f9..a2e0540 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -252,49 +252,57 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
}
});
- ctx.io().addHandler(ctx.cacheId(), GridNearAtomicMultipleUpdateRequest.class, new CI2<UUID, GridNearAtomicMultipleUpdateRequest>() {
+ ctx.io().addHandler(ctx.cacheId(), GridNearAtomicMultipleUpdateRequest.class,
+ new CI2<UUID, GridNearAtomicMultipleUpdateRequest>() {
@Override public void apply(UUID nodeId, GridNearAtomicMultipleUpdateRequest req) {
processNearAtomicUpdateRequest(nodeId, req);
}
});
- ctx.io().addHandler(ctx.cacheId(), GridNearAtomicSingleUpdateRequest.class, new CI2<UUID, GridNearAtomicSingleUpdateRequest>() {
+ ctx.io().addHandler(ctx.cacheId(), GridNearAtomicSingleUpdateRequest.class,
+ new CI2<UUID, GridNearAtomicSingleUpdateRequest>() {
@Override public void apply(UUID nodeId, GridNearAtomicSingleUpdateRequest req) {
processNearAtomicUpdateRequest(nodeId, req);
}
});
- ctx.io().addHandler(ctx.cacheId(), GridNearAtomicMultipleUpdateResponse.class, new CI2<UUID, GridNearAtomicMultipleUpdateResponse>() {
+ ctx.io().addHandler(ctx.cacheId(), GridNearAtomicMultipleUpdateResponse.class,
+ new CI2<UUID, GridNearAtomicMultipleUpdateResponse>() {
@Override public void apply(UUID nodeId, GridNearAtomicMultipleUpdateResponse res) {
processNearAtomicUpdateResponse(nodeId, res);
}
});
- ctx.io().addHandler(ctx.cacheId(), GridNearAtomicSingleUpdateResponse.class, new CI2<UUID, GridNearAtomicSingleUpdateResponse>() {
+ ctx.io().addHandler(ctx.cacheId(), GridNearAtomicSingleUpdateResponse.class,
+ new CI2<UUID, GridNearAtomicSingleUpdateResponse>() {
@Override public void apply(UUID nodeId, GridNearAtomicSingleUpdateResponse res) {
processNearAtomicUpdateResponse(nodeId, res);
}
});
- ctx.io().addHandler(ctx.cacheId(), GridDhtAtomicMultipleUpdateRequest.class, new CI2<UUID, GridDhtAtomicMultipleUpdateRequest>() {
+ ctx.io().addHandler(ctx.cacheId(), GridDhtAtomicMultipleUpdateRequest.class,
+ new CI2<UUID, GridDhtAtomicMultipleUpdateRequest>() {
@Override public void apply(UUID nodeId, GridDhtAtomicMultipleUpdateRequest req) {
processDhtAtomicUpdateRequest(nodeId, req);
}
});
- ctx.io().addHandler(ctx.cacheId(), GridDhtAtomicSingleUpdateRequest.class, new CI2<UUID, GridDhtAtomicSingleUpdateRequest>() {
+ ctx.io().addHandler(ctx.cacheId(), GridDhtAtomicSingleUpdateRequest.class,
+ new CI2<UUID, GridDhtAtomicSingleUpdateRequest>() {
@Override public void apply(UUID nodeId, GridDhtAtomicSingleUpdateRequest req) {
processDhtAtomicUpdateRequest(nodeId, req);
}
});
- ctx.io().addHandler(ctx.cacheId(), GridDhtAtomicMultipleUpdateResponse.class, new CI2<UUID, GridDhtAtomicMultipleUpdateResponse>() {
+ ctx.io().addHandler(ctx.cacheId(), GridDhtAtomicMultipleUpdateResponse.class,
+ new CI2<UUID, GridDhtAtomicMultipleUpdateResponse>() {
@Override public void apply(UUID nodeId, GridDhtAtomicMultipleUpdateResponse res) {
processDhtAtomicUpdateResponse(nodeId, res);
}
});
- ctx.io().addHandler(ctx.cacheId(), GridDhtAtomicSingleUpdateResponse.class, new CI2<UUID, GridDhtAtomicSingleUpdateResponse>() {
+ ctx.io().addHandler(ctx.cacheId(), GridDhtAtomicSingleUpdateResponse.class,
+ new CI2<UUID, GridDhtAtomicSingleUpdateResponse>() {
@Override public void apply(UUID nodeId, GridDhtAtomicSingleUpdateResponse res) {
processDhtAtomicUpdateResponse(nodeId, res);
}
@@ -1842,7 +1850,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
req.keepBinary());
Object val = ctx.config().getInterceptor().onBeforePut(new CacheLazyEntry(ctx, entry.key(),
- old, req.keepBinary()),
+ old, req.keepBinary()),
updated.value(ctx.cacheObjectContext(), false));
if (val == null)
http://git-wip-us.apache.org/repos/asf/ignite/blob/80245665/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicMultipleUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicMultipleUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicMultipleUpdateRequest.java
index becec6e..f949bbd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicMultipleUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicMultipleUpdateRequest.java
@@ -49,7 +49,8 @@ import org.jetbrains.annotations.Nullable;
/**
* Lite dht cache backup update request.
*/
-public class GridDhtAtomicMultipleUpdateRequest extends GridCacheMessage implements GridCacheDeployable, GridDhtAtomicUpdateRequest {
+public class GridDhtAtomicMultipleUpdateRequest extends GridCacheMessage implements GridCacheDeployable,
+ GridDhtAtomicUpdateRequest {
/** */
private static final long serialVersionUID = 0L;
http://git-wip-us.apache.org/repos/asf/ignite/blob/80245665/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicMultipleUpdateResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicMultipleUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicMultipleUpdateResponse.java
index 6f11686..08106e1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicMultipleUpdateResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicMultipleUpdateResponse.java
@@ -41,7 +41,8 @@ import org.apache.ignite.plugin.extensions.communication.MessageWriter;
/**
* DHT atomic cache backup update response.
*/
-public class GridDhtAtomicMultipleUpdateResponse extends GridCacheMessage implements GridCacheDeployable, GridDhtAtomicUpdateResponse {
+public class GridDhtAtomicMultipleUpdateResponse extends GridCacheMessage implements GridCacheDeployable,
+ GridDhtAtomicUpdateResponse {
/** */
private static final long serialVersionUID = 0L;
http://git-wip-us.apache.org/repos/asf/ignite/blob/80245665/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java
index 2b29df6..58c3629 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java
@@ -43,7 +43,8 @@ import java.util.Collection;
import java.util.Collections;
import java.util.UUID;
-public class GridDhtAtomicSingleUpdateRequest extends GridCacheMessage implements GridCacheDeployable, GridDhtAtomicUpdateRequest {
+public class GridDhtAtomicSingleUpdateRequest extends GridCacheMessage implements GridCacheDeployable,
+ GridDhtAtomicUpdateRequest {
/** */
private static final long serialVersionUID = 0L;
http://git-wip-us.apache.org/repos/asf/ignite/blob/80245665/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateResponse.java
index fc5a8b2..57a5db1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateResponse.java
@@ -35,7 +35,8 @@ import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.Collections;
-public class GridDhtAtomicSingleUpdateResponse extends GridCacheMessage implements GridCacheDeployable, GridDhtAtomicUpdateResponse {
+public class GridDhtAtomicSingleUpdateResponse extends GridCacheMessage implements GridCacheDeployable,
+ GridDhtAtomicUpdateResponse {
/** */
private static final long serialVersionUID = 0L;
http://git-wip-us.apache.org/repos/asf/ignite/blob/80245665/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
index df50542..d0b7be3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
@@ -401,8 +401,7 @@ public class GridDhtAtomicUpdateFuture extends GridFutureAdapter<Void> implement
if (!mappings.isEmpty() && lsnrs != null) {
Collection<KeyCacheObject> hndKeys = new ArrayList<>(keys.size());
- exit:
- for (GridDhtAtomicUpdateRequest req : mappings.values()) {
+ exit: for (GridDhtAtomicUpdateRequest req : mappings.values()) {
for (int i = 0; i < req.size(); i++) {
KeyCacheObject key = req.key(i);
http://git-wip-us.apache.org/repos/asf/ignite/blob/80245665/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicMultipleUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicMultipleUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicMultipleUpdateRequest.java
index d702202..341b4d0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicMultipleUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicMultipleUpdateRequest.java
@@ -58,8 +58,8 @@ import static org.apache.ignite.internal.processors.cache.GridCacheOperation.UPD
/**
* Lite DHT cache update request sent from near node to primary node.
*/
-public class GridNearAtomicMultipleUpdateRequest extends GridCacheMessage
- implements GridNearAtomicUpdateRequest, GridCacheDeployable {
+public class GridNearAtomicMultipleUpdateRequest extends GridCacheMessage implements GridNearAtomicUpdateRequest,
+ GridCacheDeployable {
/** */
private static final long serialVersionUID = 0L;
http://git-wip-us.apache.org/repos/asf/ignite/blob/80245665/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicMultipleUpdateResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicMultipleUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicMultipleUpdateResponse.java
index 7cb8886..fbab054 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicMultipleUpdateResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicMultipleUpdateResponse.java
@@ -47,7 +47,8 @@ import org.jetbrains.annotations.Nullable;
/**
* DHT atomic cache near update response.
*/
-public class GridNearAtomicMultipleUpdateResponse extends GridCacheMessage implements GridCacheDeployable, GridNearAtomicUpdateResponse {
+public class GridNearAtomicMultipleUpdateResponse extends GridCacheMessage implements GridCacheDeployable,
+ GridNearAtomicUpdateResponse {
/** */
private static final long serialVersionUID = 0L;
http://git-wip-us.apache.org/repos/asf/ignite/blob/80245665/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java
index 61889e3..0d1553d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java
@@ -57,8 +57,8 @@ import static org.apache.ignite.internal.processors.cache.GridCacheOperation.UPD
/**
* Lite DHT cache update request sent from near node to primary node.
*/
-public class GridNearAtomicSingleUpdateRequest extends GridCacheMessage
- implements GridNearAtomicUpdateRequest, GridCacheDeployable {
+public class GridNearAtomicSingleUpdateRequest extends GridCacheMessage implements GridNearAtomicUpdateRequest,
+ GridCacheDeployable {
/** */
private static final long serialVersionUID = 0L;
http://git-wip-us.apache.org/repos/asf/ignite/blob/80245665/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateResponse.java
index c7e5c8e..3baeed8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateResponse.java
@@ -41,8 +41,8 @@ import java.util.Collections;
import java.util.List;
import java.util.UUID;
-public class GridNearAtomicSingleUpdateResponse extends GridCacheMessage implements GridCacheDeployable, GridNearAtomicUpdateResponse {
-
+public class GridNearAtomicSingleUpdateResponse extends GridCacheMessage implements GridCacheDeployable,
+ GridNearAtomicUpdateResponse {
/** */
private static final long serialVersionUID = 0L;
http://git-wip-us.apache.org/repos/asf/ignite/blob/80245665/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 82a2a8c..9c2dfd9 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
@@ -455,8 +455,7 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> implem
if (cctx.localNodeId().equals(nodeId)) {
cache.updateAllAsyncInternal(nodeId, req,
new CI2<GridNearAtomicUpdateRequest, GridNearAtomicUpdateResponse>() {
- @Override public void apply(GridNearAtomicUpdateRequest req,
- GridNearAtomicUpdateResponse res) {
+ @Override public void apply(GridNearAtomicUpdateRequest req, GridNearAtomicUpdateResponse res) {
onResult(res.nodeId(), res);
}
});
@@ -511,8 +510,7 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> implem
if (locUpdate != null) {
cache.updateAllAsyncInternal(cctx.localNodeId(), locUpdate,
new CI2<GridNearAtomicUpdateRequest, GridNearAtomicUpdateResponse>() {
- @Override public void apply(GridNearAtomicUpdateRequest req,
- GridNearAtomicUpdateResponse res) {
+ @Override public void apply(GridNearAtomicUpdateRequest req, GridNearAtomicUpdateResponse res) {
onResult(res.nodeId(), res);
}
});
@@ -611,8 +609,8 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> implem
* @param res Response.
* @param nodeErr {@code True} if response was created on node failure.
*/
- @SuppressWarnings({"unchecked", "ThrowableResultOfMethodCallIgnored"}) void onResult(UUID nodeId,
- GridNearAtomicUpdateResponse res, boolean nodeErr) {
+ @SuppressWarnings({"unchecked", "ThrowableResultOfMethodCallIgnored"})
+ void onResult(UUID nodeId, GridNearAtomicUpdateResponse res, boolean nodeErr) {
GridNearAtomicUpdateRequest req;
AffinityTopologyVersion remapTopVer = null;
@@ -1208,8 +1206,6 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> implem
}
}
- optimize = false;
-
if (optimize) {
return new GridNearAtomicSingleUpdateRequest(
cacheKey,