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 4374317992 for ; Wed, 1 Apr 2015 12:58:06 +0000 (UTC) Received: (qmail 25515 invoked by uid 500); 1 Apr 2015 12:58:01 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 25427 invoked by uid 500); 1 Apr 2015 12:58:01 -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 25105 invoked by uid 99); 1 Apr 2015 12:58:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2015 12:58:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 01 Apr 2015 12:57:57 +0000 Received: (qmail 22347 invoked by uid 99); 1 Apr 2015 12:57:37 -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, 01 Apr 2015 12:57:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 83502E1085; Wed, 1 Apr 2015 12:57:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yzhdanov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 01 Apr 2015 12:57:52 -0000 Message-Id: <87efa329c54e42baac8a17914786e1f6@git.apache.org> In-Reply-To: <36508089c1aa4353a26299681f4889e3@git.apache.org> References: <36508089c1aa4353a26299681f4889e3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [16/50] incubator-ignite git commit: # ignite-629-1 X-Virus-Checked: Checked by ClamAV on apache.org # ignite-629-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/79c76cd1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/79c76cd1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/79c76cd1 Branch: refs/heads/sprint-2-ide-settings Commit: 79c76cd16d0a506a2775cb41f885bd3aff39f96e Parents: 67bb43a Author: sboikov Authored: Tue Mar 31 13:55:37 2015 +0300 Committer: sboikov Committed: Tue Mar 31 14:23:06 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 6 ++++-- .../cache/GridCacheConcurrentMap.java | 21 ++------------------ .../cache/GridCacheAbstractFullApiSelfTest.java | 2 +- 3 files changed, 7 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79c76cd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 8c6bfd6..02429b3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -4091,7 +4091,9 @@ public abstract class GridCacheAdapter implements GridCache, * @return Distributed ignite cache iterator. */ public Iterator> igniteIterator() { - if (!ctx.isSwapOrOffheapEnabled() && ctx.kernalContext().discovery().size() == 1) + GridCacheContext ctx0 = ctx.isNear() ? ctx.near().dht().context() : ctx; + + if (!ctx0.isSwapOrOffheapEnabled() && ctx0.kernalContext().discovery().size() == 1) return localIteratorHonorExpirePolicy(); final GridCacheProjectionImpl prj = ctx.projectionPerCall(); @@ -4371,7 +4373,7 @@ public abstract class GridCacheAdapter implements GridCache, OPTIMISTIC, READ_COMMITTED, tCfg.getDefaultTxTimeout(), - !skipStore(), + !ctx.skipStore(), 0, /** group lock keys */null, /** partition lock */false http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79c76cd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java index ba6a7f4..f45d00e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java @@ -1744,12 +1744,7 @@ public class GridCacheConcurrentMap { curVal = null; try { - CacheProjection prj = ctx.projectionPerCall(); - - if (prj != null) - prj.removex(e.key()); - else - ((IgniteKernal)ctx.grid()).getCache(ctx.name()).removex(e.key()); + ((IgniteKernal)ctx.grid()).getCache(ctx.name()).remove(e.key()); } catch (IgniteCheckedException ex) { throw new IgniteException(ex); @@ -1806,9 +1801,6 @@ public class GridCacheConcurrentMap { /** */ private GridCacheProjectionImpl prjPerCall; - /** */ - private boolean clone; - /** * Empty constructor required for {@link Externalizable}. */ @@ -2026,16 +2018,7 @@ public class GridCacheConcurrentMap { /** {@inheritDoc} */ @Override public void remove() { - GridCacheProjectionImpl oldPrj = ctx.projectionPerCall(); - - ctx.projectionPerCall(prjPerCall); - - try { - it.remove(); - } - finally { - ctx.projectionPerCall(oldPrj); - } + it.remove(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79c76cd1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index d5c279b..1238565 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -4266,7 +4266,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract * @throws Exception If failed. */ public void testWithSkipStore() throws Exception { - if (gridCount() > 1) + if (gridCount() > 1) // TODO IGNITE-656 (test primary/backup/near keys with multiple nodes). return; IgniteCache cache = grid(0).cache(null);