#ignite-683: Rename removex0 to removex in GridCacheAdapter.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a0a09f14 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a0a09f14 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a0a09f14 Branch: refs/heads/ignite-218 Commit: a0a09f14fd7d0c97ec5239a407d564b8d31010fe Parents: 2aca10e Author: ivasilinets <[email protected]> Authored: Mon Apr 13 12:37:50 2015 +0300 Committer: ivasilinets <[email protected]> Committed: Mon Apr 13 12:37:50 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheAdapter.java | 4 ++-- .../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 2 +- .../processors/cache/distributed/near/GridNearAtomicCache.java | 4 ++-- .../processors/cache/local/atomic/GridLocalAtomicCache.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a0a09f14/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 01436dc..391ca3a 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 @@ -2898,7 +2898,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, long start = statsEnabled ? System.nanoTime() : 0L; - boolean rmv = removex0(key, CU.empty0()); + boolean rmv = removex(key, CU.empty0()); if (statsEnabled && rmv) metrics0().addRemoveTimeNanos(System.nanoTime() - start); @@ -2912,7 +2912,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @return Previous value. * @throws IgniteCheckedException If failed. */ - public boolean removex0(final K key, @Nullable final CacheEntryPredicate... filter) throws IgniteCheckedException { + public boolean removex(final K key, @Nullable final CacheEntryPredicate... filter) throws IgniteCheckedException { boolean statsEnabled = ctx.config().isStatisticsEnabled(); long start = statsEnabled ? System.nanoTime() : 0L; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a0a09f14/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 c64b5ba..b60c2e5 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 @@ -507,7 +507,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public boolean removex0(K key, @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { + @Override public boolean removex(K key, @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { return removexAsync0(key, filter).get(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a0a09f14/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 1064ea1..ef49708 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 @@ -570,8 +570,8 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public boolean removex0(K key, @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { - return dht.removex0(key, filter); + @Override public boolean removex(K key, @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { + return dht.removex(key, filter); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a0a09f14/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 fdd2054..faaa292 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 @@ -330,7 +330,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public boolean removex0(K key, @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { + @Override public boolean removex(K key, @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { boolean statsEnabled = ctx.config().isStatisticsEnabled(); long start = statsEnabled ? System.nanoTime() : 0L;
