ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [1/2] incubator-ignite git commit: #ignite-683: Delete unused method get(K key, @Nullable GridCacheEntryEx entry, boolean deserializePortable, @Nullable CacheEntryPredicate... filter).
Date Wed, 08 Apr 2015 16:24:13 GMT
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 <ivasilinets@gridgain.com>
Authored: Wed Apr 8 19:13:08 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
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<K, V> implements GridCache<K,
V>,
     }
 
     /** {@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<K, V> extends CacheProjection<K,
V> {
     public IgniteInternalFuture<GridCacheReturn> 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<K, V> implements GridCacheProjectionEx<K,
V
     }
 
     /** {@inheritDoc} */
-    @Override public V get(K key, @Nullable GridCacheEntryEx entry, boolean deserializePortable,
-        @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException {
-        return cache.get(key, entry, deserializePortable, filter);
-    }
-
-    /** {@inheritDoc} */
     @Override public IgniteInternalFuture<V> 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<K, V> implements GridCacheProxy<K,
V>, Externali
     }
 
     /** {@inheritDoc} */
-    @Override public V get(K key, @Nullable GridCacheEntryEx entry, boolean deserializePortable,
-        @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException {
-        GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
-
-        try {
-            return delegate.get(key, entry, deserializePortable, filter);
-        }
-        finally {
-            gate.leave(prev);
-        }
-    }
-
-    /** {@inheritDoc} */
     @Override public IgniteInternalFuture<V> getAsync(K key) {
         GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
 


Mime
View raw message