http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/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 5e441e1..32853d5 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 @@ -109,7 +109,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V CacheProjection<K, V> parent, GridCacheContext<K, V> cctx, @Nullable IgniteBiPredicate<K, V> kvFilter, - @Nullable IgnitePredicate<? super CacheEntry<K, V>> entryFilter, + @Nullable IgnitePredicate<? super Entry<K, V>> entryFilter, @Nullable Set<CacheFlag> flags, @Nullable UUID subjId, boolean keepPortable, @@ -160,7 +160,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V * @param noNulls Flag indicating whether filter should accept nulls or not. * @return Entry filter for the flag. */ - IgnitePredicate<CacheEntry<K, V>> entryFilter(boolean noNulls) { + IgnitePredicate<Entry<K, V>> entryFilter(boolean noNulls) { return noNulls ? noNullEntryFilter : withNullEntryFilter; } @@ -193,9 +193,9 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V * @param noNulls Flag indicating whether filter should accept nulls or not. * @return {@code Anded} filter array. */ - IgnitePredicate<CacheEntry<K, V>> and( - IgnitePredicate<CacheEntry<K, V>> filter, boolean noNulls) { - IgnitePredicate<CacheEntry<K, V>> entryFilter = entryFilter(noNulls); + IgnitePredicate<Entry<K, V>> and( + IgnitePredicate<Entry<K, V>> filter, boolean noNulls) { + IgnitePredicate<Entry<K, V>> entryFilter = entryFilter(noNulls); if (filter == null) return entryFilter; @@ -252,9 +252,9 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V * @param nonNulls Flag indicating whether nulls should be included. * @return {@code Anded} filter. */ - private IgnitePredicate<CacheEntry<K, V>> and(@Nullable final IgnitePredicate<CacheEntry<K, V>>[] f1, + private IgnitePredicate<Entry<K, V>> and(@Nullable final IgnitePredicate<Entry<K, V>>[] f1, boolean nonNulls) { - IgnitePredicate<CacheEntry<K, V>> entryFilter = entryFilter(nonNulls); + IgnitePredicate<Entry<K, V>> entryFilter = entryFilter(nonNulls); if (F.isEmpty(f1)) return entryFilter; @@ -267,7 +267,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V * @param noNulls Flag indicating whether filter should accept nulls or not. * @return {@code True} if filter passed. */ - boolean isAll(CacheEntry<K, V> e, boolean noNulls) { + boolean isAll(Entry<K, V> e, boolean noNulls) { CacheFlag[] f = cctx.forceLocalRead(); try { @@ -347,9 +347,9 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V * @param vis Visitor. * @return Projection-filter-aware visitor. */ - private IgniteInClosure<CacheEntry<K, V>> visitor(final IgniteInClosure<CacheEntry<K, V>> vis) { - return new CI1<CacheEntry<K, V>>() { - @Override public void apply(CacheEntry<K, V> e) { + private IgniteInClosure<Entry<K, V>> visitor(final IgniteInClosure<Entry<K, V>> vis) { + return new CI1<Entry<K, V>>() { + @Override public void apply(Entry<K, V> e) { if (isAll(e, true)) vis.apply(e); } @@ -362,9 +362,9 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V * @param vis Visitor. * @return Projection-filter-aware visitor. */ - private IgnitePredicate<CacheEntry<K, V>> visitor(final IgnitePredicate<CacheEntry<K, V>> vis) { - return new P1<CacheEntry<K, V>>() { - @Override public boolean apply(CacheEntry<K, V> e) { + private IgnitePredicate<Entry<K, V>> visitor(final IgnitePredicate<Entry<K, V>> vis) { + return new P1<Entry<K, V>>() { + @Override public boolean apply(Entry<K, V> e) { // If projection filter didn't pass, go to the next element. // Otherwise, delegate to the visitor. return !isAll(e, true) || vis.apply(e); @@ -438,7 +438,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V (CacheProjection<K1, V1>)this, (GridCacheContext<K1, V1>)cctx, CU.<K1, V1>typeFilter(keyType, valType), - (IgnitePredicate<CacheEntry>)noNullEntryFilter.entryFilter, + (IgnitePredicate<Entry>)noNullEntryFilter.entryFilter, flags, subjId, keepPortable, @@ -480,7 +480,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @SuppressWarnings({"unchecked"}) - @Override public CacheProjection<K, V> projection(IgnitePredicate<CacheEntry<K, V>> filter) { + @Override public CacheProjection<K, V> projection(IgnitePredicate<Entry<K, V>> filter) { if (filter == null) return new GridCacheProxyImpl<>(cctx, this, this); @@ -564,7 +564,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V (CacheProjection<K1, V1>)this, (GridCacheContext<K1, V1>)cctx, (IgniteBiPredicate<K1, V1>)noNullKvFilter.kvFilter, - (IgnitePredicate<CacheEntry>)noNullEntryFilter.entryFilter, + (IgnitePredicate<Entry>)noNullEntryFilter.entryFilter, flags, subjId, true, @@ -626,12 +626,12 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public void forEach(IgniteInClosure<CacheEntry<K, V>> vis) { + @Override public void forEach(IgniteInClosure<Entry<K, V>> vis) { cache.forEach(visitor(vis)); } /** {@inheritDoc} */ - @Override public boolean forAll(IgnitePredicate<CacheEntry<K, V>> vis) { + @Override public boolean forAll(IgnitePredicate<Entry<K, V>> vis) { return cache.forAll(visitor(vis)); } @@ -672,7 +672,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public V get(K key, @Nullable GridCacheEntryEx<K, V> entry, boolean deserializePortable, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { return cache.get(key, entry, deserializePortable, and(filter, false)); } @@ -737,26 +737,26 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public V put(K key, V val, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) + @Override public V put(K key, V val, @Nullable IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { return putAsync(key, val, filter).get(); } /** {@inheritDoc} */ @Override public V put(K key, V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { return cache.put(key, val, entry, ttl, filter); } /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> putAsync(K key, V val, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) { return putAsync(key, val, null, -1, filter); } /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> putAsync(K key, V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) { A.notNull(key, "key", val, "val"); // Check k-v predicate first. @@ -768,13 +768,13 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public boolean putx(K key, V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { return cache.putx(key, val, entry, ttl, filter); } /** {@inheritDoc} */ @Override public boolean putx(K key, V val, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { return putxAsync(key, val, filter).get(); } @@ -832,13 +832,13 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> putxAsync(K key, V val, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) { return putxAsync(key, val, null, -1, filter); } /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> putxAsync(K key, V val, @Nullable GridCacheEntryEx<K, V> entry, - long ttl, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + long ttl, @Nullable IgnitePredicate<Entry<K, V>>[] filter) { A.notNull(key, "key", val, "val"); // Check k-v predicate first. @@ -895,20 +895,20 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> replaceAsync(K key, V oldVal, V newVal) { - IgnitePredicate<CacheEntry<K, V>> fltr = and(F.<K, V>cacheContainsPeek(oldVal), false); + IgnitePredicate<Entry<K, V>> fltr = and(F.<K, V>cacheContainsPeek(oldVal), false); return cache.putxAsync(key, newVal, fltr); } /** {@inheritDoc} */ @Override public void putAll(Map<? extends K, ? extends V> m, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { putAllAsync(m, filter).get(); } /** {@inheritDoc} */ @Override public IgniteInternalFuture<?> putAllAsync(Map<? extends K, ? extends V> m, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) { m = isAll(m, true); if (F.isEmpty(m)) @@ -923,7 +923,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public Set<K> keySet(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Override public Set<K> keySet(@Nullable IgnitePredicate<Entry<K, V>>... filter) { return cache.keySet(filter); } @@ -943,28 +943,28 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public Set<CacheEntry<K, V>> entrySet() { + @Override public Set<Entry<K, V>> entrySet() { return cache.entrySet(entryFilter(true)); } /** {@inheritDoc} */ - @Override public Set<CacheEntry<K, V>> entrySetx(IgnitePredicate<CacheEntry<K, V>>... filter) { + @Override public Set<Entry<K, V>> entrySetx(IgnitePredicate<Entry<K, V>>... filter) { return cache.entrySetx(F.and(filter, entryFilter(true))); } /** {@inheritDoc} */ - @Override public Set<CacheEntry<K, V>> primaryEntrySetx(IgnitePredicate<CacheEntry<K, V>>... filter) { + @Override public Set<Entry<K, V>> primaryEntrySetx(IgnitePredicate<Entry<K, V>>... filter) { return cache.primaryEntrySetx(F.and(filter, entryFilter(true))); } /** {@inheritDoc} */ - @Override public Set<CacheEntry<K, V>> entrySet(int part) { + @Override public Set<Entry<K, V>> entrySet(int part) { // TODO pass entry filter. return cache.entrySet(part); } /** {@inheritDoc} */ - @Override public Set<CacheEntry<K, V>> primaryEntrySet() { + @Override public Set<Entry<K, V>> primaryEntrySet() { return cache.primaryEntrySet(entryFilter(true)); } @@ -985,7 +985,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgnitePredicate<CacheEntry<K, V>> predicate() { + @Override public IgnitePredicate<Entry<K, V>> predicate() { return withNullEntryFilter.hasFilter() ? withNullEntryFilter : null; } @@ -1017,7 +1017,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Nullable @Override public CacheEntry<K, V> entry(K key) { + @Nullable @Override public Entry<K, V> entry(K key) { V val = peek(key); if (!isAll(key, val, false)) @@ -1073,30 +1073,30 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public V remove(K key, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { return removeAsync(key, filter).get(); } /** {@inheritDoc} */ @Override public V remove(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { return removeAsync(key, entry, filter).get(); } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> removeAsync(K key, IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Override public IgniteInternalFuture<V> removeAsync(K key, IgnitePredicate<Entry<K, V>>[] filter) { return removeAsync(key, null, filter); } /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> removeAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<Entry<K, V>>... filter) { return cache.removeAsync(key, entry, and(filter, false)); } /** {@inheritDoc} */ @Override public boolean removex(K key, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { return removexAsync(key, filter).get(); } @@ -1112,19 +1112,19 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public boolean removex(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { return removexAsync(key, entry, filter).get(); } /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> removexAsync(K key, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) { return removexAsync(key, null, filter); } /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> removexAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<Entry<K, V>>... filter) { return cache.removexAsync(key, entry, and(filter, false)); } @@ -1168,13 +1168,13 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** {@inheritDoc} */ @Override public void removeAll(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { cache.removeAll(keys, and(filter, false)); } /** {@inheritDoc} */ @Override public IgniteInternalFuture<?> removeAllAsync(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) { return cache.removeAllAsync(keys, and(filter, false)); } @@ -1185,42 +1185,42 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<?> removeAllAsync(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Override public IgniteInternalFuture<?> removeAllAsync(@Nullable IgnitePredicate<Entry<K, V>>... filter) { return cache.removeAllAsync(and(filter, false)); } /** {@inheritDoc} */ @Override public boolean lock(K key, long timeout, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { return cache.lock(key, timeout, and(filter, false)); } /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> lockAsync(K key, long timeout, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) { return cache.lockAsync(key, timeout, and(filter, false)); } /** {@inheritDoc} */ @Override public boolean lockAll(@Nullable Collection<? extends K> keys, long timeout, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { return cache.lockAll(keys, timeout, and(filter, false)); } /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> lockAllAsync(@Nullable Collection<? extends K> keys, long timeout, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) { return cache.lockAllAsync(keys, timeout, and(filter, false)); } /** {@inheritDoc} */ - @Override public void unlock(K key, IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Override public void unlock(K key, IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { cache.unlock(key, and(filter, false)); } /** {@inheritDoc} */ @Override public void unlockAll(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { cache.unlockAll(keys, and(filter, false)); } @@ -1288,7 +1288,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V } /** {@inheritDoc} */ - @Override public Iterator<CacheEntry<K, V>> iterator() { + @Override public Iterator<Entry<K, V>> iterator() { return cache.entrySet(entryFilter(true)).iterator(); } @@ -1354,7 +1354,7 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V * @param <K> Key type. * @param <V> Value type. */ - public static class FullFilter<K, V> implements IgnitePredicate<CacheEntry<K, V>> { + public static class FullFilter<K, V> implements IgnitePredicate<Entry<K, V>> { /** */ private static final long serialVersionUID = 0L; @@ -1362,13 +1362,13 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V private KeyValueFilter<K, V> kvFilter; /** Entry filter. */ - private IgnitePredicate<? super CacheEntry<K, V>> entryFilter; + private IgnitePredicate<? super Entry<K, V>> entryFilter; /** * @param kvFilter Key-value filter. * @param entryFilter Entry filter. */ - private FullFilter(KeyValueFilter<K, V> kvFilter, IgnitePredicate<? super CacheEntry<K, V>> entryFilter) { + private FullFilter(KeyValueFilter<K, V> kvFilter, IgnitePredicate<? super Entry<K, V>> entryFilter) { this.kvFilter = kvFilter; this.entryFilter = entryFilter; } @@ -1390,12 +1390,12 @@ public class GridCacheProjectionImpl<K, V> implements GridCacheProjectionEx<K, V /** * @return Entry filter. */ - public IgnitePredicate<? super CacheEntry<K, V>> entryFilter() { + public IgnitePredicate<? super Entry<K, V>> entryFilter() { return entryFilter; } /** {@inheritDoc} */ - @Override public boolean apply(CacheEntry<K, V> e) { + @Override public boolean apply(Entry<K, V> e) { if (kvFilter != null) { if (!kvFilter.apply(e.getKey(), e.peek())) return false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/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 dbe14da..39fbb3d 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 @@ -35,6 +35,7 @@ import org.apache.ignite.mxbean.*; import org.apache.ignite.transactions.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import javax.cache.expiry.*; import javax.cache.processor.*; import java.io.*; @@ -248,7 +249,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Nullable @Override public CacheEntry<K, V> randomEntry() { + @Nullable @Override public Entry<K, V> randomEntry() { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -284,7 +285,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgnitePredicate<CacheEntry<K, V>> predicate() { + @Override public IgnitePredicate<Entry<K, V>> predicate() { return delegate.predicate(); } @@ -308,7 +309,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public CacheProjection<K, V> projection( - @Nullable IgnitePredicate<CacheEntry<K, V>> filter) { + @Nullable IgnitePredicate<Entry<K, V>> filter) { return delegate.projection(filter); } @@ -369,7 +370,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public void forEach(IgniteInClosure<CacheEntry<K, V>> vis) { + @Override public void forEach(IgniteInClosure<Entry<K, V>> vis) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -381,7 +382,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public boolean forAll(IgnitePredicate<CacheEntry<K, V>> vis) { + @Override public boolean forAll(IgnitePredicate<Entry<K, V>> vis) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -479,7 +480,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public V get(K key, @Nullable GridCacheEntryEx<K, V> entry, boolean deserializePortable, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -635,7 +636,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Nullable @Override public V put(K key, V val, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) + @Nullable @Override public V put(K key, V val, @Nullable IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -649,7 +650,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public V put(K key, V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -662,7 +663,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> putAsync(K key, V val, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -675,7 +676,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> putAsync(K key, V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<Entry<K, V>>... filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -688,7 +689,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public boolean putx(K key, V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -700,7 +701,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public boolean putx(K key, V val, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) + @Override public boolean putx(K key, V val, @Nullable IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -824,7 +825,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> putxAsync(K key, V val, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -840,7 +841,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<Entry<K, V>>... filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -973,7 +974,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public void putAll(@Nullable Map<? extends K, ? extends V> m, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -986,7 +987,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public IgniteInternalFuture<?> putAllAsync(@Nullable Map<? extends K, ? extends V> m, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1010,7 +1011,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public Set<K> keySet(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Override public Set<K> keySet(@Nullable IgnitePredicate<Entry<K, V>>... filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1058,7 +1059,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public Set<CacheEntry<K, V>> entrySet() { + @Override public Set<Entry<K, V>> entrySet() { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1070,7 +1071,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public Set<CacheEntry<K, V>> entrySet(int part) { + @Override public Set<Entry<K, V>> entrySet(int part) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1082,7 +1083,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public Set<CacheEntry<K, V>> entrySetx(IgnitePredicate<CacheEntry<K, V>>... filter) { + @Override public Set<Entry<K, V>> entrySetx(IgnitePredicate<Entry<K, V>>... filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1094,7 +1095,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public Set<CacheEntry<K, V>> primaryEntrySetx(IgnitePredicate<CacheEntry<K, V>>... filter) { + @Override public Set<Entry<K, V>> primaryEntrySetx(IgnitePredicate<Entry<K, V>>... filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1106,7 +1107,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public Set<CacheEntry<K, V>> primaryEntrySet() { + @Override public Set<Entry<K, V>> primaryEntrySet() { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1242,7 +1243,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Nullable @Override public CacheEntry<K, V> entry(K key) { + @Nullable @Override public Entry<K, V> entry(K key) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1363,7 +1364,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Nullable @Override public V remove(K key, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) + @Nullable @Override public V remove(K key, @Nullable IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -1377,7 +1378,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public V remove(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1389,7 +1390,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> removeAsync(K key, IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Override public IgniteInternalFuture<V> removeAsync(K key, IgnitePredicate<Entry<K, V>>[] filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1402,7 +1403,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public IgniteInternalFuture<V> removeAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<Entry<K, V>>... filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1414,7 +1415,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public boolean removex(K key, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) + @Override public boolean removex(K key, @Nullable IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -1452,7 +1453,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public boolean removex(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1465,7 +1466,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> removexAsync(K key, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1478,7 +1479,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> removexAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<Entry<K, V>>... filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1563,7 +1564,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public void removeAll(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1576,7 +1577,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public IgniteInternalFuture<?> removeAllAsync(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1601,7 +1602,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<?> removeAllAsync(@Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Override public IgniteInternalFuture<?> removeAllAsync(@Nullable IgnitePredicate<Entry<K, V>>[] filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1613,7 +1614,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public boolean lock(K key, long timeout, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) + @Override public boolean lock(K key, long timeout, @Nullable IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@ -1627,7 +1628,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> lockAsync(K key, long timeout, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1640,7 +1641,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public boolean lockAll(@Nullable Collection<? extends K> keys, long timeout, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1653,7 +1654,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> lockAllAsync(@Nullable Collection<? extends K> keys, long timeout, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1665,7 +1666,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public void unlock(K key, IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Override public void unlock(K key, IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1678,7 +1679,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali /** {@inheritDoc} */ @Override public void unlockAll(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -1870,7 +1871,7 @@ public class GridCacheProxyImpl<K, V> implements GridCacheProxy<K, V>, Externali } /** {@inheritDoc} */ - @Override public Iterator<CacheEntry<K, V>> iterator() { + @Override public Iterator<Entry<K, V>> iterator() { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java index f4e51db..68164f4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java @@ -335,11 +335,11 @@ public class GridCacheUtils { * @param <V> Value type. * @return Factory instance. */ - public static <K, V> IgniteClosure<Integer, IgnitePredicate<CacheEntry<K, V>>[]> factory() { - return new IgniteClosure<Integer, IgnitePredicate<CacheEntry<K, V>>[]>() { + public static <K, V> IgniteClosure<Integer, IgnitePredicate<Entry<K, V>>[]> factory() { + return new IgniteClosure<Integer, IgnitePredicate<Entry<K, V>>[]>() { @SuppressWarnings({"unchecked"}) - @Override public IgnitePredicate<CacheEntry<K, V>>[] apply(Integer len) { - return (IgnitePredicate<CacheEntry<K, V>>[])(len == 0 ? EMPTY : new IgnitePredicate[len]); + @Override public IgnitePredicate<Entry<K, V>>[] apply(Integer len) { + return (IgnitePredicate<Entry<K, V>>[])(len == 0 ? EMPTY : new IgnitePredicate[len]); } }; } @@ -379,19 +379,19 @@ public class GridCacheUtils { } /** - * Gets closure which returns {@link org.apache.ignite.cache.CacheEntry} given cache key. + * Gets closure which returns {@link org.apache.ignite.cache.Entry} given cache key. * If current cache is DHT and key doesn't belong to current partition, * {@code null} is returned. * * @param ctx Cache context. * @param <K> Cache key type. * @param <V> Cache value type. - * @return Closure which returns {@link org.apache.ignite.cache.CacheEntry} given cache key or {@code null} if partition is invalid. + * @return Closure which returns {@link org.apache.ignite.cache.Entry} given cache key or {@code null} if partition is invalid. */ - public static <K, V> IgniteClosure<K, CacheEntry<K, V>> cacheKey2Entry( + public static <K, V> IgniteClosure<K, Entry<K, V>> cacheKey2Entry( final GridCacheContext<K, V> ctx) { - return new IgniteClosure<K, CacheEntry<K, V>>() { - @Nullable @Override public CacheEntry<K, V> apply(K k) { + return new IgniteClosure<K, Entry<K, V>>() { + @Nullable @Override public Entry<K, V> apply(K k) { try { return ctx.cache().entry(k); } @@ -746,16 +746,16 @@ public class GridCacheUtils { * @return Empty filter. */ @SuppressWarnings({"unchecked"}) - public static <K, V> IgnitePredicate<CacheEntry<K, V>>[] empty() { - return (IgnitePredicate<CacheEntry<K, V>>[])EMPTY_FILTER; + public static <K, V> IgnitePredicate<Entry<K, V>>[] empty() { + return (IgnitePredicate<Entry<K, V>>[])EMPTY_FILTER; } /** * @return Always false filter. */ @SuppressWarnings({"unchecked"}) - public static <K, V> IgnitePredicate<CacheEntry<K, V>>[] alwaysFalse() { - return (IgnitePredicate<CacheEntry<K, V>>[])ALWAYS_FALSE; + public static <K, V> IgnitePredicate<Entry<K, V>>[] alwaysFalse() { + return (IgnitePredicate<Entry<K, V>>[])ALWAYS_FALSE; } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueCollection.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueCollection.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueCollection.java index b16bdb9..e9e61ab 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueCollection.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueCollection.java @@ -39,18 +39,18 @@ public class GridCacheValueCollection<K, V> extends GridSerializableCollection<V private final GridCacheContext<K, V> ctx; /** Filter. */ - private final IgnitePredicate<CacheEntry<K, V>>[] filter; + private final IgnitePredicate<Entry<K, V>>[] filter; /** Base map. */ - private final Map<K, CacheEntry<K, V>> map; + private final Map<K, Entry<K, V>> map; /** * @param ctx Cache context. * @param c Entry collection. * @param filter Filter. */ - public GridCacheValueCollection(GridCacheContext<K, V> ctx, Collection<? extends CacheEntry<K, V>> c, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + public GridCacheValueCollection(GridCacheContext<K, V> ctx, Collection<? extends Entry<K, V>> c, + @Nullable IgnitePredicate<Entry<K, V>>[] filter) { map = new HashMap<>(c.size(), 1.0f); assert ctx != null; @@ -58,7 +58,7 @@ public class GridCacheValueCollection<K, V> extends GridSerializableCollection<V this.ctx = ctx; this.filter = filter; - for (CacheEntry<K, V> e : c) { + for (Entry<K, V> e : c) { if (e != null) map.put(e.getKey(), e); } @@ -129,8 +129,8 @@ public class GridCacheValueCollection<K, V> extends GridSerializableCollection<V boolean rmv = false; - for (Iterator<CacheEntry<K, V>> it = map.values().iterator(); it.hasNext();) { - CacheEntry<K, V> e = it.next(); + for (Iterator<Entry<K, V>> it = map.values().iterator(); it.hasNext();) { + Entry<K, V> e = it.next(); if (F.isAll(e, filter) && F.eq(o, e.getValue())) { it.remove(); @@ -158,7 +158,7 @@ public class GridCacheValueCollection<K, V> extends GridSerializableCollection<V @Override public boolean contains(Object o) { A.notNull(o, "o"); - for (CacheEntry<K, V> e : map.values()) + for (Entry<K, V> e : map.values()) if (F.isAll(e, filter) && F.eq(e.getValue(), o)) return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/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 b358f77..79d7e8a 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 @@ -405,7 +405,7 @@ public class IgniteCacheProxy<K, V> extends IgniteAsyncSupportAdapter<IgniteCach * @param filter Filter. * @return Entry set. */ - public Set<CacheEntry<K, V>> entrySetx(IgnitePredicate<CacheEntry<K, V>>... filter) { + public Set<Entry<K, V>> entrySetx(IgnitePredicate<Entry<K, V>>... filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java index 277d8cc..bce5607 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java @@ -81,7 +81,7 @@ public abstract class GridDistributedCacheAdapter<K, V> extends GridCacheAdapter IgniteTxIsolation isolation, boolean isInvalidate, long accessTtl, - IgnitePredicate<CacheEntry<K, V>>[] filter + IgnitePredicate<Entry<K, V>>[] filter ) { assert tx != null; @@ -90,7 +90,7 @@ public abstract class GridDistributedCacheAdapter<K, V> extends GridCacheAdapter /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> lockAllAsync(Collection<? extends K> keys, long timeout, - IgnitePredicate<CacheEntry<K, V>>... filter) { + IgnitePredicate<Entry<K, V>>... filter) { IgniteTxLocalEx<K, V> tx = ctx.tm().userTxx(); // Return value flag is true because we choose to bring values for explicit locks. @@ -117,7 +117,7 @@ public abstract class GridDistributedCacheAdapter<K, V> extends GridCacheAdapter boolean retval, @Nullable IgniteTxIsolation isolation, long accessTtl, - IgnitePredicate<CacheEntry<K, V>>[] filter); + IgnitePredicate<Entry<K, V>>[] filter); /** * @param key Key to remove. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java index 3807cc9..de282b0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java @@ -202,7 +202,7 @@ public class GridDistributedTxRemoteAdapter<K, V> extends IgniteTxAdapter<K, V> /** {@inheritDoc} */ @Override public GridTuple<V> peek(GridCacheContext<K, V> cacheCtx, boolean failFast, K key, - IgnitePredicate<CacheEntry<K, V>>[] filter) throws GridCacheFilterFailedException { + IgnitePredicate<Entry<K, V>>[] filter) throws GridCacheFilterFailedException { assert false : "Method peek can only be called on user transaction: " + this; throw new IllegalStateException("Method peek can only be called on user transaction: " + this); @@ -430,17 +430,17 @@ public class GridDistributedTxRemoteAdapter<K, V> extends IgniteTxAdapter<K, V> assert txEntry != null : "Missing transaction entry for tx: " + this; while (true) { - GridCacheEntryEx<K, V> cacheEntry = txEntry.cached(); + GridCacheEntryEx<K, V> Entry = txEntry.cached(); - assert cacheEntry != null : "Missing cached entry for transaction entry: " + txEntry; + assert Entry != null : "Missing cached entry for transaction entry: " + txEntry; try { GridCacheVersion ver = txEntry.explicitVersion() != null ? txEntry.explicitVersion() : xidVer; // If locks haven't been acquired yet, keep waiting. - if (!txEntry.groupLockEntry() && !cacheEntry.lockedBy(ver)) { + if (!txEntry.groupLockEntry() && !Entry.lockedBy(ver)) { if (log.isDebugEnabled()) - log.debug("Transaction does not own lock for entry (will wait) [entry=" + cacheEntry + + log.debug("Transaction does not own lock for entry (will wait) [entry=" + Entry + ", tx=" + this + ']'); return; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java index e673641..f792a80 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java @@ -289,7 +289,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap * * @throws GridDhtInvalidPartitionException If partition for the key is no longer valid. */ - @Override public CacheEntry<K, V> entry(K key) throws GridDhtInvalidPartitionException { + @Override public Entry<K, V> entry(K key) throws GridDhtInvalidPartitionException { return super.entry(key); } @@ -495,7 +495,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap @Nullable UUID subjId, String taskName, boolean deserializePortable, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter + @Nullable IgnitePredicate<Entry<K, V>>[] filter ) { return getAllAsync(keys, true, @@ -510,7 +510,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap } /** {@inheritDoc} */ - @Override public V reload(K key, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) + @Override public V reload(K key, @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { try { return super.reload(key, filter); @@ -535,7 +535,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap @Nullable UUID subjId, String taskName, boolean deserializePortable, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, + @Nullable IgnitePredicate<Entry<K, V>>[] filter, @Nullable IgniteCacheExpiryPolicy expiry ) { return getAllAsync(keys, @@ -573,7 +573,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap @Nullable UUID subjId, int taskNameHash, boolean deserializePortable, - IgnitePredicate<CacheEntry<K, V>>[] filter, + IgnitePredicate<Entry<K, V>>[] filter, @Nullable IgniteCacheExpiryPolicy expiry) { GridDhtGetFuture<K, V> fut = new GridDhtGetFuture<>(ctx, msgId, @@ -790,12 +790,12 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap /** {@inheritDoc} */ @Override public void unlockAll(Collection<? extends K> keys, - IgnitePredicate<CacheEntry<K, V>>[] filter) { + IgnitePredicate<Entry<K, V>>[] filter) { assert false; } /** {@inheritDoc} */ - @Override public Set<CacheEntry<K, V>> entrySet(int part) { + @Override public Set<Entry<K, V>> entrySet(int part) { return new PartitionEntrySet(part); } @@ -807,7 +807,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap /** * */ - private class PartitionEntrySet extends AbstractSet<CacheEntry<K, V>> { + private class PartitionEntrySet extends AbstractSet<Entry<K, V>> { /** */ private int partId; @@ -819,7 +819,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap } /** {@inheritDoc} */ - @NotNull @Override public Iterator<CacheEntry<K, V>> iterator() { + @NotNull @Override public Iterator<Entry<K, V>> iterator() { final GridDhtLocalPartition<K, V> part = ctx.topology().localPartition(partId, ctx.discovery().topologyVersion(), false); @@ -830,10 +830,10 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap /** {@inheritDoc} */ @Override public boolean remove(Object o) { - if (!(o instanceof CacheEntry)) + if (!(o instanceof Entry)) return false; - CacheEntry<K, V> entry = (CacheEntry<K, V>)o; + Entry<K, V> entry = (Entry<K, V>)o; K key = entry.getKey(); V val = entry.peek(); @@ -862,10 +862,10 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap /** {@inheritDoc} */ @Override public boolean contains(Object o) { - if (!(o instanceof CacheEntry)) + if (!(o instanceof Entry)) return false; - CacheEntry<K, V> entry = (CacheEntry<K, V>)o; + Entry<K, V> entry = (Entry<K, V>)o; return partId == entry.partition() && F.eq(entry.peek(), peek(entry.getKey())); } @@ -913,15 +913,15 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap /** * Complex partition iterator for both partition and swap iteration. */ - private static class PartitionEntryIterator<K, V> extends GridIteratorAdapter<CacheEntry<K, V>> { + private static class PartitionEntryIterator<K, V> extends GridIteratorAdapter<Entry<K, V>> { /** */ private static final long serialVersionUID = 0L; /** Next entry. */ - private CacheEntry<K, V> entry; + private Entry<K, V> entry; /** Last seen entry to support remove. */ - private CacheEntry<K, V> last; + private Entry<K, V> last; /** Partition iterator. */ private final Iterator<GridDhtCacheEntry<K, V>> partIt; @@ -941,7 +941,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap } /** {@inheritDoc} */ - @Override public CacheEntry<K, V> nextX() throws IgniteCheckedException { + @Override public Entry<K, V> nextX() throws IgniteCheckedException { if (!hasNext()) throw new NoSuchElementException(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java index 45173ec..0a02b6a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java @@ -80,7 +80,7 @@ public final class GridDhtGetFuture<K, V> extends GridCompoundIdentityFuture<Col private IgniteTxLocalEx<K, V> tx; /** Filters. */ - private IgnitePredicate<CacheEntry<K, V>>[] filters; + private IgnitePredicate<Entry<K, V>>[] filters; /** Logger. */ private IgniteLogger log; @@ -131,7 +131,7 @@ public final class GridDhtGetFuture<K, V> extends GridCompoundIdentityFuture<Col boolean reload, @Nullable IgniteTxLocalEx<K, V> tx, long topVer, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filters, + @Nullable IgnitePredicate<Entry<K, V>>[] filters, @Nullable UUID subjId, int taskNameHash, boolean deserializePortable, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java index a1b7655..f1f528c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java @@ -112,7 +112,7 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo private IgniteLogger log; /** Filter. */ - private IgnitePredicate<CacheEntry<K, V>>[] filter; + private IgnitePredicate<Entry<K, V>>[] filter; /** Transaction. */ private GridDhtTxLocalAdapter<K, V> tx; @@ -166,7 +166,7 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo GridDhtTxLocalAdapter<K, V> tx, long threadId, long accessTtl, - IgnitePredicate<CacheEntry<K, V>>[] filter) { + IgnitePredicate<Entry<K, V>>[] filter) { super(cctx.kernalContext(), CU.boolReducer()); assert nearNodeId != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java index 4d92302..9bcafe0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java @@ -561,7 +561,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach boolean retval, IgniteTxIsolation isolation, long accessTtl, - IgnitePredicate<CacheEntry<K, V>>[] filter) { + IgnitePredicate<Entry<K, V>>[] filter) { return lockAllAsyncInternal(keys, timeout, txx, @@ -595,7 +595,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach boolean retval, IgniteTxIsolation isolation, long accessTtl, - IgnitePredicate<CacheEntry<K, V>>[] filter) { + IgnitePredicate<Entry<K, V>>[] filter) { if (keys == null || keys.isEmpty()) return new GridDhtFinishedFuture<>(ctx.kernalContext(), true); @@ -672,7 +672,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach final GridCacheContext<K, V> cacheCtx, final ClusterNode nearNode, final GridNearLockRequest<K, V> req, - @Nullable final IgnitePredicate<CacheEntry<K, V>>[] filter0) { + @Nullable final IgnitePredicate<Entry<K, V>>[] filter0) { final List<K> keys = req.keys(); IgniteInternalFuture<Object> keyFut = null; @@ -698,7 +698,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach if (exx != null) return new GridDhtFinishedFuture<>(ctx.kernalContext(), exx); - IgnitePredicate<CacheEntry<K, V>>[] filter = filter0; + IgnitePredicate<Entry<K, V>>[] filter = filter0; // Set message into thread context. GridDhtTxLocal<K, V> tx = null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java index 4b48664..e1d68f2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java @@ -617,7 +617,7 @@ public abstract class GridDhtTxLocalAdapter<K, V> extends IgniteTxLocalAdapter<K final boolean read, final Set<K> skipped, final long accessTtl, - @Nullable final IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Nullable final IgnitePredicate<Entry<K, V>>[] filter) { if (log.isDebugEnabled()) log.debug("Before acquiring transaction lock on keys [passedKeys=" + passedKeys + ", skipped=" + skipped + ']'); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java index c1d41c6..d74546c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java @@ -82,7 +82,7 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M private GridCacheVersion ver; /** Filters. */ - private IgnitePredicate<CacheEntry<K, V>>[] filters; + private IgnitePredicate<Entry<K, V>>[] filters; /** Logger. */ private IgniteLogger log; @@ -133,7 +133,7 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M boolean readThrough, boolean reload, boolean forcePrimary, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filters, + @Nullable IgnitePredicate<Entry<K, V>>[] filters, @Nullable UUID subjId, String taskName, boolean deserializePortable, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/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 c757ad2..5eec9f0 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 @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.cache.distributed.dht.atomic; import org.apache.ignite.*; -import org.apache.ignite.cache.CacheEntry; +import org.apache.ignite.cache.Entry; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.cluster.*; @@ -233,7 +233,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public CacheEntry<K, V> entry(K key) { + @Override public Entry<K, V> entry(K key) { return new GridDhtCacheEntryImpl<>(ctx.projectionPerCall(), ctx, key, null); } @@ -265,7 +265,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { @Nullable UUID subjId, final String taskName, final boolean deserializePortable, - @Nullable final IgnitePredicate<CacheEntry<K, V>>[] filter + @Nullable final IgnitePredicate<Entry<K, V>>[] filter ) { GridCacheProjectionImpl<K, V> prj = ctx.projectionPerCall(); @@ -291,26 +291,26 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { /** {@inheritDoc} */ @Override public V put(K key, V val, @Nullable GridCacheEntryEx<K, V> cached, long ttl, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { return putAsync(key, val, cached, ttl, filter).get(); } /** {@inheritDoc} */ @Override public boolean putx(K key, V val, @Nullable GridCacheEntryEx<K, V> cached, - long ttl, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + long ttl, @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { return putxAsync(key, val, cached, ttl, filter).get(); } /** {@inheritDoc} */ @Override public boolean putx(K key, V val, - IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { return putxAsync(key, val, filter).get(); } /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public IgniteInternalFuture<V> putAsync(K key, V val, @Nullable GridCacheEntryEx<K, V> entry, - long ttl, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + long ttl, @Nullable IgnitePredicate<Entry<K, V>>... filter) { A.notNull(key, "key"); return updateAllAsync0(F0.asMap(key, val), @@ -327,7 +327,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public IgniteInternalFuture<Boolean> putxAsync(K key, V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<Entry<K, V>>... filter) { A.notNull(key, "key"); return updateAllAsync0(F0.asMap(key, val), @@ -435,13 +435,13 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { /** {@inheritDoc} */ @Override public void putAll(Map<? extends K, ? extends V> m, - IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { putAllAsync(m, filter).get(); } /** {@inheritDoc} */ @Override public IgniteInternalFuture<?> putAllAsync(Map<? extends K, ? extends V> m, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) { return updateAllAsync0(m, null, null, @@ -475,14 +475,14 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { /** {@inheritDoc} */ @Override public V remove(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { return removeAsync(key, entry, filter).get(); } /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public IgniteInternalFuture<V> removeAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<Entry<K, V>>... filter) { A.notNull(key, "key"); return removeAllAsync0(Collections.singletonList(key), null, entry, true, false, filter); @@ -490,13 +490,13 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { /** {@inheritDoc} */ @Override public void removeAll(Collection<? extends K> keys, - IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { removeAllAsync(keys, filter).get(); } /** {@inheritDoc} */ @Override public IgniteInternalFuture<?> removeAllAsync(Collection<? extends K> keys, - IgnitePredicate<CacheEntry<K, V>>[] filter) { + IgnitePredicate<Entry<K, V>>[] filter) { A.notNull(keys, "keys"); return removeAllAsync0(keys, null, null, false, false, filter); @@ -504,14 +504,14 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { /** {@inheritDoc} */ @Override public boolean removex(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { return removexAsync(key, entry, filter).get(); } /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public IgniteInternalFuture<Boolean> removexAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<Entry<K, V>>... filter) { A.notNull(key, "key"); return removeAllAsync0(Collections.singletonList(key), null, entry, false, false, filter); @@ -530,7 +530,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<?> removeAllAsync(IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Override public IgniteInternalFuture<?> removeAllAsync(IgnitePredicate<Entry<K, V>>[] filter) { return removeAllAsync(keySet(filter), filter); } @@ -604,7 +604,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { boolean retval, @Nullable IgniteTxIsolation isolation, long accessTtl, - IgnitePredicate<CacheEntry<K, V>>[] filter) { + IgnitePredicate<Entry<K, V>>[] filter) { return new FinishedLockFuture(new UnsupportedOperationException("Locks are not supported for " + "CacheAtomicityMode.ATOMIC mode (use CacheAtomicityMode.TRANSACTIONAL instead)")); } @@ -747,7 +747,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { final boolean retval, final boolean rawRetval, @Nullable GridCacheEntryEx<K, V> cached, - @Nullable final IgnitePredicate<CacheEntry<K, V>>[] filter + @Nullable final IgnitePredicate<Entry<K, V>>[] filter ) { if (map != null && keyCheck) validateCacheKeys(map.keySet()); @@ -805,7 +805,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { @Nullable GridCacheEntryEx<K, V> cached, final boolean retval, boolean rawRetval, - @Nullable final IgnitePredicate<CacheEntry<K, V>>[] filter + @Nullable final IgnitePredicate<Entry<K, V>>[] filter ) { final boolean statsEnabled = ctx.config().isStatisticsEnabled(); @@ -870,7 +870,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { private IgniteInternalFuture<Map<K, V>> getAllAsync0(@Nullable Collection<? extends K> keys, boolean reload, boolean forcePrimary, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, + @Nullable IgnitePredicate<Entry<K, V>>[] filter, UUID subjId, String taskName, boolean deserializePortable, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java index e7f6e5b..b13075e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java @@ -114,7 +114,7 @@ public class GridNearAtomicUpdateFuture<K, V> extends GridFutureAdapter<Object> private long topVer; /** Optional filter. */ - private final IgnitePredicate<CacheEntry<K, V>>[] filter; + private final IgnitePredicate<Entry<K, V>>[] filter; /** Write synchronization mode. */ private final CacheWriteSynchronizationMode syncMode; @@ -196,7 +196,7 @@ public class GridNearAtomicUpdateFuture<K, V> extends GridFutureAdapter<Object> final boolean rawRetval, @Nullable GridCacheEntryEx<K, V> cached, @Nullable ExpiryPolicy expiryPlc, - final IgnitePredicate<CacheEntry<K, V>>[] filter, + final IgnitePredicate<Entry<K, V>>[] filter, UUID subjId, int taskNameHash ) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java index 939c78b..3d0eb1e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java @@ -116,7 +116,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im /** Filter. */ @GridDirectTransient - private IgnitePredicate<CacheEntry<K, V>>[] filter; + private IgnitePredicate<Entry<K, V>>[] filter; /** Filter bytes. */ private byte[][] filterBytes; @@ -175,7 +175,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im boolean forceTransformBackups, @Nullable ExpiryPolicy expiryPlc, @Nullable Object[] invokeArgs, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, + @Nullable IgnitePredicate<Entry<K, V>>[] filter, @Nullable UUID subjId, int taskNameHash ) { @@ -285,7 +285,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im /** * @return Filter. */ - @Nullable public IgnitePredicate<CacheEntry<K, V>>[] filter() { + @Nullable public IgnitePredicate<Entry<K, V>>[] filter() { return filter; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java index b64911a..5fdac2e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java @@ -161,7 +161,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte @Nullable UUID subjId, String taskName, final boolean deserializePortable, - @Nullable final IgnitePredicate<CacheEntry<K, V>>[] filter + @Nullable final IgnitePredicate<Entry<K, V>>[] filter ) { ctx.denyOnFlag(LOCAL); ctx.checkSecurity(GridSecurityPermission.CACHE_READ); @@ -208,7 +208,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte } /** {@inheritDoc} */ - @Override public boolean containsKey(K key, @Nullable IgnitePredicate<CacheEntry<K, V>> filter) { + @Override public boolean containsKey(K key, @Nullable IgnitePredicate<Entry<K, V>> filter) { A.notNull(key, "key"); // We need detached entry here because if there is an ongoing transaction, @@ -247,7 +247,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte @Nullable UUID subjId, String taskName, boolean deserializePortable, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, + @Nullable IgnitePredicate<Entry<K, V>>[] filter, @Nullable IgniteCacheExpiryPolicy expiryPlc) { if (keys == null || keys.isEmpty()) return new GridFinishedFuture<>(ctx.kernalContext(), Collections.<K, V>emptyMap()); @@ -382,7 +382,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte boolean retval, @Nullable IgniteTxIsolation isolation, long accessTtl, - IgnitePredicate<CacheEntry<K, V>>[] filter) { + IgnitePredicate<Entry<K, V>>[] filter) { assert tx == null || tx instanceof GridNearTxLocal; GridNearTxLocal<K, V> txx = (GridNearTxLocal<K, V>)tx; @@ -410,13 +410,13 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte } /** {@inheritDoc} */ - @Override public CacheEntry<K, V> entry(K key) throws GridDhtInvalidPartitionException { + @Override public Entry<K, V> entry(K key) throws GridDhtInvalidPartitionException { return new GridDhtCacheEntryImpl<>(ctx.projectionPerCall(), ctx, key, null); } /** {@inheritDoc} */ @Override public void unlockAll(Collection<? extends K> keys, - IgnitePredicate<CacheEntry<K, V>>[] filter) { + IgnitePredicate<Entry<K, V>>[] filter) { if (keys.isEmpty()) return; @@ -432,9 +432,9 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte for (K key : keys) { GridDistributedCacheEntry<K, V> entry = peekExx(key); - CacheEntry<K, V> cacheEntry = entry == null ? entry(key) : entry.wrap(false); + Entry<K, V> Entry = entry == null ? entry(key) : entry.wrap(false); - if (!ctx.isAll(cacheEntry, filter)) + if (!ctx.isAll(Entry, filter)) break; // While. GridCacheMvccCandidate lock = ctx.mvcc().removeExplicitLock(Thread.currentThread().getId(), key, null); @@ -617,7 +617,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte final boolean txRead, final long timeout, final long accessTtl, - @Nullable final IgnitePredicate<CacheEntry<K, V>>[] filter + @Nullable final IgnitePredicate<Entry<K, V>>[] filter ) { assert keys != null; @@ -690,7 +690,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte final boolean txRead, final long timeout, final long accessTtl, - @Nullable final IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Nullable final IgnitePredicate<Entry<K, V>>[] filter) { int cnt = keys.size(); if (tx == null) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java index 370ffcd..6c06f7a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java @@ -96,7 +96,7 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity private IgniteLogger log; /** Filter. */ - private IgnitePredicate<CacheEntry<K, V>>[] filter; + private IgnitePredicate<Entry<K, V>>[] filter; /** Transaction. */ @GridToStringExclude @@ -140,7 +140,7 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity boolean retval, long timeout, long accessTtl, - IgnitePredicate<CacheEntry<K, V>>[] filter) { + IgnitePredicate<Entry<K, V>>[] filter) { super(cctx.kernalContext(), CU.boolReducer()); assert keys != null;
