Repository: incubator-ignite Updated Branches: refs/heads/ignite-96 824eb57ec -> abbb198c5
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/abbb198c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/abbb198c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/abbb198c Branch: refs/heads/ignite-96 Commit: abbb198c571c5b87c55671a1b82ed64031f0e973 Parents: 824eb57 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Tue Feb 10 00:59:10 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Tue Feb 10 00:59:10 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 5 +++++ .../cache/distributed/dht/colocated/GridDhtColocatedCache.java | 2 +- .../processors/cache/GridCacheAbstractFullApiSelfTest.java | 3 --- .../near/GridCachePartitionedMultiNodeFullApiSelfTest.java | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/abbb198c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index c9e3a0b..6921c5b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -232,6 +232,11 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { } /** {@inheritDoc} */ + @Override public Cache.Entry<K, V> entry(K key) throws GridDhtInvalidPartitionException { + return new CacheEntryImpl<>(key, peek(key)); + } + + /** {@inheritDoc} */ @Override public V peek(K key, @Nullable Collection<GridCachePeekMode> modes) throws IgniteCheckedException { GridTuple<V> val = null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/abbb198c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java index 82510d2..932a040 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java @@ -415,7 +415,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte /** {@inheritDoc} */ @Override public Cache.Entry<K, V> entry(K key) throws GridDhtInvalidPartitionException { - return new CacheEntryImpl<>(key, null); + return new CacheEntryImpl<>(key, peek(key)); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/abbb198c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index c300288..dbb9804 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -37,7 +37,6 @@ import org.apache.ignite.transactions.*; import org.jetbrains.annotations.*; import javax.cache.*; -import javax.cache.Cache.*; import javax.cache.expiry.*; import javax.cache.processor.*; import java.util.*; @@ -2743,8 +2742,6 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assert cache.peek(key, F.asList(SMART)) == 1; - Entry<String, Integer> ew = cache.entry("wrongKey"); - assert cache.peek("wrongKey", F.asList(TX, GLOBAL, SWAP, DB)) == null; if (cacheMode() == LOCAL) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/abbb198c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java index b806613..04def3a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java @@ -238,11 +238,11 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti assertEquals((Integer)1, c.peek("key", F.asList(PARTITIONED_ONLY))); } else if (!c.affinity().isPrimaryOrBackup(grid(i).localNode(), "key")) { - assertEquals((Integer)1, e.getValue()); - assertEquals(nearPeekVal, c.peek("key", Arrays.asList(NEAR_ONLY))); assert c.peek("key", Arrays.asList(PARTITIONED_ONLY)) == null; + + assertEquals((Integer)1, jcache(i).get("key")); } } }
