ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [35/50] [abbrv] incubator-ignite git commit: #ignite-683: Rename remove methods in GridCacheAdapter.
Date Tue, 14 Apr 2015 14:25:51 GMT
#ignite-683: Rename remove methods 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/bd317ee3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bd317ee3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bd317ee3

Branch: refs/heads/ignite-218
Commit: bd317ee3903c058117fa2ea36b545cf232d2a762
Parents: c1418f8
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Mon Apr 13 14:45:09 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Mon Apr 13 14:45:09 2015 +0300

----------------------------------------------------------------------
 .../internal/processors/cache/CacheProjection.java  |  8 ++++----
 .../internal/processors/cache/GridCacheAdapter.java | 14 +++++++-------
 .../processors/cache/GridCacheConcurrentMap.java    |  2 +-
 .../processors/cache/GridCacheProjectionImpl.java   | 16 ++++++++--------
 .../processors/cache/GridCacheProxyImpl.java        | 16 ++++++++--------
 .../processors/cache/GridCacheSwapManager.java      |  4 ++--
 .../internal/processors/cache/IgniteCacheProxy.java |  8 ++++----
 .../distributed/dht/atomic/GridDhtAtomicCache.java  | 14 +++++++-------
 .../cache/distributed/near/GridNearAtomicCache.java | 16 ++++++++--------
 .../distributed/near/GridNearCacheAdapter.java      |  2 +-
 .../cache/local/atomic/GridLocalAtomicCache.java    | 10 +++++-----
 .../datastructures/DataStructuresProcessor.java     |  6 +++---
 .../datastructures/GridAtomicCacheQueueImpl.java    |  8 ++++----
 .../processors/datastructures/GridCacheSetImpl.java |  2 +-
 .../GridTransactionalCacheQueueImpl.java            |  4 ++--
 .../internal/processors/igfs/IgfsMetaManager.java   | 10 +++++-----
 .../handlers/cache/GridCacheCommandHandler.java     |  4 ++--
 .../processors/service/GridServiceProcessor.java    |  6 +++---
 .../apache/ignite/startup/BasicWarmupClosure.java   |  6 +++---
 .../GridCacheSwapScanQueryAbstractSelfTest.java     |  6 +++---
 .../query/h2/GridH2IndexingGeoSelfTest.java         |  2 +-
 .../hibernate/HibernateReadWriteAccessStrategy.java |  2 +-
 .../HibernateTransactionalAccessStrategy.java       |  2 +-
 .../cache/GridCacheAbstractFieldsQuerySelfTest.java |  2 +-
 24 files changed, 85 insertions(+), 85 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd317ee3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
