Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8D7F8178E0 for ; Wed, 22 Apr 2015 14:13:44 +0000 (UTC) Received: (qmail 70234 invoked by uid 500); 22 Apr 2015 14:13:44 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 70168 invoked by uid 500); 22 Apr 2015 14:13:44 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 70151 invoked by uid 99); 22 Apr 2015 14:13:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Apr 2015 14:13:44 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [54.191.145.13] (HELO mx1-us-west.apache.org) (54.191.145.13) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Apr 2015 14:13:37 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 8B5ED25F63 for ; Wed, 22 Apr 2015 14:13:17 +0000 (UTC) Received: (qmail 69295 invoked by uid 99); 22 Apr 2015 14:13:17 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Apr 2015 14:13:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 697ABE0060; Wed, 22 Apr 2015 14:13:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 22 Apr 2015 14:14:01 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [46/46] incubator-ignite git commit: # ignite-656 X-Virus-Checked: Checked by ClamAV on apache.org # ignite-656 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/27d11b56 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/27d11b56 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/27d11b56 Branch: refs/heads/ignite-656 Commit: 27d11b563e3344844097b4ca56230ceb08108d2e Parents: 0bd9052 Author: sboikov Authored: Wed Apr 22 17:12:56 2015 +0300 Committer: sboikov Committed: Wed Apr 22 17:12:56 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/GridDistributedLockRequest.java | 1 + .../cache/distributed/dht/GridDhtGetFuture.java | 7 ++++--- .../cache/distributed/dht/GridDhtLockFuture.java | 9 +++++---- .../cache/distributed/dht/GridDhtTxLocalAdapter.java | 12 +++++++++++- .../dht/colocated/GridDhtColocatedCache.java | 2 ++ .../cache/distributed/near/GridNearCacheAdapter.java | 1 + .../distributed/near/GridNearTransactionalCache.java | 1 + .../cache/transactions/IgniteTxLocalAdapter.java | 4 ++-- 8 files changed, 27 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/27d11b56/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java index 2baee77..fd1040f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java @@ -103,6 +103,7 @@ public class GridDistributedLockRequest extends GridDistributedBaseMessage { } /** + * @param cacheId Cache ID. * @param nodeId Node ID. * @param nearXidVer Near transaction ID. * @param threadId Thread ID. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/27d11b56/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java index ed5414d..f6f930e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java @@ -356,7 +356,7 @@ public final class GridDhtGetFuture extends GridCompoundIdentityFuture extends GridCompoundIdentityFuture extends GridCompoundIdentityFuture extends GridCompoundIdentityFuture extends GridCompoundIdentityFuture extends GridCompoundIdentityFuture extends GridCompoundIdentityFuture extends GridCompoundIdentityFuture loadMap = new LinkedHashMap<>(); final GridCacheVersion ver = version(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/27d11b56/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java index 65ca0ad..b32f0bb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java @@ -530,6 +530,7 @@ public abstract class GridDhtTxLocalAdapter extends IgniteTxLocalAdapter { * @param msgId Message ID. * @param read Read flag. * @param accessTtl TTL for read operation. + * @param needRetVal Return value flag. * @param skipStore Skip store flag. * @return Lock future. */ @@ -624,7 +625,15 @@ public abstract class GridDhtTxLocalAdapter extends IgniteTxLocalAdapter { if (log.isDebugEnabled()) log.debug("Lock keys: " + passedKeys); - return obtainLockAsync(cacheCtx, ret, passedKeys, read, needRetVal, skipped, accessTtl, null, skipStore); + return obtainLockAsync(cacheCtx, + ret, + passedKeys, + read, + needRetVal, + skipped, + accessTtl, + null, + skipStore); } catch (IgniteCheckedException e) { setRollbackOnly(); @@ -638,6 +647,7 @@ public abstract class GridDhtTxLocalAdapter extends IgniteTxLocalAdapter { * @param ret Return value. * @param passedKeys Passed keys. * @param read {@code True} if read. + * @param needRetVal Return value flag. * @param skipped Skipped keys. * @param accessTtl TTL for read operation. * @param filter Entry write filter. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/27d11b56/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java index 654e1ea..4489776 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java @@ -594,6 +594,7 @@ public class GridDhtColocatedCache extends GridDhtTransactionalCacheAdapte * @param topVer Topology version. * @param keys Mapped keys. * @param txRead Tx read. + * @param retval Return value flag. * @param timeout Lock timeout. * @param accessTtl TTL for read operation. * @param filter filter Optional filter. @@ -674,6 +675,7 @@ public class GridDhtColocatedCache extends GridDhtTransactionalCacheAdapte * @param topVer Topology version. * @param keys Mapped keys. * @param txRead Tx read. + * @param retval Return value flag. * @param timeout Lock timeout. * @param accessTtl TTL for read operation. * @param filter filter Optional filter. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/27d11b56/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java index 28e1f28..29c1d45 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java @@ -210,6 +210,7 @@ public abstract class GridNearCacheAdapter extends GridDistributedCacheAda * @param taskName Task name. * @param deserializePortable Deserialize portable flag. * @param expiryPlc Expiry policy. + * @param skipVal Skip value flag. * @param skipStore Skip store flag. * @return Loaded values. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/27d11b56/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java index ca292dc..62b9aee 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java @@ -151,6 +151,7 @@ public class GridNearTransactionalCache extends GridNearCacheAdapter * @param readThrough Read through flag. * @param deserializePortable Deserialize portable flag. * @param expiryPlc Expiry policy. + * @param skipVals Skip values flag. * @return Future. */ IgniteInternalFuture> txLoadAsync(GridNearTxLocal tx, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/27d11b56/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java index 8f66d62..c0f91b7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java @@ -1399,6 +1399,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter * @param missedMap Missed keys. * @param redos Keys to retry. * @param deserializePortable Deserialize portable flag. + * @param skipVals Skip values flag. * @param keepCacheObjects Keep cache objects flag. * @param skipStore Skip store flag. * @return Loaded key-value pairs. @@ -2814,9 +2815,8 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter ExpiryPolicy plc; - if (!F.isEmpty(filter)) { + if (!F.isEmpty(filter)) plc = opCtx != null ? opCtx.expiry() : null; - } else plc = null;