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 DAE6B17888 for ; Fri, 24 Apr 2015 17:53:32 +0000 (UTC) Received: (qmail 30736 invoked by uid 500); 24 Apr 2015 17:53:32 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 30669 invoked by uid 500); 24 Apr 2015 17:53:32 -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 30653 invoked by uid 99); 24 Apr 2015 17:53:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Apr 2015 17:53:32 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of root@apache.org designates 54.76.25.247 as permitted sender) Received: from [54.76.25.247] (HELO mx1-eu-west.apache.org) (54.76.25.247) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Apr 2015 17:53:05 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 5CEBE25FCD for ; Fri, 24 Apr 2015 17:52:37 +0000 (UTC) Received: (qmail 25223 invoked by uid 99); 24 Apr 2015 17:52:33 -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; Fri, 24 Apr 2015 17:52:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9C18EE17DC; Fri, 24 Apr 2015 17:52:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 24 Apr 2015 17:53:06 -0000 Message-Id: <5b2e65caeaf84ddc811da13f1d9c3ec2@git.apache.org> In-Reply-To: <90d796ee11af4a5d803d3081b1a3eff3@git.apache.org> References: <90d796ee11af4a5d803d3081b1a3eff3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [34/50] 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/42b96fca Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/42b96fca Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/42b96fca Branch: refs/heads/ignite-789 Commit: 42b96fcae3af8a8c878c54ef2234ce469e8cf027 Parents: 92d27f5 Author: sboikov Authored: Thu Apr 23 17:10:20 2015 +0300 Committer: sboikov Committed: Thu Apr 23 17:10:20 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/GridDhtLockFuture.java | 10 +++------- .../cache/transactions/IgniteTxLocalAdapter.java | 14 ++++++++++---- 2 files changed, 13 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42b96fca/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java index 7263dfe..dd893ab 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java @@ -958,18 +958,14 @@ public final class GridDhtLockFuture extends GridCompoundIdentityFuture loadMap = new LinkedHashMap<>(); final GridCacheVersion ver = version(); for (GridDhtCacheEntry entry : entries) { - if (!entry.hasValue()) { - IgniteTxEntry txEntry = tx != null ? tx.entry(entry.txKey()) : null; - - if (txEntry == null || !txEntry.skipStore()) - loadMap.put(entry.key(), entry); - } + if (!entry.hasValue()) + loadMap.put(entry.key(), entry); } try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42b96fca/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 500a094..dfce09c 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 @@ -1729,8 +1729,6 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter deserializePortable, false); } - else if (txEntry.skipStore()) - missed.remove(cacheKey); // Even though we bring the value back from lock acquisition, // we still need to recheck primary node for consistent values @@ -1832,10 +1830,18 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter if (missed.isEmpty()) return new GridFinishedFuture<>(retMap); + IgniteInternalFuture> fut0 = checkMissed(cacheCtx, + retMap, + missed, + redos, + deserializePortable, + skipVals, + keepCacheObjects, + skipStore); + return new GridEmbeddedFuture<>( // First future. - checkMissed(cacheCtx, retMap, missed, redos, deserializePortable, skipVals, keepCacheObjects, - skipStore), + fut0, // Closure that returns another future, based on result from first. new PMC>() { @Override public IgniteInternalFuture> postMiss(Map map) {