index 13b87c3..bb8d27c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
@@ -1025,7 +1025,7 @@ public interface CacheProjection<K, V> extends Iterable<Cache.Entry<K,
V>> {
      * @throws NullPointerException If key is {@code null}.
      * @throws IgniteCheckedException If remove operation failed.
      */
-    @Nullable public V remove(K key)
+    @Nullable public V getAndRemove(K key)
         throws IgniteCheckedException;
 
     /**
@@ -1050,7 +1050,7 @@ public interface CacheProjection<K, V> extends Iterable<Cache.Entry<K,
V>> {
      * @return Future for the remove operation.
      * @throws NullPointerException if the key is {@code null}.
      */
-    public IgniteInternalFuture<V> removeAsync(K key);
+    public IgniteInternalFuture<V> getAndRemoveAsync(K key);
 
     /**
      * Removes given key mapping from cache.
@@ -1070,7 +1070,7 @@ public interface CacheProjection<K, V> extends Iterable<Cache.Entry<K,
V>> {
      * @throws NullPointerException if the key is {@code null}.
      * @throws IgniteCheckedException If remove failed.
      */
-    public boolean removex(K key) throws IgniteCheckedException;
+    public boolean remove(K key) throws IgniteCheckedException;
 
     /**
      * Asynchronously removes given key mapping from cache.
@@ -1090,7 +1090,7 @@ public interface CacheProjection<K, V> extends Iterable<Cache.Entry<K,
V>> {
      *      Note that if filter is not specified, this method will return {@code true}.
      * @throws NullPointerException if the key is {@code null}.
      */
-    public IgniteInternalFuture<Boolean> removexAsync(K key);
+    public IgniteInternalFuture<Boolean> removeAsync(K key);
 
     /**
      * Removes given key mapping from cache if one exists and value is equal to the passed
in value.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd317ee3/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 0dafb8a..e30a233 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
@@ -2697,7 +2697,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public V remove(final K key) throws IgniteCheckedException {
+    @Nullable @Override public V getAndRemove(final K key) throws IgniteCheckedException
{
         boolean statsEnabled = ctx.config().isStatisticsEnabled();
 
         long start = statsEnabled ? System.nanoTime() : 0L;
@@ -2729,7 +2729,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteInternalFuture<V> removeAsync(final K key) {
+    @Override public IgniteInternalFuture<V> getAndRemoveAsync(final K key) {
         final boolean statsEnabled = ctx.config().isStatisticsEnabled();
 
         final long start = statsEnabled ? System.nanoTime() : 0L;
@@ -2814,7 +2814,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
     }
 
     /** {@inheritDoc} */
-    @Override public boolean removex(final K key) throws IgniteCheckedException {
+    @Override public boolean remove(final K key) throws IgniteCheckedException {
         boolean statsEnabled = ctx.config().isStatisticsEnabled();
 
         long start = statsEnabled ? System.nanoTime() : 0L;
@@ -2841,10 +2841,10 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteInternalFuture<Boolean> removexAsync(K key) {
+    @Override public IgniteInternalFuture<Boolean> removeAsync(K key) {
         A.notNull(key, "key");
 
-        return removexAsync(key, CU.empty0());
+        return removeAsync(key, CU.empty0());
     }
 
     /**
@@ -2852,7 +2852,7 @@ 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
CacheEntryPredicate... filter) {
+    public IgniteInternalFuture<Boolean> removeAsync(final K key, @Nullable final CacheEntryPredicate...
filter) {
         final boolean statsEnabled = ctx.config().isStatisticsEnabled();
 
         final long start = statsEnabled ? System.nanoTime() : 0L;
@@ -3770,7 +3770,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K,
V>,
                 GridCacheProjectionImpl<K, V>  prev = ctx.gate().enter(prj);
 
                 try {
-                    removex(item.getKey());
+                    GridCacheAdapter.this.remove(item.getKey());
                 }
                 catch (IgniteCheckedException e) {
                     throw CU.convertToCacheException(e);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd317ee3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
index 5e9c2da..7d5260c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
@@ -1736,7 +1736,7 @@ public class GridCacheConcurrentMap {
             curVal = null;
 
             try {
-                ((IgniteKernal)ctx.grid()).getCache(ctx.name()).remove(e.key());
+                ((IgniteKernal)ctx.grid()).getCache(ctx.name()).getAndRemove(e.key());
             }
             catch (IgniteCheckedException ex) {
                 throw new IgniteException(ex);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd317ee3/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 968c89e..8319177 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
@@ -555,18 +555,18 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K,
V
     }
 
     /** {@inheritDoc} */
-    @Override public V remove(K key) throws IgniteCheckedException {
-        return removeAsync(key).get();
+    @Override public V getAndRemove(K key) throws IgniteCheckedException {
+        return getAndRemoveAsync(key).get();
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteInternalFuture<V> removeAsync(K key) {
-        return cache.removeAsync(key);
+    @Override public IgniteInternalFuture<V> getAndRemoveAsync(K key) {
+        return cache.getAndRemoveAsync(key);
     }
 
     /** {@inheritDoc} */
-    @Override public boolean removex(K key) throws IgniteCheckedException {
-        return removexAsync(key).get();
+    @Override public boolean remove(K key) throws IgniteCheckedException {
+        return removeAsync(key).get();
     }
 
     /** {@inheritDoc} */
@@ -581,8 +581,8 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K,
V
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteInternalFuture<Boolean> removexAsync(K key) {
-        return cache.removexAsync(key);
+    @Override public IgniteInternalFuture<Boolean> removeAsync(K key) {
+        return cache.removeAsync(key);
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd317ee3/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 b575940..b5fab4b 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
@@ -1083,12 +1083,12 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K,
V>, Externali
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public V remove(K key)
+    @Nullable @Override public V getAndRemove(K key)
         throws IgniteCheckedException {
         GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
 
         try {
-            return delegate.remove(key);
+            return delegate.getAndRemove(key);
         }
         finally {
             gate.leave(prev);
@@ -1096,11 +1096,11 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K,
V>, Externali
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteInternalFuture<V> removeAsync(K key) {
+    @Override public IgniteInternalFuture<V> getAndRemoveAsync(K key) {
         GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
 
         try {
-            return delegate.removeAsync(key);
+            return delegate.getAndRemoveAsync(key);
         }
         finally {
             gate.leave(prev);
@@ -1108,12 +1108,12 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K,
V>, Externali
     }
 
     /** {@inheritDoc} */
-    @Override public boolean removex(K key)
+    @Override public boolean remove(K key)
         throws IgniteCheckedException {
         GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
 
         try {
-            return delegate.removex(key);
+            return delegate.remove(key);
         }
         finally {
             gate.leave(prev);
@@ -1148,11 +1148,11 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K,
V>, Externali
     }
 
     /** {@inheritDoc} */
-    @Override public IgniteInternalFuture<Boolean> removexAsync(K key) {
+    @Override public IgniteInternalFuture<Boolean> removeAsync(K key) {
         GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
 
         try {
-            return delegate.removexAsync(key);
+            return delegate.removeAsync(key);
         }
         finally {
             gate.leave(prev);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd317ee3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
index f3f1e48..fb6b103 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
@@ -1452,9 +1452,9 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter {
 
                 try {
                     if (cctx.isDht())
-                        cctx.dht().near().removex(cur.getKey());
+                        cctx.dht().near().remove(cur.getKey());
                     else
-                        cctx.cache().removex(cur.getKey());
+                        cctx.cache().remove(cur.getKey());
                 }
                 finally {
                     cur = null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd317ee3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index b788b9d..359b47b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -862,12 +862,12 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K,
V
 
             try {
                 if (isAsync()) {
-                    setFuture(delegate.removexAsync(key));
+                    setFuture(delegate.removeAsync(key));
 
                     return false;
                 }
                 else
-                    return delegate.removex(key);
+                    return delegate.remove(key);
             }
             finally {
                 gate.leave(prev);
@@ -908,12 +908,12 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K,
V
 
             try {
                 if (isAsync()) {
-                    setFuture(delegate.removeAsync(key));
+                    setFuture(delegate.getAndRemoveAsync(key));
 
                     return null;
                 }
                 else
-                    return delegate.remove(key);
+                    return delegate.getAndRemove(key);
             }
             finally {
                 gate.leave(prev);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd317ee3/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 0feb0b4..d53543c 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
@@ -478,13 +478,13 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
     }
 
     /** {@inheritDoc} */
-    @Override public V remove(K key) throws IgniteCheckedException {
-        return removeAsync(key).get();
+    @Override public V getAndRemove(K key) throws IgniteCheckedException {
+        return getAndRemoveAsync(key).get();
     }
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public IgniteInternalFuture<V> removeAsync(K key) {
+    @Override public IgniteInternalFuture<V> getAndRemoveAsync(K key) {
         A.notNull(key, "key");
 
         return removeAllAsync0(Collections.singletonList(key), null, true, false, CU.empty0());
@@ -503,13 +503,13 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
     }
 
     /** {@inheritDoc} */
-    @Override public boolean removex(K key) throws IgniteCheckedException {
-        return removexAsync(key, CU.empty0()).get();
+    @Override public boolean remove(K key) throws IgniteCheckedException {
+        return removeAsync(key, CU.empty0()).get();
     }
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public IgniteInternalFuture<Boolean> removexAsync(K key, @Nullable CacheEntryPredicate...
filter) {
+    @Override public IgniteInternalFuture<Boolean> removeAsync(K key, @Nullable CacheEntryPredicate...
filter) {
         A.notNull(key, "key");
 
         return removeAllAsync0(Collections.singletonList(key), null, false, false, filter);
@@ -524,7 +524,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
     @Override public IgniteInternalFuture<Boolean> removeAsync(K key, V val) {
         A.notNull(key, "key", val, "val");
 
-        return removexAsync(key, ctx.equalsValArray(val));
+        return removeAsync(key, ctx.equalsValArray(val));
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd317ee3/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 93976f3..3f643e7 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
@@ -546,14 +546,14 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K,
V> {
     }
 
     /** {@inheritDoc} */
-    @Override public V remove(K key) throws IgniteCheckedException {
-        return dht.remove(key);
+    @Override public V getAndRemove(K key) throws IgniteCheckedException {
+        return dht.getAndRemove(key);
     }
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public IgniteInternalFuture<V> removeAsync(K key) {
-        return dht.removeAsync(key);
+    @Override public IgniteInternalFuture<V> getAndRemoveAsync(K key) {
+        return dht.getAndRemoveAsync(key);
     }
 
     /** {@inheritDoc} */
@@ -568,14 +568,14 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K,
V> {
     }
 
     /** {@inheritDoc} */
-    @Override public boolean removex(K key) throws IgniteCheckedException {
-        return dht.removex(key);
+    @Override public boolean remove(K key) throws IgniteCheckedException {
+        return dht.remove(key);
     }
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public IgniteInternalFuture<Boolean> removexAsync(K key, @Nullable CacheEntryPredicate...
filter) {
-        return dht.removexAsync(key, filter);
+    @Override public IgniteInternalFuture<Boolean> removeAsync(K key, @Nullable CacheEntryPredicate...
filter) {
+        return dht.removeAsync(key, filter);
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd317ee3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
index f153bd6..f8923e8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
@@ -610,7 +610,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda
             currIter.remove();
 
             try {
-                GridNearCacheAdapter.this.remove(currEntry.getKey());
+                GridNearCacheAdapter.this.getAndRemove(currEntry.getKey());
             }
             catch (IgniteCheckedException e) {
                 throw new IgniteException(e);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd317ee3/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 15de79a..4539a0f 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
@@ -287,7 +287,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K,
V> {
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public V remove(K key) throws IgniteCheckedException {
+    @Override public V getAndRemove(K key) throws IgniteCheckedException {
         return (V)updateAllInternal(DELETE,
             Collections.singleton(key),
             null,
@@ -301,7 +301,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K,
V> {
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public IgniteInternalFuture<V> removeAsync(K key) {
+    @Override public IgniteInternalFuture<V> getAndRemoveAsync(K key) {
         return removeAllAsync0(Collections.singletonList(key), true, false, CU.empty0());
     }
 
@@ -326,7 +326,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K,
V> {
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public boolean removex(K key) throws IgniteCheckedException {
+    @Override public boolean remove(K key) throws IgniteCheckedException {
         boolean statsEnabled = ctx.config().isStatisticsEnabled();
 
         long start = statsEnabled ? System.nanoTime() : 0L;
@@ -351,7 +351,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K,
V> {
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public IgniteInternalFuture<Boolean> removexAsync(K key, @Nullable CacheEntryPredicate...
filter) {
+    @Override public IgniteInternalFuture<Boolean> removeAsync(K key, @Nullable CacheEntryPredicate...
filter) {
         A.notNull(key, "key");
 
         return removeAllAsync0(Collections.singletonList(key), false, false, filter);
@@ -374,7 +374,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K,
V> {
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<Boolean> removeAsync(K key, V val) {
-        return removexAsync(key, ctx.equalsValArray(val));
+        return removeAsync(key, ctx.equalsValArray(val));
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd317ee3/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
index 5a9693c..7ddbf73 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
@@ -978,7 +978,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter
{
                                     "with non-zero count: " + val.get());
                         }
 
-                        dsView.removex(key);
+                        dsView.remove(key);
 
                         tx.commit();
                     } else
@@ -1013,7 +1013,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter
{
                         R val = cast(dsView.get(key), cls);
 
                         if (val != null) {
-                            dsView.removex(key);
+                            dsView.remove(key);
 
                             tx.commit();
                         }
@@ -1162,7 +1162,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter
{
     @Nullable private <T> T retryRemove(final GridCache cache, final Object key) throws
IgniteCheckedException {
         return retry(log, new Callable<T>() {
             @Nullable @Override public T call() throws Exception {
-                return (T)cache.remove(key);
+                return (T)cache.getAndRemove(key);
             }
         });
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd317ee3/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridAtomicCacheQueueImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridAtomicCacheQueueImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridAtomicCacheQueueImpl.java
index a2c8f8d..1437590 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridAtomicCacheQueueImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridAtomicCacheQueueImpl.java
@@ -100,7 +100,7 @@ public class GridAtomicCacheQueueImpl<T> extends GridCacheQueueAdapter<T>
{
 
                 while (true) {
                     try {
-                        T data = (T)cache.remove(key);
+                        T data = (T)cache.getAndRemove(key);
 
                         if (data != null)
                             return data;
@@ -109,7 +109,7 @@ public class GridAtomicCacheQueueImpl<T> extends GridCacheQueueAdapter<T>
{
                             stop = U.currentTimeMillis() + RETRY_TIMEOUT;
 
                         while (U.currentTimeMillis() < stop ) {
-                            data = (T)cache.remove(key);
+                            data = (T)cache.getAndRemove(key);
 
                             if (data != null)
                                 return data;
@@ -199,14 +199,14 @@ public class GridAtomicCacheQueueImpl<T> extends GridCacheQueueAdapter<T>
{
 
             while (true) {
                 try {
-                    if (cache.removex(key))
+                    if (cache.remove(key))
                         return;
 
                     if (stop == 0)
                         stop = U.currentTimeMillis() + RETRY_TIMEOUT;
 
                     while (U.currentTimeMillis() < stop ) {
-                        if (cache.removex(key))
+                        if (cache.remove(key))
                             return;
                     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd317ee3/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
index 550fa0f..b456586 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java
@@ -178,7 +178,7 @@ public class GridCacheSetImpl<T> extends AbstractCollection<T>
implements Ignite
 
         return retry(new Callable<Boolean>() {
             @Override public Boolean call() throws Exception {
-                return cache.removex(key);
+                return cache.remove(key);
             }
         });
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd317ee3/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
index f2eaa9c..1990016 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridTransactionalCacheQueueImpl.java
@@ -108,7 +108,7 @@ public class GridTransactionalCacheQueueImpl<T> extends GridCacheQueueAdapter<T>
                     if (idx != null) {
                         checkRemoved(idx);
 
-                        retVal = (T)cache.remove(itemKey(idx));
+                        retVal = (T)cache.getAndRemove(itemKey(idx));
 
                         assert retVal != null : idx;
                     }
@@ -210,7 +210,7 @@ public class GridTransactionalCacheQueueImpl<T> extends GridCacheQueueAdapter<T>
                     if (idx != null) {
                         checkRemoved(idx);
 
-                        boolean rmv = cache.removex(itemKey(idx));
+                        boolean rmv = cache.remove(itemKey(idx));
 
                         assert rmv : idx;
                     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd317ee3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
index 3858eea..4c5c248 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
@@ -1174,7 +1174,7 @@ public class IgfsMetaManager extends IgfsManager {
                             if (entryInfo != null) {
                                 // Delete only files or empty folders.
                                 if (entryInfo.isFile() || entryInfo.isDirectory() &&
entryInfo.listing().isEmpty()) {
-                                    id2InfoPrj.remove(entryId);
+                                    id2InfoPrj.getAndRemove(entryId);
 
                                     newListing.remove(entry.getKey());
 
@@ -1242,7 +1242,7 @@ public class IgfsMetaManager extends IgfsManager {
                         if (listingEntry != null)
                             id2InfoPrj.invoke(parentId, new UpdateListing(name, listingEntry,
true));
 
-                        id2InfoPrj.remove(id);
+                        id2InfoPrj.getAndRemove(id);
 
                         res = true;
                     }
@@ -1533,7 +1533,7 @@ public class IgfsMetaManager extends IgfsManager {
                 IgniteInternalTx tx = metaCache.txStartEx(PESSIMISTIC, REPEATABLE_READ);
 
                 try {
-                    Object prev = val != null ? metaCache.put(sampling, val) : metaCache.remove(sampling);
+                    Object prev = val != null ? metaCache.put(sampling, val) : metaCache.getAndRemove(sampling);
 
                     tx.commit();
 
@@ -1675,7 +1675,7 @@ public class IgfsMetaManager extends IgfsManager {
                             if (oldId != null) {
                                 IgfsFileInfo oldInfo = info(oldId);
 
-                                id2InfoPrj.removex(oldId); // Remove the old one.
+                                id2InfoPrj.remove(oldId); // Remove the old one.
                                 id2InfoPrj.putx(newInfo.id(), newInfo); // Put the new one.
 
                                 id2InfoPrj.invoke(parentInfo.id(),
@@ -2570,7 +2570,7 @@ public class IgfsMetaManager extends IgfsManager {
         V oldVal = cache.get(key);
         V newVal = c.apply(oldVal);
 
-        return newVal == null ? cache.removex(key) : cache.putx(key, newVal);
+        return newVal == null ? cache.remove(key) : cache.putx(key, newVal);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd317ee3/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
index 6d91423..646c3dc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
@@ -781,7 +781,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter
{
 
         /** {@inheritDoc} */
         @Override public IgniteInternalFuture<?> applyx(CacheProjection<Object,
Object> c, GridKernalContext ctx) {
-            return c.removexAsync(key);
+            return c.removeAsync(key);
         }
     }
 
@@ -834,7 +834,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter
{
 
         /** {@inheritDoc} */
         @Override public IgniteInternalFuture<?> applyx(CacheProjection<Object,
Object> c, GridKernalContext ctx) {
-            return exp == null && val == null ? c.removexAsync(key) :
+            return exp == null && val == null ? c.removeAsync(key) :
                 exp == null ? c.putxIfAbsentAsync(key, val) :
                     val == null ? c.removeAsync(key, exp) :
                         c.getAndReplaceAsync(key, exp, val);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd317ee3/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
index b6ad484..25c73ce 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
@@ -408,7 +408,7 @@ public class GridServiceProcessor extends GridProcessorAdapter {
                 else {
                     GridServiceDeploymentKey key = new GridServiceDeploymentKey(name);
 
-                    if (cache.remove(key) == null) {
+                    if (cache.getAndRemove(key) == null) {
                         // Remove future from local map if service was not deployed.
                         undepFuts.remove(name);
 
@@ -957,7 +957,7 @@ public class GridServiceProcessor extends GridProcessorAdapter {
                             // Remove assignment on primary node in case of undeploy.
                             if (cache.cache().affinity().isPrimary(ctx.discovery().localNode(),
key)) {
                                 try {
-                                    cache.remove(key);
+                                    cache.getAndRemove(key);
                                 }
                                 catch (IgniteCheckedException ex) {
                                     log.error("Failed to remove assignments for undeployed
service: " + name, ex);
@@ -1095,7 +1095,7 @@ public class GridServiceProcessor extends GridProcessorAdapter {
                                     if (log.isDebugEnabled())
                                         log.debug("Removed zombie assignments: " + e.getValue());
 
-                                    cache.remove(e.getKey());
+                                    cache.getAndRemove(e.getKey());
                                 }
                             }
                             catch (IgniteCheckedException ex) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd317ee3/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java
b/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java
index 6a767d8..a32059a 100644
--- a/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java
@@ -312,7 +312,7 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration>
                         fut.get();
 
                     for (int key = 0; key < keyRange; key++)
-                        cache0.remove(key);
+                        cache0.getAndRemove(key);
                 }
             }
         }
@@ -502,7 +502,7 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration>
 
         /** {@inheritDoc} */
         @Override protected void operation(int key) throws Exception {
-            cache.remove(key);
+            cache.getAndRemove(key);
         }
     }
 
@@ -519,7 +519,7 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration>
 
         /** {@inheritDoc} */
         @Override protected void operation(int key) throws Exception {
-            cache.removex(key);
+            cache.remove(key);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd317ee3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
index d9f357c..3c95046 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
@@ -164,7 +164,7 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA
         }
         finally {
             for (int i = 0; i < ENTRY_CNT; i++)
-                assertTrue(cache.removex(new Key(i)));
+                assertTrue(cache.remove(new Key(i)));
         }
     }
 
@@ -255,7 +255,7 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA
         }
         finally {
             for (int i = 0; i < ENTRY_CNT; i++)
-                assertTrue(cache.removex(String.valueOf(i)));
+                assertTrue(cache.remove(String.valueOf(i)));
         }
     }
 
@@ -311,7 +311,7 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA
         }
         finally {
             for (int i = 0; i < ENTRY_CNT; i++)
-                assertTrue(cache.removex(i));
+                assertTrue(cache.remove(i));
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd317ee3/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java
b/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java
index 883bd20..1fcf299 100644
--- a/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java
+++ b/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java
@@ -100,7 +100,7 @@ public class GridH2IndexingGeoSelfTest extends GridCacheAbstractSelfTest
{
         checkPoints(res, "B", "C", "D");
 
         // Remove B.
-        cache.remove(1);
+        cache.getAndRemove(1);
 
         res = qry.execute(r.read("POLYGON((5 70, 5 80, 30 80, 30 70, 5 70))")).get();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd317ee3/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateReadWriteAccessStrategy.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateReadWriteAccessStrategy.java
b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateReadWriteAccessStrategy.java
index 7b6ac2a..72d59c6 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateReadWriteAccessStrategy.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateReadWriteAccessStrategy.java
@@ -225,7 +225,7 @@ public class HibernateReadWriteAccessStrategy extends HibernateAccessStrategyAda
             TxContext ctx = txCtx.get();
 
             if (ctx != null)
-                cache.removex(key);
+                cache.remove(key);
 
             success = true;
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd317ee3/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalAccessStrategy.java
----------------------------------------------------------------------
diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalAccessStrategy.java
b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalAccessStrategy.java
index 3675249..db5d9fd 100644
--- a/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalAccessStrategy.java
+++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateTransactionalAccessStrategy.java
@@ -130,7 +130,7 @@ public class HibernateTransactionalAccessStrategy extends HibernateAccessStrateg
     /** {@inheritDoc} */
     @Override protected void remove(Object key) throws CacheException {
         try {
-            cache.removex(key);
+            cache.remove(key);
         }
         catch (IgniteCheckedException e) {
             throw new CacheException(e);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd317ee3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
index d9c7078..8cb04f2 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
@@ -262,7 +262,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
             assert wasEmpty;
         }
         finally {
-            ((IgniteKernal)grid(0)).getCache(null).removex(new GridCacheInternalKeyImpl("LONG"));
+            ((IgniteKernal)grid(0)).getCache(null).remove(new GridCacheInternalKeyImpl("LONG"));
         }
     }
 


Mime
View raw message