ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [05/50] incubator-ignite git commit: #ignite-707: remove GridCacheEntryEx cached from cache methods.
Date Mon, 13 Apr 2015 17:39:53 GMT
#ignite-707: remove GridCacheEntryEx cached from cache methods.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ac92d78d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ac92d78d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ac92d78d

Branch: refs/heads/ignite-sprint-4
Commit: ac92d78d6ef7e2bc7a51b5caead6e92cd78ead0b
Parents: c7a206f
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Thu Apr 9 16:17:24 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Thu Apr 9 16:17:24 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheAdapter.java      | 50 ++++++++------------
 .../cache/GridCacheProjectionImpl.java          |  8 ++--
 .../dht/atomic/GridDhtAtomicCache.java          | 31 +++++-------
 .../distributed/near/GridNearAtomicCache.java   | 27 ++++-------
 .../local/atomic/GridLocalAtomicCache.java      |  8 ----
 5 files changed, 45 insertions(+), 79 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac92d78d/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 ff16d13..c8382d7 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
@@ -2007,7 +2007,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
     /** {@inheritDoc} */
     @Override public V put(K key, V val, @Nullable CacheEntryPredicate... filter)
         throws IgniteCheckedException {
-        return put0(key, val, null, filter);
+        return put0(key, val, filter);
     }
 
     /**
@@ -2015,14 +2015,12 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
      *
      * @param key Key.
      * @param val Value.
-     * @param cached Cached entry. If not provided, equivalent to {CacheProjection#put}.
      * @param filter Optional filter.
      * @return Previous value.
      * @throws IgniteCheckedException If failed.
      */
     @Nullable public V put0(final K key,
                             final V val,
-                            @Nullable final GridCacheEntryEx cached,
                             @Nullable final CacheEntryPredicate[] filter)
         throws IgniteCheckedException
     {
@@ -2039,7 +2037,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
 
         V prevVal = syncOp(new SyncOp<V>(true) {
             @Override public V op(IgniteTxLocalAdapter tx) throws IgniteCheckedException
{
-                return (V)tx.putAllAsync(ctx, F.t(key, val), true, cached, -1, filter).get().value();
+                return (V)tx.putAllAsync(ctx, F.t(key, val), true, null, -1, filter).get().value();
             }
 
             @Override public String toString() {
@@ -2058,12 +2056,11 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
      *
      * @param key Key.
      * @param val Value.
-     * @param cached Cached entry. If not provided, equivalent to {CacheProjection#put}.
      * @param filter Optional filter.
      * @return Previous value.
      * @throws IgniteCheckedException If failed.
      */
-    public boolean putx0(final K key, final V val, @Nullable final GridCacheEntryEx cached,
@Nullable final CacheEntryPredicate... filter) throws IgniteCheckedException {
+    public boolean putx0(final K key, final V val, @Nullable final CacheEntryPredicate...
filter) throws IgniteCheckedException {
         A.notNull(key, "key", val, "val");
 
         if (keyCheck)
@@ -2073,7 +2070,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
 
         return syncOp(new SyncOp<Boolean>(true) {
             @Override public Boolean op(IgniteTxLocalAdapter tx) throws IgniteCheckedException
{
-                return tx.putAllAsync(ctx, F.t(key, val), false, cached, -1, filter).get().success();
+                return tx.putAllAsync(ctx, F.t(key, val), false, null, -1, filter).get().success();
             }
 
             @Override public String toString() {
@@ -2089,7 +2086,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
 
         final long start = statsEnabled ? System.nanoTime() : 0L;
 
-        IgniteInternalFuture<V> fut = putAsync0(key, val, null, filter);
+        IgniteInternalFuture<V> fut = putAsync0(key, val, filter);
 
         if (statsEnabled)
             fut.listen(new UpdatePutAndGetTimeStatClosure<V>(metrics0(), start));
@@ -2102,11 +2099,10 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
      *
      * @param key Key.
      * @param val Value.
-     * @param entry Optional cached entry.
      * @param filter Optional filter.
      * @return Put operation future.
      */
-    public IgniteInternalFuture<V> putAsync0(final K key, final V val, @Nullable final
GridCacheEntryEx entry, @Nullable final CacheEntryPredicate... filter) {
+    public IgniteInternalFuture<V> putAsync0(final K key, final V val, @Nullable final
CacheEntryPredicate... filter) {
         A.notNull(key, "key", val, "val");
 
         if (keyCheck)
@@ -2116,7 +2112,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
 
         return asyncOp(new AsyncOp<V>(key) {
             @Override public IgniteInternalFuture<V> op(IgniteTxLocalAdapter tx) {
-                return tx.putAllAsync(ctx, F.t(key, val), true, entry, -1, filter)
+                return tx.putAllAsync(ctx, F.t(key, val), true, null, -1, filter)
                     .chain((IgniteClosure<IgniteInternalFuture<GridCacheReturn>,
V>)RET2VAL);
             }
 
@@ -2400,7 +2396,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
 
         final long start = statsEnabled ? System.nanoTime() : 0L;
 
-        IgniteInternalFuture<Boolean> fut = putxAsync0(key, val, null, filter);
+        IgniteInternalFuture<Boolean> fut = putxAsync0(key, val, filter);
 
         if (statsEnabled)
             fut.listen(new UpdatePutTimeStatClosure<Boolean>(metrics0(), start));
@@ -2413,12 +2409,10 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
      *
      * @param key Key.
      * @param val Value.
-     * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}.
      * @param filter Optional filter.
      * @return Putx operation future.
      */
     public IgniteInternalFuture<Boolean> putxAsync0(final K key, final V val,
-                                                    @Nullable final GridCacheEntryEx entry,
                                                     @Nullable final CacheEntryPredicate...
filter) {
         A.notNull(key, "key", val, "val");
 
@@ -2429,7 +2423,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
 
         return asyncOp(new AsyncOp<Boolean>(key) {
             @Override public IgniteInternalFuture<Boolean> op(IgniteTxLocalAdapter
tx) {
-                return tx.putAllAsync(ctx, F.t(key, val), false, entry, -1, filter).chain(
+                return tx.putAllAsync(ctx, F.t(key, val), false, null, -1, filter).chain(
                     (IgniteClosure<IgniteInternalFuture<GridCacheReturn>, Boolean>)
RET2FLAG);
             }
 
@@ -2776,19 +2770,18 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
     /** {@inheritDoc} */
     @Nullable @Override public V remove(K key, CacheEntryPredicate[] filter)
         throws IgniteCheckedException {
-        return remove0(key, null, filter);
+        return remove0(key, filter);
     }
 
     /**
      * Internal method that is called from {@link CacheEntryImpl}.
      *
      * @param key Key to remove.
-     * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}.
      * @param filter Optional filter.
      * @return Previous value.
      * @throws IgniteCheckedException If failed.
      */
-    public V remove0(final K key, @Nullable final GridCacheEntryEx entry,
+    public V remove0(final K key,
                      @Nullable final CacheEntryPredicate... filter) throws IgniteCheckedException
{
         boolean statsEnabled = ctx.config().isStatisticsEnabled();
 
@@ -2801,7 +2794,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
 
         V prevVal = syncOp(new SyncOp<V>(true) {
             @Override public V op(IgniteTxLocalAdapter tx) throws IgniteCheckedException
{
-                V ret = (V) tx.removeAllAsync(ctx, Collections.singletonList(key), entry,
true, filter).get().value();
+                V ret = (V) tx.removeAllAsync(ctx, Collections.singletonList(key), null,
true, filter).get().value();
 
                 if (ctx.config().getInterceptor() != null)
                     return (V) ctx.config().getInterceptor().onBeforeRemove(new CacheEntryImpl(key,
ret)).get2();
@@ -2826,7 +2819,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
 
         final long start = statsEnabled ? System.nanoTime() : 0L;
 
-        IgniteInternalFuture<V> fut = removeAsync0(key, null, filter);
+        IgniteInternalFuture<V> fut = removeAsync0(key, filter);
 
         if (statsEnabled)
             fut.listen(new UpdateRemoveTimeStatClosure<V>(metrics0(), start));
@@ -2838,11 +2831,10 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
      * Internal method that is called from {@link CacheEntryImpl}.
      *
      * @param key Key to remove.
-     * @param entry Optional cached entry.
      * @param filter Optional filter.
      * @return Put operation future.
      */
-    public IgniteInternalFuture<V> removeAsync0(final K key, @Nullable final GridCacheEntryEx
entry,
+    public IgniteInternalFuture<V> removeAsync0(final K key,
                                                 @Nullable final CacheEntryPredicate... filter)
{
         final boolean statsEnabled = ctx.config().isStatisticsEnabled();
 
@@ -2936,7 +2928,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
 
         long start = statsEnabled ? System.nanoTime() : 0L;
 
-        boolean rmv = removex0(key, null, filter);
+        boolean rmv = removex0(key, filter);
 
         if (statsEnabled && rmv)
             metrics0().addRemoveTimeNanos(System.nanoTime() - start);
@@ -2948,12 +2940,11 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
      * Internal method that is called from {@link CacheEntryImpl}.
      *
      * @param key Key to remove.
-     * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}.
      * @param filter Optional filter.
      * @return Previous value.
      * @throws IgniteCheckedException If failed.
      */
-     public boolean removex0(final K key, @Nullable final GridCacheEntryEx entry,
+     public boolean removex0(final K key,
                              @Nullable final CacheEntryPredicate... filter) throws IgniteCheckedException
{
         boolean statsEnabled = ctx.config().isStatisticsEnabled();
 
@@ -2966,7 +2957,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
 
         boolean rmv = syncOp(new SyncOp<Boolean>(true) {
             @Override public Boolean op(IgniteTxLocalAdapter tx) throws IgniteCheckedException
{
-                return tx.removeAllAsync(ctx, Collections.singletonList(key), entry, false,
filter).get().success();
+                return tx.removeAllAsync(ctx, Collections.singletonList(key), null, false,
filter).get().success();
             }
 
             @Override public String toString() {
@@ -2984,18 +2975,17 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
     @Override public IgniteInternalFuture<Boolean> removexAsync(K key, CacheEntryPredicate...
filter) {
         A.notNull(key, "key");
 
-        return removexAsync0(key, null, filter);
+        return removexAsync0(key, filter);
     }
 
     /**
      * Internal method that is called from {@link CacheEntryImpl}.
      *
      * @param key Key to remove.
-     * @param entry Cached entry. If not provided, equivalent to {CacheProjection#put}.
      * @param filter Optional filter.
      * @return Putx operation future.
      */
-    public IgniteInternalFuture<Boolean> removexAsync0(final K key, @Nullable final
GridCacheEntryEx entry,
+    public IgniteInternalFuture<Boolean> removexAsync0(final K key,
                                                        @Nullable final CacheEntryPredicate...
filter) {
         final boolean statsEnabled = ctx.config().isStatisticsEnabled();
 
@@ -3008,7 +2998,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
 
         IgniteInternalFuture<Boolean> fut = asyncOp(new AsyncOp<Boolean>(key)
{
             @Override public IgniteInternalFuture<Boolean> op(IgniteTxLocalAdapter
tx) {
-                return tx.removeAllAsync(ctx, Collections.singletonList(key), entry, false,
filter).chain(
+                return tx.removeAllAsync(ctx, Collections.singletonList(key), null, false,
filter).chain(
                     (IgniteClosure<IgniteInternalFuture<GridCacheReturn>, Boolean>)RET2FLAG);
             }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac92d78d/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 42d1eb7..96a78b3 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
@@ -350,7 +350,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K,
V
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<V> putAsync(K key, V val,
         @Nullable CacheEntryPredicate[] filter) {
-        return cache.putAsync0(key, val, null, filter);
+        return cache.putAsync0(key, val, filter);
     }
 
     /** {@inheritDoc} */
@@ -414,7 +414,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K,
V
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<Boolean> putxAsync(K key, V val,
         @Nullable CacheEntryPredicate[] filter) {
-        return cache.putxAsync0(key, val, null, filter);
+        return cache.putxAsync0(key, val, filter);
     }
 
     /** {@inheritDoc} */
@@ -639,7 +639,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K,
V
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<V> removeAsync(K key, CacheEntryPredicate[]
filter) {
-        return cache.removeAsync0(key, null, filter);
+        return cache.removeAsync0(key, filter);
     }
 
     /** {@inheritDoc} */
@@ -662,7 +662,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K,
V
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<Boolean> removexAsync(K key,
         @Nullable CacheEntryPredicate[] filter) {
-        return cache.removexAsync0(key, null, filter);
+        return cache.removexAsync0(key, filter);
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac92d78d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 961d830..026a4f6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -301,15 +301,13 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
     }
 
     /** {@inheritDoc} */
-    @Override public V put0(K key, V val, @Nullable GridCacheEntryEx cached,
-                            @Nullable CacheEntryPredicate[] filter) throws IgniteCheckedException
{
-        return putAsync0(key, val, cached, filter).get();
+    @Override public V put0(K key, V val, @Nullable CacheEntryPredicate[] filter) throws
IgniteCheckedException {
+        return putAsync0(key, val, filter).get();
     }
 
     /** {@inheritDoc} */
-    @Override public boolean putx0(K key, V val, @Nullable GridCacheEntryEx cached,
-                                   @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException
{
-        return putxAsync0(key, val, cached, filter).get();
+    @Override public boolean putx0(K key, V val, @Nullable CacheEntryPredicate... filter)
throws IgniteCheckedException {
+        return putxAsync0(key, val, filter).get();
     }
 
     /** {@inheritDoc} */
@@ -320,7 +318,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public IgniteInternalFuture<V> putAsync0(K key, V val, @Nullable GridCacheEntryEx
entry, @Nullable CacheEntryPredicate... filter) {
+    @Override public IgniteInternalFuture<V> putAsync0(K key, V val, @Nullable CacheEntryPredicate...
filter) {
         A.notNull(key, "key");
 
         return updateAllAsync0(F0.asMap(key, val),
@@ -336,8 +334,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public IgniteInternalFuture<Boolean> putxAsync0(K key, V val, @Nullable
GridCacheEntryEx entry,
-                                                              @Nullable CacheEntryPredicate...
filter) {
+    @Override public IgniteInternalFuture<Boolean> putxAsync0(K key, V val, @Nullable
CacheEntryPredicate... filter) {
         A.notNull(key, "key");
 
         return updateAllAsync0(F0.asMap(key, val),
@@ -500,15 +497,13 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
     }
 
     /** {@inheritDoc} */
-    @Override public V remove0(K key, @Nullable GridCacheEntryEx entry,
-                               @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException
{
-        return removeAsync0(key, entry, filter).get();
+    @Override public V remove0(K key, @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException
{
+        return removeAsync0(key, filter).get();
     }
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public IgniteInternalFuture<V> removeAsync0(K key, @Nullable GridCacheEntryEx
entry,
-                                                          @Nullable CacheEntryPredicate...
filter) {
+    @Override public IgniteInternalFuture<V> removeAsync0(K key, @Nullable CacheEntryPredicate...
filter) {
         A.notNull(key, "key");
 
         return removeAllAsync0(Collections.singletonList(key), null, true, false, filter);
@@ -529,15 +524,13 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
     }
 
     /** {@inheritDoc} */
-    @Override public boolean removex0(K key, @Nullable GridCacheEntryEx entry,
-                                      @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException
{
-        return removexAsync0(key, entry, filter).get();
+    @Override public boolean removex0(K key, @Nullable CacheEntryPredicate... filter) throws
IgniteCheckedException {
+        return removexAsync0(key, filter).get();
     }
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public IgniteInternalFuture<Boolean> removexAsync0(K key, @Nullable GridCacheEntryEx
entry,
-                                                                 @Nullable CacheEntryPredicate...
filter) {
+    @Override public IgniteInternalFuture<Boolean> removexAsync0(K key, @Nullable CacheEntryPredicate...
filter) {
         A.notNull(key, "key");
 
         return removeAllAsync0(Collections.singletonList(key), null, false, false, filter);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac92d78d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
index db1e8c0..9fbd01c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
@@ -391,18 +391,16 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K,
V> {
     @Override public V put0(
         K key,
         V val,
-        @Nullable GridCacheEntryEx cached,
         @Nullable CacheEntryPredicate[] filter
     ) throws IgniteCheckedException {
-        return dht.put0(key, val, cached, filter);
+        return dht.put0(key, val, filter);
     }
 
     /** {@inheritDoc} */
     @Override public boolean putx0(K key,
                                    V val,
-                                   @Nullable GridCacheEntryEx cached,
                                    @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException
{
-        return dht.putx0(key, val, cached, filter);
+        return dht.putx0(key, val, filter);
     }
 
     /** {@inheritDoc} */
@@ -416,18 +414,16 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K,
V> {
     @SuppressWarnings("unchecked")
     @Override public IgniteInternalFuture<V> putAsync0(K key,
                                                        V val,
-                                                       @Nullable GridCacheEntryEx entry,
                                                        @Nullable CacheEntryPredicate... filter)
{
-        return dht.putAsync0(key, val, entry, filter);
+        return dht.putAsync0(key, val, filter);
     }
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
     @Override public IgniteInternalFuture<Boolean> putxAsync0(K key,
                                                               V val,
-                                                              @Nullable GridCacheEntryEx
entry,
                                                               @Nullable CacheEntryPredicate...
filter) {
-        return dht.putxAsync0(key, val, entry, filter);
+        return dht.putxAsync0(key, val, filter);
     }
 
     /** {@inheritDoc} */
@@ -569,17 +565,15 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K,
V> {
 
     /** {@inheritDoc} */
     @Override public V remove0(K key,
-                               @Nullable GridCacheEntryEx entry,
                                @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException
{
-        return dht.remove0(key, entry, filter);
+        return dht.remove0(key, filter);
     }
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
     @Override public IgniteInternalFuture<V> removeAsync0(K key,
-                                                          @Nullable GridCacheEntryEx entry,
                                                           @Nullable CacheEntryPredicate...
filter) {
-        return dht.removeAsync0(key, entry, filter);
+        return dht.removeAsync0(key, filter);
     }
 
     /** {@inheritDoc} */
@@ -596,17 +590,14 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K,
V> {
 
     /** {@inheritDoc} */
     @Override public boolean removex0(K key,
-                                      @Nullable GridCacheEntryEx entry,
                                       @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException
{
-        return dht.removex0(key, entry, filter);
+        return dht.removex0(key, filter);
     }
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public IgniteInternalFuture<Boolean> removexAsync0(K key,
-                                                                 @Nullable GridCacheEntryEx
entry,
-                                                                 @Nullable CacheEntryPredicate...
filter) {
-        return dht.removexAsync0(key, entry, filter);
+    @Override public IgniteInternalFuture<Boolean> removexAsync0(K key, @Nullable CacheEntryPredicate...
filter) {
+        return dht.removexAsync0(key, filter);
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac92d78d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
index 8c6f777..fa7fb72 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
@@ -102,7 +102,6 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K,
V> {
     @SuppressWarnings("unchecked")
     @Override public V put0(K key,
                             V val,
-                            @Nullable GridCacheEntryEx cached,
                             @Nullable CacheEntryPredicate[] filter) throws IgniteCheckedException
{
         A.notNull(key, "key", val, "val");
 
@@ -121,7 +120,6 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K,
V> {
     @SuppressWarnings("unchecked")
     @Override public boolean putx0(K key,
                                    V val,
-                                   @Nullable GridCacheEntryEx cached,
                                    @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException
{
         A.notNull(key, "key", val, "val");
 
@@ -157,7 +155,6 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K,
V> {
     @SuppressWarnings("unchecked")
     @Override public IgniteInternalFuture<V> putAsync0(K key,
                                                        V val,
-                                                       @Nullable GridCacheEntryEx entry,
                                                        @Nullable CacheEntryPredicate... filter)
{
         A.notNull(key, "key", val, "val");
 
@@ -173,7 +170,6 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K,
V> {
     @SuppressWarnings("unchecked")
     @Override public IgniteInternalFuture<Boolean> putxAsync0(K key,
                                                               V val,
-                                                              @Nullable GridCacheEntryEx
entry,
                                                               @Nullable CacheEntryPredicate...
filter) {
         A.notNull(key, "key", val, "val");
 
@@ -320,7 +316,6 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K,
V> {
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
     @Override public V remove0(K key,
-                               @Nullable GridCacheEntryEx entry,
                                @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException
{
         return (V)updateAllInternal(DELETE,
             Collections.singleton(key),
@@ -336,7 +331,6 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K,
V> {
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
     @Override public IgniteInternalFuture<V> removeAsync0(K key,
-                                                          @Nullable GridCacheEntryEx entry,
                                                           @Nullable CacheEntryPredicate...
filter) {
         return removeAllAsync0(Collections.singletonList(key), true, false, filter);
     }
@@ -365,7 +359,6 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K,
V> {
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
     @Override public boolean removex0(K key,
-                                      @Nullable GridCacheEntryEx entry,
                                       @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException
{
         boolean statsEnabled = ctx.config().isStatisticsEnabled();
 
@@ -392,7 +385,6 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K,
V> {
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
     @Override public IgniteInternalFuture<Boolean> removexAsync0(K key,
-                                                                 @Nullable GridCacheEntryEx
entry,
                                                                  @Nullable CacheEntryPredicate...
filter) {
         A.notNull(key, "key");
 


Mime
View raw message