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 D240B17A76 for ; Wed, 8 Apr 2015 16:25:33 +0000 (UTC) Received: (qmail 11318 invoked by uid 500); 8 Apr 2015 16:24:35 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 11285 invoked by uid 500); 8 Apr 2015 16:24:35 -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 11276 invoked by uid 99); 8 Apr 2015 16:24:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Apr 2015 16:24:35 +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, 08 Apr 2015 16:24:33 +0000 Received: (qmail 8214 invoked by uid 99); 8 Apr 2015 16:24:13 -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, 08 Apr 2015 16:24:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 12B1EE1080; Wed, 8 Apr 2015 16:24:13 +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: Wed, 08 Apr 2015 16:24:13 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-ignite git commit: #ignite-683: Delete unused method get(K key, @Nullable GridCacheEntryEx entry, boolean deserializePortable, @Nullable CacheEntryPredicate... filter). X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-ignite Updated Branches: refs/heads/ignite-683 34d312429 -> e9d912442 #ignite-683: Delete unused method get(K key, @Nullable GridCacheEntryEx entry, boolean deserializePortable, @Nullable CacheEntryPredicate... filter). Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/730d3fcf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/730d3fcf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/730d3fcf Branch: refs/heads/ignite-683 Commit: 730d3fcf08791f96cc0efe62fcf00fb3f6c1e2ff Parents: 34d3124 Author: ivasilinets Authored: Wed Apr 8 19:13:08 2015 +0300 Committer: ivasilinets Committed: Wed Apr 8 19:13:08 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheAdapter.java | 9 --------- .../processors/cache/GridCacheProjectionEx.java | 11 ----------- .../processors/cache/GridCacheProjectionImpl.java | 6 ------ .../internal/processors/cache/GridCacheProxyImpl.java | 13 ------------- 4 files changed, 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/730d3fcf/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 bf39c66..f1f660e 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 @@ -1301,15 +1301,6 @@ public abstract class GridCacheAdapter implements GridCache, } /** {@inheritDoc} */ - @Override public V get(K key, @Nullable GridCacheEntryEx entry, boolean deserializePortable, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - String taskName = ctx.kernalContext().job().currentTaskName(); - - return getAllAsync(F.asList(key), !ctx.config().isReadFromBackup(), /*skip tx*/false, entry, null, taskName, - deserializePortable, false).get().get(key); - } - - /** {@inheritDoc} */ @Override public V getForcePrimary(K key) throws IgniteCheckedException { String taskName = ctx.kernalContext().job().currentTaskName(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/730d3fcf/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java index e7c7689..8363377 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java @@ -157,17 +157,6 @@ public interface GridCacheProjectionEx extends CacheProjection { public IgniteInternalFuture removexAsync(K key, V val); /** - * @param key Key to retrieve the value for. - * @param entry Cached entry when called from entry wrapper. - * @param filter Filter to check prior to getting the value. Note that filter check - * together with getting the value is an atomic operation. - * @return Value. - * @throws IgniteCheckedException If failed. - */ - @Nullable public V get(K key, @Nullable GridCacheEntryEx entry, boolean deserializePortable, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException; - - /** * Gets value from cache. Will go to primary node even if this is a backup. * * @param key Key to get value for. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/730d3fcf/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java index 8a8084a..8e59ca8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java @@ -282,12 +282,6 @@ public class GridCacheProjectionImpl implements GridCacheProjectionEx getAsync(K key) { return cache.getAsync(key, deserializePortables()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/730d3fcf/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 051c52e..5df6964 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 @@ -421,19 +421,6 @@ public class GridCacheProxyImpl implements GridCacheProxy, Externali } /** {@inheritDoc} */ - @Override public V get(K key, @Nullable GridCacheEntryEx entry, boolean deserializePortable, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - GridCacheProjectionImpl prev = gate.enter(prj); - - try { - return delegate.get(key, entry, deserializePortable, filter); - } - finally { - gate.leave(prev); - } - } - - /** {@inheritDoc} */ @Override public IgniteInternalFuture getAsync(K key) { GridCacheProjectionImpl prev = gate.enter(prj);