Repository: incubator-ignite Updated Branches: refs/heads/ignite-96 [created] d0715a6eb
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2e80f874/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java index c22c3fe..d090ee6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheEntry.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.distributed.*; @@ -31,6 +30,7 @@ import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.jetbrains.annotations.*; +import javax.cache.Cache.*; import java.util.*; import static org.apache.ignite.events.IgniteEventType.*; @@ -316,7 +316,7 @@ public class GridNearCacheEntry<K, V> extends GridDistributedCacheEntry<K, V> { /** {@inheritDoc} */ @Override protected V readThrough(IgniteInternalTx<K, V> tx, K key, boolean reload, - IgnitePredicate<CacheEntry<K, V>>[] filter, UUID subjId, String taskName) throws IgniteCheckedException { + IgnitePredicate<Entry<K, V>>[] filter, UUID subjId, String taskName) throws IgniteCheckedException { return cctx.near().loadAsync(tx, F.asList(key), reload, @@ -612,16 +612,6 @@ public class GridNearCacheEntry<K, V> extends GridDistributedCacheEntry<K, V> { } /** {@inheritDoc} */ - @Override public CacheEntry<K, V> wrap(boolean prjAware) { - GridCacheProjectionImpl<K, V> prjPerCall = null; - - if (prjAware) - prjPerCall = cctx.projectionPerCall(); - - return new GridPartitionedCacheEntryImpl<>(prjPerCall, cctx, key, this); - } - - /** {@inheritDoc} */ @Override public synchronized String toString() { return S.toString(GridNearCacheEntry.class, this, "super", super.toString()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2e80f874/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 7048b71..454c9bb 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 @@ -35,6 +35,7 @@ import org.apache.ignite.transactions.*; import org.jetbrains.annotations.*; import sun.misc.*; +import javax.cache.Cache.*; import javax.cache.expiry.*; import javax.cache.processor.*; import java.io.*; @@ -78,13 +79,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { map.setEntryFactory(new GridCacheMapEntryFactory<K, V>() { @Override public GridCacheMapEntry<K, V> create(GridCacheContext<K, V> ctx, long topVer, K key, int hash, V val, @Nullable GridCacheMapEntry<K, V> next, long ttl, int hdrId) { - return new GridLocalCacheEntry<K, V>(ctx, key, hash, val, next, ttl, hdrId) { - @Override public CacheEntry<K, V> wrapFilterLocked() throws IgniteCheckedException { - assert Thread.holdsLock(this); - - return new GridCacheFilterEvaluationEntry<>(key, rawGetOrUnmarshalUnlocked(true), this); - } - }; + return new GridLocalCacheEntry<K, V>(ctx, key, hash, val, next, ttl, hdrId); } }); } @@ -110,7 +105,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();
