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 B2C3B17C2F for ; Mon, 2 Feb 2015 16:55:03 +0000 (UTC) Received: (qmail 87613 invoked by uid 500); 2 Feb 2015 16:55:04 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 87533 invoked by uid 500); 2 Feb 2015 16:55:04 -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 87407 invoked by uid 99); 2 Feb 2015 16:55:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Feb 2015 16:55:04 +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; Mon, 02 Feb 2015 16:55:02 +0000 Received: (qmail 86721 invoked by uid 99); 2 Feb 2015 16:54:42 -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, 02 Feb 2015 16:54:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 10657E052F; Mon, 2 Feb 2015 16:54:42 +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: Mon, 02 Feb 2015 16:54:46 -0000 Message-Id: <6380863b81d94d2aaad07f43ef0fabd4@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [06/45] incubator-ignite git commit: #IGNITE-86: remove unused param leftNodeId from onUndeploy function X-Virus-Checked: Checked by ClamAV on apache.org #IGNITE-86: remove unused param leftNodeId from onUndeploy function Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4174a74c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4174a74c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4174a74c Branch: refs/heads/ignite-121-logging Commit: 4174a74c0eca6a1b39c9c9b2ce9edde77379ce7e Parents: 65200e2 Author: ivasilinets Authored: Fri Jan 23 14:15:42 2015 +0300 Committer: ivasilinets Committed: Fri Jan 23 14:15:42 2015 +0300 ---------------------------------------------------------------------- .../deployment/GridDeploymentPerLoaderStore.java | 4 ++-- .../deployment/GridDeploymentPerVersionStore.java | 4 ++-- .../grid/kernal/processors/cache/GridCacheAdapter.java | 5 ++--- .../processors/cache/GridCacheDeploymentManager.java | 12 +++++------- .../kernal/processors/cache/GridCacheProcessor.java | 5 ++--- .../kernal/processors/cache/GridCacheSwapManager.java | 3 +-- .../kernal/processors/streamer/GridStreamProcessor.java | 5 ++--- .../kernal/processors/streamer/IgniteStreamerEx.java | 3 +-- .../kernal/processors/streamer/IgniteStreamerImpl.java | 5 ++--- 9 files changed, 19 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4174a74c/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerLoaderStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerLoaderStore.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerLoaderStore.java index 41c7c1b..9deb83c 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerLoaderStore.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerLoaderStore.java @@ -499,8 +499,8 @@ public class GridDeploymentPerLoaderStore extends GridDeploymentStoreAdapter { ClassLoader ldr = classLoader(); - ctx.cache().onUndeployed(leftNodeId, ldr); - ctx.stream().onUndeployed(leftNodeId, ldr); + ctx.cache().onUndeployed(ldr); + ctx.stream().onUndeployed(ldr); // Clear optimized marshaller's cache. If another marshaller is used, this is no-op. IgniteOptimizedMarshaller.onUndeploy(ldr); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4174a74c/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerVersionStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerVersionStore.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerVersionStore.java index 5dbbfaa..317d476 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerVersionStore.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerVersionStore.java @@ -1259,8 +1259,8 @@ public class GridDeploymentPerVersionStore extends GridDeploymentStoreAdapter { ClassLoader ldr = classLoader(); - ctx.cache().onUndeployed(leftNodeId, ldr); - ctx.stream().onUndeployed(leftNodeId, ldr); + ctx.cache().onUndeployed(ldr); + ctx.stream().onUndeployed(ldr); // Clear optimized marshaller's cache. If another marshaller is used, this is no-op. IgniteOptimizedMarshaller.onUndeploy(ldr); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4174a74c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java index 4fdfc19..16ee7a7 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java @@ -951,11 +951,10 @@ public abstract class GridCacheAdapter implements GridCache, /** * Undeploys and removes all entries for class loader. * - * @param leftNodeId Left node ID. * @param ldr Class loader to undeploy. */ - public void onUndeploy(@Nullable UUID leftNodeId, ClassLoader ldr) { - ctx.deploy().onUndeploy(leftNodeId, ldr); + public void onUndeploy(ClassLoader ldr) { + ctx.deploy().onUndeploy(ldr); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4174a74c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentManager.java index 17a116e..39d998e 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentManager.java @@ -194,10 +194,9 @@ public class GridCacheDeploymentManager extends GridCacheSharedManagerAdap /** * Undeploys given class loader. * - * @param leftNodeId Left node ID. * @param ldr Class loader to undeploy. */ - public void onUndeploy(@Nullable final UUID leftNodeId, final ClassLoader ldr) { + public void onUndeploy(final ClassLoader ldr) { assert ldr != null; if (log.isDebugEnabled()) @@ -205,7 +204,7 @@ public class GridCacheDeploymentManager extends GridCacheSharedManagerAdap undeploys.add(new CA() { @Override public void apply() { - onUndeploy0(leftNodeId, ldr); + onUndeploy0(ldr); } }); @@ -218,10 +217,9 @@ public class GridCacheDeploymentManager extends GridCacheSharedManagerAdap } /** - * @param leftNodeId Left node ID. * @param ldr Loader. */ - private void onUndeploy0(@Nullable final UUID leftNodeId, final ClassLoader ldr) { + private void onUndeploy0(final ClassLoader ldr) { for (final GridCacheContext cacheCtx : cctx.cacheContexts()) { GridCacheAdapter cache = cacheCtx.cache(); @@ -295,8 +293,8 @@ public class GridCacheDeploymentManager extends GridCacheSharedManagerAdap // Examine swap for entries to undeploy. int swapUndeployCnt = cacheCtx.isNear() ? - cacheCtx.near().dht().context().swap().onUndeploy(leftNodeId, ldr) : - cacheCtx.swap().onUndeploy(leftNodeId, ldr); + cacheCtx.near().dht().context().swap().onUndeploy(ldr) : + cacheCtx.swap().onUndeploy(ldr); if (cacheCtx.system()) continue; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4174a74c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java index cb683d1..ab845b8 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java @@ -1766,13 +1766,12 @@ public class GridCacheProcessor extends GridProcessorAdapter { * Callback invoked by deployment manager for whenever a class loader * gets undeployed. * - * @param leftNodeId Left node ID. * @param ldr Class loader. */ - public void onUndeployed(@Nullable UUID leftNodeId, ClassLoader ldr) { + public void onUndeployed(ClassLoader ldr) { if (!ctx.isStopping()) for (GridCacheAdapter cache : caches.values()) - cache.onUndeploy(leftNodeId, ldr); + cache.onUndeploy(ldr); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4174a74c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapManager.java index 5cbfb30..cde0bbe 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapManager.java @@ -1434,11 +1434,10 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { } /** - * @param leftNodeId Left Node ID. * @param ldr Undeployed class loader. * @return Undeploy count. */ - public int onUndeploy(UUID leftNodeId, ClassLoader ldr) { + public int onUndeploy(ClassLoader ldr) { if (cctx.portableEnabled()) return 0; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4174a74c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamProcessor.java index c687610..b5857f4 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamProcessor.java @@ -351,11 +351,10 @@ public class GridStreamProcessor extends GridProcessorAdapter { /** * Callback for undeployed class loaders. * - * @param leftNodeId Left node ID. * @param ldr Class loader. */ - public void onUndeployed(UUID leftNodeId, ClassLoader ldr) { + public void onUndeployed(ClassLoader ldr) { for (IgniteStreamerEx streamer : map.values()) - streamer.onUndeploy(leftNodeId, ldr); + streamer.onUndeploy(ldr); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4174a74c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerEx.java index de11622..6c729e7 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerEx.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerEx.java @@ -81,10 +81,9 @@ public interface IgniteStreamerEx extends IgniteStreamer { /** * Callback for undeployed class loaders. All deployed events will be removed from window and local storage. * - * @param leftNodeId Left node ID which caused undeployment. * @param undeployedLdr Undeployed class loader. */ - public void onUndeploy(UUID leftNodeId, ClassLoader undeployedLdr); + public void onUndeploy(ClassLoader undeployedLdr); /** * Callback executed when streamer query completes. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4174a74c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerImpl.java index eb77b51..542fc49 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerImpl.java @@ -689,10 +689,9 @@ public class IgniteStreamerImpl implements IgniteStreamerEx, Externalizable { } /** {@inheritDoc} */ - @Override public void onUndeploy(UUID leftNodeId, ClassLoader undeployedLdr) { + @Override public void onUndeploy(ClassLoader undeployedLdr) { if (log.isDebugEnabled()) - log.debug("Processing undeployment event [leftNodeId=" + leftNodeId + - ", undeployedLdr=" + undeployedLdr + ']'); + log.debug("Processing undeployment event undeployedLdr=" + undeployedLdr + ']'); unwindUndeploys(undeployedLdr, true); }