http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/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 ede8115..405e29c 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 @@ -40,8 +40,8 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; -import static org.apache.ignite.cache.GridCacheFlag.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheFlag.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*; /** @@ -111,10 +111,10 @@ public class GridNearAtomicUpdateFuture<K, V> extends GridFutureAdapter<Object> private long topVer; /** Optional filter. */ - private final IgnitePredicate<GridCacheEntry<K, V>>[] filter; + private final IgnitePredicate<CacheEntry<K, V>>[] filter; /** Write synchronization mode. */ - private final GridCacheWriteSynchronizationMode syncMode; + private final CacheWriteSynchronizationMode syncMode; /** If this future mapped to single node. */ private volatile Boolean single; @@ -182,7 +182,7 @@ public class GridNearAtomicUpdateFuture<K, V> extends GridFutureAdapter<Object> public GridNearAtomicUpdateFuture( GridCacheContext<K, V> cctx, GridDhtAtomicCache<K, V> cache, - GridCacheWriteSynchronizationMode syncMode, + CacheWriteSynchronizationMode syncMode, GridCacheOperation op, Collection<? extends K> keys, @Nullable Collection<?> vals, @@ -193,7 +193,7 @@ public class GridNearAtomicUpdateFuture<K, V> extends GridFutureAdapter<Object> final boolean rawRetval, @Nullable GridCacheEntryEx<K, V> cached, @Nullable ExpiryPolicy expiryPlc, - final IgnitePredicate<GridCacheEntry<K, V>>[] filter, + final IgnitePredicate<CacheEntry<K, V>>[] filter, UUID subjId, int taskNameHash ) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/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 d1f2692..99907a4 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 @@ -64,7 +64,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im private long topVer; /** Write synchronization mode. */ - private GridCacheWriteSynchronizationMode syncMode; + private CacheWriteSynchronizationMode syncMode; /** Update operation. */ private GridCacheOperation op; @@ -115,7 +115,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im /** Filter. */ @GridDirectTransient - private IgnitePredicate<GridCacheEntry<K, V>>[] filter; + private IgnitePredicate<CacheEntry<K, V>>[] filter; /** Filter bytes. */ private byte[][] filterBytes; @@ -168,13 +168,13 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im boolean fastMap, @Nullable GridCacheVersion updateVer, long topVer, - GridCacheWriteSynchronizationMode syncMode, + CacheWriteSynchronizationMode syncMode, GridCacheOperation op, boolean retval, boolean forceTransformBackups, @Nullable ExpiryPolicy expiryPlc, @Nullable Object[] invokeArgs, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, @Nullable UUID subjId, int taskNameHash ) { @@ -263,7 +263,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im /** * @return Cache write synchronization mode. */ - public GridCacheWriteSynchronizationMode writeSynchronizationMode() { + public CacheWriteSynchronizationMode writeSynchronizationMode() { return syncMode; } @@ -284,7 +284,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im /** * @return Filter. */ - @Nullable public IgnitePredicate<GridCacheEntry<K, V>>[] filter() { + @Nullable public IgnitePredicate<CacheEntry<K, V>>[] filter() { return filter; } @@ -1031,7 +1031,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im byte syncMode0 = commState.getByte(); - syncMode = GridCacheWriteSynchronizationMode.fromOrdinal(syncMode0); + syncMode = CacheWriteSynchronizationMode.fromOrdinal(syncMode0); commState.idx++; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/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 76b69ac..0c01c6c 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 @@ -37,7 +37,7 @@ import org.jetbrains.annotations.*; import java.io.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheFlag.*; +import static org.apache.ignite.cache.CacheFlag.*; import static org.apache.ignite.cache.GridCachePeekMode.*; /** @@ -159,7 +159,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte @Nullable UUID subjId, String taskName, final boolean deserializePortable, - @Nullable final IgnitePredicate<GridCacheEntry<K, V>>[] filter + @Nullable final IgnitePredicate<CacheEntry<K, V>>[] filter ) { ctx.denyOnFlag(LOCAL); ctx.checkSecurity(GridSecurityPermission.CACHE_READ); @@ -206,7 +206,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte } /** {@inheritDoc} */ - @Override public boolean containsKey(K key, @Nullable IgnitePredicate<GridCacheEntry<K, V>> filter) { + @Override public boolean containsKey(K key, @Nullable IgnitePredicate<CacheEntry<K, V>> filter) { A.notNull(key, "key"); // We need detached entry here because if there is an ongoing transaction, @@ -245,7 +245,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte @Nullable UUID subjId, String taskName, boolean deserializePortable, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, @Nullable IgniteCacheExpiryPolicy expiryPlc) { if (keys == null || keys.isEmpty()) return new GridFinishedFuture<>(ctx.kernalContext(), Collections.<K, V>emptyMap()); @@ -375,7 +375,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte boolean retval, @Nullable IgniteTxIsolation isolation, long accessTtl, - IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + IgnitePredicate<CacheEntry<K, V>>[] filter) { assert tx == null || tx instanceof GridNearTxLocal; GridNearTxLocal<K, V> txx = (GridNearTxLocal<K, V>)tx; @@ -403,13 +403,13 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte } /** {@inheritDoc} */ - @Override public GridCacheEntry<K, V> entry(K key) throws GridDhtInvalidPartitionException { + @Override public CacheEntry<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<GridCacheEntry<K, V>>[] filter) { + IgnitePredicate<CacheEntry<K, V>>[] filter) { if (keys.isEmpty()) return; @@ -425,7 +425,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte for (K key : keys) { GridDistributedCacheEntry<K, V> entry = peekExx(key); - GridCacheEntry<K, V> cacheEntry = entry == null ? entry(key) : entry.wrap(false); + CacheEntry<K, V> cacheEntry = entry == null ? entry(key) : entry.wrap(false); if (!ctx.isAll(cacheEntry, filter)) break; // While. @@ -610,7 +610,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte final boolean txRead, final long timeout, final long accessTtl, - @Nullable final IgnitePredicate<GridCacheEntry<K, V>>[] filter + @Nullable final IgnitePredicate<CacheEntry<K, V>>[] filter ) { assert keys != null; @@ -683,7 +683,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte final boolean txRead, final long timeout, final long accessTtl, - @Nullable final IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Nullable final IgnitePredicate<CacheEntry<K, V>>[] filter) { int cnt = keys.size(); if (tx == null) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java index cc5b02b..a6656b4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCacheEntry.java @@ -46,7 +46,7 @@ public class GridDhtColocatedCacheEntry<K, V> extends GridDhtCacheEntry<K, V> { } /** {@inheritDoc} */ - @Override public GridCacheEntry<K, V> wrap(boolean prjAware) { + @Override public CacheEntry<K, V> wrap(boolean prjAware) { GridCacheProjectionImpl<K, V> prjPerCall = cctx.projectionPerCall(); if (prjPerCall != null && prjAware) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/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 9d9bf9d..8d0b009 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 @@ -93,7 +93,7 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity private IgniteLogger log; /** Filter. */ - private IgnitePredicate<GridCacheEntry<K, V>>[] filter; + private IgnitePredicate<CacheEntry<K, V>>[] filter; /** Transaction. */ @GridToStringExclude @@ -137,7 +137,7 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity boolean retval, long timeout, long accessTtl, - IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + IgnitePredicate<CacheEntry<K, V>>[] filter) { super(cctx.kernalContext(), CU.boolReducer()); assert keys != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java index a93f797..30b536c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java @@ -73,7 +73,7 @@ public class GridDhtPartitionDemandPool<K, V> { /** Preload predicate. */ private IgnitePredicate<GridCacheEntryInfo<K, V>> preloadPred; - /** Future for preload mode {@link org.apache.ignite.cache.GridCachePreloadMode#SYNC}. */ + /** Future for preload mode {@link org.apache.ignite.cache.CachePreloadMode#SYNC}. */ @GridToStringInclude private SyncFuture syncFut; @@ -165,7 +165,7 @@ public class GridDhtPartitionDemandPool<K, V> { } /** - * @return Future for {@link org.apache.ignite.cache.GridCachePreloadMode#SYNC} mode. + * @return Future for {@link org.apache.ignite.cache.CachePreloadMode#SYNC} mode. */ IgniteFuture<?> syncFuture() { return syncFut; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index da4f0aa..7aad4c2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@ -311,10 +311,10 @@ public class GridDhtPartitionsExchangeFuture<K, V> extends GridFutureAdapter<Lon * @return {@code True} if local node can calculate affinity on it's own for this partition map exchange. */ private boolean canCalculateAffinity(GridCacheContext<K, V> cacheCtx) { - GridCacheAffinityFunction affFunc = cacheCtx.config().getAffinity(); + CacheAffinityFunction affFunc = cacheCtx.config().getAffinity(); // Do not request affinity from remote nodes if affinity function is not centralized. - if (!U.hasAnnotation(affFunc, GridCacheCentralizedAffinityFunction.class)) + if (!U.hasAnnotation(affFunc, CacheCentralizedAffinityFunction.class)) return true; // If local node did not initiate exchange or local node is the only cache node in grid. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java index 8630f4d..4ad049a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java @@ -38,7 +38,7 @@ import java.io.*; import java.util.*; import static org.apache.ignite.IgniteSystemProperties.*; -import static org.apache.ignite.cache.GridCacheFlag.*; +import static org.apache.ignite.cache.CacheFlag.*; import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*; import static org.apache.ignite.internal.processors.dr.GridDrType.*; @@ -369,7 +369,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { @Nullable UUID subjId, String taskName, boolean deserializePortable, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter ) { ctx.denyOnFlag(LOCAL); ctx.checkSecurity(GridSecurityPermission.CACHE_READ); @@ -398,7 +398,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { V val, @Nullable GridCacheEntryEx<K, V> cached, long ttl, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter ) throws IgniteCheckedException { return dht.put(key, val, cached, ttl, filter); } @@ -408,14 +408,14 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { V val, @Nullable GridCacheEntryEx<K, V> cached, long ttl, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { return dht.putx(key, val, cached, ttl, filter); } /** {@inheritDoc} */ @Override public boolean putx(K key, V val, - IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { return dht.putx(key, val, filter); } @@ -425,7 +425,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { return dht.putAsync(key, val, entry, ttl, filter); } @@ -435,7 +435,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { return dht.putxAsync(key, val, entry, ttl, filter); } @@ -512,14 +512,14 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public void putAll(Map<? extends K, ? extends V> m, IgnitePredicate<GridCacheEntry<K, V>>[] filter) + @Override public void putAll(Map<? extends K, ? extends V> m, IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { dht.putAll(m, filter); } /** {@inheritDoc} */ @Override public IgniteFuture<?> putAllAsync(Map<? extends K, ? extends V> m, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { return dht.putAllAsync(m, filter); } @@ -578,7 +578,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { /** {@inheritDoc} */ @Override public V remove(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { return dht.remove(key, entry, filter); } @@ -586,26 +586,26 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { @SuppressWarnings("unchecked") @Override public IgniteFuture<V> removeAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { return dht.removeAsync(key, entry, filter); } /** {@inheritDoc} */ - @Override public void removeAll(Collection<? extends K> keys, IgnitePredicate<GridCacheEntry<K, V>>... filter) + @Override public void removeAll(Collection<? extends K> keys, IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { dht.removeAll(keys, filter); } /** {@inheritDoc} */ @Override public IgniteFuture<?> removeAllAsync(Collection<? extends K> keys, - IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + IgnitePredicate<CacheEntry<K, V>>[] filter) { return dht.removeAllAsync(keys, filter); } /** {@inheritDoc} */ @Override public boolean removex(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { return dht.removex(key, entry, filter); } @@ -613,7 +613,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { @SuppressWarnings("unchecked") @Override public IgniteFuture<Boolean> removexAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { return dht.removexAsync(key, entry, filter); } @@ -628,12 +628,12 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<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 { dht.removeAll(keySet(filter)); } /** {@inheritDoc} */ - @Override public IgniteFuture<?> removeAllAsync(IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Override public IgniteFuture<?> removeAllAsync(IgnitePredicate<CacheEntry<K, V>>[] filter) { return dht.removeAllAsync(keySet(filter)); } @@ -656,13 +656,13 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { boolean retval, @Nullable IgniteTxIsolation isolation, long accessTtl, - IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + IgnitePredicate<CacheEntry<K, V>>[] filter) { return dht.lockAllAsync(keys, timeout, filter); } /** {@inheritDoc} */ @Override public void unlockAll(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { dht.unlockAll(keys, filter); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java index 60bbb19..25718fc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java @@ -34,7 +34,7 @@ import javax.cache.expiry.*; import java.io.*; import java.util.*; -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.internal.processors.cache.GridCacheUtils.*; @@ -172,7 +172,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda /** {@inheritDoc} */ @SuppressWarnings({"unchecked", "RedundantCast"}) @Override public IgniteFuture<Object> readThroughAllAsync(Collection<? extends K> keys, boolean reload, - IgniteTxEx<K, V> tx, IgnitePredicate<GridCacheEntry<K, V>>[] filter, @Nullable UUID subjId, String taskName, + IgniteTxEx<K, V> tx, IgnitePredicate<CacheEntry<K, V>>[] filter, @Nullable UUID subjId, String taskName, IgniteBiInClosure<K, V> vis) { return (IgniteFuture)loadAsync(tx, keys, @@ -187,7 +187,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda /** {@inheritDoc} */ @Override public void reloadAll(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { dht().reloadAll(keys, filter); super.reloadAll(keys, filter); @@ -196,7 +196,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public IgniteFuture<?> reloadAllAsync(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { GridCompoundFuture fut = new GridCompoundFuture(ctx.kernalContext()); fut.add(super.reloadAllAsync(keys, filter)); @@ -209,7 +209,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda } /** {@inheritDoc} */ - @Override public V reload(K key, @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) + @Override public V reload(K key, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { V val; @@ -247,7 +247,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda /** {@inheritDoc} */ @SuppressWarnings({"unchecked"}) - @Override public IgniteFuture<?> reloadAllAsync(@Nullable IgnitePredicate<GridCacheEntry<K, V>> filter) { + @Override public IgniteFuture<?> reloadAllAsync(@Nullable IgnitePredicate<CacheEntry<K, V>> filter) { GridCompoundFuture fut = new GridCompoundFuture(ctx.kernalContext()); fut.add(super.reloadAllAsync()); @@ -274,7 +274,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda @Nullable Collection<? extends K> keys, boolean reload, boolean forcePrimary, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, @Nullable UUID subjId, String taskName, boolean deserializePortable, @@ -365,36 +365,36 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda /** * @return Near entries. */ - public Set<GridCacheEntry<K, V>> nearEntries() { + public Set<CacheEntry<K, V>> nearEntries() { return super.entrySet(CU.<K, V>empty()); } /** {@inheritDoc} */ - @Override public Set<GridCacheEntry<K, V>> entrySet( - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public Set<CacheEntry<K, V>> entrySet( + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { return new EntrySet(super.entrySet(filter), dht().entrySet(filter)); } /** {@inheritDoc} */ - @Override public Set<GridCacheEntry<K, V>> entrySet(int part) { + @Override public Set<CacheEntry<K, V>> entrySet(int part) { return dht().entrySet(part); } /** {@inheritDoc} */ - @Override public Set<GridCacheEntry<K, V>> primaryEntrySet( - @Nullable final IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public Set<CacheEntry<K, V>> primaryEntrySet( + @Nullable final IgnitePredicate<CacheEntry<K, V>>... filter) { final long topVer = ctx.affinity().affinityTopologyVersion(); - Collection<GridCacheEntry<K, V>> entries = + Collection<CacheEntry<K, V>> entries = F.flatCollections( F.viewReadOnly( dht().topology().currentLocalPartitions(), - new C1<GridDhtLocalPartition<K, V>, Collection<GridCacheEntry<K, V>>>() { - @Override public Collection<GridCacheEntry<K, V>> apply(GridDhtLocalPartition<K, V> p) { + new C1<GridDhtLocalPartition<K, V>, Collection<CacheEntry<K, V>>>() { + @Override public Collection<CacheEntry<K, V>> apply(GridDhtLocalPartition<K, V> p) { return F.viewReadOnly( p.entries(), - new C1<GridDhtCacheEntry<K, V>, GridCacheEntry<K, V>>() { - @Override public GridCacheEntry<K, V> apply(GridDhtCacheEntry<K, V> e) { + new C1<GridDhtCacheEntry<K, V>, CacheEntry<K, V>>() { + @Override public CacheEntry<K, V> apply(GridDhtCacheEntry<K, V> e) { return e.wrap(true); } }, @@ -415,7 +415,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda } /** {@inheritDoc} */ - @Override public Set<K> keySet(@Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Override public Set<K> keySet(@Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { return new GridCacheKeySet<>(ctx, entrySet(filter), null); } @@ -423,32 +423,32 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda * @param filter Entry filter. * @return Keys for near cache only. */ - public Set<K> nearKeySet(@Nullable IgnitePredicate<GridCacheEntry<K, V>> filter) { + public Set<K> nearKeySet(@Nullable IgnitePredicate<CacheEntry<K, V>> filter) { return super.keySet(filter); } /** {@inheritDoc} */ - @Override public Set<K> primaryKeySet(@Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public Set<K> primaryKeySet(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { return new GridCacheKeySet<>(ctx, primaryEntrySet(filter), null); } /** {@inheritDoc} */ - @Override public Collection<V> values(IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public Collection<V> values(IgnitePredicate<CacheEntry<K, V>>... filter) { return new GridCacheValueCollection<>(ctx, entrySet(filter), ctx.vararg(F.<K, V>cacheHasPeekValue())); } /** {@inheritDoc} */ - @Override public Collection<V> primaryValues(@Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Override public Collection<V> primaryValues(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { return new GridCacheValueCollection<>(ctx, entrySet(filter), ctx.vararg(F.<K, V>cachePrimary())); } /** {@inheritDoc} */ - @Override public boolean containsKey(K key, IgnitePredicate<GridCacheEntry<K, V>> filter) { + @Override public boolean containsKey(K key, IgnitePredicate<CacheEntry<K, V>> filter) { return super.containsKey(key, filter) || dht().containsKey(key, filter); } /** {@inheritDoc} */ - @Override public boolean evict(K key, @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Override public boolean evict(K key, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { // Use unary 'and' to make sure that both sides execute. return super.evict(key, filter) & dht().evict(key, filter); } @@ -458,13 +458,13 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda * @param filter Optional filter. * @return {@code True} if evicted. */ - public boolean evictNearOnly(K key, @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + public boolean evictNearOnly(K key, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { return super.evict(key, filter); } /** {@inheritDoc} */ @Override public void evictAll(Collection<? extends K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { super.evictAll(keys, filter); dht().evictAll(keys, filter); @@ -472,12 +472,12 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda /** {@inheritDoc} */ @Override public boolean compact(K key, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { return super.compact(key, filter) | dht().compact(key, filter); } /** {@inheritDoc} */ - @Override public GridCacheEntry<K, V> entry(K key) { + @Override public CacheEntry<K, V> entry(K key) { // We don't try wrap entry from near or dht cache. // Created object will be wrapped once some method is called. return new GridPartitionedCacheEntryImpl<>(ctx.projectionPerCall(), ctx, key, null); @@ -504,7 +504,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda } /** {@inheritDoc} */ - @Override public V peek(K key, @Nullable IgnitePredicate<GridCacheEntry<K, V>> filter) { + @Override public V peek(K key, @Nullable IgnitePredicate<CacheEntry<K, V>> filter) { try { GridTuple<V> res = peek0(false, key, SMART, filter); @@ -544,12 +544,12 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda /** {@inheritDoc} */ @Override public Map<K, V> peekAll(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { final Map<K, V> resMap = super.peekAll(keys, filter); if (resMap.size() != keys.size()) - resMap.putAll(dht().peekAll(keys, F.and(filter, new IgnitePredicate<GridCacheEntry<K, V>>() { - @Override public boolean apply(GridCacheEntry<K, V> e) { + resMap.putAll(dht().peekAll(keys, F.and(filter, new IgnitePredicate<CacheEntry<K, V>>() { + @Override public boolean apply(CacheEntry<K, V> e) { return !resMap.containsKey(e.getKey()); } }))); @@ -558,13 +558,13 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda } /** {@inheritDoc} */ - @Override public boolean clear0(K key, @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Override public boolean clear0(K key, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { return super.clear0(key, filter) | dht().clear0(key, filter); } /** {@inheritDoc} */ @Override public void clearAll0(Collection<? extends K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { super.clearAll0(keys, filter); dht().clearAll0(keys, filter); @@ -686,18 +686,18 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda /** * Wrapper for entry set. */ - private class EntrySet extends AbstractSet<GridCacheEntry<K, V>> { + private class EntrySet extends AbstractSet<CacheEntry<K, V>> { /** Near entry set. */ - private Set<GridCacheEntry<K, V>> nearSet; + private Set<CacheEntry<K, V>> nearSet; /** Dht entry set. */ - private Set<GridCacheEntry<K, V>> dhtSet; + private Set<CacheEntry<K, V>> dhtSet; /** * @param nearSet Near entry set. * @param dhtSet Dht entry set. */ - private EntrySet(Set<GridCacheEntry<K, V>> nearSet, Set<GridCacheEntry<K, V>> dhtSet) { + private EntrySet(Set<CacheEntry<K, V>> nearSet, Set<CacheEntry<K, V>> dhtSet) { assert nearSet != null; assert dhtSet != null; @@ -706,10 +706,10 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda } /** {@inheritDoc} */ - @NotNull @Override public Iterator<GridCacheEntry<K, V>> iterator() { + @NotNull @Override public Iterator<CacheEntry<K, V>> iterator() { return new EntryIterator(nearSet.iterator(), - F.iterator0(dhtSet, false, new P1<GridCacheEntry<K, V>>() { - @Override public boolean apply(GridCacheEntry<K, V> e) { + F.iterator0(dhtSet, false, new P1<CacheEntry<K, V>>() { + @Override public boolean apply(CacheEntry<K, V> e) { return !GridNearCacheAdapter.super.containsKey(e.getKey(), null); } })); @@ -724,24 +724,24 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda /** * Entry set iterator. */ - private class EntryIterator implements Iterator<GridCacheEntry<K, V>> { + private class EntryIterator implements Iterator<CacheEntry<K, V>> { /** */ - private Iterator<GridCacheEntry<K, V>> dhtIter; + private Iterator<CacheEntry<K, V>> dhtIter; /** */ - private Iterator<GridCacheEntry<K, V>> nearIter; + private Iterator<CacheEntry<K, V>> nearIter; /** */ - private Iterator<GridCacheEntry<K, V>> currIter; + private Iterator<CacheEntry<K, V>> currIter; /** */ - private GridCacheEntry<K, V> currEntry; + private CacheEntry<K, V> currEntry; /** * @param nearIter Near set iterator. * @param dhtIter Dht set iterator. */ - private EntryIterator(Iterator<GridCacheEntry<K, V>> nearIter, Iterator<GridCacheEntry<K, V>> dhtIter) { + private EntryIterator(Iterator<CacheEntry<K, V>> nearIter, Iterator<CacheEntry<K, V>> dhtIter) { assert nearIter != null; assert dhtIter != null; @@ -757,7 +757,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda } /** {@inheritDoc} */ - @Override public GridCacheEntry<K, V> next() { + @Override public CacheEntry<K, V> next() { if (!hasNext()) throw new NoSuchElementException(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java index 04bab57..8628028 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java @@ -315,7 +315,7 @@ public class GridNearCacheEntry<K, V> extends GridDistributedCacheEntry<K, V> { /** {@inheritDoc} */ @Override protected V readThrough(IgniteTxEx<K, V> tx, K key, boolean reload, - IgnitePredicate<GridCacheEntry<K, V>>[] filter, UUID subjId, String taskName) throws IgniteCheckedException { + IgnitePredicate<CacheEntry<K, V>>[] filter, UUID subjId, String taskName) throws IgniteCheckedException { return cctx.near().loadAsync(tx, F.asList(key), reload, @@ -610,7 +610,7 @@ public class GridNearCacheEntry<K, V> extends GridDistributedCacheEntry<K, V> { } /** {@inheritDoc} */ - @Override public GridCacheEntry<K, V> wrap(boolean prjAware) { + @Override public CacheEntry<K, V> wrap(boolean prjAware) { GridCacheProjectionImpl<K, V> prjPerCall = null; if (prjAware) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java index ebe44b9..f2e564b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java @@ -82,7 +82,7 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma private IgniteTxLocalEx<K, V> tx; /** Filters. */ - private IgnitePredicate<GridCacheEntry<K, V>>[] filters; + private IgnitePredicate<CacheEntry<K, V>>[] filters; /** Logger. */ private IgniteLogger log; @@ -133,7 +133,7 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma boolean reload, boolean forcePrimary, @Nullable IgniteTxLocalEx<K, V> tx, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filters, + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filters, @Nullable UUID subjId, String taskName, boolean deserializePortable, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java index b4c300d..966b952 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java @@ -72,7 +72,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements /** Filters. */ @GridDirectTransient - private IgnitePredicate<GridCacheEntry<K, V>>[] filter; + private IgnitePredicate<CacheEntry<K, V>>[] filter; /** Subject ID. */ @GridDirectVersion(1) @@ -115,7 +115,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements boolean readThrough, boolean reload, long topVer, - IgnitePredicate<GridCacheEntry<K, V>>[] filter, + IgnitePredicate<CacheEntry<K, V>>[] filter, UUID subjId, int taskNameHash, long accessTtl @@ -205,7 +205,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements /** * @return Filters. */ - public IgnitePredicate<GridCacheEntry<K, V>>[] filter() { + public IgnitePredicate<CacheEntry<K, V>>[] filter() { return filter; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java index 0da7262..3dec521 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java @@ -95,7 +95,7 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B private IgniteLogger log; /** Filter. */ - private IgnitePredicate<GridCacheEntry<K, V>>[] filter; + private IgnitePredicate<CacheEntry<K, V>>[] filter; /** Transaction. */ @GridToStringExclude @@ -147,7 +147,7 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B boolean retval, long timeout, long accessTtl, - IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + IgnitePredicate<CacheEntry<K, V>>[] filter) { super(cctx.kernalContext(), CU.boolReducer()); assert keys != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java index bcb237d..37b1b21 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java @@ -52,7 +52,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> /** Filter. */ @GridDirectTransient - private IgnitePredicate<GridCacheEntry<K, V>>[] filter; + private IgnitePredicate<CacheEntry<K, V>>[] filter; /** Implicit flag. */ private boolean implicitTx; @@ -227,7 +227,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> /** * @return Filter. */ - public IgnitePredicate<GridCacheEntry<K, V>>[] filter() { + public IgnitePredicate<CacheEntry<K, V>>[] filter() { return filter; } @@ -236,7 +236,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> * @param ctx Context. * @throws IgniteCheckedException If failed. */ - public void filter(IgnitePredicate<GridCacheEntry<K, V>>[] filter, GridCacheContext<K, V> ctx) + public void filter(IgnitePredicate<CacheEntry<K, V>>[] filter, GridCacheContext<K, V> ctx) throws IgniteCheckedException { this.filter = filter; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java index 072c3d3..9a14def 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java @@ -35,7 +35,7 @@ import org.jetbrains.annotations.*; import java.io.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheFlag.*; +import static org.apache.ignite.cache.CacheFlag.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; /** @@ -100,7 +100,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> @Nullable UUID subjId, String taskName, final boolean deserializePortable, - @Nullable final IgnitePredicate<GridCacheEntry<K, V>>[] filter + @Nullable final IgnitePredicate<CacheEntry<K, V>>[] filter ) { ctx.denyOnFlag(LOCAL); ctx.checkSecurity(GridSecurityPermission.CACHE_READ); @@ -145,7 +145,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> IgniteFuture<Map<K, V>> txLoadAsync(GridNearTxLocal<K, V> tx, @Nullable Collection<? extends K> keys, boolean readThrough, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, boolean deserializePortable, @Nullable IgniteCacheExpiryPolicy expiryPlc) { assert tx != null; @@ -414,7 +414,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> boolean retval, IgniteTxIsolation isolation, long accessTtl, - IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + IgnitePredicate<CacheEntry<K, V>>[] filter) { GridNearLockFuture<K, V> fut = new GridNearLockFuture<>(ctx, keys, (GridNearTxLocal<K, V>)tx, @@ -464,7 +464,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> } /** {@inheritDoc} */ - @Override public void unlockAll(Collection<? extends K> keys, IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Override public void unlockAll(Collection<? extends K> keys, IgnitePredicate<CacheEntry<K, V>>[] filter) { if (keys.isEmpty()) return; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java index f85ffc2..f790bee 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java @@ -42,7 +42,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.transactions.IgniteTxState.*; -import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** * Replicated user transaction. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java index de15645..231408a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java @@ -102,13 +102,13 @@ public class GridLocalCache<K, V> extends GridCacheAdapter<K, V> { IgniteTxIsolation isolation, boolean invalidate, long accessTtl, - IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + IgnitePredicate<CacheEntry<K, V>>[] filter) { return lockAllAsync(keys, timeout, tx, filter); } /** {@inheritDoc} */ @Override public IgniteFuture<Boolean> lockAllAsync(Collection<? extends K> keys, long timeout, - IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + IgnitePredicate<CacheEntry<K, V>>[] filter) { IgniteTxLocalEx<K, V> tx = ctx.tm().localTx(); return lockAllAsync(keys, timeout, tx, filter); @@ -122,7 +122,7 @@ public class GridLocalCache<K, V> extends GridCacheAdapter<K, V> { * @return Future. */ public IgniteFuture<Boolean> lockAllAsync(Collection<? extends K> keys, long timeout, - @Nullable IgniteTxLocalEx<K, V> tx, IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Nullable IgniteTxLocalEx<K, V> tx, IgnitePredicate<CacheEntry<K, V>>[] filter) { if (F.isEmpty(keys)) return new GridFinishedFuture<>(ctx.kernalContext(), true); @@ -174,7 +174,7 @@ public class GridLocalCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @Override public void unlockAll(Collection<? extends K> keys, - IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { long topVer = ctx.affinity().affinityTopologyVersion(); for (K key : keys) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java index ddec5cf..54ee0cd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java @@ -81,7 +81,7 @@ public final class GridLocalLockFuture<K, V> extends GridFutureAdapter<Boolean> private IgniteLogger log; /** Filter. */ - private IgnitePredicate<GridCacheEntry<K, V>>[] filter; + private IgnitePredicate<CacheEntry<K, V>>[] filter; /** Transaction. */ private IgniteTxLocalEx<K, V> tx; @@ -110,7 +110,7 @@ public final class GridLocalLockFuture<K, V> extends GridFutureAdapter<Boolean> IgniteTxLocalEx<K, V> tx, GridLocalCache<K, V> cache, long timeout, - IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + IgnitePredicate<CacheEntry<K, V>>[] filter) { super(cctx.kernalContext()); assert keys != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java index 5f9c2c6..6109196 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java @@ -39,7 +39,7 @@ import java.io.*; import java.util.*; import java.util.concurrent.*; -import static org.apache.ignite.cache.GridCacheFlag.*; +import static org.apache.ignite.cache.CacheFlag.*; import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*; /** @@ -77,7 +77,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { @Override public GridCacheMapEntry<K, V> create(GridCacheContext<K, V> ctx, long topVer, K key, int hash, V val, @Nullable GridCacheMapEntry<K, V> next, long ttl, int hdrId) { return new GridLocalCacheEntry<K, V>(ctx, key, hash, val, next, ttl, hdrId) { - @Override public GridCacheEntry<K, V> wrapFilterLocked() throws IgniteCheckedException { + @Override public CacheEntry<K, V> wrapFilterLocked() throws IgniteCheckedException { assert Thread.holdsLock(this); return new GridCacheFilterEvaluationEntry<>(key, rawGetOrUnmarshalUnlocked(true), this); @@ -108,7 +108,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { V val, @Nullable GridCacheEntryEx<K, V> cached, long ttl, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { A.notNull(key, "key", val, "val"); ctx.denyOnLocalRead(); @@ -130,7 +130,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { V val, @Nullable GridCacheEntryEx<K, V> cached, long ttl, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { A.notNull(key, "key", val, "val"); ctx.denyOnLocalRead(); @@ -149,7 +149,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @Override public boolean putx(K key, V val, - IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { A.notNull(key, "key", val, "val"); ctx.denyOnLocalRead(); @@ -171,7 +171,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { A.notNull(key, "key", val, "val"); ctx.denyOnLocalRead(); @@ -190,7 +190,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { A.notNull(key, "key", val, "val"); ctx.denyOnLocalRead(); @@ -318,7 +318,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @Override public void putAll(Map<? extends K, ? extends V> m, - IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { ctx.denyOnLocalRead(); updateAllInternal(UPDATE, @@ -334,7 +334,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @Override public IgniteFuture<?> putAllAsync(Map<? extends K, ? extends V> m, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { ctx.denyOnLocalRead(); return updateAllAsync0(m, @@ -349,7 +349,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { @SuppressWarnings("unchecked") @Override public V remove(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { ctx.denyOnLocalRead(); return (V)updateAllInternal(DELETE, @@ -367,7 +367,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { @SuppressWarnings("unchecked") @Override public IgniteFuture<V> removeAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { ctx.denyOnLocalRead(); return removeAllAsync0(Collections.singletonList(key), true, false, filter); @@ -376,7 +376,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public void removeAll(Collection<? extends K> keys, - IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { + IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { ctx.denyOnLocalRead(); updateAllInternal(DELETE, @@ -392,7 +392,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @Override public IgniteFuture<?> removeAllAsync(Collection<? extends K> keys, - IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + IgnitePredicate<CacheEntry<K, V>>[] filter) { ctx.denyOnLocalRead(); return removeAllAsync0(keys, false, false, filter); @@ -402,7 +402,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { @SuppressWarnings("unchecked") @Override public boolean removex(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { A.notNull(key, "key"); ctx.denyOnLocalRead(); @@ -422,7 +422,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { @SuppressWarnings("unchecked") @Override public IgniteFuture<Boolean> removexAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { A.notNull(key, "key"); ctx.denyOnLocalRead(); @@ -454,12 +454,12 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public void removeAll(IgnitePredicate<GridCacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Override public void removeAll(IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { removeAll(keySet(filter)); } /** {@inheritDoc} */ - @Override public IgniteFuture<?> removeAllAsync(IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + @Override public IgniteFuture<?> removeAllAsync(IgnitePredicate<CacheEntry<K, V>>[] filter) { return removeAllAsync(keySet(filter), filter); } @@ -467,7 +467,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { @SuppressWarnings("unchecked") @Override @Nullable public V get(K key, boolean deserializePortable, - @Nullable IgnitePredicate<GridCacheEntry<K, V>> filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>> filter) throws IgniteCheckedException { ctx.denyOnFlag(LOCAL); String taskName = ctx.kernalContext().job().currentTaskName(); @@ -486,7 +486,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public final Map<K, V> getAll(Collection<? extends K> keys, boolean deserializePortable, - IgnitePredicate<GridCacheEntry<K, V>> filter) + IgnitePredicate<CacheEntry<K, V>> filter) throws IgniteCheckedException { ctx.denyOnFlag(LOCAL); @@ -512,7 +512,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { @Nullable UUID subjId, final String taskName, final boolean deserializePortable, - @Nullable final IgnitePredicate<GridCacheEntry<K, V>>[] filter + @Nullable final IgnitePredicate<CacheEntry<K, V>>[] filter ) { ctx.denyOnFlag(LOCAL); @@ -542,7 +542,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { */ @SuppressWarnings("ConstantConditions") private Map<K, V> getAllInternal(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, boolean swapOrOffheap, boolean storeEnabled, boolean clone, @@ -765,7 +765,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { @Nullable final Object[] invokeArgs, final boolean retval, final boolean rawRetval, - @Nullable final IgnitePredicate<GridCacheEntry<K, V>>[] filter + @Nullable final IgnitePredicate<CacheEntry<K, V>>[] filter ) { final GridCacheOperation op = invokeMap != null ? TRANSFORM : UPDATE; @@ -806,7 +806,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { @Nullable final Collection<? extends K> keys, final boolean retval, final boolean rawRetval, - @Nullable final IgnitePredicate<GridCacheEntry<K, V>>[] filter + @Nullable final IgnitePredicate<CacheEntry<K, V>>[] filter ) { final boolean writeThrough = ctx.writeThrough(); @@ -850,7 +850,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { @Nullable ExpiryPolicy expiryPlc, boolean retval, boolean rawRetval, - IgnitePredicate<GridCacheEntry<K, V>>[] filter, + IgnitePredicate<CacheEntry<K, V>>[] filter, boolean storeEnabled) throws IgniteCheckedException { if (keyCheck) validateCacheKeys(keys); @@ -991,7 +991,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { @Nullable Object[] invokeArgs, @Nullable ExpiryPolicy expiryPlc, GridCacheVersion ver, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>[] filter, + @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, UUID subjId, String taskName ) throws IgniteCheckedException { @@ -1432,7 +1432,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { IgniteTxIsolation isolation, boolean invalidate, long accessTtl, - IgnitePredicate<GridCacheEntry<K, V>>[] filter) { + IgnitePredicate<CacheEntry<K, V>>[] filter) { return new GridFinishedFutureEx<>(new UnsupportedOperationException("Locks are not supported for " + "CacheAtomicityMode.ATOMIC mode (use CacheAtomicityMode.TRANSACTIONAL instead)")); } @@ -1441,7 +1441,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { @SuppressWarnings("unchecked") @Override public IgniteFuture<Boolean> lockAllAsync(@Nullable Collection<? extends K> keys, long timeout, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { return new GridFinishedFutureEx<>(new UnsupportedOperationException("Locks are not supported for " + "CacheAtomicityMode.ATOMIC mode (use CacheAtomicityMode.TRANSACTIONAL instead)")); } @@ -1449,7 +1449,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public void unlockAll(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { throw new UnsupportedOperationException("Locks are not supported for " + "CacheAtomicityMode.ATOMIC mode (use CacheAtomicityMode.TRANSACTIONAL instead)"); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java index a53beae..e7cd7f3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java @@ -196,8 +196,8 @@ public class GridCacheDistributedQueryManager<K, V> extends GridCacheQueryManage */ @Nullable private GridCacheQueryInfo distributedQueryInfo(UUID sndId, GridCacheQueryRequest<K, V> req) throws ClassNotFoundException { - IgnitePredicate<GridCacheEntry<Object, Object>> prjPred = req.projectionFilter() == null ? - F.<GridCacheEntry<Object, Object>>alwaysTrue() : req.projectionFilter(); + IgnitePredicate<CacheEntry<Object, Object>> prjPred = req.projectionFilter() == null ? + F.<CacheEntry<Object, Object>>alwaysTrue() : req.projectionFilter(); IgniteReducer<Object, Object> rdc = req.reducer(); IgniteClosure<Object, Object> trans = req.transformer(); @@ -480,7 +480,7 @@ public class GridCacheDistributedQueryManager<K, V> extends GridCacheQueryManage } /** {@inheritDoc} */ - @Override public GridCacheQueryFuture<?> queryLocal(GridCacheQueryBean qry) { + @Override public CacheQueryFuture<?> queryLocal(GridCacheQueryBean qry) { assert cctx.config().getCacheMode() != LOCAL; if (log.isDebugEnabled()) @@ -502,7 +502,7 @@ public class GridCacheDistributedQueryManager<K, V> extends GridCacheQueryManage /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public GridCacheQueryFuture<?> queryDistributed(GridCacheQueryBean qry, Collection<ClusterNode> nodes) { + @Override public CacheQueryFuture<?> queryDistributed(GridCacheQueryBean qry, Collection<ClusterNode> nodes) { assert cctx.config().getCacheMode() != LOCAL; if (log.isDebugEnabled()) @@ -590,7 +590,7 @@ public class GridCacheDistributedQueryManager<K, V> extends GridCacheQueryManage } /** {@inheritDoc} */ - @Override public GridCacheQueryFuture<?> queryFieldsLocal(GridCacheQueryBean qry) { + @Override public CacheQueryFuture<?> queryFieldsLocal(GridCacheQueryBean qry) { assert cctx.config().getCacheMode() != LOCAL; if (log.isDebugEnabled()) @@ -612,7 +612,7 @@ public class GridCacheDistributedQueryManager<K, V> extends GridCacheQueryManage /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public GridCacheQueryFuture<?> queryFieldsDistributed(GridCacheQueryBean qry, + @Override public CacheQueryFuture<?> queryFieldsDistributed(GridCacheQueryBean qry, Collection<ClusterNode> nodes) { assert cctx.config().getCacheMode() != LOCAL; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java index 509856b..e5ac5f7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryFuture.java @@ -111,8 +111,8 @@ public class GridCacheLocalQueryFuture<K, V, R> extends GridCacheQueryFutureAdap private GridCacheQueryInfo localQueryInfo() throws IgniteCheckedException { GridCacheQueryBean qry = query(); - IgnitePredicate<GridCacheEntry<Object, Object>> prjPred = qry.query().projectionFilter() == null ? - F.<GridCacheEntry<Object, Object>>alwaysTrue() : qry.query().projectionFilter(); + IgnitePredicate<CacheEntry<Object, Object>> prjPred = qry.query().projectionFilter() == null ? + F.<CacheEntry<Object, Object>>alwaysTrue() : qry.query().projectionFilter(); IgniteMarshaller marsh = cctx.marshaller(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryManager.java index 876973f..077e1c9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryManager.java @@ -80,7 +80,7 @@ public class GridCacheLocalQueryManager<K, V> extends GridCacheQueryManager<K, V } /** {@inheritDoc} */ - @Override public GridCacheQueryFuture<?> queryLocal(GridCacheQueryBean qry) { + @Override public CacheQueryFuture<?> queryLocal(GridCacheQueryBean qry) { assert cctx.config().getCacheMode() == LOCAL; if (log.isDebugEnabled()) @@ -101,11 +101,11 @@ public class GridCacheLocalQueryManager<K, V> extends GridCacheQueryManager<K, V } /** {@inheritDoc} */ - @Override public GridCacheQueryFuture<?> queryDistributed(GridCacheQueryBean qry, Collection<ClusterNode> nodes) { + @Override public CacheQueryFuture<?> queryDistributed(GridCacheQueryBean qry, Collection<ClusterNode> nodes) { assert cctx.config().getCacheMode() == LOCAL; throw new IgniteException("Distributed queries are not available for local cache " + - "(use 'GridCacheQuery.execute(grid.forLocal())' instead) [cacheName=" + cctx.name() + ']'); + "(use 'CacheQuery.execute(grid.forLocal())' instead) [cacheName=" + cctx.name() + ']'); } /** {@inheritDoc} */ @@ -114,7 +114,7 @@ public class GridCacheLocalQueryManager<K, V> extends GridCacheQueryManager<K, V } /** {@inheritDoc} */ - @Override public GridCacheQueryFuture<?> queryFieldsLocal(GridCacheQueryBean qry) { + @Override public CacheQueryFuture<?> queryFieldsLocal(GridCacheQueryBean qry) { assert cctx.config().getCacheMode() == LOCAL; if (log.isDebugEnabled()) @@ -135,11 +135,11 @@ public class GridCacheLocalQueryManager<K, V> extends GridCacheQueryManager<K, V } /** {@inheritDoc} */ - @Override public GridCacheQueryFuture<?> queryFieldsDistributed(GridCacheQueryBean qry, + @Override public CacheQueryFuture<?> queryFieldsDistributed(GridCacheQueryBean qry, Collection<ClusterNode> nodes) { assert cctx.config().getCacheMode() == LOCAL; throw new IgniteException("Distributed queries are not available for local cache " + - "(use 'GridCacheQuery.execute(grid.forLocal())' instead) [cacheName=" + cctx.name() + ']'); + "(use 'CacheQuery.execute(grid.forLocal())' instead) [cacheName=" + cctx.name() + ']'); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesEx.java index bf78e48..bccba8e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesEx.java @@ -25,7 +25,7 @@ import java.util.*; /** * Extended queries interface. */ -public interface GridCacheQueriesEx<K, V> extends GridCacheQueries<K, V> { +public interface GridCacheQueriesEx<K, V> extends CacheQueries<K, V> { /** * Gets SQL metadata. * @@ -41,12 +41,12 @@ public interface GridCacheQueriesEx<K, V> extends GridCacheQueries<K, V> { * @param incMeta Whether to include results metadata. * @return Created query. */ - public GridCacheQuery<List<?>> createSqlFieldsQuery(String qry, boolean incMeta); + public CacheQuery<List<?>> createSqlFieldsQuery(String qry, boolean incMeta); /** * Creates SPI query. * * @return Query. */ - public <R> GridCacheQuery<R> createSpiQuery(); + public <R> CacheQuery<R> createSpiQuery(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java index c85bbd7..364eb01 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java @@ -32,7 +32,7 @@ import java.util.*; import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.*; /** - * {@link GridCacheQueries} implementation. + * {@link org.apache.ignite.cache.query.CacheQueries} implementation. */ public class GridCacheQueriesImpl<K, V> implements GridCacheQueriesEx<K, V>, Externalizable { /** */ @@ -63,7 +63,7 @@ public class GridCacheQueriesImpl<K, V> implements GridCacheQueriesEx<K, V>, Ext } /** {@inheritDoc} */ - @Override public GridCacheQuery<Map.Entry<K, V>> createSqlQuery(Class<?> cls, String clause) { + @Override public CacheQuery<Map.Entry<K, V>> createSqlQuery(Class<?> cls, String clause) { A.notNull(cls, "cls"); A.notNull(clause, "clause"); @@ -78,7 +78,7 @@ public class GridCacheQueriesImpl<K, V> implements GridCacheQueriesEx<K, V>, Ext } /** {@inheritDoc} */ - @Override public GridCacheQuery<Map.Entry<K, V>> createSqlQuery(String clsName, String clause) { + @Override public CacheQuery<Map.Entry<K, V>> createSqlQuery(String clsName, String clause) { A.notNull("clsName", clsName); A.notNull("clause", clause); @@ -93,7 +93,7 @@ public class GridCacheQueriesImpl<K, V> implements GridCacheQueriesEx<K, V>, Ext } /** {@inheritDoc} */ - @Override public GridCacheQuery<List<?>> createSqlFieldsQuery(String qry) { + @Override public CacheQuery<List<?>> createSqlFieldsQuery(String qry) { A.notNull(qry, "qry"); return new GridCacheQueryAdapter<>(ctx, @@ -107,7 +107,7 @@ public class GridCacheQueriesImpl<K, V> implements GridCacheQueriesEx<K, V>, Ext } /** {@inheritDoc} */ - @Override public GridCacheQuery<Map.Entry<K, V>> createFullTextQuery(Class<?> cls, String search) { + @Override public CacheQuery<Map.Entry<K, V>> createFullTextQuery(Class<?> cls, String search) { A.notNull(cls, "cls"); A.notNull(search, "search"); @@ -122,7 +122,7 @@ public class GridCacheQueriesImpl<K, V> implements GridCacheQueriesEx<K, V>, Ext } /** {@inheritDoc} */ - @Override public GridCacheQuery<Map.Entry<K, V>> createFullTextQuery(String clsName, String search) { + @Override public CacheQuery<Map.Entry<K, V>> createFullTextQuery(String clsName, String search) { A.notNull("clsName", clsName); A.notNull("search", search); @@ -138,7 +138,7 @@ public class GridCacheQueriesImpl<K, V> implements GridCacheQueriesEx<K, V>, Ext /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public GridCacheQuery<Map.Entry<K, V>> createScanQuery(@Nullable IgniteBiPredicate<K, V> filter) { + @Override public CacheQuery<Map.Entry<K, V>> createScanQuery(@Nullable IgniteBiPredicate<K, V> filter) { return new GridCacheQueryAdapter<>(ctx, SCAN, filter(), @@ -154,7 +154,7 @@ public class GridCacheQueriesImpl<K, V> implements GridCacheQueriesEx<K, V>, Ext * * @return Query. */ - public <R> GridCacheQuery<R> createSpiQuery() { + public <R> CacheQuery<R> createSpiQuery() { return new GridCacheQueryAdapter<>(ctx, SPI, filter(), @@ -166,7 +166,7 @@ public class GridCacheQueriesImpl<K, V> implements GridCacheQueriesEx<K, V>, Ext } /** {@inheritDoc} */ - @Override public GridCacheContinuousQuery<K, V> createContinuousQuery() { + @Override public CacheContinuousQuery<K, V> createContinuousQuery() { return ctx.continuousQueries().createQuery(prj == null ? null : prj.predicate()); } @@ -190,7 +190,7 @@ public class GridCacheQueriesImpl<K, V> implements GridCacheQueriesEx<K, V>, Ext } /** {@inheritDoc} */ - @Override public GridCacheQueryMetrics metrics() { + @Override public CacheQueryMetrics metrics() { return ctx.queries().metrics(); } @@ -205,7 +205,7 @@ public class GridCacheQueriesImpl<K, V> implements GridCacheQueriesEx<K, V>, Ext } /** {@inheritDoc} */ - @Override public GridCacheQuery<List<?>> createSqlFieldsQuery(String qry, boolean incMeta) { + @Override public CacheQuery<List<?>> createSqlFieldsQuery(String qry, boolean incMeta) { assert qry != null; return new GridCacheQueryAdapter<>(ctx, @@ -222,7 +222,7 @@ public class GridCacheQueriesImpl<K, V> implements GridCacheQueriesEx<K, V>, Ext * @return Optional projection filter. */ @SuppressWarnings("unchecked") - @Nullable private IgnitePredicate<GridCacheEntry<Object, Object>> filter() { + @Nullable private IgnitePredicate<CacheEntry<Object, Object>> filter() { return prj == null ? null : ((GridCacheProjectionImpl<Object, Object>)prj).predicate(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cafee25f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesProxy.java index 1ecd3e1..26c9d55 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesProxy.java @@ -73,12 +73,12 @@ public class GridCacheQueriesProxy<K, V> implements GridCacheQueriesEx<K, V>, Ex * * @return Cache projection. */ - public GridCacheProjection<K, V> projection() { + public CacheProjection<K, V> projection() { return prj; } /** {@inheritDoc} */ - @Override public GridCacheQuery<Map.Entry<K, V>> createSqlQuery(Class<?> cls, String clause) { + @Override public CacheQuery<Map.Entry<K, V>> createSqlQuery(Class<?> cls, String clause) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -90,7 +90,7 @@ public class GridCacheQueriesProxy<K, V> implements GridCacheQueriesEx<K, V>, Ex } /** {@inheritDoc} */ - @Override public GridCacheQuery<Map.Entry<K, V>> createSqlQuery(String clsName, String clause) { + @Override public CacheQuery<Map.Entry<K, V>> createSqlQuery(String clsName, String clause) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -102,7 +102,7 @@ public class GridCacheQueriesProxy<K, V> implements GridCacheQueriesEx<K, V>, Ex } /** {@inheritDoc} */ - @Override public GridCacheQuery<List<?>> createSqlFieldsQuery(String qry) { + @Override public CacheQuery<List<?>> createSqlFieldsQuery(String qry) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -114,7 +114,7 @@ public class GridCacheQueriesProxy<K, V> implements GridCacheQueriesEx<K, V>, Ex } /** {@inheritDoc} */ - @Override public GridCacheQuery<Map.Entry<K, V>> createFullTextQuery(Class<?> cls, String search) { + @Override public CacheQuery<Map.Entry<K, V>> createFullTextQuery(Class<?> cls, String search) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -126,7 +126,7 @@ public class GridCacheQueriesProxy<K, V> implements GridCacheQueriesEx<K, V>, Ex } /** {@inheritDoc} */ - @Override public GridCacheQuery<Map.Entry<K, V>> createFullTextQuery(String clsName, String search) { + @Override public CacheQuery<Map.Entry<K, V>> createFullTextQuery(String clsName, String search) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -138,7 +138,7 @@ public class GridCacheQueriesProxy<K, V> implements GridCacheQueriesEx<K, V>, Ex } /** {@inheritDoc} */ - @Override public GridCacheQuery<Map.Entry<K, V>> createScanQuery(@Nullable IgniteBiPredicate<K, V> filter) { + @Override public CacheQuery<Map.Entry<K, V>> createScanQuery(@Nullable IgniteBiPredicate<K, V> filter) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -150,7 +150,7 @@ public class GridCacheQueriesProxy<K, V> implements GridCacheQueriesEx<K, V>, Ex } /** {@inheritDoc} */ - @Override public GridCacheContinuousQuery<K, V> createContinuousQuery() { + @Override public CacheContinuousQuery<K, V> createContinuousQuery() { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -162,7 +162,7 @@ public class GridCacheQueriesProxy<K, V> implements GridCacheQueriesEx<K, V>, Ex } /** {@inheritDoc} */ - @Override public <R> GridCacheQuery<R> createSpiQuery() { + @Override public <R> CacheQuery<R> createSpiQuery() { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -210,7 +210,7 @@ public class GridCacheQueriesProxy<K, V> implements GridCacheQueriesEx<K, V>, Ex } /** {@inheritDoc} */ - @Override public GridCacheQueryMetrics metrics() { + @Override public CacheQueryMetrics metrics() { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try { @@ -246,7 +246,7 @@ public class GridCacheQueriesProxy<K, V> implements GridCacheQueriesEx<K, V>, Ex } /** {@inheritDoc} */ - @Override public GridCacheQuery<List<?>> createSqlFieldsQuery(String qry, boolean incMeta) { + @Override public CacheQuery<List<?>> createSqlFieldsQuery(String qry, boolean incMeta) { GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try {
