#ignite-707: rename 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/260a494d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/260a494d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/260a494d Branch: refs/heads/ignite-683-1 Commit: 260a494d0ddcc157f0a4323c08beb06249ce5ec1 Parents: fb4985e Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Apr 9 16:06:46 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Apr 9 16:06:46 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 59 ++++++++-------- .../cache/GridCacheProjectionImpl.java | 9 ++- .../dht/atomic/GridDhtAtomicCache.java | 40 +++++------ .../distributed/near/GridNearAtomicCache.java | 72 ++++++++++---------- .../local/atomic/GridLocalAtomicCache.java | 64 ++++++++--------- 5 files changed, 121 insertions(+), 123 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/260a494d/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 461b3ff..21699cc 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 @@ -461,7 +461,6 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @param isolation Transaction isolation. * @param invalidate Invalidate flag. * @param accessTtl TTL for read operation. - * @param filter Optional filter. * @return Locks future. */ public abstract IgniteInternalFuture<Boolean> txLockAsync( @@ -2008,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 put(key, val, null, -1, filter); + return put0(key, val, null, -1, filter); } /** @@ -2016,17 +2015,17 @@ 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 cached Cached entry. If not provided, equivalent to {CacheProjection#put}. * @param ttl Optional time-to-live. If negative, leaves ttl value unchanged. * @param filter Optional filter. * @return Previous value. * @throws IgniteCheckedException If failed. */ - @Nullable public V put(final K key, - final V val, - @Nullable final GridCacheEntryEx cached, - final long ttl, - @Nullable final CacheEntryPredicate[] filter) + @Nullable public V put0(final K key, + final V val, + @Nullable final GridCacheEntryEx cached, + final long ttl, + @Nullable final CacheEntryPredicate[] filter) throws IgniteCheckedException { boolean statsEnabled = ctx.config().isStatisticsEnabled(); @@ -2061,14 +2060,14 @@ 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 cached Cached entry. If not provided, equivalent to {CacheProjection#put}. * @param ttl Optional time-to-live. If negative, leaves ttl value unchanged. * @param filter Optional filter. * @return Previous value. * @throws IgniteCheckedException If failed. */ - public boolean putx(final K key, final V val, @Nullable final GridCacheEntryEx cached, - final long ttl, @Nullable final CacheEntryPredicate... filter) throws IgniteCheckedException { + public boolean putx0(final K key, final V val, @Nullable final GridCacheEntryEx cached, + final long ttl, @Nullable final CacheEntryPredicate... filter) throws IgniteCheckedException { A.notNull(key, "key", val, "val"); if (keyCheck) @@ -2094,7 +2093,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, final long start = statsEnabled ? System.nanoTime() : 0L; - IgniteInternalFuture<V> fut = putAsync(key, val, null, -1, filter); + IgniteInternalFuture<V> fut = putAsync0(key, val, null, -1, filter); if (statsEnabled) fut.listen(new UpdatePutAndGetTimeStatClosure<V>(metrics0(), start)); @@ -2112,8 +2111,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @param filter Optional filter. * @return Put operation future. */ - public IgniteInternalFuture<V> putAsync(final K key, final V val, @Nullable final GridCacheEntryEx entry, - final long ttl, @Nullable final CacheEntryPredicate... filter) { + public IgniteInternalFuture<V> putAsync0(final K key, final V val, @Nullable final GridCacheEntryEx entry, + final long ttl, @Nullable final CacheEntryPredicate... filter) { A.notNull(key, "key", val, "val"); if (keyCheck) @@ -2407,7 +2406,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, final long start = statsEnabled ? System.nanoTime() : 0L; - IgniteInternalFuture<Boolean> fut = putxAsync(key, val, null, -1, filter); + IgniteInternalFuture<Boolean> fut = putxAsync0(key, val, null, -1, filter); if (statsEnabled) fut.listen(new UpdatePutTimeStatClosure<Boolean>(metrics0(), start)); @@ -2425,9 +2424,9 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @param filter Optional filter. * @return Putx operation future. */ - public IgniteInternalFuture<Boolean> putxAsync(final K key, final V val, - @Nullable final GridCacheEntryEx entry, final long ttl, - @Nullable final CacheEntryPredicate... filter) { + public IgniteInternalFuture<Boolean> putxAsync0(final K key, final V val, + @Nullable final GridCacheEntryEx entry, final long ttl, + @Nullable final CacheEntryPredicate... filter) { A.notNull(key, "key", val, "val"); if (keyCheck) @@ -2784,7 +2783,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Nullable @Override public V remove(K key, CacheEntryPredicate[] filter) throws IgniteCheckedException { - return remove(key, null, filter); + return remove0(key, null, filter); } /** @@ -2796,8 +2795,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @return Previous value. * @throws IgniteCheckedException If failed. */ - public V remove(final K key, @Nullable final GridCacheEntryEx entry, - @Nullable final CacheEntryPredicate... filter) throws IgniteCheckedException { + public V remove0(final K key, @Nullable final GridCacheEntryEx entry, + @Nullable final CacheEntryPredicate... filter) throws IgniteCheckedException { boolean statsEnabled = ctx.config().isStatisticsEnabled(); long start = statsEnabled ? System.nanoTime() : 0L; @@ -2834,7 +2833,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, final long start = statsEnabled ? System.nanoTime() : 0L; - IgniteInternalFuture<V> fut = removeAsync(key, null, filter); + IgniteInternalFuture<V> fut = removeAsync0(key, null, filter); if (statsEnabled) fut.listen(new UpdateRemoveTimeStatClosure<V>(metrics0(), start)); @@ -2850,8 +2849,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @param filter Optional filter. * @return Put operation future. */ - public IgniteInternalFuture<V> removeAsync(final K key, @Nullable final GridCacheEntryEx entry, - @Nullable final CacheEntryPredicate... filter) { + public IgniteInternalFuture<V> removeAsync0(final K key, @Nullable final GridCacheEntryEx entry, + @Nullable final CacheEntryPredicate... filter) { final boolean statsEnabled = ctx.config().isStatisticsEnabled(); final long start = statsEnabled ? System.nanoTime() : 0L; @@ -2944,7 +2943,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, long start = statsEnabled ? System.nanoTime() : 0L; - boolean rmv = removex(key, null, filter); + boolean rmv = removex0(key, null, filter); if (statsEnabled && rmv) metrics0().addRemoveTimeNanos(System.nanoTime() - start); @@ -2961,8 +2960,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @return Previous value. * @throws IgniteCheckedException If failed. */ - public boolean removex(final K key, @Nullable final GridCacheEntryEx entry, - @Nullable final CacheEntryPredicate... filter) throws IgniteCheckedException { + public boolean removex0(final K key, @Nullable final GridCacheEntryEx entry, + @Nullable final CacheEntryPredicate... filter) throws IgniteCheckedException { boolean statsEnabled = ctx.config().isStatisticsEnabled(); long start = statsEnabled ? System.nanoTime() : 0L; @@ -2992,7 +2991,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, @Override public IgniteInternalFuture<Boolean> removexAsync(K key, CacheEntryPredicate... filter) { A.notNull(key, "key"); - return removexAsync(key, null, filter); + return removexAsync0(key, null, filter); } /** @@ -3003,8 +3002,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @param filter Optional filter. * @return Putx operation future. */ - public IgniteInternalFuture<Boolean> removexAsync(final K key, @Nullable final GridCacheEntryEx entry, - @Nullable final CacheEntryPredicate... filter) { + public IgniteInternalFuture<Boolean> removexAsync0(final K key, @Nullable final GridCacheEntryEx entry, + @Nullable final CacheEntryPredicate... filter) { final boolean statsEnabled = ctx.config().isStatisticsEnabled(); final long start = statsEnabled ? System.nanoTime() : 0L; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/260a494d/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 b8dd5f1..d425266 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 @@ -26,7 +26,6 @@ import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.processors.cache.transactions.*; import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; @@ -351,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.putAsync(key, val, null, -1, filter); + return cache.putAsync0(key, val, null, -1, filter); } /** {@inheritDoc} */ @@ -415,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.putxAsync(key, val, null, -1, filter); + return cache.putxAsync0(key, val, null, -1, filter); } /** {@inheritDoc} */ @@ -640,7 +639,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> removeAsync(K key, CacheEntryPredicate[] filter) { - return cache.removeAsync(key, null, filter); + return cache.removeAsync0(key, null, filter); } /** {@inheritDoc} */ @@ -663,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.removexAsync(key, null, filter); + return cache.removexAsync0(key, null, filter); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/260a494d/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 f23b0ae..e5ec89a 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,15 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public V put(K key, V val, @Nullable GridCacheEntryEx cached, long ttl, - @Nullable CacheEntryPredicate[] filter) throws IgniteCheckedException { - return putAsync(key, val, cached, ttl, filter).get(); + @Override public V put0(K key, V val, @Nullable GridCacheEntryEx cached, long ttl, + @Nullable CacheEntryPredicate[] filter) throws IgniteCheckedException { + return putAsync0(key, val, cached, ttl, filter).get(); } /** {@inheritDoc} */ - @Override public boolean putx(K key, V val, @Nullable GridCacheEntryEx cached, - long ttl, @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - return putxAsync(key, val, cached, ttl, filter).get(); + @Override public boolean putx0(K key, V val, @Nullable GridCacheEntryEx cached, + long ttl, @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { + return putxAsync0(key, val, cached, ttl, filter).get(); } /** {@inheritDoc} */ @@ -320,8 +320,8 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public IgniteInternalFuture<V> putAsync(K key, V val, @Nullable GridCacheEntryEx entry, - long ttl, @Nullable CacheEntryPredicate... filter) { + @Override public IgniteInternalFuture<V> putAsync0(K key, V val, @Nullable GridCacheEntryEx entry, + long ttl, @Nullable CacheEntryPredicate... filter) { A.notNull(key, "key"); return updateAllAsync0(F0.asMap(key, val), @@ -337,8 +337,8 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public IgniteInternalFuture<Boolean> putxAsync(K key, V val, @Nullable GridCacheEntryEx entry, long ttl, - @Nullable CacheEntryPredicate... filter) { + @Override public IgniteInternalFuture<Boolean> putxAsync0(K key, V val, @Nullable GridCacheEntryEx entry, long ttl, + @Nullable CacheEntryPredicate... filter) { A.notNull(key, "key"); return updateAllAsync0(F0.asMap(key, val), @@ -501,15 +501,15 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public V remove(K key, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - return removeAsync(key, entry, filter).get(); + @Override public V remove0(K key, @Nullable GridCacheEntryEx entry, + @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { + return removeAsync0(key, entry, filter).get(); } /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public IgniteInternalFuture<V> removeAsync(K key, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) { + @Override public IgniteInternalFuture<V> removeAsync0(K key, @Nullable GridCacheEntryEx entry, + @Nullable CacheEntryPredicate... filter) { A.notNull(key, "key"); return removeAllAsync0(Collections.singletonList(key), null, true, false, filter); @@ -530,15 +530,15 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public boolean removex(K key, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - return removexAsync(key, entry, filter).get(); + @Override public boolean removex0(K key, @Nullable GridCacheEntryEx entry, + @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { + return removexAsync0(key, entry, filter).get(); } /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public IgniteInternalFuture<Boolean> removexAsync(K key, @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) { + @Override public IgniteInternalFuture<Boolean> removexAsync0(K key, @Nullable GridCacheEntryEx entry, + @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/260a494d/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 264cad9..cbea18c 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 @@ -388,23 +388,23 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public V put( + @Override public V put0( K key, V val, @Nullable GridCacheEntryEx cached, long ttl, @Nullable CacheEntryPredicate[] filter ) throws IgniteCheckedException { - return dht.put(key, val, cached, ttl, filter); + return dht.put0(key, val, cached, ttl, filter); } /** {@inheritDoc} */ - @Override public boolean putx(K key, - V val, - @Nullable GridCacheEntryEx cached, - long ttl, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - return dht.putx(key, val, cached, ttl, filter); + @Override public boolean putx0(K key, + V val, + @Nullable GridCacheEntryEx cached, + long ttl, + @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { + return dht.putx0(key, val, cached, ttl, filter); } /** {@inheritDoc} */ @@ -416,22 +416,22 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public IgniteInternalFuture<V> putAsync(K key, - V val, - @Nullable GridCacheEntryEx entry, - long ttl, - @Nullable CacheEntryPredicate... filter) { - return dht.putAsync(key, val, entry, ttl, filter); + @Override public IgniteInternalFuture<V> putAsync0(K key, + V val, + @Nullable GridCacheEntryEx entry, + long ttl, + @Nullable CacheEntryPredicate... filter) { + return dht.putAsync0(key, val, entry, ttl, filter); } /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public IgniteInternalFuture<Boolean> putxAsync(K key, - V val, - @Nullable GridCacheEntryEx entry, - long ttl, - @Nullable CacheEntryPredicate... filter) { - return dht.putxAsync(key, val, entry, ttl, filter); + @Override public IgniteInternalFuture<Boolean> putxAsync0(K key, + V val, + @Nullable GridCacheEntryEx entry, + long ttl, + @Nullable CacheEntryPredicate... filter) { + return dht.putxAsync0(key, val, entry, ttl, filter); } /** {@inheritDoc} */ @@ -572,18 +572,18 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public V remove(K key, - @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - return dht.remove(key, entry, filter); + @Override public V remove0(K key, + @Nullable GridCacheEntryEx entry, + @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { + return dht.remove0(key, entry, filter); } /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public IgniteInternalFuture<V> removeAsync(K key, - @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) { - return dht.removeAsync(key, entry, filter); + @Override public IgniteInternalFuture<V> removeAsync0(K key, + @Nullable GridCacheEntryEx entry, + @Nullable CacheEntryPredicate... filter) { + return dht.removeAsync0(key, entry, filter); } /** {@inheritDoc} */ @@ -599,18 +599,18 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public boolean removex(K key, - @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - return dht.removex(key, entry, filter); + @Override public boolean removex0(K key, + @Nullable GridCacheEntryEx entry, + @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { + return dht.removex0(key, entry, filter); } /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public IgniteInternalFuture<Boolean> removexAsync(K key, - @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) { - return dht.removexAsync(key, entry, filter); + @Override public IgniteInternalFuture<Boolean> removexAsync0(K key, + @Nullable GridCacheEntryEx entry, + @Nullable CacheEntryPredicate... filter) { + return dht.removexAsync0(key, entry, filter); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/260a494d/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 6e17f38..ad78819 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 @@ -100,11 +100,11 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public V put(K key, - V val, - @Nullable GridCacheEntryEx cached, - long ttl, - @Nullable CacheEntryPredicate[] filter) throws IgniteCheckedException { + @Override public V put0(K key, + V val, + @Nullable GridCacheEntryEx cached, + long ttl, + @Nullable CacheEntryPredicate[] filter) throws IgniteCheckedException { A.notNull(key, "key", val, "val"); return (V)updateAllInternal(UPDATE, @@ -120,11 +120,11 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public boolean putx(K key, - V val, - @Nullable GridCacheEntryEx cached, - long ttl, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { + @Override public boolean putx0(K key, + V val, + @Nullable GridCacheEntryEx cached, + long ttl, + @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { A.notNull(key, "key", val, "val"); return (Boolean)updateAllInternal(UPDATE, @@ -157,11 +157,11 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public IgniteInternalFuture<V> putAsync(K key, - V val, - @Nullable GridCacheEntryEx entry, - long ttl, - @Nullable CacheEntryPredicate... filter) { + @Override public IgniteInternalFuture<V> putAsync0(K key, + V val, + @Nullable GridCacheEntryEx entry, + long ttl, + @Nullable CacheEntryPredicate... filter) { A.notNull(key, "key", val, "val"); return updateAllAsync0(F0.asMap(key, val), @@ -174,11 +174,11 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public IgniteInternalFuture<Boolean> putxAsync(K key, - V val, - @Nullable GridCacheEntryEx entry, - long ttl, - @Nullable CacheEntryPredicate... filter) { + @Override public IgniteInternalFuture<Boolean> putxAsync0(K key, + V val, + @Nullable GridCacheEntryEx entry, + long ttl, + @Nullable CacheEntryPredicate... filter) { A.notNull(key, "key", val, "val"); return updateAllAsync0(F0.asMap(key, val), @@ -323,9 +323,9 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public V remove(K key, - @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { + @Override public V remove0(K key, + @Nullable GridCacheEntryEx entry, + @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { return (V)updateAllInternal(DELETE, Collections.singleton(key), null, @@ -339,9 +339,9 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public IgniteInternalFuture<V> removeAsync(K key, - @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) { + @Override public IgniteInternalFuture<V> removeAsync0(K key, + @Nullable GridCacheEntryEx entry, + @Nullable CacheEntryPredicate... filter) { return removeAllAsync0(Collections.singletonList(key), true, false, filter); } @@ -368,9 +368,9 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public boolean removex(K key, - @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { + @Override public boolean removex0(K key, + @Nullable GridCacheEntryEx entry, + @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { boolean statsEnabled = ctx.config().isStatisticsEnabled(); long start = statsEnabled ? System.nanoTime() : 0L; @@ -395,9 +395,9 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public IgniteInternalFuture<Boolean> removexAsync(K key, - @Nullable GridCacheEntryEx entry, - @Nullable CacheEntryPredicate... filter) { + @Override public IgniteInternalFuture<Boolean> removexAsync0(K key, + @Nullable GridCacheEntryEx entry, + @Nullable CacheEntryPredicate... filter) { A.notNull(key, "key"); return removeAllAsync0(Collections.singletonList(key), false, false, filter);
