http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/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 dc3d929..ccc8af7 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 @@ -59,7 +59,7 @@ import java.util.concurrent.locks.*; import static java.util.Collections.*; import static org.apache.ignite.IgniteSystemProperties.*; import static org.apache.ignite.events.IgniteEventType.*; -import static org.apache.ignite.cache.GridCacheFlag.*; +import static org.apache.ignite.cache.CacheFlag.*; import static org.apache.ignite.cache.GridCachePeekMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; @@ -71,7 +71,7 @@ import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKe * Adapter for different cache implementations. */ @SuppressWarnings("unchecked") -public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, +public abstract class GridCacheAdapter<K, V> implements Cache<K, V>, GridCacheProjectionEx<K, V>, Externalizable { /** */ private static final long serialVersionUID = 0L; @@ -151,13 +151,13 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, protected IgniteLogger log; /** Queries impl. */ - private GridCacheQueries<K, V> qry; + private CacheQueries<K, V> qry; /** Data structures impl. */ - private GridCacheDataStructures dataStructures; + private CacheDataStructures dataStructures; /** Affinity impl. */ - private GridCacheAffinity<K> aff; + private CacheAffinity<K> aff; /** Whether this cache is GGFS data cache. */ private boolean ggfsDataCache; @@ -344,33 +344,33 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, public abstract GridCachePreloader<K, V> preloader(); /** {@inheritDoc} */ - @Override public GridCacheQueries<K, V> queries() { + @Override public CacheQueries<K, V> queries() { return qry; } /** {@inheritDoc} */ - @Override public GridCacheAffinity<K> affinity() { + @Override public CacheAffinity<K> affinity() { return aff; } /** {@inheritDoc} */ - @Override public GridCacheDataStructures dataStructures() { + @Override public CacheDataStructures dataStructures() { return dataStructures; } /** {@inheritDoc} */ @SuppressWarnings({"unchecked", "RedundantCast"}) - @Override public <K1, V1> GridCache<K1, V1> cache() { - return (GridCache<K1, V1>)this; + @Override public <K1, V1> Cache<K1, V1> cache() { + return (Cache<K1, V1>)this; } /** {@inheritDoc} */ - @Override public Set<GridCacheFlag> flags() { + @Override public Set<CacheFlag> flags() { return F.asSet(ctx.forcedFlags()); } /** {@inheritDoc} */ - @Override public IgnitePredicate<GridCacheEntry<K, V>> predicate() { + @Override public IgnitePredicate<CacheEntry<K, V>> predicate() { return null; } @@ -389,7 +389,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Override public GridCacheProjection<K, V> flagsOn(@Nullable GridCacheFlag[] flags) { + @Override public CacheProjection<K, V> flagsOn(@Nullable CacheFlag[] flags) { if (F.isEmpty(flags)) return this; @@ -406,12 +406,12 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Override public GridCacheProjection<K, V> flagsOff(@Nullable GridCacheFlag[] flags) { + @Override public CacheProjection<K, V> flagsOff(@Nullable CacheFlag[] flags) { return this; } /** {@inheritDoc} */ - @Override public <K1, V1> GridCacheProjection<K1, V1> keepPortable() { + @Override public <K1, V1> CacheProjection<K1, V1> keepPortable() { GridCacheProjectionImpl<K1, V1> prj = keepPortable0(); return new GridCacheProxyImpl<>((GridCacheContext<K1, V1>)ctx, prj, prj); @@ -424,7 +424,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, */ public <K1, V1> GridCacheProjectionImpl<K1, V1> keepPortable0() { return new GridCacheProjectionImpl<>( - (GridCacheProjection<K1, V1>)this, + (CacheProjection<K1, V1>)this, (GridCacheContext<K1, V1>)ctx, null, null, @@ -455,7 +455,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @SuppressWarnings({"unchecked", "RedundantCast"}) - @Override public <K1, V1> GridCacheProjection<K1, V1> projection( + @Override public <K1, V1> CacheProjection<K1, V1> projection( Class<? super K1> keyType, Class<? super V1> valType ) { @@ -472,7 +472,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } } - GridCacheProjectionImpl<K1, V1> prj = new GridCacheProjectionImpl<>((GridCacheProjection<K1, V1>)this, + GridCacheProjectionImpl<K1, V1> prj = new GridCacheProjectionImpl<>((CacheProjection<K1, V1>)this, (GridCacheContext<K1, V1>)ctx, CU.<K1, V1>typeFilter(keyType, valType), /*filter*/null, @@ -485,7 +485,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Override public GridCacheProjection<K, V> projection(IgniteBiPredicate<K, V> p) { + @Override public CacheProjection<K, V> projection(IgniteBiPredicate<K, V> p) { if (p == null) return this; @@ -511,7 +511,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Override public GridCacheProjection<K, V> projection(IgnitePredicate<GridCacheEntry<K, V>> filter) { + @Override public CacheProjection<K, V> projection(IgnitePredicate<CacheEntry<K, V>> filter) { if (filter == null) return this; @@ -563,7 +563,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, IgniteTxIsolation isolation, boolean invalidate, long accessTtl, - IgnitePredicate<GridCacheEntry<K, V>>[] filter); + IgnitePredicate<CacheEntry<K, V>>[] filter); /** * Post constructor initialization for subclasses. @@ -643,7 +643,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public V peek(K key) { - return peek(key, (IgnitePredicate<GridCacheEntry<K, V>>)null); + return peek(key, (IgnitePredicate<CacheEntry<K, V>>)null); } /** {@inheritDoc} */ @@ -653,7 +653,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ public Map<K, V> peekAll(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { return peekAll0(keys, filter, null); } @@ -666,7 +666,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @throws GridCacheFilterFailedException If filter failed. */ @Nullable protected GridTuple<V> peek0(boolean failFast, K key, GridCachePeekMode mode, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws GridCacheFilterFailedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws GridCacheFilterFailedException { A.notNull(key, "key"); if (keyCheck) @@ -730,7 +730,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @return Peeked map. */ protected Map<K, V> peekAll0(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, @Nullable Collection<K> skipped) { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, @Nullable Collection<K> skipped) { if (F.isEmpty(keys)) return Collections.emptyMap(); @@ -802,7 +802,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, @Nullable protected GridTuple<V> peek0(boolean failFast, K key, @Nullable Collection<GridCachePeekMode> modes, IgniteTxEx<K, V> tx) throws IgniteCheckedException, GridCacheFilterFailedException { if (F.isEmpty(modes)) - return F.t(peek(key, (IgnitePredicate<GridCacheEntry<K, V>>)null)); + return F.t(peek(key, (IgnitePredicate<CacheEntry<K, V>>)null)); assert modes != null; @@ -927,18 +927,18 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Override public void forEach(IgniteInClosure<GridCacheEntry<K, V>> vis) { + @Override public void forEach(IgniteInClosure<CacheEntry<K, V>> vis) { A.notNull(vis, "vis"); - for (GridCacheEntry<K, V> e : entrySet()) + for (CacheEntry<K, V> e : entrySet()) vis.apply(e); } /** {@inheritDoc} */ - @Override public boolean forAll(IgnitePredicate<GridCacheEntry<K, V>> vis) { + @Override public boolean forAll(IgnitePredicate<CacheEntry<K, V>> vis) { A.notNull(vis, "vis"); - for (GridCacheEntry<K, V> e : entrySet()) + for (CacheEntry<K, V> e : entrySet()) if (!vis.apply(e)) return false; @@ -956,7 +956,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Nullable @Override public GridCacheEntry<K, V> entry(K key) { + @Nullable @Override public CacheEntry<K, V> entry(K key) { A.notNull(key, "key"); if (keyCheck) @@ -1066,54 +1066,54 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Override public Set<GridCacheEntry<K, V>> entrySet() { - return entrySet((IgnitePredicate<GridCacheEntry<K, V>>[])null); + @Override public Set<CacheEntry<K, V>> entrySet() { + return entrySet((IgnitePredicate<CacheEntry<K, V>>[])null); } /** {@inheritDoc} */ - @Override public Set<GridCacheEntry<K, V>> entrySetx(IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public Set<CacheEntry<K, V>> entrySetx(IgnitePredicate<CacheEntry<K, V>>... filter) { return map.entriesx(filter); } /** {@inheritDoc} */ - @Override public Set<GridCacheEntry<K, V>> primaryEntrySetx(IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public Set<CacheEntry<K, V>> primaryEntrySetx(IgnitePredicate<CacheEntry<K, V>>... filter) { return map.entriesx(F.and(filter, F.<K, V>cachePrimary())); } /** {@inheritDoc} */ - @Override public Set<GridCacheEntry<K, V>> entrySet(int part) { + @Override public Set<CacheEntry<K, V>> entrySet(int part) { throw new UnsupportedOperationException(); } /** {@inheritDoc} */ - @Override public Set<GridCacheEntry<K, V>> primaryEntrySet() { - return primaryEntrySet((IgnitePredicate<GridCacheEntry<K, V>>[])null); + @Override public Set<CacheEntry<K, V>> primaryEntrySet() { + return primaryEntrySet((IgnitePredicate<CacheEntry<K, V>>[])null); } /** {@inheritDoc} */ @Override public Set<K> keySet() { - return keySet((IgnitePredicate<GridCacheEntry<K, V>>[])null); + return keySet((IgnitePredicate<CacheEntry<K, V>>[])null); } /** {@inheritDoc} */ @Override public Set<K> primaryKeySet() { - return primaryKeySet((IgnitePredicate<GridCacheEntry<K, V>>[])null); + return primaryKeySet((IgnitePredicate<CacheEntry<K, V>>[])null); } /** {@inheritDoc} */ @Override public Collection<V> values() { - return values((IgnitePredicate<GridCacheEntry<K, V>>[])null); + return values((IgnitePredicate<CacheEntry<K, V>>[])null); } /** {@inheritDoc} */ - public Collection<V> values(IgnitePredicate<GridCacheEntry<K, V>>... filter) { + public Collection<V> values(IgnitePredicate<CacheEntry<K, V>>... filter) { return map.values(filter); } /** {@inheritDoc} */ @Override public Collection<V> primaryValues() { - return primaryValues((IgnitePredicate<GridCacheEntry<K, V>>[])null); + return primaryValues((IgnitePredicate<CacheEntry<K, V>>[])null); } /** @@ -1200,7 +1200,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, execSvc.awaitTermination(1000, TimeUnit.MILLISECONDS); } catch (InterruptedException ignore) { - U.warn(log, "Got interrupted while waiting for GridCache.clearAll() executor service to " + + U.warn(log, "Got interrupted while waiting for Cache.clearAll() executor service to " + "finish."); Thread.currentThread().interrupt(); @@ -1246,7 +1246,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @return {@code True} if cleared. */ private boolean clear(GridCacheVersion obsoleteVer, K key, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { try { if (ctx.portableEnabled()) key = (K)ctx.marshalToPortable(key); @@ -1301,7 +1301,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public boolean compact(K key) throws IgniteCheckedException { - return compact(key, (IgnitePredicate<GridCacheEntry<K, V>>[])null); + return compact(key, (IgnitePredicate<CacheEntry<K, V>>[])null); } /** {@inheritDoc} */ @@ -1325,7 +1325,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @return {@code True} if entry was evicted. */ private boolean evictx(K key, GridCacheVersion ver, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { if (ctx.portableEnabled()) { try { key = (K)ctx.marshalToPortable(key); @@ -1352,7 +1352,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public V get(K key, @Nullable GridCacheEntryEx<K, V> entry, boolean deserializePortable, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { String taskName = ctx.kernalContext().job().currentTaskName(); return getAllAsync(F.asList(key), !ctx.config().isReadFromBackup(), /*skip tx*/false, entry, null, taskName, @@ -1399,36 +1399,36 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Nullable @Override public V reload(K key) throws IgniteCheckedException { - return reload(key, (IgnitePredicate<GridCacheEntry<K, V>>[])null); + return reload(key, (IgnitePredicate<CacheEntry<K, V>>[])null); } /** {@inheritDoc} */ @Override public IgniteFuture<V> reloadAsync(K key) { - return reloadAsync(key, (IgnitePredicate<GridCacheEntry<K, V>>[])null); + return reloadAsync(key, (IgnitePredicate<CacheEntry<K, V>>[])null); } /** {@inheritDoc} */ @Override public void reloadAll(@Nullable Collection<? extends K> keys) throws IgniteCheckedException { - reloadAll(keys, (IgnitePredicate<GridCacheEntry<K, V>>[])null); + reloadAll(keys, (IgnitePredicate<CacheEntry<K, V>>[])null); } /** {@inheritDoc} */ @Override public IgniteFuture<?> reloadAllAsync(@Nullable Collection<? extends K> keys) { - return reloadAllAsync(keys, (IgnitePredicate<GridCacheEntry<K, V>>[])null); + return reloadAllAsync(keys, (IgnitePredicate<CacheEntry<K, V>>[])null); } /** {@inheritDoc} */ @Override public void reloadAll() throws IgniteCheckedException { ctx.denyOnFlags(F.asList(LOCAL, READ)); - reloadAll(keySet(), (IgnitePredicate<GridCacheEntry<K, V>>[])null); + reloadAll(keySet(), (IgnitePredicate<CacheEntry<K, V>>[])null); } /** {@inheritDoc} */ @Override public IgniteFuture<?> reloadAllAsync() { ctx.denyOnFlags(F.asList(LOCAL, READ)); - return reloadAllAsync(keySet(), (IgnitePredicate<GridCacheEntry<K, V>>[])null); + return reloadAllAsync(keySet(), (IgnitePredicate<CacheEntry<K, V>>[])null); } /** @@ -1444,7 +1444,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, public IgniteFuture<Object> readThroughAllAsync(final Collection<? extends K> keys, boolean reload, @Nullable final IgniteTxEx<K, V> tx, - IgnitePredicate<GridCacheEntry<K, V>>[] filter, + IgnitePredicate<CacheEntry<K, V>>[] filter, @Nullable UUID subjId, String taskName, final IgniteBiInClosure<K, V> vis) { @@ -1470,7 +1470,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @throws IgniteCheckedException If failed. */ @Nullable public Map<K, V> reloadAll(@Nullable Collection<? extends K> keys, boolean ret, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { UUID subjId = ctx.subjectIdPerCall(null); String taskName = ctx.kernalContext().job().currentTaskName(); @@ -1485,7 +1485,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @return Future. */ public IgniteFuture<Map<K, V>> reloadAllAsync(@Nullable Collection<? extends K> keys, boolean ret, - @Nullable UUID subjId, String taskName, @Nullable final IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable UUID subjId, String taskName, @Nullable final IgnitePredicate<CacheEntry<K, V>>... filter) { ctx.denyOnFlag(READ); final long topVer = ctx.affinity().affinityTopologyVersion(); @@ -1650,7 +1650,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public boolean evict(K key) { - return evict(key, (IgnitePredicate<GridCacheEntry<K, V>>[])null); + return evict(key, (IgnitePredicate<CacheEntry<K, V>>[])null); } /** {@inheritDoc} */ @@ -1660,7 +1660,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public void evictAll(@Nullable Collection<? extends K> keys) { - evictAll(keys, (IgnitePredicate<GridCacheEntry<K, V>>[])null); + evictAll(keys, (IgnitePredicate<CacheEntry<K, V>>[])null); } /** {@inheritDoc} */ @@ -1723,7 +1723,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, if (F.isEmpty(keys)) return map; - GridCacheInterceptor<K, V> interceptor = cacheCfg.getInterceptor(); + CacheInterceptor<K, V> interceptor = cacheCfg.getInterceptor(); assert interceptor != null; @@ -1761,7 +1761,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, @Nullable UUID subjId, String taskName, boolean deserializePortable, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter ) { GridCacheProjectionImpl<K, V> prj = ctx.projectionPerCall(); @@ -1789,7 +1789,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, final boolean deserializePortable, final boolean forcePrimary, @Nullable IgniteCacheExpiryPolicy expiry, - @Nullable final IgnitePredicate<GridCacheEntry<K, V>>... filter + @Nullable final IgnitePredicate<CacheEntry<K, V>>... filter ) { ctx.checkSecurity(GridSecurityPermission.CACHE_READ); @@ -2066,14 +2066,14 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Override public V put(K key, V val, @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) + @Override public V put(K key, V val, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { return put(key, val, null, -1, filter); } /** {@inheritDoc} */ @Nullable @Override public V put(final K key, final V val, @Nullable final GridCacheEntryEx<K, V> cached, - final long ttl, @Nullable final IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + final long ttl, @Nullable final IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { A.notNull(key, "key", val, "val"); if (keyCheck) @@ -2096,7 +2096,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public boolean putx(final K key, final V val, @Nullable final GridCacheEntryEx<K, V> cached, - final long ttl, @Nullable final IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { + final long ttl, @Nullable final IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { A.notNull(key, "key", val, "val"); if (keyCheck) @@ -2121,13 +2121,13 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public IgniteFuture<V> putAsync(K key, V val, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { return putAsync(key, val, null, -1, filter); } /** {@inheritDoc} */ @Override public IgniteFuture<V> putAsync(final K key, final V val, @Nullable final GridCacheEntryEx<K, V> entry, - final long ttl, @Nullable final IgnitePredicate<GridCacheEntry<K, V>>... filter) { + final long ttl, @Nullable final IgnitePredicate<CacheEntry<K, V>>... filter) { A.notNull(key, "key", val, "val"); if (keyCheck) @@ -2153,7 +2153,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public boolean putx(final K key, final V val, - final IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + final IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { A.notNull(key, "key", val, "val"); if (keyCheck) @@ -2428,14 +2428,14 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public IgniteFuture<Boolean> putxAsync(K key, V val, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { return putxAsync(key, val, null, -1, filter); } /** {@inheritDoc} */ @Override public IgniteFuture<Boolean> putxAsync(final K key, final V val, @Nullable final GridCacheEntryEx<K, V> entry, final long ttl, - @Nullable final IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable final IgnitePredicate<CacheEntry<K, V>>... filter) { A.notNull(key, "key", val, "val"); if (keyCheck) @@ -2704,7 +2704,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public void putAll(@Nullable final Map<? extends K, ? extends V> m, - final IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + final IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { if (F.isEmpty(m)) return; @@ -2728,7 +2728,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public IgniteFuture<?> putAllAsync(final Map<? extends K, ? extends V> m, - @Nullable final IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable final IgnitePredicate<CacheEntry<K, V>>... filter) { if (F.isEmpty(m)) return new GridFinishedFuture<Object>(ctx.kernalContext()); @@ -2751,14 +2751,14 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Nullable @Override public V remove(K key, IgnitePredicate<GridCacheEntry<K, V>>[] filter) + @Nullable @Override public V remove(K key, IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { return remove(key, null, filter); } /** {@inheritDoc} */ @Override public V remove(final K key, @Nullable final GridCacheEntryEx<K, V> entry, - @Nullable final IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable final IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { ctx.denyOnLocalRead(); A.notNull(key, "key"); @@ -2783,13 +2783,13 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Override public IgniteFuture<V> removeAsync(K key, IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public IgniteFuture<V> removeAsync(K key, IgnitePredicate<CacheEntry<K, V>>... filter) { return removeAsync(key, null, filter); } /** {@inheritDoc} */ @Override public IgniteFuture<V> removeAsync(final K key, @Nullable final GridCacheEntryEx<K, V> entry, - @Nullable final IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable final IgnitePredicate<CacheEntry<K, V>>... filter) { ctx.denyOnLocalRead(); A.notNull(key, "key"); @@ -2812,7 +2812,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public void removeAll(final Collection<? extends K> keys, - final IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { + final IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { A.notNull(keys, "keys"); ctx.denyOnLocalRead(); @@ -2847,7 +2847,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public IgniteFuture<?> removeAllAsync(@Nullable final Collection<? extends K> keys, - final IgnitePredicate<GridCacheEntry<K, V>>... filter) { + final IgnitePredicate<CacheEntry<K, V>>... filter) { if (F.isEmpty(keys)) return new GridFinishedFuture<Object>(ctx.kernalContext()); @@ -2868,14 +2868,14 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Override public boolean removex(final K key, final IgnitePredicate<GridCacheEntry<K, V>>... filter) + @Override public boolean removex(final K key, final IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { return removex(key, null, filter); } /** {@inheritDoc} */ @Override public boolean removex(final K key, @Nullable final GridCacheEntryEx<K, V> entry, - @Nullable final IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable final IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { ctx.denyOnLocalRead(); A.notNull(key, "key"); @@ -2895,13 +2895,13 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> removexAsync(K key, IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public IgniteFuture<Boolean> removexAsync(K key, IgnitePredicate<CacheEntry<K, V>>... filter) { return removexAsync(key, null, filter); } /** {@inheritDoc} */ @Override public IgniteFuture<Boolean> removexAsync(final K key, @Nullable final GridCacheEntryEx<K, V> entry, - @Nullable final IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable final IgnitePredicate<CacheEntry<K, V>>... filter) { ctx.denyOnLocalRead(); A.notNull(key, "key"); @@ -3148,13 +3148,13 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Override public void removeAll(IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Override public void removeAll(IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { ctx.denyOnLocalRead(); if (F.isEmptyOrNulls(filter)) filter = ctx.trueArray(); - final IgnitePredicate<GridCacheEntry<K, V>>[] p = filter; + final IgnitePredicate<CacheEntry<K, V>>[] p = filter; syncOp(new SyncInOp(false) { @Override public void inOp(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException { @@ -3168,7 +3168,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Override public IgniteFuture<?> removeAllAsync(final IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public IgniteFuture<?> removeAllAsync(final IgnitePredicate<CacheEntry<K, V>>... filter) { ctx.denyOnLocalRead(); final Set<? extends K> keys = keySet(filter); @@ -3185,7 +3185,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Override public GridCacheMetrics metrics() { + @Override public CacheMetrics metrics() { return GridCacheMetricsAdapter.copyOf(metrics); } @@ -3205,7 +3205,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public boolean lock(K key, long timeout, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { A.notNull(key, "key"); return lockAll(Collections.singletonList(key), timeout, filter); @@ -3213,7 +3213,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public boolean lockAll(@Nullable Collection<? extends K> keys, long timeout, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { if (F.isEmpty(keys)) return true; @@ -3243,7 +3243,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public IgniteFuture<Boolean> lockAsync(K key, long timeout, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { A.notNull(key, "key"); if (keyCheck) @@ -3253,7 +3253,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Override public void unlock(K key, IgnitePredicate<GridCacheEntry<K, V>>... filter) + @Override public void unlock(K key, IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { A.notNull(key, "key"); @@ -3574,7 +3574,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Nullable @Override public GridCacheEntry<K, V> randomEntry() { + @Nullable @Override public CacheEntry<K, V> randomEntry() { GridCacheMapEntry<K, V> e = map.randomEntry(); return e == null || e.obsolete() ? null : e.wrap(true); @@ -3611,7 +3611,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** {@inheritDoc} */ - @Override public Iterator<GridCacheEntry<K, V>> iterator() { + @Override public Iterator<CacheEntry<K, V>> iterator() { return entrySet().iterator(); } @@ -4194,7 +4194,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @param filter Filters to evaluate. */ public void clearAll0(Collection<? extends K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { ctx.denyOnFlag(READ); ctx.checkSecurity(GridSecurityPermission.CACHE_REMOVE); @@ -4215,7 +4215,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @param filter Filters to evaluate. * @return {@code True} if cleared. */ - public boolean clear0(K key, @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + public boolean clear0(K key, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { A.notNull(key, "key"); if (keyCheck) @@ -4233,7 +4233,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @return {@code True} if compacted. * @throws IgniteCheckedException If failed. */ - public boolean compact(K key, @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) + public boolean compact(K key, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { ctx.denyOnFlag(READ); @@ -4264,7 +4264,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @param filter Filters to evaluate. * @return {@code True} if evicted. */ - public boolean evict(K key, @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + public boolean evict(K key, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { A.notNull(key, "key"); if (keyCheck) @@ -4280,7 +4280,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @param filter Filters to evaluate. */ public void evictAll(Collection<? extends K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { ctx.denyOnFlag(READ); if (F.isEmpty(keys)) @@ -4310,7 +4310,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @param filter Filters to evaluate. * @return {@code True} if contains key. */ - public boolean containsKey(K key, @Nullable IgnitePredicate<GridCacheEntry<K, V>> filter) { + public boolean containsKey(K key, @Nullable IgnitePredicate<CacheEntry<K, V>> filter) { A.notNull(key, "key"); if (keyCheck) @@ -4344,7 +4344,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @return {@code True} if contains all keys. */ public boolean containsAllKeys(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>> filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>> filter) { if (F.isEmpty(keys)) return true; @@ -4364,7 +4364,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @return {@code True} if cache contains any of given keys. */ public boolean containsAnyKeys(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>> filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>> filter) { if (F.isEmpty(keys)) return true; @@ -4384,7 +4384,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @param filter Filter to evaluate. * @return {@code True} if contains value. */ - public boolean containsValue(V val, @Nullable IgnitePredicate<GridCacheEntry<K, V>> filter) { + public boolean containsValue(V val, @Nullable IgnitePredicate<CacheEntry<K, V>> filter) { A.notNull(val, "val"); validateCacheValue(val); @@ -4398,7 +4398,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @return {@code True} if contains all given values. */ public boolean containsAllValues(@Nullable Collection<? extends V> vals, - @Nullable IgnitePredicate<GridCacheEntry<K, V>> filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>> filter) { if (F.isEmpty(vals)) return true; @@ -4413,7 +4413,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @return {@code True} if contains any of given values. */ public boolean containsAnyValues(@Nullable Collection<? extends V> vals, - @Nullable IgnitePredicate<GridCacheEntry<K, V>> filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>> filter) { if (F.isEmpty(vals)) return true; @@ -4427,7 +4427,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @param filter Filter to evaluate. * @return Peeked value. */ - public V peek(K key, @Nullable IgnitePredicate<GridCacheEntry<K, V>> filter) { + public V peek(K key, @Nullable IgnitePredicate<CacheEntry<K, V>> filter) { try { GridTuple<V> peek = peek0(false, key, SMART, filter); @@ -4446,7 +4446,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @param filter Filters to evaluate. * @return Entry set. */ - public Set<GridCacheEntry<K, V>> entrySet(@Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + public Set<CacheEntry<K, V>> entrySet(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { return map.entries(filter); } @@ -4456,8 +4456,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @param filter Entry filter. * @return Entry set. */ - public Set<GridCacheEntry<K, V>> entrySet(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<K> keyFilter, @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + public Set<CacheEntry<K, V>> entrySet(@Nullable Collection<? extends K> keys, + @Nullable IgnitePredicate<K> keyFilter, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { if (F.isEmpty(keys)) return emptySet(); @@ -4471,8 +4471,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @param filter Filters to evaluate. * @return Primary entry set. */ - public Set<GridCacheEntry<K, V>> primaryEntrySet( - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + public Set<CacheEntry<K, V>> primaryEntrySet( + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { return map.entries(F.and(filter, F.<K, V>cachePrimary())); } @@ -4480,7 +4480,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @param filter Filters to evaluate. * @return Key set. */ - public Set<K> keySet(@Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + public Set<K> keySet(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { return map.keySet(filter); } @@ -4488,7 +4488,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @param filter Primary key set. * @return Primary key set. */ - public Set<K> primaryKeySet(@Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + public Set<K> primaryKeySet(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { return map.keySet(F.and(filter, F.<K, V>cachePrimary())); } @@ -4496,7 +4496,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @param filter Filters to evaluate. * @return Primary values. */ - public Collection<V> primaryValues(@Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + public Collection<V> primaryValues(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { return map.values(F.and(filter, F.<K, V>cachePrimary())); } @@ -4506,7 +4506,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @throws IgniteCheckedException If failed. */ public void compactAll(@Nullable Iterable<K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { ctx.denyOnFlag(READ); if (keys != null) { @@ -4521,7 +4521,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @return Cached value. * @throws IgniteCheckedException If failed. */ - @Nullable public V get(K key, boolean deserializePortable, @Nullable IgnitePredicate<GridCacheEntry<K, V>> filter) + @Nullable public V get(K key, boolean deserializePortable, @Nullable IgnitePredicate<CacheEntry<K, V>> filter) throws IgniteCheckedException { return getAllAsync(F.asList(key), deserializePortable, filter).get().get(key); } @@ -4532,7 +4532,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @return Read operation future. */ public final IgniteFuture<V> getAsync(final K key, boolean deserializePortable, - @Nullable IgnitePredicate<GridCacheEntry<K, V>> filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>> filter) { ctx.denyOnFlag(LOCAL); try { @@ -4557,7 +4557,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @throws IgniteCheckedException If read failed. */ public Map<K, V> getAll(Collection<? extends K> keys, boolean deserializePortable, - IgnitePredicate<GridCacheEntry<K, V>> filter) throws IgniteCheckedException { + IgnitePredicate<CacheEntry<K, V>> filter) throws IgniteCheckedException { ctx.denyOnFlag(LOCAL); checkJta(); @@ -4571,7 +4571,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @return Reloaded value. * @throws IgniteCheckedException If failed. */ - @Nullable public V reload(K key, @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) + @Nullable public V reload(K key, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { ctx.denyOnFlags(F.asList(LOCAL, READ)); @@ -4606,7 +4606,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @throws IgniteCheckedException If failed. */ public void reloadAll(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { reloadAll(keys, false, filter); } @@ -4616,7 +4616,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @return Reload future. */ public IgniteFuture<?> reloadAllAsync(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { UUID subjId = ctx.subjectIdPerCall(null); String taskName = ctx.kernalContext().job().currentTaskName(); @@ -4630,7 +4630,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @return Reload future. */ public IgniteFuture<V> reloadAsync(final K key, - @Nullable final IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable final IgnitePredicate<CacheEntry<K, V>>... filter) { ctx.denyOnFlags(F.asList(LOCAL, READ)); return ctx.closures().callLocalSafe(ctx.projectSafe(new Callable<V>() { @@ -4644,7 +4644,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @param filter Filter to evaluate. * @throws IgniteCheckedException If reload failed. */ - public final void reloadAll(@Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { + public final void reloadAll(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { ctx.denyOnFlag(READ); Set<K> keys = keySet(); @@ -4658,7 +4658,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, * @param filter Filter to evaluate. * @return Reload future. */ - public IgniteFuture<?> reloadAllAsync(@Nullable final IgnitePredicate<GridCacheEntry<K, V>> filter) { + public IgniteFuture<?> reloadAllAsync(@Nullable final IgnitePredicate<CacheEntry<K, V>> filter) { ctx.denyOnFlag(READ); return ctx.closures().callLocalSafe(ctx.projectSafe(new GPC() { @@ -4678,7 +4678,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, */ public IgniteFuture<Map<K, V>> getAllAsync(@Nullable Collection<? extends K> keys, boolean deserializePortable, - @Nullable IgnitePredicate<GridCacheEntry<K, V>> filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>> filter) { String taskName = ctx.kernalContext().job().currentTaskName(); if (ctx.portableEnabled() && !F.isEmpty(keys)) { @@ -4920,7 +4920,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** - * Internal callable which performs {@link GridCacheProjection#clearAll()} + * Internal callable which performs {@link org.apache.ignite.cache.CacheProjection#clearAll()} * operation on a cache with the given name. */ @GridInternal @@ -4968,7 +4968,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** - * Internal callable which performs {@link GridCacheProjection#size()} or {@link GridCacheProjection#primarySize()} + * Internal callable which performs {@link org.apache.ignite.cache.CacheProjection#size()} or {@link org.apache.ignite.cache.CacheProjection#primarySize()} * operation on a cache with the given name. */ @GridInternal @@ -5004,7 +5004,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public Integer apply(Object o) { - GridCache<Object, Object> cache = ((GridEx) ignite).cachex(cacheName); + Cache<Object, Object> cache = ((GridEx) ignite).cachex(cacheName); return primaryOnly ? cache.primarySize() : cache.size(); }
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java index 481a7ec..fa268b1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java @@ -28,7 +28,7 @@ import java.io.*; import static org.apache.ignite.cache.CacheConfiguration.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; /** * Cache attributes. @@ -70,16 +70,16 @@ public class GridCacheAttributes implements Externalizable { private boolean storeValBytes; /** Cache preload mode. */ - private GridCachePreloadMode preloadMode; + private CachePreloadMode preloadMode; /** Partitioned cache mode. */ - private GridCacheDistributionMode partDistro; + private CacheDistributionMode partDistro; /** Preload batch size. */ private int preloadBatchSize; /** Synchronization mode. */ - private GridCacheWriteSynchronizationMode writeSyncMode; + private CacheWriteSynchronizationMode writeSyncMode; /** Flag indicating whether GridGain should use swap storage by default. */ protected boolean swapEnabled; @@ -195,11 +195,11 @@ public class GridCacheAttributes implements Externalizable { affKeyBackups = cfg.getBackups(); - GridCacheAffinityFunction aff = cfg.getAffinity(); + CacheAffinityFunction aff = cfg.getAffinity(); if (aff != null) { - if (aff instanceof GridCacheConsistentHashAffinityFunction) { - GridCacheConsistentHashAffinityFunction aff0 = (GridCacheConsistentHashAffinityFunction) aff; + if (aff instanceof CacheConsistentHashAffinityFunction) { + CacheConsistentHashAffinityFunction aff0 = (CacheConsistentHashAffinityFunction) aff; affInclNeighbors = aff0.isExcludeNeighbors(); affReplicas = aff0.getDefaultReplicas(); @@ -270,7 +270,7 @@ public class GridCacheAttributes implements Externalizable { /** * @return Preload mode. */ - public GridCachePreloadMode cachePreloadMode() { + public CachePreloadMode cachePreloadMode() { return preloadMode; } @@ -411,7 +411,7 @@ public class GridCacheAttributes implements Externalizable { /** * @return Partitioned cache mode. */ - public GridCacheDistributionMode partitionedTaxonomy() { + public CacheDistributionMode partitionedTaxonomy() { return partDistro; } @@ -446,7 +446,7 @@ public class GridCacheAttributes implements Externalizable { /** * @return Synchronization mode. */ - public GridCacheWriteSynchronizationMode writeSynchronization() { + public CacheWriteSynchronizationMode writeSynchronization() { return writeSyncMode; } @@ -585,9 +585,9 @@ public class GridCacheAttributes implements Externalizable { indexingSpiName = U.readString(in); loadPrevVal = in.readBoolean(); name = U.readString(in); - partDistro = GridCacheDistributionMode.fromOrdinal(U.readEnumOrdinal0(in)); + partDistro = CacheDistributionMode.fromOrdinal(U.readEnumOrdinal0(in)); preloadBatchSize = in.readInt(); - preloadMode = GridCachePreloadMode.fromOrdinal(U.readEnumOrdinal0(in)); + preloadMode = CachePreloadMode.fromOrdinal(U.readEnumOrdinal0(in)); qryIdxEnabled = in.readBoolean(); readThrough = in.readBoolean(); seqReserveSize = in.readInt(); @@ -599,7 +599,7 @@ public class GridCacheAttributes implements Externalizable { writeBehindFlushFreq = in.readLong(); writeBehindFlushSize = in.readInt(); writeBehindFlushThreadCnt = in.readInt(); - writeSyncMode = GridCacheWriteSynchronizationMode.fromOrdinal(U.readEnumOrdinal0(in)); + writeSyncMode = CacheWriteSynchronizationMode.fromOrdinal(U.readEnumOrdinal0(in)); writeThrough = in.readBoolean(); affClsName = U.readString(in); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java index 1f289ae..0088f25 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java @@ -34,7 +34,7 @@ import java.util.*; import java.util.concurrent.atomic.*; import java.util.concurrent.locks.*; -import static org.apache.ignite.cache.GridCacheFlag.*; +import static org.apache.ignite.cache.CacheFlag.*; /** * Concurrent implementation of cache map. @@ -87,9 +87,9 @@ public class GridCacheConcurrentMap<K, V> { private final LongAdder mapSize = new LongAdder(); /** Filters cache internal entry. */ - private static final P1<GridCacheEntry<?, ?>> NON_INTERNAL = - new P1<GridCacheEntry<?, ?>>() { - @Override public boolean apply(GridCacheEntry<?, ?> entry) { + private static final P1<CacheEntry<?, ?>> NON_INTERNAL = + new P1<CacheEntry<?, ?>>() { + @Override public boolean apply(CacheEntry<?, ?> entry) { return !(entry.getKey() instanceof GridCacheInternal); } }; @@ -312,17 +312,17 @@ public class GridCacheConcurrentMap<K, V> { /** * @return Non-internal predicate. */ - private static <K, V> IgnitePredicate<GridCacheEntry<K, V>>[] nonInternal() { - return (IgnitePredicate<GridCacheEntry<K,V>>[])NON_INTERNAL_ARR; + private static <K, V> IgnitePredicate<CacheEntry<K, V>>[] nonInternal() { + return (IgnitePredicate<CacheEntry<K,V>>[])NON_INTERNAL_ARR; } /** * @param filter Filter to add to non-internal-key filter. * @return Non-internal predicate. */ - private static <K, V> IgnitePredicate<GridCacheEntry<K, V>>[] nonInternal( - IgnitePredicate<GridCacheEntry<K, V>>[] filter) { - return F.asArray(F0.and((IgnitePredicate<GridCacheEntry<K, V>>[]) NON_INTERNAL_ARR, filter)); + private static <K, V> IgnitePredicate<CacheEntry<K, V>>[] nonInternal( + IgnitePredicate<CacheEntry<K, V>>[] filter) { + return F.asArray(F0.and((IgnitePredicate<CacheEntry<K, V>>[]) NON_INTERNAL_ARR, filter)); } /** @@ -394,7 +394,7 @@ public class GridCacheConcurrentMap<K, V> { * @param filter Filter. * @return a collection view of the values contained in this map. */ - public Collection<V> allValues(IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + public Collection<V> allValues(IgnitePredicate<CacheEntry<K, V>>[] filter) { checkWeakQueue(); return new Values<>(this, filter); @@ -562,10 +562,10 @@ public class GridCacheConcurrentMap<K, V> { * @return Entry wrapper set. */ @SuppressWarnings({"unchecked", "RedundantCast"}) - public Set<GridCacheEntryImpl<K, V>> wrappers(IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + public Set<GridCacheEntryImpl<K, V>> wrappers(IgnitePredicate<CacheEntry<K, V>>[] filter) { checkWeakQueue(); - return (Set<GridCacheEntryImpl<K, V>>)(Set<? extends GridCacheEntry<K, V>>)entries(filter); + return (Set<GridCacheEntryImpl<K, V>>)(Set<? extends CacheEntry<K, V>>)entries(filter); } /** @@ -575,10 +575,10 @@ public class GridCacheConcurrentMap<K, V> { * @return Entry projections set. */ @SuppressWarnings({"unchecked", "RedundantCast"}) - public Set<GridCacheEntry<K, V>> projections(IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + public Set<CacheEntry<K, V>> projections(IgnitePredicate<CacheEntry<K, V>>[] filter) { checkWeakQueue(); - return (Set<GridCacheEntry<K, V>>)(Set<? extends GridCacheEntry<K, V>>)wrappers(filter); + return (Set<CacheEntry<K, V>>)(Set<? extends CacheEntry<K, V>>)wrappers(filter); } /** @@ -588,7 +588,7 @@ public class GridCacheConcurrentMap<K, V> { * @return Set of the mappings contained in this map. */ @SuppressWarnings({"unchecked"}) - public Set<GridCacheEntry<K, V>> entries(IgnitePredicate<GridCacheEntry<K, V>>... filter) { + public Set<CacheEntry<K, V>> entries(IgnitePredicate<CacheEntry<K, V>>... filter) { checkWeakQueue(); return new EntrySet<>(this, filter); @@ -601,7 +601,7 @@ public class GridCacheConcurrentMap<K, V> { * @return Set of the mappings contained in this map. */ @SuppressWarnings({"unchecked"}) - public Set<GridCacheEntry<K, V>> entriesx(IgnitePredicate<GridCacheEntry<K, V>>... filter) { + public Set<CacheEntry<K, V>> entriesx(IgnitePredicate<CacheEntry<K, V>>... filter) { checkWeakQueue(); return new EntrySet<>(this, filter, true); @@ -648,7 +648,7 @@ public class GridCacheConcurrentMap<K, V> { * @param filter Filter. * @return Set of the keys contained in this map. */ - public Set<K> keySet(IgnitePredicate<GridCacheEntry<K, V>>... filter) { + public Set<K> keySet(IgnitePredicate<CacheEntry<K, V>>... filter) { checkWeakQueue(); return new KeySet<>(this, filter); @@ -660,7 +660,7 @@ public class GridCacheConcurrentMap<K, V> { * @param filter Filter. * @return Collection view of the values contained in this map. */ - public Collection<V> values(IgnitePredicate<GridCacheEntry<K, V>>... filter) { + public Collection<V> values(IgnitePredicate<CacheEntry<K, V>>... filter) { checkWeakQueue(); return allValues(filter); @@ -1568,7 +1568,7 @@ public class GridCacheConcurrentMap<K, V> { private GridCacheMapEntry<K, V> cur; /** Iterator filter. */ - private IgnitePredicate<GridCacheEntry<K, V>>[] filter; + private IgnitePredicate<CacheEntry<K, V>>[] filter; /** Outer cache map. */ private GridCacheConcurrentMap<K, V> map; @@ -1601,7 +1601,7 @@ public class GridCacheConcurrentMap<K, V> { */ @SuppressWarnings({"unchecked"}) Iterator0(GridCacheConcurrentMap<K, V> map, boolean isVal, - IgnitePredicate<GridCacheEntry<K, V>>[] filter, int id, int totalCnt) { + IgnitePredicate<CacheEntry<K, V>>[] filter, int id, int totalCnt) { this.filter = filter; this.isVal = isVal; this.id = id; @@ -1780,7 +1780,7 @@ public class GridCacheConcurrentMap<K, V> { @SuppressWarnings({"unchecked"}) @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { ctx = (GridCacheContext<K, V>)in.readObject(); - filter = (IgnitePredicate<GridCacheEntry<K, V>>[])in.readObject(); + filter = (IgnitePredicate<CacheEntry<K, V>>[])in.readObject(); isVal = in.readBoolean(); id = in.readInt(); totalCnt = in.readInt(); @@ -1806,7 +1806,7 @@ public class GridCacheConcurrentMap<K, V> { private static final long serialVersionUID = 0L; /** Filter. */ - private IgnitePredicate<GridCacheEntry<K, V>>[] filter; + private IgnitePredicate<CacheEntry<K, V>>[] filter; /** Base map. */ private GridCacheConcurrentMap<K, V> map; @@ -1818,7 +1818,7 @@ public class GridCacheConcurrentMap<K, V> { private GridCacheProjectionImpl prjPerCall; /** */ - private GridCacheFlag[] forcedFlags; + private CacheFlag[] forcedFlags; /** */ private boolean clone; @@ -1834,7 +1834,7 @@ public class GridCacheConcurrentMap<K, V> { * @param map Base map. * @param filter Filter. */ - private Set0(GridCacheConcurrentMap<K, V> map, IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + private Set0(GridCacheConcurrentMap<K, V> map, IgnitePredicate<CacheEntry<K, V>>[] filter) { assert map != null; this.map = map; @@ -1855,7 +1855,7 @@ public class GridCacheConcurrentMap<K, V> { /** * @return Entry iterator. */ - Iterator<GridCacheEntry<K, V>> entryIterator() { + Iterator<CacheEntry<K, V>> entryIterator() { return new EntryIterator<>(map, filter, ctx, prjPerCall, forcedFlags); } @@ -1924,7 +1924,7 @@ public class GridCacheConcurrentMap<K, V> { /** {@inheritDoc} */ @Override public boolean remove(Object o) { - return o instanceof GridCacheEntry && removeKey(((Map.Entry<K, V>)o).getKey()); + return o instanceof CacheEntry && removeKey(((Map.Entry<K, V>)o).getKey()); } /** @@ -1964,7 +1964,7 @@ public class GridCacheConcurrentMap<K, V> { /** {@inheritDoc} */ @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { ctx = (GridCacheContext<K, V>)in.readObject(); - filter = (IgnitePredicate<GridCacheEntry<K, V>>[])in.readObject(); + filter = (IgnitePredicate<CacheEntry<K, V>>[])in.readObject(); } /** @@ -1983,7 +1983,7 @@ public class GridCacheConcurrentMap<K, V> { * <p> * Note, class is static for {@link Externalizable}. */ - private static class EntryIterator<K, V> implements Iterator<GridCacheEntry<K, V>>, Externalizable { + private static class EntryIterator<K, V> implements Iterator<CacheEntry<K, V>>, Externalizable { /** */ private static final long serialVersionUID = 0L; @@ -1997,7 +1997,7 @@ public class GridCacheConcurrentMap<K, V> { private GridCacheProjectionImpl<K, V> prjPerCall; /** */ - private GridCacheFlag[] forcedFlags; + private CacheFlag[] forcedFlags; /** * Empty constructor required for {@link Externalizable}. @@ -2015,10 +2015,10 @@ public class GridCacheConcurrentMap<K, V> { */ EntryIterator( GridCacheConcurrentMap<K, V> map, - IgnitePredicate<GridCacheEntry<K, V>>[] filter, + IgnitePredicate<CacheEntry<K, V>>[] filter, GridCacheContext<K, V> ctx, GridCacheProjectionImpl<K, V> prjPerCall, - GridCacheFlag[] forcedFlags) { + CacheFlag[] forcedFlags) { it = new Iterator0<>(map, false, filter, -1, -1); this.ctx = ctx; @@ -2032,12 +2032,12 @@ public class GridCacheConcurrentMap<K, V> { } /** {@inheritDoc} */ - @Override public GridCacheEntry<K, V> next() { + @Override public CacheEntry<K, V> next() { GridCacheProjectionImpl<K, V> oldPrj = ctx.projectionPerCall(); ctx.projectionPerCall(prjPerCall); - GridCacheFlag[] oldFlags = ctx.forceFlags(forcedFlags); + CacheFlag[] oldFlags = ctx.forceFlags(forcedFlags); try { return it.next().wrap(true); @@ -2067,7 +2067,7 @@ public class GridCacheConcurrentMap<K, V> { it = (Iterator0<K, V>)in.readObject(); ctx = (GridCacheContext<K, V>)in.readObject(); prjPerCall = (GridCacheProjectionImpl<K, V>)in.readObject(); - forcedFlags = (GridCacheFlag[])in.readObject(); + forcedFlags = (CacheFlag[])in.readObject(); } } @@ -2104,7 +2104,7 @@ public class GridCacheConcurrentMap<K, V> { */ private ValueIterator( GridCacheConcurrentMap<K, V> map, - IgnitePredicate<GridCacheEntry<K, V>>[] filter, + IgnitePredicate<CacheEntry<K, V>>[] filter, GridCacheContext<K, V> ctx, boolean clone) { it = new Iterator0<>(map, true, filter, -1, -1); @@ -2175,7 +2175,7 @@ public class GridCacheConcurrentMap<K, V> { * @param map Cache map. * @param filter Filter. */ - private KeyIterator(GridCacheConcurrentMap<K, V> map, IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + private KeyIterator(GridCacheConcurrentMap<K, V> map, IgnitePredicate<CacheEntry<K, V>>[] filter) { it = new Iterator0<>(map, false, filter, -1, -1); } @@ -2227,7 +2227,7 @@ public class GridCacheConcurrentMap<K, V> { * @param map Base map. * @param filter Key filter. */ - private KeySet(GridCacheConcurrentMap<K, V> map, IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + private KeySet(GridCacheConcurrentMap<K, V> map, IgnitePredicate<CacheEntry<K, V>>[] filter) { assert map != null; set = new Set0<>(map, nonInternal(filter)); @@ -2295,7 +2295,7 @@ public class GridCacheConcurrentMap<K, V> { * @param map Base map. * @param filter Value filter. */ - private Values(GridCacheConcurrentMap<K, V> map, IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + private Values(GridCacheConcurrentMap<K, V> map, IgnitePredicate<CacheEntry<K, V>>[] filter) { assert map != null; set = new Set0<>(map, nonInternal(filter)); @@ -2337,7 +2337,7 @@ public class GridCacheConcurrentMap<K, V> { /** * Entry set. */ - private static class EntrySet<K, V> extends AbstractSet<GridCacheEntry<K, V>> implements Externalizable { + private static class EntrySet<K, V> extends AbstractSet<CacheEntry<K, V>> implements Externalizable { /** */ private static final long serialVersionUID = 0L; @@ -2355,7 +2355,7 @@ public class GridCacheConcurrentMap<K, V> { * @param map Base map. * @param filter Key filter. */ - private EntrySet(GridCacheConcurrentMap<K, V> map, IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + private EntrySet(GridCacheConcurrentMap<K, V> map, IgnitePredicate<CacheEntry<K, V>>[] filter) { this(map, filter, false); } @@ -2364,7 +2364,7 @@ public class GridCacheConcurrentMap<K, V> { * @param filter Key filter. * @param internal Whether to allow internal entries. */ - private EntrySet(GridCacheConcurrentMap<K, V> map, IgnitePredicate<GridCacheEntry<K, V>>[] filter, + private EntrySet(GridCacheConcurrentMap<K, V> map, IgnitePredicate<CacheEntry<K, V>>[] filter, boolean internal) { assert map != null; @@ -2372,7 +2372,7 @@ public class GridCacheConcurrentMap<K, V> { } /** {@inheritDoc} */ - @NotNull @Override public Iterator<GridCacheEntry<K, V>> iterator() { + @NotNull @Override public Iterator<CacheEntry<K, V>> iterator() { return set.entryIterator(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java index 78349b1..14b2b81 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java @@ -61,10 +61,10 @@ import java.util.*; import java.util.concurrent.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.GridCacheFlag.*; -import static org.apache.ignite.cache.GridCacheMemoryMode.*; -import static org.apache.ignite.cache.GridCachePreloadMode.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheFlag.*; +import static org.apache.ignite.cache.CacheMemoryMode.*; +import static org.apache.ignite.cache.CachePreloadMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Cache context. @@ -142,19 +142,19 @@ public class GridCacheContext<K, V> implements Externalizable { private GridCacheAdapter<K, V> cache; /** No-value filter array. */ - private IgnitePredicate<GridCacheEntry<K, V>>[] noValArr; + private IgnitePredicate<CacheEntry<K, V>>[] noValArr; /** Has-value filter array. */ - private IgnitePredicate<GridCacheEntry<K, V>>[] hasValArr; + private IgnitePredicate<CacheEntry<K, V>>[] hasValArr; /** No-peek-value filter array. */ - private IgnitePredicate<GridCacheEntry<K, V>>[] noPeekArr; + private IgnitePredicate<CacheEntry<K, V>>[] noPeekArr; /** Has-peek-value filter array. */ - private IgnitePredicate<GridCacheEntry<K, V>>[] hasPeekArr; + private IgnitePredicate<CacheEntry<K, V>>[] hasPeekArr; /** No-op filter array. */ - private IgnitePredicate<GridCacheEntry<K, V>>[] trueArr; + private IgnitePredicate<CacheEntry<K, V>>[] trueArr; /** Cached local rich node. */ private ClusterNode locNode; @@ -166,13 +166,13 @@ public class GridCacheContext<K, V> implements Externalizable { private ThreadLocal<GridCacheProjectionImpl<K, V>> prjPerCall = new ThreadLocal<>(); /** Thread local forced flags that affect any projection in the same thread. */ - private ThreadLocal<GridCacheFlag[]> forcedFlags = new ThreadLocal<>(); + private ThreadLocal<CacheFlag[]> forcedFlags = new ThreadLocal<>(); /** Constant array to avoid recreation. */ - private static final GridCacheFlag[] FLAG_LOCAL_READ = new GridCacheFlag[]{LOCAL, READ}; + private static final CacheFlag[] FLAG_LOCAL_READ = new CacheFlag[]{LOCAL, READ}; /** Local flag array. */ - private static final GridCacheFlag[] FLAG_LOCAL = new GridCacheFlag[]{LOCAL}; + private static final CacheFlag[] FLAG_LOCAL = new CacheFlag[]{LOCAL}; /** Cache name. */ private String cacheName; @@ -901,28 +901,28 @@ public class GridCacheContext<K, V> implements Externalizable { /** * @return No get-value filter. */ - public IgnitePredicate<GridCacheEntry<K, V>>[] noGetArray() { + public IgnitePredicate<CacheEntry<K, V>>[] noGetArray() { return noValArr; } /** * @return Has get-value filer. */ - public IgnitePredicate<GridCacheEntry<K, V>>[] hasGetArray() { + public IgnitePredicate<CacheEntry<K, V>>[] hasGetArray() { return hasValArr; } /** * @return No get-value filter. */ - public IgnitePredicate<GridCacheEntry<K, V>>[] noPeekArray() { + public IgnitePredicate<CacheEntry<K, V>>[] noPeekArray() { return noPeekArr; } /** * @return Has get-value filer. */ - public IgnitePredicate<GridCacheEntry<K, V>>[] hasPeekArray() { + public IgnitePredicate<CacheEntry<K, V>>[] hasPeekArray() { return hasPeekArr; } @@ -931,7 +931,7 @@ public class GridCacheContext<K, V> implements Externalizable { * @return Predicate array that checks for value. */ @SuppressWarnings({"unchecked"}) - public IgnitePredicate<GridCacheEntry<K, V>>[] equalsPeekArray(V val) { + public IgnitePredicate<CacheEntry<K, V>>[] equalsPeekArray(V val) { assert val != null; return new IgnitePredicate[]{F.cacheContainsPeek(val)}; @@ -940,14 +940,14 @@ public class GridCacheContext<K, V> implements Externalizable { /** * @return Empty filter. */ - public IgnitePredicate<GridCacheEntry<K, V>> truex() { + public IgnitePredicate<CacheEntry<K, V>> truex() { return F.alwaysTrue(); } /** * @return No-op array. */ - public IgnitePredicate<GridCacheEntry<K, V>>[] trueArray() { + public IgnitePredicate<CacheEntry<K, V>>[] trueArray() { return trueArr; } @@ -963,7 +963,7 @@ public class GridCacheContext<K, V> implements Externalizable { * @return Array containing single predicate. */ @SuppressWarnings({"unchecked"}) - public IgnitePredicate<GridCacheEntry<K, V>>[] vararg(IgnitePredicate<GridCacheEntry<K, V>> p) { + public IgnitePredicate<CacheEntry<K, V>>[] vararg(IgnitePredicate<CacheEntry<K, V>> p) { return p == null ? CU.<K, V>empty() : new IgnitePredicate[]{p}; } @@ -977,7 +977,7 @@ public class GridCacheContext<K, V> implements Externalizable { */ @SuppressWarnings({"ErrorNotRethrown"}) public <K1, V1> boolean isAll(GridCacheEntryEx<K1, V1> e, - @Nullable IgnitePredicate<GridCacheEntry<K1, V1>>[] p) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K1, V1>>[] p) throws IgniteCheckedException { return F.isEmpty(p) || isAll(e.wrap(false), p); } @@ -996,7 +996,7 @@ public class GridCacheContext<K, V> implements Externalizable { return true; // We should allow only local read-only operations within filter checking. - GridCacheFlag[] oldFlags = forceFlags(FLAG_LOCAL_READ); + CacheFlag[] oldFlags = forceFlags(FLAG_LOCAL_READ); try { boolean pass = F.isAll(e, p); @@ -1020,7 +1020,7 @@ public class GridCacheContext<K, V> implements Externalizable { * * @return Previously forced flags. */ - @Nullable public GridCacheFlag[] forceLocal() { + @Nullable public CacheFlag[] forceLocal() { return forceFlags(FLAG_LOCAL); } @@ -1029,7 +1029,7 @@ public class GridCacheContext<K, V> implements Externalizable { * * @return Forced flags that were set prior to method call. */ - @Nullable public GridCacheFlag[] forceLocalRead() { + @Nullable public CacheFlag[] forceLocalRead() { return forceFlags(FLAG_LOCAL_READ); } @@ -1040,8 +1040,8 @@ public class GridCacheContext<K, V> implements Externalizable { * @param flags Flags to force. * @return Forced flags that were set prior to method call. */ - @Nullable public GridCacheFlag[] forceFlags(@Nullable GridCacheFlag[] flags) { - GridCacheFlag[] oldFlags = forcedFlags.get(); + @Nullable public CacheFlag[] forceFlags(@Nullable CacheFlag[] flags) { + CacheFlag[] oldFlags = forcedFlags.get(); forcedFlags.set(F.isEmpty(flags) ? null : flags); @@ -1053,7 +1053,7 @@ public class GridCacheContext<K, V> implements Externalizable { * * @return Forced flags. */ - public GridCacheFlag[] forcedFlags() { + public CacheFlag[] forcedFlags() { return forcedFlags.get(); } @@ -1069,7 +1069,7 @@ public class GridCacheContext<K, V> implements Externalizable { if (obj == null) return obj; - GridCacheCloner c = cacheCfg.getCloner(); + CacheCloner c = cacheCfg.getCloner(); if (c != null) return c.cloneValue(obj); @@ -1133,7 +1133,7 @@ public class GridCacheContext<K, V> implements Externalizable { * @param flag Flag to check. * @return {@code true} if the given flag is set. */ - public boolean hasFlag(GridCacheFlag flag) { + public boolean hasFlag(CacheFlag flag) { assert flag != null; if (nearContext()) @@ -1141,7 +1141,7 @@ public class GridCacheContext<K, V> implements Externalizable { GridCacheProjectionImpl<K, V> prj = prjPerCall.get(); - GridCacheFlag[] forced = forcedFlags.get(); + CacheFlag[] forced = forcedFlags.get(); return (prj != null && prj.flags().contains(flag)) || (forced != null && U.containsObjectArray(forced, flag)); } @@ -1152,7 +1152,7 @@ public class GridCacheContext<K, V> implements Externalizable { * @param flags Flags to check. * @return {@code true} if any of the given flags is set. */ - public boolean hasAnyFlags(GridCacheFlag[] flags) { + public boolean hasAnyFlags(CacheFlag[] flags) { assert !F.isEmpty(flags); if (nearContext()) @@ -1163,7 +1163,7 @@ public class GridCacheContext<K, V> implements Externalizable { if (prj == null && F.isEmpty(forcedFlags.get())) return false; - for (GridCacheFlag f : flags) + for (CacheFlag f : flags) if (hasFlag(f)) return true; @@ -1176,7 +1176,7 @@ public class GridCacheContext<K, V> implements Externalizable { * @param flags Flags to check. * @return {@code true} if any of the given flags is set. */ - public boolean hasAnyFlags(Collection<GridCacheFlag> flags) { + public boolean hasAnyFlags(Collection<CacheFlag> flags) { assert !F.isEmpty(flags); if (nearContext()) @@ -1187,7 +1187,7 @@ public class GridCacheContext<K, V> implements Externalizable { if (prj == null && F.isEmpty(forcedFlags.get())) return false; - for (GridCacheFlag f : flags) + for (CacheFlag f : flags) if (hasFlag(f)) return true; @@ -1204,11 +1204,11 @@ public class GridCacheContext<K, V> implements Externalizable { /** * @param flag Flag to check. */ - public void denyOnFlag(GridCacheFlag flag) { + public void denyOnFlag(CacheFlag flag) { assert flag != null; if (hasFlag(flag)) - throw new GridCacheFlagException(flag); + throw new CacheFlagException(flag); } /** @@ -1221,25 +1221,25 @@ public class GridCacheContext<K, V> implements Externalizable { /** * @param flags Flags. */ - public void denyOnFlags(GridCacheFlag[] flags) { + public void denyOnFlags(CacheFlag[] flags) { assert !F.isEmpty(flags); if (hasAnyFlags(flags)) - throw new GridCacheFlagException(flags); + throw new CacheFlagException(flags); } /** * @param flags Flags. */ - public void denyOnFlags(Collection<GridCacheFlag> flags) { + public void denyOnFlags(Collection<CacheFlag> flags) { assert !F.isEmpty(flags); if (hasAnyFlags(flags)) - throw new GridCacheFlagException(flags); + throw new CacheFlagException(flags); } /** - * Clones cached object depending on whether or not {@link GridCacheFlag#CLONE} flag + * Clones cached object depending on whether or not {@link org.apache.ignite.cache.CacheFlag#CLONE} flag * is set thread locally. * * @param obj Object to clone. @@ -1302,7 +1302,7 @@ public class GridCacheContext<K, V> implements Externalizable { final GridCacheProjectionImpl<K, V> prj = projectionPerCall(); // Get flags in the same thread. - final GridCacheFlag[] flags = forcedFlags(); + final CacheFlag[] flags = forcedFlags(); if (prj == null && F.isEmpty(flags)) return r; @@ -1313,7 +1313,7 @@ public class GridCacheContext<K, V> implements Externalizable { projectionPerCall(prj); - GridCacheFlag[] oldFlags = forceFlags(flags); + CacheFlag[] oldFlags = forceFlags(flags); try { r.run(); @@ -1344,7 +1344,7 @@ public class GridCacheContext<K, V> implements Externalizable { final GridCacheProjectionImpl<K, V> prj = projectionPerCall(); // Get flags in the same thread. - final GridCacheFlag[] flags = forcedFlags(); + final CacheFlag[] flags = forcedFlags(); if (prj == null && F.isEmpty(flags)) return r; @@ -1355,7 +1355,7 @@ public class GridCacheContext<K, V> implements Externalizable { projectionPerCall(prj); - GridCacheFlag[] oldFlags = forceFlags(flags); + CacheFlag[] oldFlags = forceFlags(flags); try { return r.call(); @@ -1553,13 +1553,13 @@ public class GridCacheContext<K, V> implements Externalizable { } /** - * @param interceptorRes Result of {@link org.apache.ignite.cache.GridCacheInterceptor#onBeforeRemove} callback. + * @param interceptorRes Result of {@link org.apache.ignite.cache.CacheInterceptor#onBeforeRemove} callback. * @return {@code True} if interceptor cancels remove. */ public boolean cancelRemove(@Nullable IgniteBiTuple<Boolean, ?> interceptorRes) { if (interceptorRes != null) { if (interceptorRes.get1() == null) { - U.warn(log, "GridCacheInterceptor must not return null as cancellation flag value from " + + U.warn(log, "CacheInterceptor must not return null as cancellation flag value from " + "'onBeforeRemove' method."); return false; @@ -1568,7 +1568,7 @@ public class GridCacheContext<K, V> implements Externalizable { return interceptorRes.get1(); } else { - U.warn(log, "GridCacheInterceptor must not return null from 'onBeforeRemove' method."); + U.warn(log, "CacheInterceptor must not return null from 'onBeforeRemove' method."); return false; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java index 34025e5..8a2b8e1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDefaultAffinityKeyMapper.java @@ -30,17 +30,17 @@ import java.lang.annotation.*; import java.lang.reflect.*; /** - * Default key affinity mapper. If key class has annotation {@link GridCacheAffinityKeyMapped}, + * Default key affinity mapper. If key class has annotation {@link org.apache.ignite.cache.affinity.CacheAffinityKeyMapped}, * then the value of annotated method or field will be used to get affinity value instead * of the key itself. If there is no annotation, then the key is used as is. * <p> - * Convenience affinity key adapter, {@link GridCacheAffinityKey} can be used in + * Convenience affinity key adapter, {@link org.apache.ignite.cache.affinity.CacheAffinityKey} can be used in * conjunction with this mapper to automatically provide custom affinity keys for cache keys. * <p> * If non-default affinity mapper is used, is should be provided via * {@link CacheConfiguration#getAffinityMapper()} configuration property. */ -public class GridCacheDefaultAffinityKeyMapper implements GridCacheAffinityKeyMapper { +public class GridCacheDefaultAffinityKeyMapper implements CacheAffinityKeyMapper { /** */ private static final long serialVersionUID = 0L; @@ -49,17 +49,17 @@ public class GridCacheDefaultAffinityKeyMapper implements GridCacheAffinityKeyMa new P1<Field>() { @Override public boolean apply(Field f) { // Account for anonymous inner classes. - return f.getAnnotation(GridCacheAffinityKeyMapped.class) != null; + return f.getAnnotation(CacheAffinityKeyMapped.class) != null; } }, new P1<Method>() { @Override public boolean apply(Method m) { // Account for anonymous inner classes. - Annotation ann = m.getAnnotation(GridCacheAffinityKeyMapped.class); + Annotation ann = m.getAnnotation(CacheAffinityKeyMapped.class); if (ann != null) { if (!F.isEmpty(m.getParameterTypes())) - throw new IllegalStateException("Method annotated with @GridCacheAffinityKey annotation " + + throw new IllegalStateException("Method annotated with @CacheAffinityKey annotation " + "cannot have parameters: " + m); return true; @@ -75,7 +75,7 @@ public class GridCacheDefaultAffinityKeyMapper implements GridCacheAffinityKeyMa private transient IgniteLogger log; /** - * If key class has annotation {@link GridCacheAffinityKeyMapped}, + * If key class has annotation {@link org.apache.ignite.cache.affinity.CacheAffinityKeyMapped}, * then the value of annotated method or field will be used to get affinity value instead * of the key itself. If there is no annotation, then the key is returned as is. * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java index ff53833..d5ffb0d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java @@ -226,8 +226,8 @@ public class GridCacheDeploymentManager<K, V> extends GridCacheSharedManagerAdap GridCacheAdapter<K, V> cache = cacheCtx.cache(); Set<K> keySet = cache.keySet(cacheCtx.vararg( - new P1<GridCacheEntry<K, V>>() { - @Override public boolean apply(GridCacheEntry<K, V> e) { + new P1<CacheEntry<K, V>>() { + @Override public boolean apply(CacheEntry<K, V> e) { return cacheCtx.isNear() ? undeploy(e, cacheCtx.near()) || undeploy(e, cacheCtx.near().dht()) : undeploy(e, cacheCtx.cache()); } @@ -237,7 +237,7 @@ public class GridCacheDeploymentManager<K, V> extends GridCacheSharedManagerAdap * @param cache Cache. * @return {@code True} if entry should be undeployed. */ - private boolean undeploy(GridCacheEntry<K, V> e, GridCacheAdapter<K, V> cache) { + private boolean undeploy(CacheEntry<K, V> e, GridCacheAdapter<K, V> cache) { K k = e.getKey(); GridCacheEntryEx<K, V> entry = cache.peekEx(e.getKey());
