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/11/24 10:22:21 UTC
[23/50] [abbrv] ignite git commit: Merge branch ignite-1.5 into
ignite-1.5-tx-futs-opts
Merge branch ignite-1.5 into ignite-1.5-tx-futs-opts
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/388c8578
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/388c8578
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/388c8578
Branch: refs/heads/ignite-1924
Commit: 388c85785271deabc8822e1d8cf1fdaf4254b6e2
Parents: 7cd4a77
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Mon Nov 23 09:36:32 2015 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Mon Nov 23 09:36:32 2015 +0300
----------------------------------------------------------------------
.../colocated/GridDhtColocatedLockFuture.java | 61 +++++++-------------
.../distributed/near/GridNearLockFuture.java | 18 +++---
2 files changed, 29 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/388c8578/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
index bd6c2a7..7e6ce89 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
@@ -89,26 +89,26 @@ public final class GridDhtColocatedLockFuture extends GridCompoundIdentityFuture
/** Cache registry. */
@GridToStringExclude
- private GridCacheContext<?, ?> cctx;
+ private final GridCacheContext<?, ?> cctx;
/** Lock owner thread. */
@GridToStringInclude
- private long threadId;
+ private final long threadId;
/** Keys to lock. */
private Collection<KeyCacheObject> keys;
/** Future ID. */
- private IgniteUuid futId;
+ private final IgniteUuid futId;
/** Lock version. */
- private GridCacheVersion lockVer;
+ private final GridCacheVersion lockVer;
/** Read flag. */
- private boolean read;
+ private final boolean read;
/** Flag to return value. */
- private boolean retval;
+ private final boolean retval;
/** Error. */
private volatile Throwable err;
@@ -118,26 +118,26 @@ public final class GridDhtColocatedLockFuture extends GridCompoundIdentityFuture
private LockTimeoutObject timeoutObj;
/** Lock timeout. */
- private long timeout;
+ private final long timeout;
/** Filter. */
- private CacheEntryPredicate[] filter;
+ private final CacheEntryPredicate[] filter;
/** Transaction. */
@GridToStringExclude
- private GridNearTxLocal tx;
+ private final GridNearTxLocal tx;
/** Topology snapshot to operate on. */
private volatile AffinityTopologyVersion topVer;
/** Map of current values. */
- private Map<KeyCacheObject, IgniteBiTuple<GridCacheVersion, CacheObject>> valMap;
+ private final Map<KeyCacheObject, IgniteBiTuple<GridCacheVersion, CacheObject>> valMap;
/** Trackable flag (here may be non-volatile). */
private boolean trackable;
/** TTL for read operation. */
- private long accessTtl;
+ private final long accessTtl;
/** Skip store flag. */
private final boolean skipStore;
@@ -457,7 +457,7 @@ public final class GridDhtColocatedLockFuture extends GridCompoundIdentityFuture
* @param miniId Mini ID to find.
* @return Mini future.
*/
- @SuppressWarnings("ForLoopReplaceableByForEach")
+ @SuppressWarnings({"ForLoopReplaceableByForEach", "IfMayBeConditional"})
private MiniFuture miniFuture(IgniteUuid miniId) {
// We iterate directly over the futs collection here to avoid copy.
synchronized (futs) {
@@ -742,6 +742,12 @@ public final class GridDhtColocatedLockFuture extends GridCompoundIdentityFuture
}
}
+ /**
+ * @param keys Keys to map.
+ * @param remap Remap flag.
+ * @param topLocked Topology locked flag.
+ * @throws IgniteCheckedException If mapping failed.
+ */
private synchronized void map0(
Collection<KeyCacheObject> keys,
boolean remap,
@@ -908,34 +914,6 @@ public final class GridDhtColocatedLockFuture extends GridCompoundIdentityFuture
mapping.request(req);
}
- req = new GridNearLockRequest(
- cctx.cacheId(),
- topVer,
- cctx.nodeId(),
- threadId,
- futId,
- lockVer,
- inTx(),
- implicitTx(),
- implicitSingleTx(),
- read,
- retval,
- isolation(),
- isInvalidate(),
- timeout,
- mappedKeys.size(),
- inTx() ? tx.size() : mappedKeys.size(),
- inTx() && tx.syncCommit(),
- inTx() ? tx.subjectId() : null,
- inTx() ? tx.taskNameHash() : 0,
- read ? accessTtl : -1L,
- skipStore,
- clientFirst,
- cctx.deploymentEnabled());
-
- mapping.request(req);
- }
-
distributedKeys.add(key);
if (tx != null)
@@ -1502,7 +1480,8 @@ public final class GridDhtColocatedLockFuture extends GridCompoundIdentityFuture
false,
CU.subjectId(tx, cctx.shared()),
null,
- tx == null ? null : tx.resolveTaskName());
+ tx == null ? null : tx.resolveTaskName(),
+ keepBinary);
}
i++;
http://git-wip-us.apache.org/repos/asf/ignite/blob/388c8578/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
index 832cc3d..f1f9990 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
@@ -85,26 +85,26 @@ public final class GridNearLockFuture extends GridCompoundIdentityFuture<Boolean
/** Cache registry. */
@GridToStringExclude
- private GridCacheContext<?, ?> cctx;
+ private final GridCacheContext<?, ?> cctx;
/** Lock owner thread. */
@GridToStringInclude
private long threadId;
/** Keys to lock. */
- private Collection<KeyCacheObject> keys;
+ private final Collection<KeyCacheObject> keys;
/** Future ID. */
- private IgniteUuid futId;
+ private final IgniteUuid futId;
/** Lock version. */
- private GridCacheVersion lockVer;
+ private final GridCacheVersion lockVer;
/** Read flag. */
private boolean read;
/** Flag to return value. */
- private boolean retval;
+ private final boolean retval;
/** Error. */
private volatile Throwable err;
@@ -120,17 +120,17 @@ public final class GridNearLockFuture extends GridCompoundIdentityFuture<Boolean
private long timeout;
/** Filter. */
- private CacheEntryPredicate[] filter;
+ private final CacheEntryPredicate[] filter;
/** Transaction. */
@GridToStringExclude
- private GridNearTxLocal tx;
+ private final GridNearTxLocal tx;
/** Topology snapshot to operate on. */
private volatile AffinityTopologyVersion topVer;
/** Map of current values. */
- private Map<KeyCacheObject, IgniteBiTuple<GridCacheVersion, CacheObject>> valMap;
+ private final Map<KeyCacheObject, IgniteBiTuple<GridCacheVersion, CacheObject>> valMap;
/** Trackable flag. */
private boolean trackable = true;
@@ -496,7 +496,7 @@ public final class GridNearLockFuture extends GridCompoundIdentityFuture<Boolean
* @param miniId Mini ID to find.
* @return Mini future.
*/
- @SuppressWarnings("ForLoopReplaceableByForEach")
+ @SuppressWarnings({"ForLoopReplaceableByForEach", "IfMayBeConditional"})
private MiniFuture miniFuture(IgniteUuid miniId) {
// We iterate directly over the futs collection here to avoid copy.
synchronized (futs) {