Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A8391200D1A for ; Mon, 25 Sep 2017 06:00:41 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9E3661609E8; Mon, 25 Sep 2017 04:00:41 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id BBCF51609E6 for ; Mon, 25 Sep 2017 06:00:40 +0200 (CEST) Received: (qmail 41582 invoked by uid 500); 25 Sep 2017 04:00:39 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 41573 invoked by uid 99); 25 Sep 2017 04:00:39 -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; Mon, 25 Sep 2017 04:00:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 59E9DF5617; Mon, 25 Sep 2017 04:00:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shroman@apache.org To: commits@ignite.apache.org Message-Id: <19246428dd83438c80c716b713569c55@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-6053: IgniteCache.clear clears local caches with same names on all server nodes. - Fixes #2443. Date: Mon, 25 Sep 2017 04:00:38 +0000 (UTC) archived-at: Mon, 25 Sep 2017 04:00:41 -0000 Repository: ignite Updated Branches: refs/heads/master 7ecdd7dcf -> 6aa94a9ae IGNITE-6053: IgniteCache.clear clears local caches with same names on all server nodes. - Fixes #2443. Signed-off-by: shroman Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6aa94a9a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6aa94a9a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6aa94a9a Branch: refs/heads/master Commit: 6aa94a9ae1eb52546385e5ba0027c09172873175 Parents: 7ecdd7d Author: shroman Authored: Mon Sep 25 12:59:51 2017 +0900 Committer: shroman Committed: Mon Sep 25 12:59:51 2017 +0900 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 62 ++++++++++++---- .../local/GridCacheLocalFullApiSelfTest.java | 76 +++++++++++++++++++- 2 files changed, 123 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6aa94a9a/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 32b1b99..c7e40ec 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 @@ -383,6 +383,7 @@ public abstract class GridCacheAdapter implements IgniteInternalCache implements IgniteInternalCache implements IgniteInternalCache keys) throws IgniteCheckedException { - executeClearTask(keys, false).get(); - executeClearTask(keys, true).get(); + if (isLocal()) { + if (keys == null) + clearLocally(true, false, false); + else + clearLocallyAll(keys, true, false, false); + } + else { + executeClearTask(keys, false).get(); + executeClearTask(keys, true).get(); + } } /** @@ -1123,13 +1133,33 @@ public abstract class GridCacheAdapter implements IgniteInternalCache clearAsync(@Nullable final Set keys) { - return executeClearTask(keys, false).chain(new CX1, Object>() { - @Override public Object applyx(IgniteInternalFuture fut) throws IgniteCheckedException { - executeClearTask(keys, true).get(); + if (isLocal()) + return clearLocallyAsync(keys); + else + return executeClearTask(keys, false).chain(new CX1, Object>() { + @Override public Object applyx(IgniteInternalFuture fut) throws IgniteCheckedException { + executeClearTask(keys, true).get(); + + return null; + } + }); + } + + /** + * @param keys Keys to clear. + * @return Clear future. + */ + private IgniteInternalFuture clearLocallyAsync(@Nullable final Set keys) { + return ctx.closures().callLocalSafe(new Callable() { + @Override public Object call() throws Exception { + if (keys == null) + clearLocally(true, false, false); + else + clearLocallyAll(keys, true, false, false); return null; } - }); + }, false); } /** @@ -3670,8 +3700,8 @@ public abstract class GridCacheAdapter implements IgniteInternalCache globalLoadCacheAsync(@Nullable IgniteBiPredicate p, @Nullable Object... args) throws IgniteCheckedException { @@ -3693,7 +3723,6 @@ public abstract class GridCacheAdapter implements IgniteInternalCache(ctx.name(), ctx.affinity().affinityTopologyVersion(), p, args, plc, keepBinary)), nodes); - return fut; } @@ -5995,7 +6024,7 @@ public abstract class GridCacheAdapter implements IgniteInternalCache implements IgniteInternalCache implements IgniteInternalCache implements IgniteInternalCache implements IgniteInternalCache implements IgniteInternalCache implements IgniteInternalCache internalSet) { @@ -6585,6 +6616,7 @@ public abstract class GridCacheAdapter implements IgniteInternalCache implements IgniteInternalCache cache = jcache(); + + for (int i = 0; i < 5; i++) { + cache.put(String.valueOf(i), i); + jcache(1).put(String.valueOf(i), i); + } + + if (async) + cache.clearAsync("4").get(); + else + cache.clear("4"); + + assertNull(peek(cache, "4")); + assertNotNull(peek(jcache(1), "4")); + + if (async) + cache.clearAllAsync(new HashSet<>(Arrays.asList("2", "3"))).get(); + else + cache.clearAll(new HashSet<>(Arrays.asList("2", "3"))); + + for (int i = 2; i < 4; i++) { + assertNull(peek(cache, String.valueOf(i))); + assertNotNull(peek(jcache(1), String.valueOf(i))); + } + + if (async) + cache.clearAsync().get(); + else + cache.clear(); + + for (int i = 0; i < 2; i++) { + assertNull(peek(cache, String.valueOf(i))); + assertNotNull(peek(jcache(1), String.valueOf(i))); + } + + if (async) + jcache(1).clearAsync().get(); + else + jcache(1).clear(); + + for (int i = 0; i < 2; i++) + assert jcache(i).localSize() == 0; + } + finally { + stopGrid(1); + } + } +}