#ignite-683:
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/064bcd89 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/064bcd89 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/064bcd89 Branch: refs/heads/ignite-683-1 Commit: 064bcd897d3466b53b1b20785de5873f56cd3d52 Parents: ac92d78 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Apr 9 16:40:48 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Apr 9 16:40:48 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/CacheProjection.java | 47 +++------------- .../processors/cache/GridCacheAdapter.java | 56 +++++++++++++++----- .../cache/GridCacheProjectionImpl.java | 47 +++++++--------- .../processors/cache/GridCacheProxyImpl.java | 44 +++++---------- .../distributed/near/GridNearCacheAdapter.java | 2 +- .../GridAtomicCacheQueueImpl.java | 4 +- .../GridTransactionalCacheQueueImpl.java | 2 +- .../query/h2/GridH2IndexingGeoSelfTest.java | 2 +- 8 files changed, 87 insertions(+), 117 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/064bcd89/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 736c156..f3215d1 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 @@ -458,15 +458,13 @@ public interface CacheProjection<K, V> extends Iterable<Cache.Entry<K, V>> { * * @param key Key to store in cache. * @param val Value to be associated with the given key. - * @param filter Optional filter to check prior to putting value in cache. Note - * that filter check is atomic with put operation. * @return Previous value associated with specified key, or {@code null} * if entry did not pass the filter, or if there was no mapping for the key in swap * or in persistent storage. * @throws NullPointerException If either key or value are {@code null}. * @throws IgniteCheckedException If put operation failed. */ - @Nullable public V put(K key, V val, @Nullable CacheEntryPredicate... filter) + @Nullable public V put(K key, V val) throws IgniteCheckedException; /** @@ -493,12 +491,10 @@ public interface CacheProjection<K, V> extends Iterable<Cache.Entry<K, V>> { * * @param key Key to store in cache. * @param val Value to be associated with the given key. - * @param filter Optional filter to check prior to putting value in cache. Note - * that filter check is atomic with put operation. * @return Future for the put operation. * @throws NullPointerException If either key or value are {@code null}. */ - public IgniteInternalFuture<V> putAsync(K key, V val, @Nullable CacheEntryPredicate... filter); + public IgniteInternalFuture<V> putAsync(K key, V val); /** * Stores given key-value pair in cache. If filters are provided, then entries will @@ -518,15 +514,13 @@ public interface CacheProjection<K, V> extends Iterable<Cache.Entry<K, V>> { * * @param key Key to store in cache. * @param val Value to be associated with the given key. - * @param filter Optional filter to check prior to putting value in cache. Note - * that filter check is atomic with put operation. * @return {@code True} if optional filter passed and value was stored in cache, * {@code false} otherwise. Note that this method will return {@code true} if filter is not * specified. * @throws NullPointerException If either key or value are {@code null}. * @throws IgniteCheckedException If put operation failed. */ - public boolean putx(K key, V val, @Nullable CacheEntryPredicate... filter) + public boolean putx(K key, V val) throws IgniteCheckedException; /** @@ -547,14 +541,12 @@ public interface CacheProjection<K, V> extends Iterable<Cache.Entry<K, V>> { * * @param key Key to store in cache. * @param val Value to be associated with the given key. - * @param filter Optional filter to check prior to putting value in cache. Note - * that filter check is atomic with put operation. * @return Future for the put operation. Future will return {@code true} if optional filter * passed and value was stored in cache, {@code false} otherwise. Note that future will * return {@code true} if filter is not specified. * @throws NullPointerException If either key or value are {@code null}. */ - public IgniteInternalFuture<Boolean> putxAsync(K key, V val, @Nullable CacheEntryPredicate... filter); + public IgniteInternalFuture<Boolean> putxAsync(K key, V val); /** * Stores given key-value pair in cache only if cache had no previous mapping for it. If cache @@ -800,12 +792,9 @@ public interface CacheProjection<K, V> extends Iterable<Cache.Entry<K, V>> { * if there is one. * * @param m Key-value pairs to store in cache. - * @param filter Optional entry filter. If provided, then entry will - * be stored only if the filter returned {@code true}. * @throws IgniteCheckedException If put operation failed. */ - public void putAll(@Nullable Map<? extends K, ? extends V> m, - @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException; + public void putAll(@Nullable Map<? extends K, ? extends V> m) throws IgniteCheckedException; /** * Asynchronously stores given key-value pairs in cache. If filters are provided, then entries will @@ -819,12 +808,9 @@ public interface CacheProjection<K, V> extends Iterable<Cache.Entry<K, V>> { * if there is one. * * @param m Key-value pairs to store in cache. - * @param filter Optional entry filter. If provided, then entry will - * be stored only if the filter returned {@code true}. * @return Future for putAll operation. */ - public IgniteInternalFuture<?> putAllAsync(@Nullable Map<? extends K, ? extends V> m, - @Nullable CacheEntryPredicate... filter); + public IgniteInternalFuture<?> putAllAsync(@Nullable Map<? extends K, ? extends V> m); /** * Set of keys cached on this node. You can remove elements from this set, but you cannot add elements @@ -842,23 +828,6 @@ public interface CacheProjection<K, V> extends Iterable<Cache.Entry<K, V>> { public Set<K> keySet(); /** - * Set of keys cached on this node. You can remove elements from this set, but you cannot add elements - * to this set. All removal operation will be reflected on the cache itself. - * <p> - * Iterator over this set will not fail if set was concurrently updated - * by another thread. This means that iterator may or may not return latest - * keys depending on whether they were added before or after current - * iterator position. - * <p> - * NOTE: this operation is not distributed and returns only the keys cached on this node. - * - * @param filter Optional filter to check prior to getting key form cache. Note - * that filter is checked atomically together with get operation. - * @return Key set for this cache projection. - */ - public Set<K> keySet(@Nullable CacheEntryPredicate... filter); - - /** * Set of keys for which this node is primary. * This set is dynamic and may change with grid topology changes. * Note that this set will contain mappings for all keys, even if their values are @@ -1184,14 +1153,12 @@ public interface CacheProjection<K, V> extends Iterable<Cache.Entry<K, V>> { * if there is one. * * @param key Key whose mapping is to be removed from cache. - * @param filter Optional filter to check prior to removing value form cache. Note - * that filter is checked atomically together with remove operation. * @return Previous value associated with specified key, or {@code null} * if there was no value for this key. * @throws NullPointerException If key is {@code null}. * @throws IgniteCheckedException If remove operation failed. */ - @Nullable public V remove(K key, @Nullable CacheEntryPredicate... filter) + @Nullable public V remove(K key) throws IgniteCheckedException; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/064bcd89/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 c8382d7..8019940 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 @@ -2004,12 +2004,18 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } } - /** {@inheritDoc} */ - @Override public V put(K key, V val, @Nullable CacheEntryPredicate... filter) + /** */ + public V put(K key, V val, @Nullable CacheEntryPredicate... filter) throws IgniteCheckedException { return put0(key, val, filter); } + /** {@inheritDoc} */ + @Override public V put(K key, V val) + throws IgniteCheckedException { + return put0(key, val, CU.empty0()); + } + /** * Internal method that is called from {@link CacheEntryImpl}. * @@ -2080,8 +2086,13 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> putAsync(K key, V val, - @Nullable CacheEntryPredicate[] filter) { + @Override public IgniteInternalFuture<V> putAsync(K key, V val) { + return putAsync(key, val, CU.empty0()); + } + + /** */ + public IgniteInternalFuture<V> putAsync(K key, V val, + @Nullable CacheEntryPredicate[] filter) { final boolean statsEnabled = ctx.config().isStatisticsEnabled(); final long start = statsEnabled ? System.nanoTime() : 0L; @@ -2123,7 +2134,12 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Override public boolean putx(final K key, final V val, + @Override public boolean putx(final K key, final V val) throws IgniteCheckedException { + return putx(key, val, CU.empty0()); + } + + /** */ + public boolean putx(final K key, final V val, final CacheEntryPredicate[] filter) throws IgniteCheckedException { boolean statsEnabled = ctx.config().isStatisticsEnabled(); @@ -2390,7 +2406,12 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> putxAsync(K key, V val, + @Override public IgniteInternalFuture<Boolean> putxAsync(K key, V val) { + return putxAsync(key, val, CU.empty0()); + } + + /** {@inheritDoc} */ + public IgniteInternalFuture<Boolean> putxAsync(K key, V val, @Nullable CacheEntryPredicate... filter) { final boolean statsEnabled = ctx.config().isStatisticsEnabled(); @@ -2717,7 +2738,12 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Override public void putAll(@Nullable final Map<? extends K, ? extends V> m, + @Override public void putAll(@Nullable final Map<? extends K, ? extends V> m) throws IgniteCheckedException { + putAll(m, CU.empty0()); + } + + /** */ + public void putAll(@Nullable final Map<? extends K, ? extends V> m, final CacheEntryPredicate[] filter) throws IgniteCheckedException { boolean statsEnabled = ctx.config().isStatisticsEnabled(); @@ -2746,7 +2772,12 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<?> putAllAsync(final Map<? extends K, ? extends V> m, + @Override public IgniteInternalFuture<?> putAllAsync(final Map<? extends K, ? extends V> m) { + return putAllAsync(m, CU.empty0()); + } + + /** */ + public IgniteInternalFuture<?> putAllAsync(final Map<? extends K, ? extends V> m, @Nullable final CacheEntryPredicate... filter) { if (F.isEmpty(m)) return new GridFinishedFuture<Object>(); @@ -2768,9 +2799,9 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Nullable @Override public V remove(K key, CacheEntryPredicate[] filter) + @Nullable @Override public V remove(K key) throws IgniteCheckedException { - return remove0(key, filter); + return remove0(key, CU.empty0()); } /** @@ -2781,8 +2812,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @return Previous value. * @throws IgniteCheckedException If failed. */ - public V remove0(final K key, - @Nullable final CacheEntryPredicate... filter) throws IgniteCheckedException { + public V remove0(final K key, @Nullable final CacheEntryPredicate... filter) throws IgniteCheckedException { boolean statsEnabled = ctx.config().isStatisticsEnabled(); long start = statsEnabled ? System.nanoTime() : 0L; @@ -4601,7 +4631,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @param filter Filters to evaluate. * @return Key set. */ - @Override public Set<K> keySet(@Nullable CacheEntryPredicate... filter) { + public Set<K> keySet(@Nullable CacheEntryPredicate... filter) { return map.keySet(filter); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/064bcd89/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 96a78b3..3fe2857 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 @@ -342,21 +342,19 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public V put(K key, V val, @Nullable CacheEntryPredicate[] filter) + @Override public V put(K key, V val) throws IgniteCheckedException { - return putAsync(key, val, filter).get(); + return putAsync(key, val).get(); } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> putAsync(K key, V val, - @Nullable CacheEntryPredicate[] filter) { - return cache.putAsync0(key, val, filter); + @Override public IgniteInternalFuture<V> putAsync(K key, V val) { + return cache.putAsync0(key, val, CU.empty0()); } /** {@inheritDoc} */ - @Override public boolean putx(K key, V val, - @Nullable CacheEntryPredicate[] filter) throws IgniteCheckedException { - return putxAsync(key, val, filter).get(); + @Override public boolean putx(K key, V val) throws IgniteCheckedException { + return cache.putxAsync0(key, val, CU.empty0()).get(); } /** {@inheritDoc} */ @@ -412,9 +410,8 @@ 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, filter); + @Override public IgniteInternalFuture<Boolean> putxAsync(K key, V val) { + return cache.putxAsync0(key, val, CU.empty0()); } /** {@inheritDoc} */ @@ -424,7 +421,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> putIfAbsentAsync(K key, V val) { - return putAsync(key, val, cctx.noValArray()); + return cache.putAsync0(key, val, cctx.noValArray()); } /** {@inheritDoc} */ @@ -434,7 +431,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> putxIfAbsentAsync(K key, V val) { - return putxAsync(key, val, cctx.noValArray()); + return cache.putxAsync0(key, val, cctx.noValArray()); } /** {@inheritDoc} */ @@ -444,7 +441,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> replaceAsync(K key, V val) { - return putAsync(key, val, cctx.hasValArray()); + return cache.putAsync0(key, val, cctx.hasValArray()); } /** {@inheritDoc} */ @@ -454,7 +451,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> replacexAsync(K key, V val) { - return putxAsync(key, val, cctx.hasValArray()); + return cache.putxAsync0(key, val, cctx.hasValArray()); } /** {@inheritDoc} */ @@ -470,15 +467,13 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public void putAll(Map<? extends K, ? extends V> m, - @Nullable CacheEntryPredicate[] filter) throws IgniteCheckedException { - putAllAsync(m, filter).get(); + @Override public void putAll(Map<? extends K, ? extends V> m) throws IgniteCheckedException { + putAllAsync(m).get(); } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<?> putAllAsync(Map<? extends K, ? extends V> m, - @Nullable CacheEntryPredicate[] filter) { - return cache.putAllAsync(m, filter); + @Override public IgniteInternalFuture<?> putAllAsync(Map<? extends K, ? extends V> m) { + return cache.putAllAsync(m, CU.empty0()); } /** {@inheritDoc} */ @@ -487,11 +482,6 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public Set<K> keySet(@Nullable CacheEntryPredicate... filter) { - return cache.keySet(filter); - } - - /** {@inheritDoc} */ @Override public Set<K> primaryKeySet() { return cache.primaryKeySet(); } @@ -632,9 +622,8 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public V remove(K key, - @Nullable CacheEntryPredicate[] filter) throws IgniteCheckedException { - return removeAsync(key, filter).get(); + @Override public V remove(K key) throws IgniteCheckedException { + return removeAsync(key, CU.empty0()).get(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/064bcd89/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 d79615e..4615ee8 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 @@ -565,12 +565,12 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Nullable @Override public V put(K key, V val, @Nullable CacheEntryPredicate[] filter) + @Nullable @Override public V put(K key, V val) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { - return delegate.put(key, val, filter); + return delegate.put(key, val); } finally { gate.leave(prev); @@ -578,12 +578,11 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> putAsync(K key, V val, - @Nullable CacheEntryPredicate[] filter) { + @Override public IgniteInternalFuture<V> putAsync(K key, V val) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { - return delegate.putAsync(key, val, filter); + return delegate.putAsync(key, val); } finally { gate.leave(prev); @@ -591,12 +590,12 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public boolean putx(K key, V val, @Nullable CacheEntryPredicate[] filter) + @Override public boolean putx(K key, V val) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { - return delegate.putx(key, val, filter); + return delegate.putx(key, val); } finally { gate.leave(prev); @@ -714,12 +713,11 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> putxAsync(K key, V val, - @Nullable CacheEntryPredicate[] filter) { + @Override public IgniteInternalFuture<Boolean> putxAsync(K key, V val) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { - return delegate.putxAsync(key, val, filter); + return delegate.putxAsync(key, val); } finally { gate.leave(prev); @@ -847,12 +845,11 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public void putAll(@Nullable Map<? extends K, ? extends V> m, - @Nullable CacheEntryPredicate[] filter) throws IgniteCheckedException { + @Override public void putAll(@Nullable Map<? extends K, ? extends V> m) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { - delegate.putAll(m, filter); + delegate.putAll(m); } finally { gate.leave(prev); @@ -860,12 +857,11 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<?> putAllAsync(@Nullable Map<? extends K, ? extends V> m, - @Nullable CacheEntryPredicate[] filter) { + @Override public IgniteInternalFuture<?> putAllAsync(@Nullable Map<? extends K, ? extends V> m) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { - return delegate.putAllAsync(m, filter); + return delegate.putAllAsync(m); } finally { gate.leave(prev); @@ -885,18 +881,6 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public Set<K> keySet(@Nullable CacheEntryPredicate... filter) { - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - - try { - return delegate.keySet(filter); - } - finally { - gate.leave(prev); - } - } - - /** {@inheritDoc} */ @Override public Set<K> primaryKeySet() { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -1251,12 +1235,12 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Nullable @Override public V remove(K key, @Nullable CacheEntryPredicate[] filter) + @Nullable @Override public V remove(K key) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { - return delegate.remove(key, filter); + return delegate.remove(key); } finally { gate.leave(prev); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/064bcd89/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 5986b15..e70a632 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 @@ -655,7 +655,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda currIter.remove(); try { - GridNearCacheAdapter.this.remove(currEntry.getKey(), CU.empty0()); + GridNearCacheAdapter.this.remove(currEntry.getKey()); } catch (IgniteCheckedException e) { throw new IgniteException(e); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/064bcd89/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 a48d7b4..70e72a2 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, null); + T data = (T)cache.remove(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, null); + data = (T)cache.remove(key); if (data != null) return data; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/064bcd89/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 801e27f..c14011c 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), null); + retVal = (T)cache.remove(itemKey(idx)); assert retVal != null : idx; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/064bcd89/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 07abaf1..883bd20 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, CU.empty0()); + cache.remove(1); res = qry.execute(r.read("POLYGON((5 70, 5 80, 30 80, 30 70, 5 70))")).get();
