http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/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 335f268..66b6a51 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 @@ -371,7 +371,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { @Nullable UUID subjId, String taskName, boolean deserializePortable, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter + @Nullable IgnitePredicate<Entry<K, V>>... filter ) { ctx.denyOnFlag(LOCAL); ctx.checkSecurity(GridSecurityPermission.CACHE_READ); @@ -400,7 +400,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { V val, @Nullable GridCacheEntryEx<K, V> cached, long ttl, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter + @Nullable IgnitePredicate<Entry<K, V>>[] filter ) throws IgniteCheckedException { return dht.put(key, val, cached, ttl, filter); } @@ -410,14 +410,14 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { V val, @Nullable GridCacheEntryEx<K, V> cached, long ttl, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { return dht.putx(key, val, cached, ttl, filter); } /** {@inheritDoc} */ @Override public boolean putx(K key, V val, - IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { return dht.putx(key, val, filter); } @@ -427,7 +427,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<Entry<K, V>>... filter) { return dht.putAsync(key, val, entry, ttl, filter); } @@ -437,7 +437,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<Entry<K, V>>... filter) { return dht.putxAsync(key, val, entry, ttl, filter); } @@ -514,14 +514,14 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public void putAll(Map<? extends K, ? extends V> m, IgnitePredicate<CacheEntry<K, V>>[] filter) + @Override public void putAll(Map<? extends K, ? extends V> m, IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { dht.putAll(m, filter); } /** {@inheritDoc} */ @Override public IgniteInternalFuture<?> putAllAsync(Map<? extends K, ? extends V> m, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) { return dht.putAllAsync(m, filter); } @@ -580,7 +580,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { /** {@inheritDoc} */ @Override public V remove(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { return dht.remove(key, entry, filter); } @@ -588,26 +588,26 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { @SuppressWarnings("unchecked") @Override public IgniteInternalFuture<V> removeAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<Entry<K, V>>... filter) { return dht.removeAsync(key, entry, filter); } /** {@inheritDoc} */ - @Override public void removeAll(Collection<? extends K> keys, IgnitePredicate<CacheEntry<K, V>>... filter) + @Override public void removeAll(Collection<? extends K> keys, IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { dht.removeAll(keys, filter); } /** {@inheritDoc} */ @Override public IgniteInternalFuture<?> removeAllAsync(Collection<? extends K> keys, - IgnitePredicate<CacheEntry<K, V>>[] filter) { + IgnitePredicate<Entry<K, V>>[] filter) { return dht.removeAllAsync(keys, filter); } /** {@inheritDoc} */ @Override public boolean removex(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { return dht.removex(key, entry, filter); } @@ -615,7 +615,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { @SuppressWarnings("unchecked") @Override public IgniteInternalFuture<Boolean> removexAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<Entry<K, V>>... filter) { return dht.removexAsync(key, entry, filter); } @@ -635,7 +635,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<?> removeAllAsync(IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Override public IgniteInternalFuture<?> removeAllAsync(IgnitePredicate<Entry<K, V>>[] filter) { return dht.removeAllAsync(keySet(filter)); } @@ -658,13 +658,13 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { boolean retval, @Nullable IgniteTxIsolation isolation, long accessTtl, - IgnitePredicate<CacheEntry<K, V>>[] filter) { + IgnitePredicate<Entry<K, V>>[] filter) { return dht.lockAllAsync(keys, timeout, filter); } /** {@inheritDoc} */ @Override public void unlockAll(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { dht.unlockAll(keys, filter); }
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/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 abb1694..54f2dee 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 @@ -174,7 +174,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda /** {@inheritDoc} */ @SuppressWarnings({"unchecked", "RedundantCast"}) @Override public IgniteInternalFuture<Object> readThroughAllAsync(Collection<? extends K> keys, boolean reload, - IgniteInternalTx<K, V> tx, IgnitePredicate<CacheEntry<K, V>>[] filter, @Nullable UUID subjId, String taskName, + IgniteInternalTx<K, V> tx, IgnitePredicate<Entry<K, V>>[] filter, @Nullable UUID subjId, String taskName, IgniteBiInClosure<K, V> vis) { return (IgniteInternalFuture)loadAsync(tx, keys, @@ -189,7 +189,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda /** {@inheritDoc} */ @Override public void reloadAll(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { dht().reloadAll(keys, filter); super.reloadAll(keys, filter); @@ -198,7 +198,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public IgniteInternalFuture<?> reloadAllAsync(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<Entry<K, V>>... filter) { GridCompoundFuture fut = new GridCompoundFuture(ctx.kernalContext()); fut.add(super.reloadAllAsync(keys, filter)); @@ -211,7 +211,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda } /** {@inheritDoc} */ - @Override public V reload(K key, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) + @Override public V reload(K key, @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { V val; @@ -249,7 +249,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda /** {@inheritDoc} */ @SuppressWarnings({"unchecked"}) - @Override public IgniteInternalFuture<?> reloadAllAsync(@Nullable IgnitePredicate<CacheEntry<K, V>> filter) { + @Override public IgniteInternalFuture<?> reloadAllAsync(@Nullable IgnitePredicate<Entry<K, V>> filter) { GridCompoundFuture fut = new GridCompoundFuture(ctx.kernalContext()); fut.add(super.reloadAllAsync()); @@ -276,7 +276,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda @Nullable Collection<? extends K> keys, boolean reload, boolean forcePrimary, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, + @Nullable IgnitePredicate<Entry<K, V>>[] filter, @Nullable UUID subjId, String taskName, boolean deserializePortable, @@ -360,36 +360,36 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda /** * @return Near entries. */ - public Set<CacheEntry<K, V>> nearEntries() { + public Set<Entry<K, V>> nearEntries() { return super.entrySet(CU.<K, V>empty()); } /** {@inheritDoc} */ - @Override public Set<CacheEntry<K, V>> entrySet( - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Override public Set<Entry<K, V>> entrySet( + @Nullable IgnitePredicate<Entry<K, V>>... filter) { return new EntrySet(super.entrySet(filter), dht().entrySet(filter)); } /** {@inheritDoc} */ - @Override public Set<CacheEntry<K, V>> entrySet(int part) { + @Override public Set<Entry<K, V>> entrySet(int part) { return dht().entrySet(part); } /** {@inheritDoc} */ - @Override public Set<CacheEntry<K, V>> primaryEntrySet( - @Nullable final IgnitePredicate<CacheEntry<K, V>>... filter) { + @Override public Set<Entry<K, V>> primaryEntrySet( + @Nullable final IgnitePredicate<Entry<K, V>>... filter) { final long topVer = ctx.affinity().affinityTopologyVersion(); - Collection<CacheEntry<K, V>> entries = + Collection<Entry<K, V>> entries = F.flatCollections( F.viewReadOnly( dht().topology().currentLocalPartitions(), - new C1<GridDhtLocalPartition<K, V>, Collection<CacheEntry<K, V>>>() { - @Override public Collection<CacheEntry<K, V>> apply(GridDhtLocalPartition<K, V> p) { + new C1<GridDhtLocalPartition<K, V>, Collection<Entry<K, V>>>() { + @Override public Collection<Entry<K, V>> apply(GridDhtLocalPartition<K, V> p) { return F.viewReadOnly( p.entries(), - new C1<GridDhtCacheEntry<K, V>, CacheEntry<K, V>>() { - @Override public CacheEntry<K, V> apply(GridDhtCacheEntry<K, V> e) { + new C1<GridDhtCacheEntry<K, V>, Entry<K, V>>() { + @Override public Entry<K, V> apply(GridDhtCacheEntry<K, V> e) { return e.wrap(true); } }, @@ -410,7 +410,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda } /** {@inheritDoc} */ - @Override public Set<K> keySet(@Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Override public Set<K> keySet(@Nullable IgnitePredicate<Entry<K, V>>[] filter) { return new GridCacheKeySet<>(ctx, entrySet(filter), null); } @@ -418,32 +418,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<CacheEntry<K, V>> filter) { + public Set<K> nearKeySet(@Nullable IgnitePredicate<Entry<K, V>> filter) { return super.keySet(filter); } /** {@inheritDoc} */ - @Override public Set<K> primaryKeySet(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Override public Set<K> primaryKeySet(@Nullable IgnitePredicate<Entry<K, V>>... filter) { return new GridCacheKeySet<>(ctx, primaryEntrySet(filter), null); } /** {@inheritDoc} */ - @Override public Collection<V> values(IgnitePredicate<CacheEntry<K, V>>... filter) { + @Override public Collection<V> values(IgnitePredicate<Entry<K, V>>... filter) { return new GridCacheValueCollection<>(ctx, entrySet(filter), ctx.vararg(F.<K, V>cacheHasPeekValue())); } /** {@inheritDoc} */ - @Override public Collection<V> primaryValues(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Override public Collection<V> primaryValues(@Nullable IgnitePredicate<Entry<K, V>>... filter) { return new GridCacheValueCollection<>(ctx, entrySet(filter), ctx.vararg(F.<K, V>cachePrimary())); } /** {@inheritDoc} */ - @Override public boolean containsKey(K key, IgnitePredicate<CacheEntry<K, V>> filter) { + @Override public boolean containsKey(K key, IgnitePredicate<Entry<K, V>> filter) { return super.containsKey(key, filter) || dht().containsKey(key, filter); } /** {@inheritDoc} */ - @Override public boolean evict(K key, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Override public boolean evict(K key, @Nullable IgnitePredicate<Entry<K, V>>[] filter) { // Use unary 'and' to make sure that both sides execute. return super.evict(key, filter) & dht().evict(key, filter); } @@ -453,13 +453,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<CacheEntry<K, V>>[] filter) { + public boolean evictNearOnly(K key, @Nullable IgnitePredicate<Entry<K, V>>[] filter) { return super.evict(key, filter); } /** {@inheritDoc} */ @Override public void evictAll(Collection<? extends K> keys, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) { super.evictAll(keys, filter); dht().evictAll(keys, filter); @@ -467,12 +467,12 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda /** {@inheritDoc} */ @Override public boolean compact(K key, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { return super.compact(key, filter) | dht().compact(key, filter); } /** {@inheritDoc} */ - @Override public CacheEntry<K, V> entry(K key) { + @Override public Entry<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); @@ -499,7 +499,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda } /** {@inheritDoc} */ - @Override public V peek(K key, @Nullable IgnitePredicate<CacheEntry<K, V>> filter) { + @Override public V peek(K key, @Nullable IgnitePredicate<Entry<K, V>> filter) { try { GridTuple<V> res = peek0(false, key, SMART, filter); @@ -539,12 +539,12 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda /** {@inheritDoc} */ @Override public Map<K, V> peekAll(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<Entry<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<CacheEntry<K, V>>() { - @Override public boolean apply(CacheEntry<K, V> e) { + resMap.putAll(dht().peekAll(keys, F.and(filter, new IgnitePredicate<Entry<K, V>>() { + @Override public boolean apply(Entry<K, V> e) { return !resMap.containsKey(e.getKey()); } }))); @@ -553,13 +553,13 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda } /** {@inheritDoc} */ - public boolean clearLocally0(K key, @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + public boolean clearLocally0(K key, @Nullable IgnitePredicate<Entry<K, V>>[] filter) { return super.clearLocally0(key, filter) | dht().clearLocally0(key, filter); } /** {@inheritDoc} */ @Override public void clearLocally0(Collection<? extends K> keys, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) { super.clearLocally0(keys, filter); dht().clearLocally0(keys, filter); @@ -681,18 +681,18 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda /** * Wrapper for entry set. */ - private class EntrySet extends AbstractSet<CacheEntry<K, V>> { + private class EntrySet extends AbstractSet<Entry<K, V>> { /** Near entry set. */ - private Set<CacheEntry<K, V>> nearSet; + private Set<Entry<K, V>> nearSet; /** Dht entry set. */ - private Set<CacheEntry<K, V>> dhtSet; + private Set<Entry<K, V>> dhtSet; /** * @param nearSet Near entry set. * @param dhtSet Dht entry set. */ - private EntrySet(Set<CacheEntry<K, V>> nearSet, Set<CacheEntry<K, V>> dhtSet) { + private EntrySet(Set<Entry<K, V>> nearSet, Set<Entry<K, V>> dhtSet) { assert nearSet != null; assert dhtSet != null; @@ -701,10 +701,10 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda } /** {@inheritDoc} */ - @NotNull @Override public Iterator<CacheEntry<K, V>> iterator() { + @NotNull @Override public Iterator<Entry<K, V>> iterator() { return new EntryIterator(nearSet.iterator(), - F.iterator0(dhtSet, false, new P1<CacheEntry<K, V>>() { - @Override public boolean apply(CacheEntry<K, V> e) { + F.iterator0(dhtSet, false, new P1<Entry<K, V>>() { + @Override public boolean apply(Entry<K, V> e) { return !GridNearCacheAdapter.super.containsKey(e.getKey(), null); } })); @@ -719,24 +719,24 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda /** * Entry set iterator. */ - private class EntryIterator implements Iterator<CacheEntry<K, V>> { + private class EntryIterator implements Iterator<Entry<K, V>> { /** */ - private Iterator<CacheEntry<K, V>> dhtIter; + private Iterator<Entry<K, V>> dhtIter; /** */ - private Iterator<CacheEntry<K, V>> nearIter; + private Iterator<Entry<K, V>> nearIter; /** */ - private Iterator<CacheEntry<K, V>> currIter; + private Iterator<Entry<K, V>> currIter; /** */ - private CacheEntry<K, V> currEntry; + private Entry<K, V> currEntry; /** * @param nearIter Near set iterator. * @param dhtIter Dht set iterator. */ - private EntryIterator(Iterator<CacheEntry<K, V>> nearIter, Iterator<CacheEntry<K, V>> dhtIter) { + private EntryIterator(Iterator<Entry<K, V>> nearIter, Iterator<Entry<K, V>> dhtIter) { assert nearIter != null; assert dhtIter != null; @@ -752,7 +752,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda } /** {@inheritDoc} */ - @Override public CacheEntry<K, V> next() { + @Override public Entry<K, V> next() { if (!hasNext()) throw new NoSuchElementException(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/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 a2c2f8a..64cf938 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 @@ -85,7 +85,7 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma private IgniteTxLocalEx<K, V> tx; /** Filters. */ - private IgnitePredicate<CacheEntry<K, V>>[] filters; + private IgnitePredicate<Entry<K, V>>[] filters; /** Logger. */ private IgniteLogger log; @@ -136,7 +136,7 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma boolean reload, boolean forcePrimary, @Nullable IgniteTxLocalEx<K, V> tx, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filters, + @Nullable IgnitePredicate<Entry<K, V>>[] filters, @Nullable UUID subjId, String taskName, boolean deserializePortable, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/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 5efbae5..00d7e90 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 @@ -73,7 +73,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements /** Filters. */ @GridDirectTransient - private IgnitePredicate<CacheEntry<K, V>>[] filter; + private IgnitePredicate<Entry<K, V>>[] filter; /** Subject ID. */ @GridDirectVersion(1) @@ -116,7 +116,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements boolean readThrough, boolean reload, long topVer, - IgnitePredicate<CacheEntry<K, V>>[] filter, + IgnitePredicate<Entry<K, V>>[] filter, UUID subjId, int taskNameHash, long accessTtl @@ -206,7 +206,7 @@ public class GridNearGetRequest<K, V> extends GridCacheMessage<K, V> implements /** * @return Filters. */ - public IgnitePredicate<CacheEntry<K, V>>[] filter() { + public IgnitePredicate<Entry<K, V>>[] filter() { return filter; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/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 4a0f687..13ac0f1 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 @@ -98,7 +98,7 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B private IgniteLogger log; /** Filter. */ - private IgnitePredicate<CacheEntry<K, V>>[] filter; + private IgnitePredicate<Entry<K, V>>[] filter; /** Transaction. */ @GridToStringExclude @@ -150,7 +150,7 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B boolean retval, long timeout, long accessTtl, - IgnitePredicate<CacheEntry<K, V>>[] filter) { + IgnitePredicate<Entry<K, V>>[] filter) { super(cctx.kernalContext(), CU.boolReducer()); assert keys != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/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 acd4b76..787d68c 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 @@ -53,7 +53,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> /** Filter. */ @GridDirectTransient - private IgnitePredicate<CacheEntry<K, V>>[] filter; + private IgnitePredicate<Entry<K, V>>[] filter; /** Implicit flag. */ private boolean implicitTx; @@ -228,7 +228,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> /** * @return Filter. */ - public IgnitePredicate<CacheEntry<K, V>>[] filter() { + public IgnitePredicate<Entry<K, V>>[] filter() { return filter; } @@ -237,7 +237,7 @@ public class GridNearLockRequest<K, V> extends GridDistributedLockRequest<K, V> * @param ctx Context. * @throws IgniteCheckedException If failed. */ - public void filter(IgnitePredicate<CacheEntry<K, V>>[] filter, GridCacheContext<K, V> ctx) + public void filter(IgnitePredicate<Entry<K, V>>[] filter, GridCacheContext<K, V> ctx) throws IgniteCheckedException { this.filter = filter; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/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 d6d7b51..15baff3 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 @@ -103,7 +103,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> @Nullable UUID subjId, String taskName, final boolean deserializePortable, - @Nullable final IgnitePredicate<CacheEntry<K, V>>[] filter + @Nullable final IgnitePredicate<Entry<K, V>>[] filter ) { ctx.denyOnFlag(LOCAL); ctx.checkSecurity(GridSecurityPermission.CACHE_READ); @@ -148,7 +148,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> IgniteInternalFuture<Map<K, V>> txLoadAsync(GridNearTxLocal<K, V> tx, @Nullable Collection<? extends K> keys, boolean readThrough, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, + @Nullable IgnitePredicate<Entry<K, V>>[] filter, boolean deserializePortable, @Nullable IgniteCacheExpiryPolicy expiryPlc) { assert tx != null; @@ -417,7 +417,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> boolean retval, IgniteTxIsolation isolation, long accessTtl, - IgnitePredicate<CacheEntry<K, V>>[] filter) { + IgnitePredicate<Entry<K, V>>[] filter) { GridNearLockFuture<K, V> fut = new GridNearLockFuture<>(ctx, keys, (GridNearTxLocal<K, V>)tx, @@ -467,7 +467,7 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> } /** {@inheritDoc} */ - @Override public void unlockAll(Collection<? extends K> keys, IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Override public void unlockAll(Collection<? extends K> keys, IgnitePredicate<Entry<K, V>>[] filter) { if (keys.isEmpty()) return; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java index 72ab384..bbe89b1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java @@ -230,10 +230,10 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu try { if (e.op() != NOOP && !cacheCtx.affinity().localNode(e.key(), topVer)) { - GridCacheEntryEx<K, V> cacheEntry = cacheCtx.cache().peekEx(e.key()); + GridCacheEntryEx<K, V> Entry = cacheCtx.cache().peekEx(e.key()); - if (cacheEntry != null) - cacheEntry.invalidate(null, this.tx.xidVersion()); + if (Entry != null) + Entry.invalidate(null, this.tx.xidVersion()); } } catch (Throwable t) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/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 b4bc3a5..8d8074c 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 @@ -104,13 +104,13 @@ public class GridLocalCache<K, V> extends GridCacheAdapter<K, V> { IgniteTxIsolation isolation, boolean invalidate, long accessTtl, - IgnitePredicate<CacheEntry<K, V>>[] filter) { + IgnitePredicate<Entry<K, V>>[] filter) { return lockAllAsync(keys, timeout, tx, filter); } /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> lockAllAsync(Collection<? extends K> keys, long timeout, - IgnitePredicate<CacheEntry<K, V>>[] filter) { + IgnitePredicate<Entry<K, V>>[] filter) { IgniteTxLocalEx<K, V> tx = ctx.tm().localTx(); return lockAllAsync(keys, timeout, tx, filter); @@ -124,7 +124,7 @@ public class GridLocalCache<K, V> extends GridCacheAdapter<K, V> { * @return Future. */ public IgniteInternalFuture<Boolean> lockAllAsync(Collection<? extends K> keys, long timeout, - @Nullable IgniteTxLocalEx<K, V> tx, IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Nullable IgniteTxLocalEx<K, V> tx, IgnitePredicate<Entry<K, V>>[] filter) { if (F.isEmpty(keys)) return new GridFinishedFuture<>(ctx.kernalContext(), true); @@ -176,7 +176,7 @@ public class GridLocalCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @Override public void unlockAll(Collection<? extends K> keys, - IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + IgnitePredicate<Entry<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/4fcea520/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 5db5ac1..fd0918b 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 @@ -82,7 +82,7 @@ public final class GridLocalLockFuture<K, V> extends GridFutureAdapter<Boolean> private IgniteLogger log; /** Filter. */ - private IgnitePredicate<CacheEntry<K, V>>[] filter; + private IgnitePredicate<Entry<K, V>>[] filter; /** Transaction. */ private IgniteTxLocalEx<K, V> tx; @@ -111,7 +111,7 @@ public final class GridLocalLockFuture<K, V> extends GridFutureAdapter<Boolean> IgniteTxLocalEx<K, V> tx, GridLocalCache<K, V> cache, long timeout, - IgnitePredicate<CacheEntry<K, V>>[] filter) { + IgnitePredicate<Entry<K, V>>[] filter) { super(cctx.kernalContext()); assert keys != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/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 e42292b..ce1b949 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 @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.cache.local.atomic; import org.apache.ignite.*; -import org.apache.ignite.cache.CacheEntry; +import org.apache.ignite.cache.Entry; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.local.*; @@ -127,7 +127,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { V val, @Nullable GridCacheEntryEx<K, V> cached, long ttl, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { A.notNull(key, "key", val, "val"); ctx.denyOnLocalRead(); @@ -146,7 +146,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @Override public boolean putx(K key, V val, - IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { A.notNull(key, "key", val, "val"); ctx.denyOnLocalRead(); @@ -168,7 +168,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<Entry<K, V>>... filter) { A.notNull(key, "key", val, "val"); ctx.denyOnLocalRead(); @@ -187,7 +187,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { V val, @Nullable GridCacheEntryEx<K, V> entry, long ttl, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<Entry<K, V>>... filter) { A.notNull(key, "key", val, "val"); ctx.denyOnLocalRead(); @@ -317,7 +317,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @Override public void putAll(Map<? extends K, ? extends V> m, - IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { ctx.denyOnLocalRead(); updateAllInternal(UPDATE, @@ -333,7 +333,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @Override public IgniteInternalFuture<?> putAllAsync(Map<? extends K, ? extends V> m, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) { ctx.denyOnLocalRead(); return updateAllAsync0(m, @@ -348,7 +348,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<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { ctx.denyOnLocalRead(); return (V)updateAllInternal(DELETE, @@ -366,7 +366,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { @SuppressWarnings("unchecked") @Override public IgniteInternalFuture<V> removeAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<Entry<K, V>>... filter) { ctx.denyOnLocalRead(); return removeAllAsync0(Collections.singletonList(key), true, false, filter); @@ -375,7 +375,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public void removeAll(Collection<? extends K> keys, - IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { ctx.denyOnLocalRead(); updateAllInternal(DELETE, @@ -391,7 +391,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @Override public IgniteInternalFuture<?> removeAllAsync(Collection<? extends K> keys, - IgnitePredicate<CacheEntry<K, V>>[] filter) { + IgnitePredicate<Entry<K, V>>[] filter) { ctx.denyOnLocalRead(); return removeAllAsync0(keys, false, false, filter); @@ -401,7 +401,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<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { boolean statsEnabled = ctx.config().isStatisticsEnabled(); long start = statsEnabled ? System.nanoTime() : 0L; @@ -430,7 +430,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { @SuppressWarnings("unchecked") @Override public IgniteInternalFuture<Boolean> removexAsync(K key, @Nullable GridCacheEntryEx<K, V> entry, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<Entry<K, V>>... filter) { A.notNull(key, "key"); ctx.denyOnLocalRead(); @@ -467,7 +467,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<?> removeAllAsync(IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Override public IgniteInternalFuture<?> removeAllAsync(IgnitePredicate<Entry<K, V>>[] filter) { return removeAllAsync(keySet(filter), filter); } @@ -475,7 +475,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { @SuppressWarnings("unchecked") @Override @Nullable public V get(K key, boolean deserializePortable, - @Nullable IgnitePredicate<CacheEntry<K, V>> filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>> filter) throws IgniteCheckedException { ctx.denyOnFlag(LOCAL); String taskName = ctx.kernalContext().job().currentTaskName(); @@ -494,7 +494,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<CacheEntry<K, V>> filter) + IgnitePredicate<Entry<K, V>> filter) throws IgniteCheckedException { ctx.denyOnFlag(LOCAL); @@ -522,7 +522,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { @Nullable UUID subjId, final String taskName, final boolean deserializePortable, - @Nullable final IgnitePredicate<CacheEntry<K, V>>[] filter + @Nullable final IgnitePredicate<Entry<K, V>>[] filter ) { ctx.denyOnFlag(LOCAL); @@ -554,7 +554,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { */ @SuppressWarnings("ConstantConditions") private Map<K, V> getAllInternal(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, + @Nullable IgnitePredicate<Entry<K, V>>[] filter, boolean swapOrOffheap, boolean storeEnabled, boolean clone, @@ -816,7 +816,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { @Nullable final Object[] invokeArgs, final boolean retval, final boolean rawRetval, - @Nullable final IgnitePredicate<CacheEntry<K, V>>[] filter + @Nullable final IgnitePredicate<Entry<K, V>>[] filter ) { final GridCacheOperation op = invokeMap != null ? TRANSFORM : UPDATE; @@ -857,7 +857,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<CacheEntry<K, V>>[] filter + @Nullable final IgnitePredicate<Entry<K, V>>[] filter ) { final boolean writeThrough = ctx.writeThrough(); @@ -910,7 +910,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { @Nullable ExpiryPolicy expiryPlc, boolean retval, boolean rawRetval, - IgnitePredicate<CacheEntry<K, V>>[] filter, + IgnitePredicate<Entry<K, V>>[] filter, boolean storeEnabled) throws IgniteCheckedException { if (keyCheck) validateCacheKeys(keys); @@ -1054,7 +1054,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { @Nullable Object[] invokeArgs, @Nullable ExpiryPolicy expiryPlc, GridCacheVersion ver, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, + @Nullable IgnitePredicate<Entry<K, V>>[] filter, UUID subjId, String taskName ) throws IgniteCheckedException { @@ -1495,7 +1495,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { IgniteTxIsolation isolation, boolean invalidate, long accessTtl, - IgnitePredicate<CacheEntry<K, V>>[] filter) { + IgnitePredicate<Entry<K, V>>[] filter) { return new GridFinishedFutureEx<>(new UnsupportedOperationException("Locks are not supported for " + "CacheAtomicityMode.ATOMIC mode (use CacheAtomicityMode.TRANSACTIONAL instead)")); } @@ -1504,7 +1504,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { @SuppressWarnings("unchecked") @Override public IgniteInternalFuture<Boolean> lockAllAsync(@Nullable Collection<? extends K> keys, long timeout, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<Entry<K, V>>... filter) { return new GridFinishedFutureEx<>(new UnsupportedOperationException("Locks are not supported for " + "CacheAtomicityMode.ATOMIC mode (use CacheAtomicityMode.TRANSACTIONAL instead)")); } @@ -1512,7 +1512,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public void unlockAll(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { 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/4fcea520/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 b294f9e..7615707 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 @@ -198,8 +198,8 @@ public class GridCacheDistributedQueryManager<K, V> extends GridCacheQueryManage */ @Nullable private GridCacheQueryInfo distributedQueryInfo(UUID sndId, GridCacheQueryRequest<K, V> req) throws ClassNotFoundException { - IgnitePredicate<CacheEntry<Object, Object>> prjPred = req.projectionFilter() == null ? - F.<CacheEntry<Object, Object>>alwaysTrue() : req.projectionFilter(); + IgnitePredicate<Entry<Object, Object>> prjPred = req.projectionFilter() == null ? + F.<Entry<Object, Object>>alwaysTrue() : req.projectionFilter(); IgniteReducer<Object, Object> rdc = req.reducer(); IgniteClosure<Object, Object> trans = req.transformer(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/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 6ff5ccd..f5f90a4 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 @@ -112,8 +112,8 @@ public class GridCacheLocalQueryFuture<K, V, R> extends GridCacheQueryFutureAdap private GridCacheQueryInfo localQueryInfo() throws IgniteCheckedException { GridCacheQueryBean qry = query(); - IgnitePredicate<CacheEntry<Object, Object>> prjPred = qry.query().projectionFilter() == null ? - F.<CacheEntry<Object, Object>>alwaysTrue() : qry.query().projectionFilter(); + IgnitePredicate<Entry<Object, Object>> prjPred = qry.query().projectionFilter() == null ? + F.<Entry<Object, Object>>alwaysTrue() : qry.query().projectionFilter(); IgniteMarshaller marsh = cctx.marshaller(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/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 0366377..a2646a9 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 @@ -238,7 +238,7 @@ public class GridCacheQueriesImpl<K, V> implements GridCacheQueriesEx<K, V>, Ext * @return Optional projection filter. */ @SuppressWarnings("unchecked") - @Nullable private IgnitePredicate<CacheEntry<Object, Object>> filter() { + @Nullable private IgnitePredicate<Entry<Object, Object>> filter() { return prj == null ? null : ((GridCacheProjectionImpl<Object, Object>)prj).predicate(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java index d3f0808..ce5efad 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java @@ -42,7 +42,7 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> { private final GridCacheContext<?, ?> cctx; /** */ - private final IgnitePredicate<CacheEntry<Object, Object>> prjPred; + private final IgnitePredicate<Entry<Object, Object>> prjPred; /** */ private final GridCacheQueryType type; @@ -104,7 +104,7 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> { */ public GridCacheQueryAdapter(GridCacheContext<?, ?> cctx, GridCacheQueryType type, - @Nullable IgnitePredicate<CacheEntry<Object, Object>> prjPred, + @Nullable IgnitePredicate<Entry<Object, Object>> prjPred, @Nullable String clsName, @Nullable String clause, @Nullable IgniteBiPredicate<Object, Object> filter, @@ -147,7 +147,7 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> { * @param taskHash Task hash. */ public GridCacheQueryAdapter(GridCacheContext<?, ?> cctx, - IgnitePredicate<CacheEntry<Object, Object>> prjPred, + IgnitePredicate<Entry<Object, Object>> prjPred, GridCacheQueryType type, IgniteLogger log, int pageSize, @@ -185,7 +185,7 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> { /** * @return cache projection filter. */ - @Nullable public IgnitePredicate<CacheEntry<Object, Object>> projectionFilter() { + @Nullable public IgnitePredicate<Entry<Object, Object>> projectionFilter() { return prjPred; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryInfo.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryInfo.java index d1cc337..0035fa6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryInfo.java @@ -32,7 +32,7 @@ class GridCacheQueryInfo { private boolean loc; /** */ - private IgnitePredicate<CacheEntry<Object, Object>> prjPred; + private IgnitePredicate<Entry<Object, Object>> prjPred; /** */ private IgniteClosure<Object, Object> trans; @@ -76,7 +76,7 @@ class GridCacheQueryInfo { */ GridCacheQueryInfo( boolean loc, - IgnitePredicate<CacheEntry<Object, Object>> prjPred, + IgnitePredicate<Entry<Object, Object>> prjPred, IgniteClosure<Object, Object> trans, IgniteReducer<Object, Object> rdc, GridCacheQueryAdapter<?> qry, @@ -124,7 +124,7 @@ class GridCacheQueryInfo { /** * @return Projection predicate. */ - IgnitePredicate<CacheEntry<Object, Object>> projectionPredicate() { + IgnitePredicate<Entry<Object, Object>> projectionPredicate() { return prjPred; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java index c1b4237..fb5bc8b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java @@ -43,6 +43,7 @@ import org.apache.ignite.spi.indexing.*; import org.jdk8.backport.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import java.io.*; import java.sql.*; import java.util.*; @@ -733,12 +734,12 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte @SuppressWarnings({"unchecked"}) private GridCloseableIterator<IgniteBiTuple<K, V>> scanIterator(final GridCacheQueryAdapter<?> qry) throws IgniteCheckedException { - IgnitePredicate<CacheEntry<K, V>> filter = null; + IgnitePredicate<Entry<K, V>> filter = null; if (qry.projectionFilter() != null) { - filter = new P1<CacheEntry<K, V>>() { - @Override public boolean apply(CacheEntry<K, V> e) { - return qry.projectionFilter().apply((CacheEntry<Object, Object>)e); + filter = new P1<Entry<K, V>>() { + @Override public boolean apply(Entry<K, V> e) { + return qry.projectionFilter().apply((Entry<Object, Object>)e); } }; } @@ -859,7 +860,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte */ private GridIterator<IgniteBiTuple<K, V>> swapIterator(GridCacheQueryAdapter<?> qry) throws IgniteCheckedException { - IgnitePredicate<CacheEntry<Object, Object>> prjPred = qry.projectionFilter(); + IgnitePredicate<Entry<Object, Object>> prjPred = qry.projectionFilter(); IgniteBiPredicate<K, V> filter = qry.scanFilter(); @@ -873,7 +874,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte * @return Offheap iterator. */ private GridIterator<IgniteBiTuple<K, V>> offheapIterator(GridCacheQueryAdapter<?> qry) { - IgnitePredicate<CacheEntry<Object, Object>> prjPred = qry.projectionFilter(); + IgnitePredicate<Entry<Object, Object>> prjPred = qry.projectionFilter(); IgniteBiPredicate<K, V> filter = qry.scanFilter(); @@ -898,7 +899,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte */ private GridIteratorAdapter<IgniteBiTuple<K, V>> scanIterator( @Nullable final Iterator<Map.Entry<byte[], byte[]>> it, - @Nullable final IgnitePredicate<CacheEntry<Object, Object>> prjPred, + @Nullable final IgnitePredicate<Entry<Object, Object>> prjPred, @Nullable final IgniteBiPredicate<K, V> filter, final boolean keepPortable) { if (it == null) @@ -937,9 +938,9 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte final LazySwapEntry e = new LazySwapEntry(it.next()); if (prjPred != null) { - CacheEntry<K, V> cacheEntry = new GridCacheScanSwapEntry(e); + Entry<K, V> Entry = new GridCacheScanSwapEntry(e); - if (!prjPred.apply((CacheEntry<Object, Object>)cacheEntry)) + if (!prjPred.apply((Entry<Object, Object>)Entry)) continue; } @@ -999,7 +1000,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte try { // Preparing query closures. - IgnitePredicate<CacheEntry<Object, Object>> prjFilter = qryInfo.projectionPredicate(); + IgnitePredicate<Entry<Object, Object>> prjFilter = qryInfo.projectionPredicate(); IgniteClosure<Object, Object> trans = (IgniteClosure<Object, Object>)qryInfo.transformer(); IgniteReducer<Object, Object> rdc = (IgniteReducer<Object, Object>)qryInfo.reducer(); @@ -1166,7 +1167,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte try { // Preparing query closures. - IgnitePredicate<CacheEntry<Object, Object>> prjFilter = qryInfo.projectionPredicate(); + IgnitePredicate<Entry<Object, Object>> prjFilter = qryInfo.projectionPredicate(); IgniteClosure<Map.Entry<K, V>, Object> trans = (IgniteClosure<Map.Entry<K, V>, Object>)qryInfo.transformer(); IgniteReducer<Map.Entry<K, V>, Object> rdc = (IgniteReducer<Map.Entry<K, V>, Object>)qryInfo.reducer(); @@ -1755,7 +1756,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte @Nullable private GridIndexingQueryFilter projectionFilter(GridCacheQueryAdapter<?> qry) { assert qry != null; - final IgnitePredicate<CacheEntry<Object, Object>> prjFilter = qry.projectionFilter(); + final IgnitePredicate<Entry<Object, Object>> prjFilter = qry.projectionFilter(); if (prjFilter == null || F.isAlwaysTrue(prjFilter)) return null; @@ -1768,9 +1769,9 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte return new IgniteBiPredicate<K, V>() { @Override public boolean apply(K k, V v) { try { - CacheEntry<K, V> entry = context().cache().entry(k); + Entry<K, V> entry = context().cache().entry(k); - return entry != null && prjFilter.apply((CacheEntry<Object, Object>)entry); + return entry != null && prjFilter.apply((Entry<Object, Object>)entry); } catch (GridDhtInvalidPartitionException ignore) { return false; @@ -2437,7 +2438,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte private static final long serialVersionUID = 7410163202728985912L; /** */ - private IgnitePredicate<CacheEntry<Object, Object>> prjPred; + private IgnitePredicate<Entry<Object, Object>> prjPred; /** */ private IgniteBiPredicate<K, V> filter; @@ -2451,7 +2452,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte * @param keepPortable Keep portable flag. */ private OffheapIteratorClosure( - @Nullable IgnitePredicate<CacheEntry<Object, Object>> prjPred, + @Nullable IgnitePredicate<Entry<Object, Object>> prjPred, @Nullable IgniteBiPredicate<K, V> filter, boolean keepPortable) { assert prjPred != null || filter != null; @@ -2468,9 +2469,9 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte LazyOffheapEntry e = new LazyOffheapEntry(keyPtr, valPtr); if (prjPred != null) { - CacheEntry<K, V> cacheEntry = new GridCacheScanSwapEntry(e); + Entry<K, V> Entry = new GridCacheScanSwapEntry(e); - if (!prjPred.apply((CacheEntry<Object, Object>)cacheEntry)) + if (!prjPred.apply((Entry<Object, Object>)Entry)) return null; } @@ -2550,7 +2551,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte /** * */ - private class GridCacheScanSwapEntry implements CacheEntry<K, V> { + private class GridCacheScanSwapEntry implements Entry<K, V> { /** */ private static final long serialVersionUID = 1262515168518736214L; @@ -2662,12 +2663,12 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte } /** {@inheritDoc} */ - @Nullable @Override public V set(V val, IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable @Override public V set(V val, IgnitePredicate<Entry<K, V>>... filter) { throw new UnsupportedOperationException(); } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> setAsync(V val, IgnitePredicate<CacheEntry<K, V>>... filter) { + @Override public IgniteInternalFuture<V> setAsync(V val, IgnitePredicate<Entry<K, V>>... filter) { throw new UnsupportedOperationException(); } @@ -2682,12 +2683,12 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte } /** {@inheritDoc} */ - @Override public boolean setx(V val, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Override public boolean setx(V val, @Nullable IgnitePredicate<Entry<K, V>>... filter) { throw new UnsupportedOperationException(); } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> setxAsync(V val, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Override public IgniteInternalFuture<Boolean> setxAsync(V val, @Nullable IgnitePredicate<Entry<K, V>>... filter) { throw new UnsupportedOperationException(); } @@ -2732,22 +2733,22 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte } /** {@inheritDoc} */ - @Nullable @Override public V remove(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable @Override public V remove(@Nullable IgnitePredicate<Entry<K, V>>... filter) { throw new UnsupportedOperationException(); } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> removeAsync(IgnitePredicate<CacheEntry<K, V>>... filter) { + @Override public IgniteInternalFuture<V> removeAsync(IgnitePredicate<Entry<K, V>>... filter) { throw new UnsupportedOperationException(); } /** {@inheritDoc} */ - @Override public boolean removex(IgnitePredicate<CacheEntry<K, V>>... filter) { + @Override public boolean removex(IgnitePredicate<Entry<K, V>>... filter) { throw new UnsupportedOperationException(); } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> removexAsync(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Override public IgniteInternalFuture<Boolean> removexAsync(@Nullable IgnitePredicate<Entry<K, V>>... filter) { throw new UnsupportedOperationException(); } @@ -2777,18 +2778,18 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte } /** {@inheritDoc} */ - @Override public boolean lock(long timeout, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Override public boolean lock(long timeout, @Nullable IgnitePredicate<Entry<K, V>>... filter) { throw new UnsupportedOperationException(); } /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> lockAsync(long timeout, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<Entry<K, V>>... filter) { throw new UnsupportedOperationException(); } /** {@inheritDoc} */ - @Override public void unlock(IgnitePredicate<CacheEntry<K, V>>... filter) { + @Override public void unlock(IgnitePredicate<Entry<K, V>>... filter) { throw new UnsupportedOperationException(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java index 37266d8..fe74a56 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java @@ -67,7 +67,7 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen /** */ @GridDirectTransient - private IgnitePredicate<CacheEntry<Object, Object>> prjFilter; + private IgnitePredicate<Entry<Object, Object>> prjFilter; /** */ private byte[] prjFilterBytes; @@ -201,7 +201,7 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen String clause, String clsName, IgniteBiPredicate<Object, Object> keyValFilter, - IgnitePredicate<CacheEntry<Object, Object>> prjFilter, + IgnitePredicate<Entry<Object, Object>> prjFilter, IgniteReducer<Object, Object> rdc, IgniteClosure<Object, Object> trans, int pageSize, @@ -376,7 +376,7 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen } /** {@inheritDoc} */ - public IgnitePredicate<CacheEntry<Object, Object>> projectionFilter() { + public IgnitePredicate<Entry<Object, Object>> projectionFilter() { return prjFilter; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java index acd96ed..a67fabe 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java @@ -54,7 +54,7 @@ public class GridCacheContinuousQueryAdapter<K, V> implements CacheContinuousQue private final Object topic; /** Projection predicate */ - private final IgnitePredicate<CacheEntry<K, V>> prjPred; + private final IgnitePredicate<Entry<K, V>> prjPred; /** Keep portable flag. */ private final boolean keepPortable; @@ -93,7 +93,7 @@ public class GridCacheContinuousQueryAdapter<K, V> implements CacheContinuousQue * @param prjPred Projection predicate. */ GridCacheContinuousQueryAdapter(GridCacheContext<K, V> ctx, Object topic, - @Nullable IgnitePredicate<CacheEntry<K, V>> prjPred) { + @Nullable IgnitePredicate<Entry<K, V>> prjPred) { assert ctx != null; assert topic != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java index f249a74..f9eb301 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java @@ -42,7 +42,7 @@ import static org.apache.ignite.internal.processors.cache.GridCacheValueBytes.*; * Entry implementation. */ @SuppressWarnings("TypeParameterHidesVisibleType") -public class GridCacheContinuousQueryEntry<K, V> implements CacheEntry<K, V>, GridCacheDeployable, Externalizable, +public class GridCacheContinuousQueryEntry<K, V> implements Entry<K, V>, GridCacheDeployable, Externalizable, CacheContinuousQueryEntry<K, V> { /** */ private static final long serialVersionUID = 0L; @@ -58,7 +58,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements CacheEntry<K, V>, Gr /** Cache entry. */ @SuppressWarnings("TransientFieldNotInitialized") @GridToStringExclude - private final transient CacheEntry<K, V> impl; + private final transient Entry<K, V> impl; /** Key. */ @GridToStringInclude @@ -112,7 +112,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements CacheEntry<K, V>, Gr * @param evtType Event type. */ GridCacheContinuousQueryEntry(GridCacheContext<K, V> ctx, - CacheEntry<K, V> impl, + Entry<K, V> impl, K key, @Nullable V newVal, @Nullable GridCacheValueBytes newValBytes, @@ -137,7 +137,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements CacheEntry<K, V>, Gr /** * @return Cache entry. */ - CacheEntry<K, V> entry() { + Entry<K, V> entry() { return impl; } @@ -381,7 +381,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements CacheEntry<K, V>, Gr } /** {@inheritDoc} */ - @Nullable @Override public V set(V val, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) + @Nullable @Override public V set(V val, @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { assert impl != null; @@ -391,7 +391,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements CacheEntry<K, V>, Gr } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> setAsync(V val, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Override public IgniteInternalFuture<V> setAsync(V val, @Nullable IgnitePredicate<Entry<K, V>>... filter) { assert impl != null; ctx.denyOnFlag(READ); @@ -418,7 +418,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements CacheEntry<K, V>, Gr } /** {@inheritDoc} */ - @Override public boolean setx(V val, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) + @Override public boolean setx(V val, @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { assert impl != null; @@ -429,7 +429,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements CacheEntry<K, V>, Gr /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> setxAsync(V val, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<Entry<K, V>>... filter) { assert impl != null; ctx.denyOnFlag(READ); @@ -510,7 +510,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements CacheEntry<K, V>, Gr } /** {@inheritDoc} */ - @Nullable @Override public V remove(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) + @Nullable @Override public V remove(@Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { assert impl != null; @@ -520,7 +520,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements CacheEntry<K, V>, Gr } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> removeAsync(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Override public IgniteInternalFuture<V> removeAsync(@Nullable IgnitePredicate<Entry<K, V>>... filter) { assert impl != null; ctx.denyOnFlag(READ); @@ -529,7 +529,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements CacheEntry<K, V>, Gr } /** {@inheritDoc} */ - @Override public boolean removex(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Override public boolean removex(@Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { assert impl != null; ctx.denyOnFlag(READ); @@ -538,7 +538,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements CacheEntry<K, V>, Gr } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> removexAsync(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Override public IgniteInternalFuture<Boolean> removexAsync(@Nullable IgnitePredicate<Entry<K, V>>... filter) { assert impl != null; ctx.denyOnFlag(READ); @@ -593,7 +593,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements CacheEntry<K, V>, Gr } /** {@inheritDoc} */ - @Override public boolean lock(long timeout, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) + @Override public boolean lock(long timeout, @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { assert impl != null; @@ -602,14 +602,14 @@ public class GridCacheContinuousQueryEntry<K, V> implements CacheEntry<K, V>, Gr /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> lockAsync(long timeout, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + @Nullable IgnitePredicate<Entry<K, V>>... filter) { assert impl != null; return impl.lockAsync(timeout, filter); } /** {@inheritDoc} */ - @Override public void unlock(IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException { + @Override public void unlock(IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException { assert impl != null; impl.unlock(filter); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java index a03b9db..b1eaffb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java @@ -58,7 +58,7 @@ class GridCacheContinuousQueryHandler<K, V> implements GridContinuousHandler { private IgnitePredicate<CacheContinuousQueryEntry<K, V>> filter; /** Projection predicate */ - private IgnitePredicate<CacheEntry<K, V>> prjPred; + private IgnitePredicate<Entry<K, V>> prjPred; /** Deployable object for filter. */ private DeployableObject filterDep; @@ -113,7 +113,7 @@ class GridCacheContinuousQueryHandler<K, V> implements GridContinuousHandler { Object topic, IgniteBiPredicate<UUID, Collection<CacheContinuousQueryEntry<K, V>>> cb, @Nullable IgnitePredicate<CacheContinuousQueryEntry<K, V>> filter, - @Nullable IgnitePredicate<CacheEntry<K, V>> prjPred, + @Nullable IgnitePredicate<Entry<K, V>> prjPred, boolean internal, boolean entryLsnr, boolean sync, @@ -280,7 +280,7 @@ class GridCacheContinuousQueryHandler<K, V> implements GridContinuousHandler { GridCacheProjectionImpl.FullFilter<K, V> filter = (GridCacheProjectionImpl.FullFilter<K, V>)prjPred; GridCacheProjectionImpl.KeyValueFilter<K, V> kvFilter = filter.keyValueFilter(); - IgnitePredicate<? super CacheEntry<K, V>> entryFilter = filter.entryFilter(); + IgnitePredicate<? super Entry<K, V>> entryFilter = filter.entryFilter(); boolean ret = true; @@ -462,7 +462,7 @@ class GridCacheContinuousQueryHandler<K, V> implements GridContinuousHandler { if (b) prjPredDep = (DeployableObject)in.readObject(); else - prjPred = (IgnitePredicate<CacheEntry<K, V>>)in.readObject(); + prjPred = (IgnitePredicate<Entry<K, V>>)in.readObject(); internal = in.readBoolean(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java index bd70f02..7dff5ae 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java @@ -102,7 +102,7 @@ public class GridCacheContinuousQueryManager<K, V> extends GridCacheManagerAdapt * @param prjPred Projection predicate. * @return New continuous query. */ - public CacheContinuousQuery<K, V> createQuery(@Nullable IgnitePredicate<CacheEntry<K, V>> prjPred) { + public CacheContinuousQuery<K, V> createQuery(@Nullable IgnitePredicate<Entry<K, V>> prjPred) { Object topic = TOPIC_CACHE.topic(topicPrefix, cctx.localNodeId(), seq.getAndIncrement()); return new GridCacheContinuousQueryAdapter<>(cctx, topic, prjPred); @@ -363,7 +363,7 @@ public class GridCacheContinuousQueryManager<K, V> extends GridCacheManagerAdapt cctx.projectionPerCall(cctx.cache().<K, V>keepPortable0()); } - Set<CacheEntry<K, V>> entries; + Set<Entry<K, V>> entries; if (cctx.isReplicated()) entries = internal ? cctx.cache().entrySetx() : @@ -374,7 +374,7 @@ public class GridCacheContinuousQueryManager<K, V> extends GridCacheManagerAdapt boolean evt = !internal && cctx.gridEvents().isRecordable(EVT_CACHE_QUERY_OBJECT_READ); - for (CacheEntry<K, V> e : entries) { + for (Entry<K, V> e : entries) { GridCacheContinuousQueryEntry<K, V> qryEntry = new GridCacheContinuousQueryEntry<>(cctx, e, e.getKey(), http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java index a349731..f462ba0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.transactions; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; @@ -29,6 +28,7 @@ import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import java.util.*; /** @@ -502,7 +502,7 @@ public interface IgniteInternalTx<K, V> extends AutoCloseable, GridTimeoutObject GridCacheContext<K, V> ctx, boolean failFast, K key, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws GridCacheFilterFailedException; + @Nullable IgnitePredicate<Entry<K, V>>[] filter) throws GridCacheFilterFailedException; /** * @return Start version. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java index a6e39ce..dd84c81 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java @@ -102,7 +102,7 @@ public class IgniteTxEntry<K, V> implements GridPeerDeployAware, Externalizable, /** Put filters. */ @GridToStringInclude - private IgnitePredicate<CacheEntry<K, V>>[] filters; + private IgnitePredicate<Entry<K, V>>[] filters; /** Flag indicating whether filters passed. Used for fast-commit transactions. */ private boolean filtersPassed; @@ -217,7 +217,7 @@ public class IgniteTxEntry<K, V> implements GridPeerDeployAware, Externalizable, Object[] invokeArgs, long ttl, GridCacheEntryEx<K, V> entry, - IgnitePredicate<CacheEntry<K, V>>[] filters, + IgnitePredicate<Entry<K, V>>[] filters, GridCacheVersion drVer) { assert ctx != null; assert tx != null; @@ -725,14 +725,14 @@ public class IgniteTxEntry<K, V> implements GridPeerDeployAware, Externalizable, /** * @return Put filters. */ - public IgnitePredicate<CacheEntry<K, V>>[] filters() { + public IgnitePredicate<Entry<K, V>>[] filters() { return filters; } /** * @param filters Put filters. */ - public void filters(IgnitePredicate<CacheEntry<K, V>>[] filters) { + public void filters(IgnitePredicate<Entry<K, V>>[] filters) { filterBytes = null; this.filters = filters;
