Repository: incubator-ignite Updated Branches: refs/heads/ignite-52 e91f214f8 -> 85ff69951
IGNITE-52 - Fixing tests. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/85ff6995 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/85ff6995 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/85ff6995 Branch: refs/heads/ignite-52 Commit: 85ff699510843b0bb8b1442b6ffab0463bbb31d2 Parents: e91f214 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Fri Feb 13 15:24:56 2015 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Fri Feb 13 15:24:56 2015 -0800 ---------------------------------------------------------------------- .../distributed/dht/atomic/GridDhtAtomicCache.java | 2 +- .../dht/colocated/GridDhtColocatedCache.java | 2 +- .../cache/distributed/near/GridNearCacheAdapter.java | 13 +++++++++++-- .../cache/distributed/near/GridNearGetFuture.java | 5 ++--- .../cache/local/atomic/GridLocalAtomicCache.java | 2 +- .../cache/GridCacheAbstractMetricsSelfTest.java | 4 +++- ...dCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java | 12 ++++++------ ...idCacheAtomicPartitionedTckMetricsSelfTestImpl.java | 4 ++-- .../GridCacheAtomicLocalTckMetricsSelfTestImpl.java | 4 ++-- 9 files changed, 29 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/85ff6995/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 4005795..868db2e 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 @@ -967,7 +967,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { if (!success) break; - else + else if (!skipVals) metrics0().onRead(true); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/85ff6995/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 d1e1be2..9d44cda 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 @@ -318,7 +318,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte if (!success) break; - else + else if (!skipVals) ctx.cache().metrics0().onRead(true); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/85ff6995/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 d2c20ca..df5d66d 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 @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.cache.distributed.near; 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.distributed.*; @@ -47,6 +48,9 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda /** */ private static final long serialVersionUID = 0L; + /** */ + private static final CachePeekMode[] NEAR_PEEK_MODE = {CachePeekMode.NEAR}; + /** * Empty constructor required for {@link Externalizable}. */ @@ -543,7 +547,7 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda } /** {@inheritDoc} */ - public boolean clearLocally0(K key, @Nullable IgnitePredicate<Cache.Entry<K, V>>[] filter) { + @Override public boolean clearLocally0(K key, @Nullable IgnitePredicate<Cache.Entry<K, V>>[] filter) { return super.clearLocally0(key, filter) | dht().clearLocally0(key, filter); } @@ -695,7 +699,12 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda return new EntryIterator(nearSet.iterator(), F.iterator0(dhtSet, false, new P1<Cache.Entry<K, V>>() { @Override public boolean apply(Cache.Entry<K, V> e) { - return !GridNearCacheAdapter.super.containsKey(e.getKey()); + try { + return GridNearCacheAdapter.super.localPeek(e.getKey(), NEAR_PEEK_MODE, null) == null; + } + catch (IgniteCheckedException ex) { + throw new IgniteException(ex); + } } })); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/85ff6995/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 6029b92..8cd19c4 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 @@ -34,7 +34,6 @@ import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.jetbrains.annotations.*; -import javax.cache.*; import java.io.*; import java.util.*; import java.util.concurrent.atomic.*; @@ -482,13 +481,13 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma } if (v != null) { - if (cctx.cache().configuration().isStatisticsEnabled()) + if (cctx.cache().configuration().isStatisticsEnabled() && !skipVals) near.metrics0().onRead(true); } else { primary = cctx.affinity().primary(key, topVer); - if (!primary.isLocal() && cctx.cache().configuration().isStatisticsEnabled()) + if (!primary.isLocal() && cctx.cache().configuration().isStatisticsEnabled() && !skipVals) near.metrics0().onRead(false); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/85ff6995/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 b4fbc5d..d6d2a97 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 @@ -615,7 +615,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { success = false; } else { - if (!storeEnabled && configuration().isStatisticsEnabled()) + if (!storeEnabled && configuration().isStatisticsEnabled() && !skipVals) metrics0().onRead(false); success = false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/85ff6995/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java index d4e4dc1..f20c411 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java @@ -641,6 +641,8 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract cache.getAndPut(key, key); // +1 read, +1 miss. + assertEquals("Expected 2 reads", 2, cache.metrics().getCacheGets()); + cache.get(key); assertEquals("Expected 1 write", 1, cache.metrics().getCachePuts()); @@ -868,7 +870,7 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract assertTrue(GridTestUtils.waitForCondition(new GridAbsPredicateX() { @SuppressWarnings("unchecked") - @Override public boolean applyx() throws IgniteCheckedException { + @Override public boolean applyx() { try { if (c.get(key) != null) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/85ff6995/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java index 29596b6..505aed9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest.java @@ -299,9 +299,9 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache cache.localEvict(Collections.singleton(k2)); cache.localEvict(Collections.singleton(k3)); - assert !cache.containsKey(k1); - assert !cache.containsKey(k2); - assert !cache.containsKey(k3); + assertNull(cache.localPeek(k1, CachePeekMode.ONHEAP, CachePeekMode.OFFHEAP)); + assertNull(cache.localPeek(k2, CachePeekMode.ONHEAP, CachePeekMode.OFFHEAP)); + assertNull(cache.localPeek(k3, CachePeekMode.ONHEAP, CachePeekMode.OFFHEAP)); int cnt = 0; @@ -358,9 +358,9 @@ public class GridCacheAtomicClientOnlyMultiNodeFullApiSelfTest extends GridCache cache.localEvict(Collections.singleton(k2)); cache.localEvict(Collections.singleton(k3)); - assert !cache.containsKey(k1); - assert !cache.containsKey(k2); - assert !cache.containsKey(k3); + assertNull(cache.localPeek(k1, CachePeekMode.ONHEAP, CachePeekMode.OFFHEAP)); + assertNull(cache.localPeek(k2, CachePeekMode.ONHEAP, CachePeekMode.OFFHEAP)); + assertNull(cache.localPeek(k3, CachePeekMode.ONHEAP, CachePeekMode.OFFHEAP)); cache.localPromote(ImmutableSet.of(k2, k3)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/85ff6995/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedTckMetricsSelfTestImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedTckMetricsSelfTestImpl.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedTckMetricsSelfTestImpl.java index 532ef3e..a9dc45e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedTckMetricsSelfTestImpl.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedTckMetricsSelfTestImpl.java @@ -123,7 +123,7 @@ public class GridCacheAtomicPartitionedTckMetricsSelfTestImpl extends GridCacheA assertEquals(hitCount, cache.metrics().getCacheHits()); assertEquals(putCount, cache.metrics().getCachePuts()); - assertFalse(cache.containsKey(1)); + assertNull(cache.localPeek(1)); cache.put(1, 10); ++putCount; @@ -132,7 +132,7 @@ public class GridCacheAtomicPartitionedTckMetricsSelfTestImpl extends GridCacheA assertEquals(hitCount, cache.metrics().getCacheHits()); assertEquals(putCount, cache.metrics().getCachePuts()); - assertTrue(cache.containsKey(1)); + assertNotNull(cache.localPeek(1)); result = cache.replace(1, 10, 20); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/85ff6995/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalTckMetricsSelfTestImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalTckMetricsSelfTestImpl.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalTckMetricsSelfTestImpl.java index 231986b..2429ac0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalTckMetricsSelfTestImpl.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalTckMetricsSelfTestImpl.java @@ -118,7 +118,7 @@ public class GridCacheAtomicLocalTckMetricsSelfTestImpl extends GridCacheAtomicL assertEquals(hitCount, cache.metrics().getCacheHits()); assertEquals(putCount, cache.metrics().getCachePuts()); - assertFalse(cache.containsKey(1)); + assertNull(cache.localPeek(1)); cache.put(1, 10); ++putCount; @@ -127,7 +127,7 @@ public class GridCacheAtomicLocalTckMetricsSelfTestImpl extends GridCacheAtomicL assertEquals(hitCount, cache.metrics().getCacheHits()); assertEquals(putCount, cache.metrics().getCachePuts()); - assertTrue(cache.containsKey(1)); + assertNotNull(cache.localPeek(1)); result = cache.replace(1, 10, 20);
