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 EA9D81733B for ; Wed, 1 Apr 2015 15:23:32 +0000 (UTC) Received: (qmail 62274 invoked by uid 500); 1 Apr 2015 15:23:10 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 62241 invoked by uid 500); 1 Apr 2015 15:23:10 -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 62232 invoked by uid 99); 1 Apr 2015 15:23:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2015 15:23:10 +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 15:22:46 +0000 Received: (qmail 58996 invoked by uid 99); 1 Apr 2015 15:22:43 -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 15:22:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A8693E17CC; Wed, 1 Apr 2015 15:22:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergi@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 01 Apr 2015 15:22:44 -0000 Message-Id: <18e9362de3a64a34b94aca31c9913155@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [02/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/5fd9ded9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5fd9ded9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5fd9ded9 Branch: refs/heads/ignite-gg-10002 Commit: 5fd9ded9336d3dd8cc0da3e88f548de8fb57c12c Parents: 5b6700f Author: sboikov Authored: Tue Mar 31 12:53:34 2015 +0300 Committer: sboikov Committed: Tue Mar 31 12:53:34 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 6 ++++-- .../cache/GridCacheAbstractFullApiSelfTest.java | 10 +++++----- .../GridCacheReturnValueTransferSelfTest.java | 18 ++---------------- 3 files changed, 11 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5fd9ded9/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 db1fd12..00ab5719 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 @@ -4155,6 +4155,8 @@ public abstract class GridCacheAdapter implements GridCache, if (!ctx.isSwapOrOffheapEnabled() && ctx.kernalContext().discovery().size() == 1) return localIteratorHonorExpirePolicy(); + final GridCacheProjectionImpl prj = ctx.projectionPerCall(); + CacheQueryFuture> fut = queries().createScanQuery(null) .keepAll(false) .execute(); @@ -4165,7 +4167,7 @@ public abstract class GridCacheAdapter implements GridCache, } @Override protected void remove(Cache.Entry item) { - ctx.gate().enter(); + GridCacheProjectionImpl prev = ctx.gate().enter(prj); try { removex(item.getKey()); @@ -4174,7 +4176,7 @@ public abstract class GridCacheAdapter implements GridCache, throw CU.convertToCacheException(e); } finally { - ctx.gate().leave(); + ctx.gate().leave(prev); } } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5fd9ded9/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 1a8bdcd..d5c279b 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 @@ -4310,19 +4310,19 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract Cache.Entry entry = it.next(); - String removedKey = entry.getKey(); + String rmvKey = entry.getKey(); - assertTrue(map.containsKey(removedKey)); + assertTrue(map.containsKey(rmvKey)); it.remove(); - assertNull(cacheSkipStore.get(removedKey)); + assertNull(cacheSkipStore.get(rmvKey)); - assertTrue(map.containsKey(removedKey)); + assertTrue(map.containsKey(rmvKey)); } /** - * + * @return Cache start mode. */ protected CacheStartMode cacheStartType() { String mode = System.getProperty("cache.start.mode"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5fd9ded9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java index 4761e21..0dd23a7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java @@ -71,21 +71,7 @@ public class GridCacheReturnValueTransferSelfTest extends GridCommonAbstractTest /** * @throws Exception If failed. - */ - public void testTransformAtomicPrimaryNoBackups() throws Exception { - checkTransform(ATOMIC, PRIMARY, 0); - } - - /** - * @throws Exception If failed. - */ - public void testTransformAtomicClockNoBackups() throws Exception { - checkTransform(ATOMIC, CLOCK, 0); - } - - /** - * @throws Exception If failed. - * TODO gg-8273 enable when fixed + * TODO IGNITE-581 enable when fixed */ public void _testTransformTransactionalNoBackups() throws Exception { checkTransform(TRANSACTIONAL, PRIMARY, 0); @@ -93,7 +79,7 @@ public class GridCacheReturnValueTransferSelfTest extends GridCommonAbstractTest /** * @throws Exception If failed. - * TODO gg-8273 enable when fixed + * TODO IGNITE-581 enable when fixed */ public void _testTransformTransactionalOneBackup() throws Exception { checkTransform(TRANSACTIONAL, PRIMARY, 1);