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 EF42317FE2 for ; Mon, 20 Apr 2015 14:54:48 +0000 (UTC) Received: (qmail 49590 invoked by uid 500); 20 Apr 2015 14:54:45 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 49562 invoked by uid 500); 20 Apr 2015 14:54:45 -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 49553 invoked by uid 99); 20 Apr 2015 14:54:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Apr 2015 14:54:45 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of root@apache.org designates 54.191.145.13 as permitted sender) Received: from [54.191.145.13] (HELO mx1-us-west.apache.org) (54.191.145.13) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Apr 2015 14:54:41 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 817B625AF3 for ; Mon, 20 Apr 2015 14:53:40 +0000 (UTC) Received: (qmail 36473 invoked by uid 99); 20 Apr 2015 14:53:40 -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, 20 Apr 2015 14:53:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 62D0DE0850; Mon, 20 Apr 2015 14:53:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 20 Apr 2015 14:54:16 -0000 Message-Id: In-Reply-To: <0a6a06f9cba142a8876a7b7dfa153b97@git.apache.org> References: <0a6a06f9cba142a8876a7b7dfa153b97@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [38/50] [abbrv] incubator-ignite git commit: # ignite-758 minor X-Virus-Checked: Checked by ClamAV on apache.org # ignite-758 minor Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e99216fd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e99216fd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e99216fd Branch: refs/heads/ignite-gg-9613 Commit: e99216fd431ce4cbcb21a1893475509e564e7222 Parents: a64810a Author: sboikov Authored: Fri Apr 17 16:34:09 2015 +0300 Committer: sboikov Committed: Fri Apr 17 16:34:09 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheAdapter.java | 4 +++- .../internal/processors/cache/GridCacheContext.java | 2 +- .../internal/processors/cache/GridCacheProcessor.java | 6 +++--- .../internal/processors/cache/GridCacheProxyImpl.java | 4 +++- .../internal/processors/cache/IgniteCacheProxy.java | 11 +++++------ .../datastreamer/DataStreamerCacheUpdaters.java | 5 ++--- 6 files changed, 17 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e99216fd/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 694f3d8..4379e3f 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 @@ -3545,7 +3545,9 @@ public abstract class GridCacheAdapter implements IgniteInternalCache randomEntry() { GridCacheMapEntry e = map.randomEntry(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e99216fd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java index 2e62290..48dcee7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java @@ -156,7 +156,7 @@ public class GridCacheContext implements Externalizable { /** * Thread local operation context. If it's set it means that method call was initiated - * by child internal cache of initial cache. + * by child cache of initial cache. */ private ThreadLocal opCtxPerCall = new ThreadLocal<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e99216fd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index c270078..83f1fed 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -2444,7 +2444,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { IgniteCacheProxy jcache = (IgniteCacheProxy)jCacheProxies.get(maskNull(name)); - return jcache == null ? null : jcache.legacyProxy(); + return jcache == null ? null : jcache.internalProxy(); } /** @@ -2454,7 +2454,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { return F.viewReadOnly(jCacheProxies.values(), new IgniteClosure, IgniteInternalCache>() { @Override public IgniteInternalCache apply(IgniteCacheProxy entries) { - return entries.legacyProxy(); + return entries.internalProxy(); } }); } @@ -2515,7 +2515,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { if (jcache == null) throw new IllegalArgumentException("Cache is not started: " + name); - return jcache.legacyProxy(); + return jcache.internalProxy(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e99216fd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java index babb3ac..22c730b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java @@ -220,7 +220,9 @@ public class GridCacheProxyImpl implements IgniteInternalCache, Exte if (opCtx.isKeepPortable()) return (GridCacheProxyImpl)this; - return new GridCacheProxyImpl<>((GridCacheContext)ctx, (GridCacheAdapter)delegate, opCtx.keepPortable()); + return new GridCacheProxyImpl<>((GridCacheContext)ctx, + (GridCacheAdapter)delegate, + opCtx.keepPortable()); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e99216fd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index 128091f..c17156b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@ -76,7 +76,7 @@ public class IgniteCacheProxy extends AsyncSupportAdapter legacyProxy; + private GridCacheProxyImpl internalProxy; /** */ @GridToStringExclude @@ -133,7 +133,7 @@ public class IgniteCacheProxy extends AsyncSupportAdapter(ctx, delegate, opCtx); + internalProxy = new GridCacheProxyImpl<>(ctx, delegate, opCtx); this.lock = lock; } @@ -1497,11 +1497,10 @@ public class IgniteCacheProxy extends AsyncSupportAdapter legacyProxy() { - return legacyProxy; + public GridCacheProxyImpl internalProxy() { + return internalProxy; } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e99216fd/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java index d712ba1..50e9ab9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.datastreamer; import org.apache.ignite.*; -import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.stream.*; import org.jetbrains.annotations.*; @@ -39,8 +38,8 @@ public class DataStreamerCacheUpdaters { private static final StreamReceiver BATCHED_SORTED = new BatchedSorted(); /** - * Updates cache using independent {@link IgniteCache#getAndPut(Object, Object)}and - * {@link IgniteCache#getAndRemove(Object)} operations. Thus it is safe from deadlocks but performance + * Updates cache using independent {@link IgniteCache#put(Object, Object)}and + * {@link IgniteCache#remove(Object)} operations. Thus it is safe from deadlocks but performance * is not the best. * * @return Single updater.