ignite-96 wip
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4fcea520 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4fcea520 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4fcea520 Branch: refs/heads/ignite-96 Commit: 4fcea520f420a5ee3291008f7992c25581307faa Parents: 59238cf Author: Yakov Zhdanov <[email protected]> Authored: Fri Feb 6 11:18:12 2015 +0300 Committer: Yakov Zhdanov <[email protected]> Committed: Fri Feb 6 11:18:12 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/CacheConfiguration.java | 6 +- .../apache/ignite/cache/CacheProjection.java | 57 ++--- .../java/org/apache/ignite/cache/GridCache.java | 3 +- .../cache/eviction/CacheEvictionFilter.java | 6 +- .../cache/eviction/CacheEvictionPolicy.java | 8 +- .../ignite/cache/eviction/EvictableEntry.java | 2 +- .../eviction/fifo/CacheFifoEvictionPolicy.java | 17 +- .../eviction/ggfs/CacheGgfsEvictionFilter.java | 2 +- .../CacheGgfsPerBlockLruEvictionPolicy.java | 20 +- .../eviction/lru/CacheLruEvictionPolicy.java | 16 +- .../random/CacheRandomEvictionPolicy.java | 6 +- .../processors/cache/CacheEntryImpl.java | 2 +- .../cache/GridCacheConcurrentMap.java | 72 +++--- .../processors/cache/GridCacheContext.java | 29 +-- .../cache/GridCacheDeploymentManager.java | 6 +- .../processors/cache/GridCacheEntrySet.java | 20 +- .../cache/GridCacheEvictionEntry.java | 26 +-- .../processors/cache/GridCacheIterator.java | 12 +- .../processors/cache/GridCacheKeySet.java | 14 +- .../processors/cache/GridCacheMessage.java | 12 +- .../processors/cache/GridCachePeekMode.java | 4 +- .../cache/GridCacheProjectionImpl.java | 124 +++++------ .../processors/cache/GridCacheProxyImpl.java | 83 +++---- .../processors/cache/GridCacheUtils.java | 26 +-- .../cache/GridCacheValueCollection.java | 16 +- .../processors/cache/IgniteCacheProxy.java | 2 +- .../GridDistributedCacheAdapter.java | 6 +- .../GridDistributedTxRemoteAdapter.java | 10 +- .../distributed/dht/GridDhtCacheAdapter.java | 34 +-- .../cache/distributed/dht/GridDhtGetFuture.java | 4 +- .../distributed/dht/GridDhtLockFuture.java | 4 +- .../dht/GridDhtTransactionalCacheAdapter.java | 8 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 2 +- .../dht/GridPartitionedGetFuture.java | 4 +- .../dht/atomic/GridDhtAtomicCache.java | 42 ++-- .../dht/atomic/GridNearAtomicUpdateFuture.java | 4 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 6 +- .../dht/colocated/GridDhtColocatedCache.java | 20 +- .../colocated/GridDhtColocatedLockFuture.java | 4 +- .../distributed/near/GridNearAtomicCache.java | 34 +-- .../distributed/near/GridNearCacheAdapter.java | 96 ++++---- .../distributed/near/GridNearGetFuture.java | 4 +- .../distributed/near/GridNearGetRequest.java | 6 +- .../distributed/near/GridNearLockFuture.java | 4 +- .../distributed/near/GridNearLockRequest.java | 6 +- .../near/GridNearTransactionalCache.java | 8 +- .../near/GridNearTxFinishFuture.java | 6 +- .../processors/cache/local/GridLocalCache.java | 8 +- .../cache/local/GridLocalLockFuture.java | 4 +- .../local/atomic/GridLocalAtomicCache.java | 50 ++--- .../query/GridCacheDistributedQueryManager.java | 4 +- .../cache/query/GridCacheLocalQueryFuture.java | 4 +- .../cache/query/GridCacheQueriesImpl.java | 2 +- .../cache/query/GridCacheQueryAdapter.java | 8 +- .../cache/query/GridCacheQueryInfo.java | 6 +- .../cache/query/GridCacheQueryManager.java | 61 ++--- .../cache/query/GridCacheQueryRequest.java | 6 +- .../GridCacheContinuousQueryAdapter.java | 4 +- .../GridCacheContinuousQueryEntry.java | 30 +-- .../GridCacheContinuousQueryHandler.java | 8 +- .../GridCacheContinuousQueryManager.java | 6 +- .../cache/transactions/IgniteInternalTx.java | 4 +- .../cache/transactions/IgniteTxEntry.java | 8 +- .../transactions/IgniteTxLocalAdapter.java | 28 +-- .../cache/transactions/IgniteTxLocalEx.java | 6 +- .../GridCacheVersionConflictContext.java | 2 +- .../processors/fs/GridGgfsDataManager.java | 2 +- .../service/GridServiceProcessor.java | 10 +- .../ignite/internal/util/IgniteUtils.java | 8 +- .../ignite/internal/util/lang/GridFunc.java | 220 +++++++++---------- .../ignite/internal/util/typedef/PCE.java | 8 +- .../ignite/internal/visor/cache/VisorCache.java | 4 +- .../visor/cache/VisorCacheSwapBackupsTask.java | 4 +- ...cheAbstractFullApiMultithreadedSelfTest.java | 10 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 84 +++---- .../GridCacheAbstractIteratorsSelfTest.java | 16 +- .../cache/GridCacheAbstractMetricsSelfTest.java | 10 +- .../GridCacheAbstractProjectionSelfTest.java | 20 +- .../cache/GridCacheAbstractSelfTest.java | 38 ++-- .../cache/GridCacheAffinityApiSelfTest.java | 2 +- .../cache/GridCacheAlwaysEvictionPolicy.java | 2 +- .../cache/GridCacheBasicStoreAbstractTest.java | 4 +- .../cache/GridCacheConcurrentMapSelfTest.java | 14 +- .../cache/GridCacheConcurrentMapTest.java | 4 +- .../GridCacheConcurrentTxMultiNodeTest.java | 2 +- ...idCacheConfigurationConsistencySelfTest.java | 4 +- .../cache/GridCacheEntryMemorySizeSelfTest.java | 4 +- .../cache/GridCacheIteratorPerformanceTest.java | 18 +- .../cache/GridCacheLifecycleAwareSelfTest.java | 4 +- .../cache/GridCacheObjectToStringSelfTest.java | 2 +- ...HeapMultiThreadedUpdateAbstractSelfTest.java | 4 +- .../cache/GridCacheOffHeapSelfTest.java | 4 +- .../GridCacheOffHeapTieredAbstractSelfTest.java | 4 +- ...heOffHeapTieredEvictionAbstractSelfTest.java | 4 +- .../cache/GridCachePartitionedGetSelfTest.java | 8 +- .../GridCachePreloadingEvictionsSelfTest.java | 6 +- .../processors/cache/GridCacheTestEntryEx.java | 34 +-- .../processors/cache/IgniteTxAbstractTest.java | 4 +- .../GridCacheEntrySetAbstractSelfTest.java | 4 +- ...acheEntrySetIterationPreloadingSelfTest.java | 4 +- .../distributed/GridCacheEventAbstractTest.java | 12 +- ...dCacheMultithreadedFailoverAbstractTest.java | 8 +- .../GridCacheNodeFailureAbstractTest.java | 4 +- ...chePartitionedReloadAllAbstractSelfTest.java | 2 +- .../dht/GridCacheDhtPreloadPutGetSelfTest.java | 4 +- ...cheGroupLockPartitionedAbstractSelfTest.java | 4 +- .../near/GridCacheGetStoreErrorSelfTest.java | 2 +- .../GridCacheNearReaderPreloadSelfTest.java | 2 +- .../GridCachePartitionedEntryLockSelfTest.java | 2 +- ...titionedExplicitLockNodeFailureSelfTest.java | 4 +- .../GridCachePartitionedFullApiSelfTest.java | 12 +- .../GridCachePartitionedLoadCacheSelfTest.java | 2 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 8 +- .../near/GridPartitionedBackupLoadSelfTest.java | 2 +- ...ReplicatedFullApiMultithreadedSelfTest1.java | 36 +-- .../GridCacheReplicatedPreloadSelfTest.java | 4 +- ...heConcurrentEvictionConsistencySelfTest.java | 8 +- .../eviction/GridCacheEvictionAbstractTest.java | 12 +- .../GridCacheEvictionFilterSelfTest.java | 4 +- .../GridCacheEvictionLockUnlockSelfTest.java | 2 +- .../GridCacheEvictionTouchSelfTest.java | 2 +- .../cache/eviction/GridCacheMockEntry.java | 24 +- .../GridCacheFifoEvictionPolicySelfTest.java | 3 +- .../lru/GridCacheLruEvictionPolicySelfTest.java | 2 +- .../local/GridCacheLocalFullApiSelfTest.java | 4 +- .../local/GridCacheLocalIteratorsSelfTest.java | 6 +- .../GridCacheSwapScanQueryAbstractSelfTest.java | 8 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 8 +- .../fs/GridGgfsProcessorSelfTest.java | 2 +- .../ignite/loadtests/dsi/GridDsiPerfJob.java | 17 +- 130 files changed, 973 insertions(+), 959 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java index d7b3f14..07f718d 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java @@ -701,8 +701,8 @@ public class CacheConfiguration extends MutableConfiguration { /** * Gets eviction filter to specify which entries should not be evicted - * (except explicit evict by calling {@link CacheEntry#evict()}). - * If {@link org.apache.ignite.cache.eviction.CacheEvictionFilter#evictAllowed(CacheEntry)} method returns + * (except explicit evict by calling {@link Entry#evict()}). + * If {@link org.apache.ignite.cache.eviction.CacheEvictionFilter#evictAllowed(Entry)} method returns * {@code false} then eviction policy will not be notified and entry will * never be evicted. * <p> @@ -732,7 +732,7 @@ public class CacheConfiguration extends MutableConfiguration { * When not set, default value is {@link #DFLT_EAGER_TTL}. * <p> * <b>Note</b> that this flag only matters for entries expiring based on - * {@link CacheEntry#timeToLive()} value and should not be confused with entry + * {@link Entry#timeToLive()} value and should not be confused with entry * evictions based on configured {@link org.apache.ignite.cache.eviction.CacheEvictionPolicy}. * * @return Flag indicating whether Ignite will eagerly remove expired entries. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java index 0b59564..a889aee 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java @@ -28,6 +28,7 @@ import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import java.sql.*; import java.util.*; import java.util.Date; @@ -182,7 +183,7 @@ import java.util.concurrent.*; * </pre> * See {@link #keepPortable()} method JavaDoc for more details. */ -public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> { +public interface CacheProjection<K, V> extends Iterable<Entry<K, V>> { /** * Gets name of this cache ({@code null} for default cache). * @@ -259,7 +260,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> { * will be {@code 'anded'}. * @return Projection based on given filter. */ - public CacheProjection<K, V> projection(@Nullable IgnitePredicate<CacheEntry<K, V>> filter); + public CacheProjection<K, V> projection(@Nullable IgnitePredicate<Entry<K, V>> filter); /** * Gets cache projection base on this one, but with the specified flags turned on. @@ -369,7 +370,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> { * * @param vis Closure which will be invoked for each cache entry. */ - public void forEach(IgniteInClosure<CacheEntry<K, V>> vis); + public void forEach(IgniteInClosure<Entry<K, V>> vis); /** * Tests whether the predicate holds for all entries. If cache is empty, @@ -382,7 +383,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> { * @param vis Predicate to test for each cache entry. * @return {@code True} if the given predicate holds for all visited entries, {@code false} otherwise. */ - public boolean forAll(IgnitePredicate<CacheEntry<K, V>> vis); + public boolean forAll(IgnitePredicate<Entry<K, V>> vis); /** * Reloads a single key from persistent storage. This method @@ -628,7 +629,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> { * @throws IgniteCheckedException If put operation failed. * @throws CacheFlagException If projection flags validation failed. */ - @Nullable public V put(K key, V val, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) + @Nullable public V put(K key, V val, @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException; /** @@ -664,7 +665,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> { * @throws NullPointerException If either key or value are {@code null}. * @throws CacheFlagException If projection flags validation failed. */ - public IgniteInternalFuture<V> putAsync(K key, V val, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter); + public IgniteInternalFuture<V> putAsync(K key, V val, @Nullable IgnitePredicate<Entry<K, V>>... filter); /** * Stores given key-value pair in cache. If filters are provided, then entries will @@ -696,7 +697,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> { * @throws IgniteCheckedException If put operation failed. * @throws CacheFlagException If projection flags validation failed. */ - public boolean putx(K key, V val, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) + public boolean putx(K key, V val, @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException; /** @@ -728,7 +729,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> { * @throws NullPointerException If either key or value are {@code null}. * @throws CacheFlagException If projection flags validation failed. */ - public IgniteInternalFuture<Boolean> putxAsync(K key, V val, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter); + public IgniteInternalFuture<Boolean> putxAsync(K key, V val, @Nullable IgnitePredicate<Entry<K, V>>... filter); /** * Stores given key-value pair in cache only if cache had no previous mapping for it. If cache @@ -1023,7 +1024,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> { * @throws CacheFlagException If projection flags validation failed. */ public void putAll(@Nullable Map<? extends K, ? extends V> m, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException; + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException; /** * Asynchronously stores given key-value pairs in cache. If filters are provided, then entries will @@ -1046,7 +1047,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> { * @throws CacheFlagException If projection flags validation failed. */ public IgniteInternalFuture<?> putAllAsync(@Nullable Map<? extends K, ? extends V> m, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter); + @Nullable IgnitePredicate<Entry<K, V>>... filter); /** * Set of keys cached on this node. You can remove elements from this set, but you cannot add elements @@ -1078,7 +1079,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> { * that filter is checked atomically together with get operation. * @return Key set for this cache projection. */ - public Set<K> keySet(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter); + public Set<K> keySet(@Nullable IgnitePredicate<Entry<K, V>>... filter); /** * Set of keys for which this node is primary. @@ -1143,7 +1144,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> { * * @return Entries that pass through key filter. */ - public Set<CacheEntry<K, V>> entrySet(); + public Set<Entry<K, V>> entrySet(); /** * Gets set containing cache entries that belong to provided partition or {@code null} @@ -1155,7 +1156,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> { * @return Set containing partition's entries or {@code null} if partition is * not found locally. */ - @Nullable public Set<CacheEntry<K, V>> entrySet(int part); + @Nullable public Set<Entry<K, V>> entrySet(int part); /** * Gets set of cache entries for which this node is primary. @@ -1167,7 +1168,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> { * * @return Primary cache entries that pass through key filter. */ - public Set<CacheEntry<K, V>> primaryEntrySet(); + public Set<Entry<K, V>> primaryEntrySet(); /** * Starts transaction with default isolation, concurrency, timeout, and invalidation policy. @@ -1305,7 +1306,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> { * @param key Entry key. * @return Cache entry or {@code null} if projection pre-filtering was not passed. */ - @Nullable public CacheEntry<K, V> entry(K key); + @Nullable public Entry<K, V> entry(K key); /** * Evicts entry associated with given key from cache. Note, that entry will be evicted @@ -1466,7 +1467,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> { * @throws IgniteCheckedException If remove operation failed. * @throws CacheFlagException If projection flags validation failed. */ - @Nullable public V remove(K key, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) + @Nullable public V remove(K key, @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException; /** @@ -1497,7 +1498,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> { * @throws NullPointerException if the key is {@code null}. * @throws CacheFlagException If projection flags validation failed. */ - public IgniteInternalFuture<V> removeAsync(K key, IgnitePredicate<CacheEntry<K, V>>... filter); + public IgniteInternalFuture<V> removeAsync(K key, IgnitePredicate<Entry<K, V>>... filter); /** * Removes given key mapping from cache. @@ -1523,7 +1524,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> { * @throws IgniteCheckedException If remove failed. * @throws CacheFlagException If projection flags validation failed. */ - public boolean removex(K key, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) + public boolean removex(K key, @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException; /** @@ -1551,7 +1552,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> { * @throws CacheFlagException If projection flags validation failed. */ public IgniteInternalFuture<Boolean> removexAsync(K key, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter); + @Nullable IgnitePredicate<Entry<K, V>>... filter); /** * Removes given key mapping from cache if one exists and value is equal to the passed in value. @@ -1619,7 +1620,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> { * @throws CacheFlagException If flags validation failed. */ public void removeAll(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException; + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException; /** * Asynchronously removes given key mappings from cache for entries for which the optionally @@ -1642,7 +1643,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> { * @throws CacheFlagException If flags validation failed. */ public IgniteInternalFuture<?> removeAllAsync(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter); + @Nullable IgnitePredicate<Entry<K, V>>... filter); /** * Removes mappings from cache for entries for which the optionally passed in filters do @@ -1691,7 +1692,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> { * remove operation completes. * @throws CacheFlagException If flags validation failed. */ - public IgniteInternalFuture<?> removeAllAsync(@Nullable IgnitePredicate<CacheEntry<K, V>>... filter); + public IgniteInternalFuture<?> removeAllAsync(@Nullable IgnitePredicate<Entry<K, V>>... filter); /** * Synchronously acquires lock on a cached object with given @@ -1716,7 +1717,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> { * @throws IgniteCheckedException If lock acquisition resulted in error. * @throws CacheFlagException If flags validation failed. */ - public boolean lock(K key, long timeout, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) + public boolean lock(K key, long timeout, @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException; /** @@ -1743,7 +1744,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> { * @throws CacheFlagException If flags validation failed. */ public IgniteInternalFuture<Boolean> lockAsync(K key, long timeout, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter); + @Nullable IgnitePredicate<Entry<K, V>>... filter); /** * All or nothing synchronous lock for passed in keys. This method @@ -1769,7 +1770,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> { * @throws CacheFlagException If flags validation failed. */ public boolean lockAll(@Nullable Collection<? extends K> keys, long timeout, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException; + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException; /** * All or nothing synchronous lock for passed in keys. This method @@ -1795,7 +1796,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> { * @throws CacheFlagException If flags validation failed. */ public IgniteInternalFuture<Boolean> lockAllAsync(@Nullable Collection<? extends K> keys, long timeout, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter); + @Nullable IgnitePredicate<Entry<K, V>>... filter); /** * Unlocks given key only if current thread owns the lock. If optional filter @@ -1815,7 +1816,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> { * @throws IgniteCheckedException If unlock execution resulted in error. * @throws CacheFlagException If flags validation failed. */ - public void unlock(K key, IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException; + public void unlock(K key, IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException; /** * Unlocks given keys only if current thread owns the locks. Only the keys @@ -1838,7 +1839,7 @@ public interface CacheProjection<K, V> extends Iterable<CacheEntry<K, V>> { * @throws CacheFlagException If flags validation failed. */ public void unlockAll(@Nullable Collection<? extends K> keys, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException; + @Nullable IgnitePredicate<Entry<K, V>>... filter) throws IgniteCheckedException; /** * Checks if any node owns a lock for this key. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java b/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java index 6eafb42..dc08470 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java @@ -26,6 +26,7 @@ import org.apache.ignite.mxbean.*; import org.apache.ignite.transactions.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import java.util.*; /** @@ -242,7 +243,7 @@ public interface GridCache<K, V> extends CacheProjection<K, V> { * * @return Random entry, or {@code null} if cache is empty. */ - @Nullable public CacheEntry<K, V> randomEntry(); + @Nullable public Entry<K, V> randomEntry(); /** * Forces this cache node to re-balance its partitions. This method is usually used when http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/cache/eviction/CacheEvictionFilter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/CacheEvictionFilter.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/CacheEvictionFilter.java index 3833bae..592e79c 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/CacheEvictionFilter.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/CacheEvictionFilter.java @@ -21,8 +21,8 @@ import org.apache.ignite.cache.*; /** * Eviction filter to specify which entries should not be evicted. Not applicable when - * calling explicit evict via {@link org.apache.ignite.cache.CacheEntry#evict()}. - * If {@link #evictAllowed(org.apache.ignite.cache.CacheEntry)} method returns {@code false} then eviction + * calling explicit evict via {@link org.apache.ignite.cache.Entry#evict()}. + * If {@link #evictAllowed(org.apache.ignite.cache.Entry)} method returns {@code false} then eviction * policy will not be notified and entry will never be evicted. * <p> * Eviction filter can be configured via {@link CacheConfiguration#getEvictionFilter()} @@ -36,5 +36,5 @@ public interface CacheEvictionFilter<K, V> { * @param entry Cache entry. * @return {@code True} if it is allowed to evict this entry. */ - public boolean evictAllowed(CacheEntry<K, V> entry); + public boolean evictAllowed(Entry<K, V> entry); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/cache/eviction/CacheEvictionPolicy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/CacheEvictionPolicy.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/CacheEvictionPolicy.java index 44f36a6..c2978a0 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/CacheEvictionPolicy.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/CacheEvictionPolicy.java @@ -21,10 +21,10 @@ import org.apache.ignite.cache.*; /** * Pluggable cache eviction policy. Usually, implementations will internally order - * cache entries based on {@link #onEntryAccessed(boolean, org.apache.ignite.cache.CacheEntry)} notifications and - * whenever an element needs to be evicted, {@link org.apache.ignite.cache.CacheEntry#evict()} + * cache entries based on {@link #onEntryAccessed(boolean, org.apache.ignite.cache.Entry)} notifications and + * whenever an element needs to be evicted, {@link org.apache.ignite.cache.Entry#evict()} * method should be called. If you need to access the underlying cache directly - * from this policy, you can get it via {@link org.apache.ignite.cache.CacheEntry#projection()} method. + * from this policy, you can get it via {@link org.apache.ignite.cache.Entry#projection()} method. * <p> * GridGain comes with following eviction policies out-of-the-box: * <ul> @@ -49,5 +49,5 @@ public interface CacheEvictionPolicy<K, V> { * @param rmv {@code True} if entry has been removed, {@code false} otherwise. * @param entry Accessed entry. */ - public void onEntryAccessed(boolean rmv, CacheEntry<K, V> entry); + public void onEntryAccessed(boolean rmv, EvictableEntry<K, V> entry); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictableEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictableEntry.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictableEntry.java index 5c940b3..2379179 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictableEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/EvictableEntry.java @@ -27,7 +27,7 @@ import javax.cache.*; * @author @java.author * @version @java.version */ -public interface EvictableEntry extends Cache.Entry { +public interface EvictableEntry<K, V> extends Cache.Entry<K, V> { /** * Attaches metadata to the entry. * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/CacheFifoEvictionPolicy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/CacheFifoEvictionPolicy.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/CacheFifoEvictionPolicy.java index d0f74b4..ff84fa4 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/CacheFifoEvictionPolicy.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/fifo/CacheFifoEvictionPolicy.java @@ -26,6 +26,7 @@ import org.apache.ignite.internal.util.typedef.internal.*; import org.jdk8.backport.*; import org.jdk8.backport.ConcurrentLinkedDeque8.*; +import javax.cache.Cache.*; import java.util.*; /** @@ -43,7 +44,7 @@ public class CacheFifoEvictionPolicy<K, V> implements CacheEvictionPolicy<K, V>, private volatile int max = CacheConfiguration.DFLT_CACHE_SIZE; /** FIFO queue. */ - private final ConcurrentLinkedDeque8<CacheEntry<K, V>> queue = + private final ConcurrentLinkedDeque8<Entry<K, V>> queue = new ConcurrentLinkedDeque8<>(); /** @@ -99,12 +100,12 @@ public class CacheFifoEvictionPolicy<K, V> implements CacheEvictionPolicy<K, V>, * * @return Read-only view ono internal {@code 'FIFO'} queue. */ - public Collection<CacheEntry<K, V>> queue() { + public Collection<Entry<K, V>> queue() { return Collections.unmodifiableCollection(queue); } /** {@inheritDoc} */ - @Override public void onEntryAccessed(boolean rmv, CacheEntry<K, V> entry) { + @Override public void onEntryAccessed(boolean rmv, Entry<K, V> entry) { if (!rmv) { if (!entry.isCached()) return; @@ -114,7 +115,7 @@ public class CacheFifoEvictionPolicy<K, V> implements CacheEvictionPolicy<K, V>, shrink(); } else { - Node<CacheEntry<K, V>> node = entry.removeMeta(meta); + Node<Entry<K, V>> node = entry.removeMeta(meta); if (node != null) queue.unlinkx(node); @@ -125,8 +126,8 @@ public class CacheFifoEvictionPolicy<K, V> implements CacheEvictionPolicy<K, V>, * @param entry Entry to touch. * @return {@code True} if queue has been changed by this call. */ - private boolean touch(CacheEntry<K, V> entry) { - Node<CacheEntry<K, V>> node = entry.meta(meta); + private boolean touch(Entry<K, V> entry) { + Node<Entry<K, V>> node = entry.meta(meta); // Entry has not been enqueued yet. if (node == null) { @@ -169,7 +170,7 @@ public class CacheFifoEvictionPolicy<K, V> implements CacheEvictionPolicy<K, V>, int startSize = queue.sizex(); for (int i = 0; i < startSize && queue.sizex() > max; i++) { - CacheEntry<K, V> entry = queue.poll(); + Entry<K, V> entry = queue.poll(); if (entry == null) break; @@ -188,7 +189,7 @@ public class CacheFifoEvictionPolicy<K, V> implements CacheEvictionPolicy<K, V>, * @param entry Entry to check. * @return {@code True} if entry is empty. */ - private boolean empty(CacheEntry<K, V> entry) { + private boolean empty(Entry<K, V> entry) { try { return entry.peek(F.asList(GridCachePeekMode.GLOBAL)) == null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/cache/eviction/ggfs/CacheGgfsEvictionFilter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/ggfs/CacheGgfsEvictionFilter.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/ggfs/CacheGgfsEvictionFilter.java index 124b17c..d931f74 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/ggfs/CacheGgfsEvictionFilter.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/ggfs/CacheGgfsEvictionFilter.java @@ -26,7 +26,7 @@ import org.apache.ignite.internal.processors.fs.*; */ public class CacheGgfsEvictionFilter implements CacheEvictionFilter { /** {@inheritDoc} */ - @Override public boolean evictAllowed(CacheEntry entry) { + @Override public boolean evictAllowed(Entry entry) { Object key = entry.getKey(); return !(key instanceof GridGgfsBlockKey && ((GridGgfsBlockKey)key).evictExclude()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/cache/eviction/ggfs/CacheGgfsPerBlockLruEvictionPolicy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/ggfs/CacheGgfsPerBlockLruEvictionPolicy.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/ggfs/CacheGgfsPerBlockLruEvictionPolicy.java index f1d5cdf..736ac34 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/ggfs/CacheGgfsPerBlockLruEvictionPolicy.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/ggfs/CacheGgfsPerBlockLruEvictionPolicy.java @@ -54,7 +54,7 @@ public class CacheGgfsPerBlockLruEvictionPolicy implements CacheEvictionPolicy<G private final AtomicBoolean excludeRecompile = new AtomicBoolean(true); /** Queue. */ - private final ConcurrentLinkedDeque8<CacheEntry<GridGgfsBlockKey, byte[]>> queue = + private final ConcurrentLinkedDeque8<Entry<GridGgfsBlockKey, byte[]>> queue = new ConcurrentLinkedDeque8<>(); /** Current size of all enqueued blocks in bytes. */ @@ -92,7 +92,7 @@ public class CacheGgfsPerBlockLruEvictionPolicy implements CacheEvictionPolicy<G } /** {@inheritDoc} */ - @Override public void onEntryAccessed(boolean rmv, CacheEntry<GridGgfsBlockKey, byte[]> entry) { + @Override public void onEntryAccessed(boolean rmv, Entry<GridGgfsBlockKey, byte[]> entry) { if (!rmv) { if (!entry.isCached()) return; @@ -112,7 +112,7 @@ public class CacheGgfsPerBlockLruEvictionPolicy implements CacheEvictionPolicy<G * @param entry Entry to touch. * @return {@code True} if new node has been added to queue by this call. */ - private boolean touch(CacheEntry<GridGgfsBlockKey, byte[]> entry) { + private boolean touch(Entry<GridGgfsBlockKey, byte[]> entry) { byte[] val = entry.peek(); int blockSize = val != null ? val.length : 0; @@ -122,7 +122,7 @@ public class CacheGgfsPerBlockLruEvictionPolicy implements CacheEvictionPolicy<G // Entry has not been enqueued yet. if (meta == null) { while (true) { - Node<CacheEntry<GridGgfsBlockKey, byte[]>> node = queue.offerLastx(entry); + Node<Entry<GridGgfsBlockKey, byte[]>> node = queue.offerLastx(entry); meta = new MetaEntry(node, blockSize); @@ -154,11 +154,11 @@ public class CacheGgfsPerBlockLruEvictionPolicy implements CacheEvictionPolicy<G else { int oldBlockSize = meta.size(); - Node<CacheEntry<GridGgfsBlockKey, byte[]>> node = meta.node(); + Node<Entry<GridGgfsBlockKey, byte[]>> node = meta.node(); if (queue.unlinkx(node)) { // Move node to tail. - Node<CacheEntry<GridGgfsBlockKey, byte[]>> newNode = queue.offerLastx(entry); + Node<Entry<GridGgfsBlockKey, byte[]>> newNode = queue.offerLastx(entry); int delta = blockSize - oldBlockSize; @@ -193,7 +193,7 @@ public class CacheGgfsPerBlockLruEvictionPolicy implements CacheEvictionPolicy<G for (int i = 0; i < cnt && (maxBlocks > 0 && queue.sizex() > maxBlocks || maxSize > 0 && curSize.longValue() > maxSize); i++) { - CacheEntry<GridGgfsBlockKey, byte[]> entry = queue.poll(); + Entry<GridGgfsBlockKey, byte[]> entry = queue.poll(); if (entry == null) break; // Queue is empty. @@ -317,7 +317,7 @@ public class CacheGgfsPerBlockLruEvictionPolicy implements CacheEvictionPolicy<G */ private static class MetaEntry { /** Queue node. */ - private final Node<CacheEntry<GridGgfsBlockKey, byte[]>> node; + private final Node<Entry<GridGgfsBlockKey, byte[]>> node; /** Data size. */ private final int size; @@ -328,7 +328,7 @@ public class CacheGgfsPerBlockLruEvictionPolicy implements CacheEvictionPolicy<G * @param node Queue node. * @param size Data size. */ - private MetaEntry(Node<CacheEntry<GridGgfsBlockKey, byte[]>> node, int size) { + private MetaEntry(Node<Entry<GridGgfsBlockKey, byte[]>> node, int size) { assert node != null; assert size >= 0; @@ -339,7 +339,7 @@ public class CacheGgfsPerBlockLruEvictionPolicy implements CacheEvictionPolicy<G /** * @return Queue node. */ - private Node<CacheEntry<GridGgfsBlockKey, byte[]>> node() { + private Node<Entry<GridGgfsBlockKey, byte[]>> node() { return node; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/CacheLruEvictionPolicy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/CacheLruEvictionPolicy.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/CacheLruEvictionPolicy.java index a5277db..87a0d41 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/CacheLruEvictionPolicy.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/lru/CacheLruEvictionPolicy.java @@ -40,7 +40,7 @@ public class CacheLruEvictionPolicy<K, V> implements CacheEvictionPolicy<K, V>, private volatile int max = CacheConfiguration.DFLT_CACHE_SIZE; /** Queue. */ - private final ConcurrentLinkedDeque8<CacheEntry<K, V>> queue = + private final ConcurrentLinkedDeque8<Entry<K, V>> queue = new ConcurrentLinkedDeque8<>(); /** @@ -96,12 +96,12 @@ public class CacheLruEvictionPolicy<K, V> implements CacheEvictionPolicy<K, V>, * * @return Read-only view ono internal {@code 'FIFO'} queue. */ - public Collection<CacheEntry<K, V>> queue() { + public Collection<Entry<K, V>> queue() { return Collections.unmodifiableCollection(queue); } /** {@inheritDoc} */ - @Override public void onEntryAccessed(boolean rmv, CacheEntry<K, V> entry) { + @Override public void onEntryAccessed(boolean rmv, Entry<K, V> entry) { if (!rmv) { if (!entry.isCached()) return; @@ -110,7 +110,7 @@ public class CacheLruEvictionPolicy<K, V> implements CacheEvictionPolicy<K, V>, shrink(); } else { - Node<CacheEntry<K, V>> node = entry.removeMeta(meta); + Node<Entry<K, V>> node = entry.removeMeta(meta); if (node != null) queue.unlinkx(node); @@ -121,8 +121,8 @@ public class CacheLruEvictionPolicy<K, V> implements CacheEvictionPolicy<K, V>, * @param entry Entry to touch. * @return {@code True} if new node has been added to queue by this call. */ - private boolean touch(CacheEntry<K, V> entry) { - Node<CacheEntry<K, V>> node = entry.meta(meta); + private boolean touch(Entry<K, V> entry) { + Node<Entry<K, V>> node = entry.meta(meta); // Entry has not been enqueued yet. if (node == null) { @@ -153,7 +153,7 @@ public class CacheLruEvictionPolicy<K, V> implements CacheEvictionPolicy<K, V>, } else if (queue.unlinkx(node)) { // Move node to tail. - Node<CacheEntry<K, V>> newNode = queue.offerLastx(entry); + Node<Entry<K, V>> newNode = queue.offerLastx(entry); if (!entry.replaceMeta(meta, node, newNode)) // Was concurrently added, need to clear it from queue. @@ -173,7 +173,7 @@ public class CacheLruEvictionPolicy<K, V> implements CacheEvictionPolicy<K, V>, int startSize = queue.sizex(); for (int i = 0; i < startSize && queue.sizex() > max; i++) { - CacheEntry<K, V> entry = queue.poll(); + Entry<K, V> entry = queue.poll(); if (entry == null) break; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/CacheRandomEvictionPolicy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/CacheRandomEvictionPolicy.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/CacheRandomEvictionPolicy.java index 9fa6941..67f2c84 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/CacheRandomEvictionPolicy.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/random/CacheRandomEvictionPolicy.java @@ -77,7 +77,7 @@ public class CacheRandomEvictionPolicy<K, V> implements CacheEvictionPolicy<K, V } /** {@inheritDoc} */ - @Override public void onEntryAccessed(boolean rmv, CacheEntry<K, V> entry) { + @Override public void onEntryAccessed(boolean rmv, Entry<K, V> entry) { if (!entry.isCached()) return; @@ -86,7 +86,7 @@ public class CacheRandomEvictionPolicy<K, V> implements CacheEvictionPolicy<K, V int size = cache.size(); for (int i = max; i < size; i++) { - CacheEntry<K, V> e = cache.randomEntry(); + Entry<K, V> e = cache.randomEntry(); if (e != null) e.evict(); @@ -99,7 +99,7 @@ public class CacheRandomEvictionPolicy<K, V> implements CacheEvictionPolicy<K, V * @param entry Entry to check. * @return {@code True} if entry is empty. */ - private boolean empty(CacheEntry<K, V> entry) { + private boolean empty(Entry<K, V> entry) { try { return entry.peek(F.asList(GridCachePeekMode.GLOBAL)) == null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java index e609cd1..d6feefc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java @@ -59,6 +59,6 @@ public class CacheEntryImpl<K, V> implements Cache.Entry<K, V> { /** {@inheritDoc} */ public String toString() { - return "CacheEntry [key=" + key + ", val=" + val + ']'; + return "Entry [key=" + key + ", val=" + val + ']'; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java index 5a6a4b3..6065615 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java @@ -87,9 +87,9 @@ public class GridCacheConcurrentMap<K, V> { private final LongAdder mapSize = new LongAdder(); /** Filters cache internal entry. */ - private static final P1<CacheEntry<?, ?>> NON_INTERNAL = - new P1<CacheEntry<?, ?>>() { - @Override public boolean apply(CacheEntry<?, ?> entry) { + private static final P1<Entry<?, ?>> NON_INTERNAL = + new P1<Entry<?, ?>>() { + @Override public boolean apply(Entry<?, ?> entry) { return !(entry.getKey() instanceof GridCacheInternal); } }; @@ -312,17 +312,17 @@ public class GridCacheConcurrentMap<K, V> { /** * @return Non-internal predicate. */ - private static <K, V> IgnitePredicate<CacheEntry<K, V>>[] nonInternal() { - return (IgnitePredicate<CacheEntry<K,V>>[])NON_INTERNAL_ARR; + private static <K, V> IgnitePredicate<Entry<K, V>>[] nonInternal() { + return (IgnitePredicate<Entry<K,V>>[])NON_INTERNAL_ARR; } /** * @param filter Filter to add to non-internal-key filter. * @return Non-internal predicate. */ - private static <K, V> IgnitePredicate<CacheEntry<K, V>>[] nonInternal( - IgnitePredicate<CacheEntry<K, V>>[] filter) { - return F.asArray(F0.and((IgnitePredicate<CacheEntry<K, V>>[]) NON_INTERNAL_ARR, filter)); + private static <K, V> IgnitePredicate<Entry<K, V>>[] nonInternal( + IgnitePredicate<Entry<K, V>>[] filter) { + return F.asArray(F0.and((IgnitePredicate<Entry<K, V>>[]) NON_INTERNAL_ARR, filter)); } /** @@ -394,7 +394,7 @@ public class GridCacheConcurrentMap<K, V> { * @param filter Filter. * @return a collection view of the values contained in this map. */ - public Collection<V> allValues(IgnitePredicate<CacheEntry<K, V>>[] filter) { + public Collection<V> allValues(IgnitePredicate<Entry<K, V>>[] filter) { checkWeakQueue(); return new Values<>(this, filter); @@ -562,10 +562,10 @@ public class GridCacheConcurrentMap<K, V> { * @return Entry wrapper set. */ @SuppressWarnings({"unchecked", "RedundantCast"}) - public Set<GridCacheEntryImpl<K, V>> wrappers(IgnitePredicate<CacheEntry<K, V>>[] filter) { + public Set<GridCacheEntryImpl<K, V>> wrappers(IgnitePredicate<Entry<K, V>>[] filter) { checkWeakQueue(); - return (Set<GridCacheEntryImpl<K, V>>)(Set<? extends CacheEntry<K, V>>)entries(filter); + return (Set<GridCacheEntryImpl<K, V>>)(Set<? extends Entry<K, V>>)entries(filter); } /** @@ -575,10 +575,10 @@ public class GridCacheConcurrentMap<K, V> { * @return Entry projections set. */ @SuppressWarnings({"unchecked", "RedundantCast"}) - public Set<CacheEntry<K, V>> projections(IgnitePredicate<CacheEntry<K, V>>[] filter) { + public Set<Entry<K, V>> projections(IgnitePredicate<Entry<K, V>>[] filter) { checkWeakQueue(); - return (Set<CacheEntry<K, V>>)(Set<? extends CacheEntry<K, V>>)wrappers(filter); + return (Set<Entry<K, V>>)(Set<? extends Entry<K, V>>)wrappers(filter); } /** @@ -588,7 +588,7 @@ public class GridCacheConcurrentMap<K, V> { * @return Set of the mappings contained in this map. */ @SuppressWarnings({"unchecked"}) - public Set<CacheEntry<K, V>> entries(IgnitePredicate<CacheEntry<K, V>>... filter) { + public Set<Entry<K, V>> entries(IgnitePredicate<Entry<K, V>>... filter) { checkWeakQueue(); return new EntrySet<>(this, filter); @@ -601,7 +601,7 @@ public class GridCacheConcurrentMap<K, V> { * @return Set of the mappings contained in this map. */ @SuppressWarnings({"unchecked"}) - public Set<CacheEntry<K, V>> entriesx(IgnitePredicate<CacheEntry<K, V>>... filter) { + public Set<Entry<K, V>> entriesx(IgnitePredicate<Entry<K, V>>... filter) { checkWeakQueue(); return new EntrySet<>(this, filter, true); @@ -648,7 +648,7 @@ public class GridCacheConcurrentMap<K, V> { * @param filter Filter. * @return Set of the keys contained in this map. */ - public Set<K> keySet(IgnitePredicate<CacheEntry<K, V>>... filter) { + public Set<K> keySet(IgnitePredicate<Entry<K, V>>... filter) { checkWeakQueue(); return new KeySet<>(this, filter); @@ -660,7 +660,7 @@ public class GridCacheConcurrentMap<K, V> { * @param filter Filter. * @return Collection view of the values contained in this map. */ - public Collection<V> values(IgnitePredicate<CacheEntry<K, V>>... filter) { + public Collection<V> values(IgnitePredicate<Entry<K, V>>... filter) { checkWeakQueue(); return allValues(filter); @@ -1568,7 +1568,7 @@ public class GridCacheConcurrentMap<K, V> { private GridCacheMapEntry<K, V> cur; /** Iterator filter. */ - private IgnitePredicate<CacheEntry<K, V>>[] filter; + private IgnitePredicate<Entry<K, V>>[] filter; /** Outer cache map. */ private GridCacheConcurrentMap<K, V> map; @@ -1601,7 +1601,7 @@ public class GridCacheConcurrentMap<K, V> { */ @SuppressWarnings({"unchecked"}) Iterator0(GridCacheConcurrentMap<K, V> map, boolean isVal, - IgnitePredicate<CacheEntry<K, V>>[] filter, int id, int totalCnt) { + IgnitePredicate<Entry<K, V>>[] filter, int id, int totalCnt) { this.filter = filter; this.isVal = isVal; this.id = id; @@ -1780,7 +1780,7 @@ public class GridCacheConcurrentMap<K, V> { @SuppressWarnings({"unchecked"}) @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { ctx = (GridCacheContext<K, V>)in.readObject(); - filter = (IgnitePredicate<CacheEntry<K, V>>[])in.readObject(); + filter = (IgnitePredicate<Entry<K, V>>[])in.readObject(); isVal = in.readBoolean(); id = in.readInt(); totalCnt = in.readInt(); @@ -1806,7 +1806,7 @@ public class GridCacheConcurrentMap<K, V> { private static final long serialVersionUID = 0L; /** Filter. */ - private IgnitePredicate<CacheEntry<K, V>>[] filter; + private IgnitePredicate<Entry<K, V>>[] filter; /** Base map. */ private GridCacheConcurrentMap<K, V> map; @@ -1834,7 +1834,7 @@ public class GridCacheConcurrentMap<K, V> { * @param map Base map. * @param filter Filter. */ - private Set0(GridCacheConcurrentMap<K, V> map, IgnitePredicate<CacheEntry<K, V>>[] filter) { + private Set0(GridCacheConcurrentMap<K, V> map, IgnitePredicate<Entry<K, V>>[] filter) { assert map != null; this.map = map; @@ -1855,7 +1855,7 @@ public class GridCacheConcurrentMap<K, V> { /** * @return Entry iterator. */ - Iterator<CacheEntry<K, V>> entryIterator() { + Iterator<Entry<K, V>> entryIterator() { return new EntryIterator<>(map, filter, ctx, prjPerCall, forcedFlags); } @@ -1924,7 +1924,7 @@ public class GridCacheConcurrentMap<K, V> { /** {@inheritDoc} */ @Override public boolean remove(Object o) { - return o instanceof CacheEntry && removeKey(((Map.Entry<K, V>)o).getKey()); + return o instanceof Entry && removeKey(((Map.Entry<K, V>)o).getKey()); } /** @@ -1964,7 +1964,7 @@ public class GridCacheConcurrentMap<K, V> { /** {@inheritDoc} */ @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { ctx = (GridCacheContext<K, V>)in.readObject(); - filter = (IgnitePredicate<CacheEntry<K, V>>[])in.readObject(); + filter = (IgnitePredicate<Entry<K, V>>[])in.readObject(); } /** @@ -1983,7 +1983,7 @@ public class GridCacheConcurrentMap<K, V> { * <p> * Note, class is static for {@link Externalizable}. */ - private static class EntryIterator<K, V> implements Iterator<CacheEntry<K, V>>, Externalizable { + private static class EntryIterator<K, V> implements Iterator<Entry<K, V>>, Externalizable { /** */ private static final long serialVersionUID = 0L; @@ -2015,7 +2015,7 @@ public class GridCacheConcurrentMap<K, V> { */ EntryIterator( GridCacheConcurrentMap<K, V> map, - IgnitePredicate<CacheEntry<K, V>>[] filter, + IgnitePredicate<Entry<K, V>>[] filter, GridCacheContext<K, V> ctx, GridCacheProjectionImpl<K, V> prjPerCall, CacheFlag[] forcedFlags) { @@ -2032,7 +2032,7 @@ public class GridCacheConcurrentMap<K, V> { } /** {@inheritDoc} */ - @Override public CacheEntry<K, V> next() { + @Override public Entry<K, V> next() { GridCacheProjectionImpl<K, V> oldPrj = ctx.projectionPerCall(); ctx.projectionPerCall(prjPerCall); @@ -2104,7 +2104,7 @@ public class GridCacheConcurrentMap<K, V> { */ private ValueIterator( GridCacheConcurrentMap<K, V> map, - IgnitePredicate<CacheEntry<K, V>>[] filter, + IgnitePredicate<Entry<K, V>>[] filter, GridCacheContext<K, V> ctx, boolean clone) { it = new Iterator0<>(map, true, filter, -1, -1); @@ -2175,7 +2175,7 @@ public class GridCacheConcurrentMap<K, V> { * @param map Cache map. * @param filter Filter. */ - private KeyIterator(GridCacheConcurrentMap<K, V> map, IgnitePredicate<CacheEntry<K, V>>[] filter) { + private KeyIterator(GridCacheConcurrentMap<K, V> map, IgnitePredicate<Entry<K, V>>[] filter) { it = new Iterator0<>(map, false, filter, -1, -1); } @@ -2227,7 +2227,7 @@ public class GridCacheConcurrentMap<K, V> { * @param map Base map. * @param filter Key filter. */ - private KeySet(GridCacheConcurrentMap<K, V> map, IgnitePredicate<CacheEntry<K, V>>[] filter) { + private KeySet(GridCacheConcurrentMap<K, V> map, IgnitePredicate<Entry<K, V>>[] filter) { assert map != null; set = new Set0<>(map, nonInternal(filter)); @@ -2295,7 +2295,7 @@ public class GridCacheConcurrentMap<K, V> { * @param map Base map. * @param filter Value filter. */ - private Values(GridCacheConcurrentMap<K, V> map, IgnitePredicate<CacheEntry<K, V>>[] filter) { + private Values(GridCacheConcurrentMap<K, V> map, IgnitePredicate<Entry<K, V>>[] filter) { assert map != null; set = new Set0<>(map, nonInternal(filter)); @@ -2337,7 +2337,7 @@ public class GridCacheConcurrentMap<K, V> { /** * Entry set. */ - private static class EntrySet<K, V> extends AbstractSet<CacheEntry<K, V>> implements Externalizable { + private static class EntrySet<K, V> extends AbstractSet<Entry<K, V>> implements Externalizable { /** */ private static final long serialVersionUID = 0L; @@ -2355,7 +2355,7 @@ public class GridCacheConcurrentMap<K, V> { * @param map Base map. * @param filter Key filter. */ - private EntrySet(GridCacheConcurrentMap<K, V> map, IgnitePredicate<CacheEntry<K, V>>[] filter) { + private EntrySet(GridCacheConcurrentMap<K, V> map, IgnitePredicate<Entry<K, V>>[] filter) { this(map, filter, false); } @@ -2364,7 +2364,7 @@ public class GridCacheConcurrentMap<K, V> { * @param filter Key filter. * @param internal Whether to allow internal entries. */ - private EntrySet(GridCacheConcurrentMap<K, V> map, IgnitePredicate<CacheEntry<K, V>>[] filter, + private EntrySet(GridCacheConcurrentMap<K, V> map, IgnitePredicate<Entry<K, V>>[] filter, boolean internal) { assert map != null; @@ -2372,7 +2372,7 @@ public class GridCacheConcurrentMap<K, V> { } /** {@inheritDoc} */ - @NotNull @Override public Iterator<CacheEntry<K, V>> iterator() { + @NotNull @Override public Iterator<Entry<K, V>> iterator() { return set.entryIterator(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java index 9563327..0f881f9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java @@ -55,6 +55,7 @@ import org.apache.ignite.plugin.security.*; import org.apache.ignite.portables.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import javax.cache.configuration.*; import javax.cache.expiry.*; import java.io.*; @@ -143,19 +144,19 @@ public class GridCacheContext<K, V> implements Externalizable { private GridCacheAdapter<K, V> cache; /** No-value filter array. */ - private IgnitePredicate<CacheEntry<K, V>>[] noValArr; + private IgnitePredicate<Entry<K, V>>[] noValArr; /** Has-value filter array. */ - private IgnitePredicate<CacheEntry<K, V>>[] hasValArr; + private IgnitePredicate<Entry<K, V>>[] hasValArr; /** No-peek-value filter array. */ - private IgnitePredicate<CacheEntry<K, V>>[] noPeekArr; + private IgnitePredicate<Entry<K, V>>[] noPeekArr; /** Has-peek-value filter array. */ - private IgnitePredicate<CacheEntry<K, V>>[] hasPeekArr; + private IgnitePredicate<Entry<K, V>>[] hasPeekArr; /** No-op filter array. */ - private IgnitePredicate<CacheEntry<K, V>>[] trueArr; + private IgnitePredicate<Entry<K, V>>[] trueArr; /** Cached local rich node. */ private ClusterNode locNode; @@ -925,28 +926,28 @@ public class GridCacheContext<K, V> implements Externalizable { /** * @return No get-value filter. */ - public IgnitePredicate<CacheEntry<K, V>>[] noGetArray() { + public IgnitePredicate<Entry<K, V>>[] noGetArray() { return noValArr; } /** * @return Has get-value filer. */ - public IgnitePredicate<CacheEntry<K, V>>[] hasGetArray() { + public IgnitePredicate<Entry<K, V>>[] hasGetArray() { return hasValArr; } /** * @return No get-value filter. */ - public IgnitePredicate<CacheEntry<K, V>>[] noPeekArray() { + public IgnitePredicate<Entry<K, V>>[] noPeekArray() { return noPeekArr; } /** * @return Has get-value filer. */ - public IgnitePredicate<CacheEntry<K, V>>[] hasPeekArray() { + public IgnitePredicate<Entry<K, V>>[] hasPeekArray() { return hasPeekArr; } @@ -955,7 +956,7 @@ public class GridCacheContext<K, V> implements Externalizable { * @return Predicate array that checks for value. */ @SuppressWarnings({"unchecked"}) - public IgnitePredicate<CacheEntry<K, V>>[] equalsPeekArray(V val) { + public IgnitePredicate<Entry<K, V>>[] equalsPeekArray(V val) { assert val != null; return new IgnitePredicate[]{F.cacheContainsPeek(val)}; @@ -964,14 +965,14 @@ public class GridCacheContext<K, V> implements Externalizable { /** * @return Empty filter. */ - public IgnitePredicate<CacheEntry<K, V>> truex() { + public IgnitePredicate<Entry<K, V>> truex() { return F.alwaysTrue(); } /** * @return No-op array. */ - public IgnitePredicate<CacheEntry<K, V>>[] trueArray() { + public IgnitePredicate<Entry<K, V>>[] trueArray() { return trueArr; } @@ -987,7 +988,7 @@ public class GridCacheContext<K, V> implements Externalizable { * @return Array containing single predicate. */ @SuppressWarnings({"unchecked"}) - public IgnitePredicate<CacheEntry<K, V>>[] vararg(IgnitePredicate<CacheEntry<K, V>> p) { + public IgnitePredicate<Entry<K, V>>[] vararg(IgnitePredicate<Entry<K, V>> p) { return p == null ? CU.<K, V>empty() : new IgnitePredicate[]{p}; } @@ -1001,7 +1002,7 @@ public class GridCacheContext<K, V> implements Externalizable { */ @SuppressWarnings({"ErrorNotRethrown"}) public <K1, V1> boolean isAll(GridCacheEntryEx<K1, V1> e, - @Nullable IgnitePredicate<CacheEntry<K1, V1>>[] p) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K1, V1>>[] p) throws IgniteCheckedException { return F.isEmpty(p) || isAll(e.wrap(false), p); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java index 41f5f6c..71242b2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java @@ -244,8 +244,8 @@ public class GridCacheDeploymentManager<K, V> extends GridCacheSharedManagerAdap GridCacheAdapter<K, V> cache = cacheCtx.cache(); Set<K> keySet = cache.keySet(cacheCtx.vararg( - new P1<CacheEntry<K, V>>() { - @Override public boolean apply(CacheEntry<K, V> e) { + new P1<Entry<K, V>>() { + @Override public boolean apply(Entry<K, V> e) { return cacheCtx.isNear() ? undeploy(e, cacheCtx.near()) || undeploy(e, cacheCtx.near().dht()) : undeploy(e, cacheCtx.cache()); } @@ -255,7 +255,7 @@ public class GridCacheDeploymentManager<K, V> extends GridCacheSharedManagerAdap * @param cache Cache. * @return {@code True} if entry should be undeployed. */ - private boolean undeploy(CacheEntry<K, V> e, GridCacheAdapter<K, V> cache) { + private boolean undeploy(Entry<K, V> e, GridCacheAdapter<K, V> cache) { K k = e.getKey(); GridCacheEntryEx<K, V> entry = cache.peekEx(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/GridCacheEntrySet.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java index 1aaf65e..7d41cb7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntrySet.java @@ -29,23 +29,23 @@ import java.util.*; /** * Entry set backed by cache itself. */ -public class GridCacheEntrySet<K, V> extends AbstractSet<CacheEntry<K, V>> { +public class GridCacheEntrySet<K, V> extends AbstractSet<Entry<K, V>> { /** Cache context. */ private final GridCacheContext<K, V> ctx; /** Filter. */ - private final IgnitePredicate<CacheEntry<K, V>>[] filter; + private final IgnitePredicate<Entry<K, V>>[] filter; /** Base set. */ - private final Set<CacheEntry<K, V>> set; + private final Set<Entry<K, V>> set; /** * @param ctx Cache context. * @param c Entry collection. * @param filter Filter. */ - public GridCacheEntrySet(GridCacheContext<K, V> ctx, Collection<? extends CacheEntry<K, V>> c, - @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) { + public GridCacheEntrySet(GridCacheContext<K, V> ctx, Collection<? extends Entry<K, V>> c, + @Nullable IgnitePredicate<Entry<K, V>>... filter) { set = new HashSet<>(c.size(), 1.0f); assert ctx != null; @@ -53,15 +53,15 @@ public class GridCacheEntrySet<K, V> extends AbstractSet<CacheEntry<K, V>> { this.ctx = ctx; this.filter = filter; - for (CacheEntry<K, V> e : c) { + for (Entry<K, V> e : c) { if (e != null) set.add(e); } } /** {@inheritDoc} */ - @Override public Iterator<CacheEntry<K, V>> iterator() { - return new GridCacheIterator<>(set, F.<CacheEntry<K, V>>identity(), filter); + @Override public Iterator<Entry<K, V>> iterator() { + return new GridCacheIterator<>(set, F.<Entry<K, V>>identity(), filter); } /** {@inheritDoc} */ @@ -77,7 +77,7 @@ public class GridCacheEntrySet<K, V> extends AbstractSet<CacheEntry<K, V>> { if (!(o instanceof GridCacheEntryImpl)) return false; - CacheEntry<K, V> e = (CacheEntry<K,V>)o; + Entry<K, V> e = (Entry<K,V>)o; if (F.isAll(e, filter) && set.remove(e)) { try { @@ -104,7 +104,7 @@ public class GridCacheEntrySet<K, V> extends AbstractSet<CacheEntry<K, V>> { if (!(o instanceof GridCacheEntryImpl)) return false; - CacheEntry<K,V> e = (CacheEntry<K, V>)o; + Entry<K,V> e = (Entry<K, V>)o; return F.isAll(e, filter) && set.contains(e); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEntry.java index 2ce1e17..6558cf6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEntry.java @@ -153,7 +153,7 @@ public class GridCacheEvictionEntry<K, V> implements Entry<K, V>, Externalizable */ @SuppressWarnings({"unchecked"}) @Nullable private V peek0(@Nullable GridCachePeekMode mode, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, @Nullable IgniteInternalTx<K, V> tx) + @Nullable IgnitePredicate<Entry<K, V>>[] filter, @Nullable IgniteInternalTx<K, V> tx) throws IgniteCheckedException { assert tx == null || tx.local(); @@ -185,7 +185,7 @@ public class GridCacheEvictionEntry<K, V> implements Entry<K, V>, Externalizable * @throws IgniteCheckedException If failed. */ @Nullable private V peek0(@Nullable Collection<GridCachePeekMode> modes, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, IgniteInternalTx<K, V> tx) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>[] filter, IgniteInternalTx<K, V> tx) throws IgniteCheckedException { if (F.isEmpty(modes)) return peek0(SMART, filter, tx); @@ -256,22 +256,22 @@ public class GridCacheEvictionEntry<K, V> implements Entry<K, V>, Externalizable } /** {@inheritDoc} */ - @Nullable @Override public V set(V val, IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable @Override public V set(V val, IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { throw unsupported(); } /** {@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 unsupported(); } /** {@inheritDoc} */ - @Override public boolean setx(V val, IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Override public boolean setx(V val, IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { throw unsupported(); } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> setxAsync(V val, IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Override public IgniteInternalFuture<Boolean> setxAsync(V val, IgnitePredicate<Entry<K, V>>[] filter) { throw unsupported(); } @@ -336,22 +336,22 @@ public class GridCacheEvictionEntry<K, V> implements Entry<K, V>, Externalizable } /** {@inheritDoc} */ - @Nullable @Override public V remove(IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable @Override public V remove(IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { throw unsupported(); } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<V> removeAsync(IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Override public IgniteInternalFuture<V> removeAsync(IgnitePredicate<Entry<K, V>>[] filter) { throw unsupported(); } /** {@inheritDoc} */ - @Override public boolean removex(IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Override public boolean removex(IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { throw unsupported(); } /** {@inheritDoc} */ - @Override public IgniteInternalFuture<Boolean> removexAsync(IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Override public IgniteInternalFuture<Boolean> removexAsync(IgnitePredicate<Entry<K, V>>[] filter) { throw unsupported(); } @@ -414,18 +414,18 @@ public class GridCacheEvictionEntry<K, V> implements Entry<K, V>, Externalizable /** {@inheritDoc} */ @Override public boolean lock(long timeout, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { throw unsupported(); } /** {@inheritDoc} */ @Override public IgniteInternalFuture<Boolean> lockAsync(long timeout, - @Nullable IgnitePredicate<CacheEntry<K, V>>[] filter) { + @Nullable IgnitePredicate<Entry<K, V>>[] filter) { throw unsupported(); } /** {@inheritDoc} */ - @Override public void unlock(IgnitePredicate<CacheEntry<K, V>>[] filter) throws IgniteCheckedException { + @Override public void unlock(IgnitePredicate<Entry<K, V>>[] filter) throws IgniteCheckedException { throw unsupported(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIterator.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIterator.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIterator.java index e19bf34..9b3230a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIterator.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIterator.java @@ -34,22 +34,22 @@ public class GridCacheIterator<K, V, T> implements GridSerializableIterator<T> { private static final long serialVersionUID = 0L; /** Base iterator. */ - private final Iterator<? extends CacheEntry<K, V>> it; + private final Iterator<? extends Entry<K, V>> it; /** Transformer. */ - private final IgniteClosure<CacheEntry<K, V>, T> trans; + private final IgniteClosure<Entry<K, V>, T> trans; /** Current element. */ - private CacheEntry<K, V> cur; + private Entry<K, V> cur; /** * @param c Cache entry collection. * @param trans Transformer. * @param filter Filter. */ - public GridCacheIterator(Iterable<? extends CacheEntry<K, V>> c, - IgniteClosure<CacheEntry<K, V>, T> trans, - IgnitePredicate<CacheEntry<K, V>>[] filter) { + public GridCacheIterator(Iterable<? extends Entry<K, V>> c, + IgniteClosure<Entry<K, V>, T> trans, + IgnitePredicate<Entry<K, V>>[] filter) { it = F.iterator0(c, false, filter); this.trans = trans; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheKeySet.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheKeySet.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheKeySet.java index 15c163e..757da90 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheKeySet.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheKeySet.java @@ -38,18 +38,18 @@ public class GridCacheKeySet<K, V> extends GridSerializableSet<K> { private final GridCacheContext<K, V> ctx; /** Filter. */ - private final IgnitePredicate<CacheEntry<K, V>>[] filter; + private final IgnitePredicate<Entry<K, V>>[] filter; /** Base map. */ - private final Map<K, CacheEntry<K, V>> map; + private final Map<K, Entry<K, V>> map; /** * @param ctx Cache context. * @param c Entry collection. * @param filter Filter. */ - public GridCacheKeySet(GridCacheContext<K, V> ctx, Collection<? extends CacheEntry<K, V>> c, - IgnitePredicate<CacheEntry<K, V>>[] filter) { + public GridCacheKeySet(GridCacheContext<K, V> ctx, Collection<? extends Entry<K, V>> c, + IgnitePredicate<Entry<K, V>>[] filter) { map = new HashMap<>(c.size(), 1.0f); assert ctx != null; @@ -57,7 +57,7 @@ public class GridCacheKeySet<K, V> extends GridSerializableSet<K> { this.ctx = ctx; this.filter = filter == null ? CU.<K, V>empty() : filter; - for (CacheEntry<K, V> e : c) { + for (Entry<K, V> e : c) { if (e != null) map.put(e.getKey(), e); } @@ -78,7 +78,7 @@ public class GridCacheKeySet<K, V> extends GridSerializableSet<K> { /** {@inheritDoc} */ @SuppressWarnings({"SuspiciousMethodCalls"}) @Override public boolean remove(Object o) { - CacheEntry<K, V> e = map.get(o); + Entry<K, V> e = map.get(o); if (e == null || !F.isAll(e, filter)) return false; @@ -103,7 +103,7 @@ public class GridCacheKeySet<K, V> extends GridSerializableSet<K> { /** {@inheritDoc} */ @SuppressWarnings({"SuspiciousMethodCalls"}) @Override public boolean contains(Object o) { - CacheEntry<K, V> e = map.get(o); + Entry<K, V> e = map.get(o); return e != null && F.isAll(e, filter); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fcea520/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java index 8737b0a..4717e39 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java @@ -172,7 +172,7 @@ public abstract class GridCacheMessage<K, V> extends GridTcpCommunicationMessage * @param ctx Context. * @throws IgniteCheckedException If failed. */ - protected final void prepareFilter(@Nullable IgnitePredicate<CacheEntry<K, V>>[] filters, + protected final void prepareFilter(@Nullable IgnitePredicate<Entry<K, V>>[] filters, GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException { if (filters != null) for (IgnitePredicate filter : filters) @@ -439,7 +439,7 @@ public abstract class GridCacheMessage<K, V> extends GridTcpCommunicationMessage * @return Marshalled collection. * @throws IgniteCheckedException If failed. */ - @Nullable protected final <T> byte[][] marshalFilter(@Nullable IgnitePredicate<CacheEntry<K, V>>[] filter, + @Nullable protected final <T> byte[][] marshalFilter(@Nullable IgnitePredicate<Entry<K, V>>[] filter, GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException { assert ctx != null; @@ -449,7 +449,7 @@ public abstract class GridCacheMessage<K, V> extends GridTcpCommunicationMessage byte[][] filterBytes = new byte[filter.length][]; for (int i = 0; i < filter.length; i++) { - IgnitePredicate<CacheEntry<K, V>> p = filter[i]; + IgnitePredicate<Entry<K, V>> p = filter[i]; if (ctx.deploymentEnabled()) prepareObject(p, ctx); @@ -468,7 +468,7 @@ public abstract class GridCacheMessage<K, V> extends GridTcpCommunicationMessage * @throws IgniteCheckedException If failed. */ @SuppressWarnings({"unchecked"}) - @Nullable protected final <T> IgnitePredicate<CacheEntry<K, V>>[] unmarshalFilter( + @Nullable protected final <T> IgnitePredicate<Entry<K, V>>[] unmarshalFilter( @Nullable byte[][] byteCol, GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws IgniteCheckedException { assert ldr != null; assert ctx != null; @@ -476,13 +476,13 @@ public abstract class GridCacheMessage<K, V> extends GridTcpCommunicationMessage if (byteCol == null) return null; - IgnitePredicate<CacheEntry<K, V>>[] filter = new IgnitePredicate[byteCol.length]; + IgnitePredicate<Entry<K, V>>[] filter = new IgnitePredicate[byteCol.length]; IgniteMarshaller marsh = ctx.marshaller(); for (int i = 0; i < byteCol.length; i++) filter[i] = byteCol[i] == null ? null : - marsh.<IgnitePredicate<CacheEntry<K, V>>>unmarshal(byteCol[i], ldr); + marsh.<IgnitePredicate<Entry<K, V>>>unmarshal(byteCol[i], ldr); 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/GridCachePeekMode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePeekMode.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePeekMode.java index b50dd18..a4aa453 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePeekMode.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePeekMode.java @@ -23,9 +23,9 @@ import java.util.*; /** * Enumeration of all supported cache peek modes. Peek modes can be passed into various - * {@code 'CacheProjection.peek(..)'} and {@code CacheEntry.peek(..)} methods, + * {@code 'CacheProjection.peek(..)'} and {@code Entry.peek(..)} methods, * such as {@link org.apache.ignite.cache.CacheProjection#peek(Object, Collection)}, - * {@link org.apache.ignite.cache.CacheEntry#peek()}, and others. + * {@link org.apache.ignite.cache.Entry#peek()}, and others. * <p> * The following modes are supported: * <ul>
