Repository: incubator-ignite Updated Branches: refs/heads/ignite-645 [created] fd4c54a67
ignite-645 Remove GridCachePeekMode Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fd4c54a6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fd4c54a6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fd4c54a6 Branch: refs/heads/ignite-645 Commit: fd4c54a6743df3bfedbbf00c40e1bff12f7fe006 Parents: a6f7294 Author: Andrey Gura <ag...@gridgain.com> Authored: Mon Mar 30 21:57:29 2015 +0300 Committer: Andrey Gura <ag...@gridgain.com> Committed: Mon Mar 30 21:57:29 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 63 +++----------------- .../processors/cache/GridCachePeekMode.java | 1 + .../GridCachePreloadingEvictionsSelfTest.java | 4 +- .../near/GridCacheNearMultiNodeSelfTest.java | 22 +------ .../near/GridCacheNearReadersSelfTest.java | 52 ++++++++++++---- .../GridCacheReplicatedPreloadSelfTest.java | 11 ++-- 6 files changed, 58 insertions(+), 95 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd4c54a6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 14d9230..b7cf2fd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -59,7 +59,6 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.locks.*; -import static java.util.Collections.*; import static org.apache.ignite.IgniteSystemProperties.*; import static org.apache.ignite.events.EventType.*; import static org.apache.ignite.internal.GridClosureCallMode.*; @@ -1064,43 +1063,6 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, } /** - * @param keys Keys. - * @param modes Modes. - * @param tx Transaction. - * @param skipped Keys skipped during filter validation. - * @return Peeked values. - * @throws IgniteCheckedException If failed. - */ - protected Map<K, V> peekAll0(@Nullable Collection<? extends K> keys, @Nullable Collection<GridCachePeekMode> modes, - IgniteInternalTx tx, @Nullable Collection<K> skipped) throws IgniteCheckedException { - if (F.isEmpty(keys)) - return emptyMap(); - - if (keyCheck) - validateCacheKeys(keys); - - Map<K, V> ret = new HashMap<>(keys.size(), 1.0f); - - for (K k : keys) { - try { - GridTuple<V> val = peek0(skipped != null, k, modes, tx); - - if (val != null) - ret.put(k, val.get()); - } - catch (GridCacheFilterFailedException ignored) { - if (log.isDebugEnabled()) - log.debug("Filter validation failed for key: " + k); - - if (skipped != null) - skipped.add(k); - } - } - - return ret; - } - - /** * Undeploys and removes all entries for class loader. * * @param ldr Class loader to undeploy. @@ -1613,8 +1575,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, return getAllAsync(Collections.singletonList(key), /*force primary*/true, /*skip tx*/false, null, null, taskName, true, false).chain(new CX1<IgniteInternalFuture<Map<K, V>>, V>() { - @Override - public V applyx(IgniteInternalFuture<Map<K, V>> e) throws IgniteCheckedException { + @Override public V applyx(IgniteInternalFuture<Map<K, V>> e) throws IgniteCheckedException { return e.get().get(key); } }); @@ -1880,8 +1841,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, if (ctx.config().getInterceptor() != null) fut = fut.chain(new CX1<IgniteInternalFuture<V>, V>() { - @Override - public V applyx(IgniteInternalFuture<V> f) throws IgniteCheckedException { + @Override public V applyx(IgniteInternalFuture<V> f) throws IgniteCheckedException { return (V)ctx.config().getInterceptor().onGet(key, f.get()); } }); @@ -2483,13 +2443,11 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, ctx.denyOnLocalRead(); return asyncOp(new AsyncInOp(drMap.keySet()) { - @Override - public IgniteInternalFuture<?> inOp(IgniteTxLocalAdapter tx) { + @Override public IgniteInternalFuture<?> inOp(IgniteTxLocalAdapter tx) { return tx.putAllDrAsync(ctx, drMap); } - @Override - public String toString() { + @Override public String toString() { return "putAllConflictAsync [drMap=" + drMap + ']'; } }); @@ -2542,10 +2500,8 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, ctx.denyOnLocalRead(); return syncOp(new SyncOp<Map<K, EntryProcessorResult<T>>>(keys.size() == 1) { - @Nullable - @Override - public Map<K, EntryProcessorResult<T>> op(IgniteTxLocalAdapter tx) - throws IgniteCheckedException { + @Nullable @Override public Map<K, EntryProcessorResult<T>> op(IgniteTxLocalAdapter tx) + throws IgniteCheckedException { Map<? extends K, EntryProcessor<K, V, Object>> invokeMap = F.viewAsMap(keys, new C1<K, EntryProcessor<K, V, Object>>() { @Override public EntryProcessor apply(K k) { @@ -2742,8 +2698,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, (IgniteClosure<IgniteInternalFuture<GridCacheReturn>, Boolean>) RET2FLAG); } - @Override - public String toString() { + @Override public String toString() { return "putxAsync [key=" + key + ", val=" + val + ", filter=" + Arrays.toString(filter) + ']'; } }); @@ -5355,9 +5310,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, modes.swap = true; } else { - for (int i = 0; i < peekModes.length; i++) { - CachePeekMode peekMode = peekModes[i]; - + for (CachePeekMode peekMode : peekModes) { A.notNull(peekMode, "peekMode"); switch (peekMode) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd4c54a6/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 0aef1ee..5e5b950 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 @@ -32,6 +32,7 @@ import org.jetbrains.annotations.*; * <li>{@link #DB}</li> * </ul> */ +@Deprecated public enum GridCachePeekMode { /** Peeks value only from in-transaction memory of an ongoing transaction, if any. */ TX, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd4c54a6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java index 3624b58..89646e9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePreloadingEvictionsSelfTest.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.internal.*; @@ -95,7 +96,6 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest /** * @throws Exception If failed. */ - @SuppressWarnings("BusyWait") public void testEvictions() throws Exception { try { final Ignite ignite1 = startGrid(1); @@ -240,7 +240,7 @@ public class GridCachePreloadingEvictionsSelfTest extends GridCommonAbstractTest ", s2=" + cache2.size() + ']'; for (Integer key : cache1.keySet()) { - Object e = cache1.peek(key); + Object e = cache1.localPeek(key, new CachePeekMode[] {CachePeekMode.ONHEAP}, null); if (e != null) assert cache2.containsKey(key) : "Cache2 does not contain key: " + key; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd4c54a6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java index b3b04e0..7774076 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java @@ -44,7 +44,6 @@ import java.util.concurrent.locks.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.internal.processors.cache.GridCachePeekMode.*; import static org.apache.ignite.transactions.TransactionConcurrency.*; import static org.apache.ignite.transactions.TransactionIsolation.*; @@ -186,15 +185,6 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { } /** - * @param g Grid. - * @return Dht cache. - */ - @SuppressWarnings({"unchecked", "TypeMayBeWeakened"}) - private GridNearCacheAdapter<Integer, String> near(Ignite g) { - return (GridNearCacheAdapter)((IgniteKernal)g).internalCache(); - } - - /** * @param idx Index. * @return Affinity. */ @@ -359,7 +349,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { GridCacheAdapter<Integer, String> dhtCache = dht(G.ignite(n.id())); - String s = dhtCache.peek(key); + String s = dhtCache.localPeek(key, new CachePeekMode[] {CachePeekMode.ONHEAP}, null); assert s != null : "Value is null for key: " + key; assertEquals(s, Integer.toString(key)); @@ -519,7 +509,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { assertEquals("2", near.get(2)); assertEquals("3", near.get(3)); - assertNotNull(dht(primaryGrid(3)).peek(3, F.asList(GLOBAL))); + assertNotNull(dht(primaryGrid(3)).localPeek(3, new CachePeekMode[] {CachePeekMode.ONHEAP}, null)); tx.commit(); } @@ -926,14 +916,6 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { return map.get(key); } - /** - * @param key Key. - * @return {@code True} if has value. - */ - boolean hasValue(Integer key) { - return map.containsKey(key); - } - /** @return {@code True} if empty. */ boolean isEmpty() { return map.isEmpty(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd4c54a6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java index 1ab738f..ad2668d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java @@ -45,6 +45,8 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; * Checks that readers are properly handled. */ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest { + /**Cache peek modes array taht consist of only ONHEAP mode. */ + private static final CachePeekMode[] ONHEAP_PEEK_MODES = new CachePeekMode[] {CachePeekMode.ONHEAP}; /** Number of grids. */ private int grids = 2; @@ -158,13 +160,13 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest { assertTrue(cache1.containsKey(1)); assertTrue(cache1.containsKey(2)); - assertNotNull(near(cache1).peek(1)); - assertNotNull(near(cache1).peek(2)); - assertNotNull(dht(cache1).peek(1)); - assertNull(dht(cache1).peek(2)); + assertNotNull(nearPeek(cache1, 1)); + assertNotNull(nearPeek(cache1, 2)); + assertNotNull(dhtPeek(cache1, 1)); + assertNull(dhtPeek(cache1, 2)); - assertNull(near(cache2).peek(1)); - assertNotNull(dht(cache2).peek(2)); + assertNull(nearPeek(cache2, 1)); + assertNotNull(dhtPeek(cache2, 2)); // Node2 should have node1 in reader's map, since request to // put key 2 came from node1. @@ -177,7 +179,7 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest { assertEquals("v1", cache2.get(1)); // Check that key1 is in near cache of cache2. - assertNotNull(near(cache2).peek(1)); + assertNotNull(nearPeek(cache2, 1)); // Now node1 should have node2 in readers map. assertTrue(e1.readers().contains(n2.id())); @@ -185,8 +187,8 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest { // Evict locally from cache2. cache2.localEvict(Collections.singleton(1)); - assertNull(near(cache2).peek(1)); - assertNull(dht(cache2).peek(1)); + assertNull(nearPeek(cache2, 1)); + assertNull(dhtPeek(cache2, 1)); // Node 1 still has node2 in readers map. assertTrue(e1.readers().contains(n2.id())); @@ -240,10 +242,10 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest { assertTrue(cache1.containsKey(1)); assertTrue(cache2.containsKey(1)); - assertEquals("v1", near(cache1).peek(1)); - assertEquals("v1", near(cache2).peek(1)); - assertEquals("v1", dht(cache1).peek(1)); - assertEquals("v1", dht(cache2).peek(1)); + assertEquals("v1", nearPeek(cache1, 1)); + assertEquals("v1", nearPeek(cache2, 1)); + assertEquals("v1", dhtPeek(cache1, 1)); + assertEquals("v1", dhtPeek(cache2, 1)); assertNull(near(cache1).peekNearOnly(1)); assertNull(near(cache2).peekNearOnly(1)); @@ -591,4 +593,28 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest { lock1.unlock(); } } + + /** + * @param cache Cache. + * @param key Key. + */ + private static <K, V> V nearPeek(IgniteCache<K, V> cache, K key) throws IgniteCheckedException { + return localPeek(near(cache), key); + } + + /** + * @param cache Cache. + * @param key Key. + */ + private static <K, V> V dhtPeek(IgniteCache<K, V> cache, K key) throws IgniteCheckedException { + return localPeek(dht(cache), key); + } + + /** + * @param cache Cache. + * @param key Key. + */ + private static <K, V> V localPeek(GridCacheAdapter<K, V> cache, K key) throws IgniteCheckedException { + return cache.localPeek(key, ONHEAP_PEEK_MODES, null); + } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd4c54a6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java index 51c2047..9ebbebc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java @@ -148,7 +148,6 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { /** * @throws Exception If test failed. */ - @SuppressWarnings({"BusyWait"}) public void testIntegrity() throws Exception { preloadMode = SYNC; @@ -188,12 +187,14 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { assertEquals(EVT_CACHE_REBALANCE_STARTED, iter.next().type()); assertEquals(EVT_CACHE_REBALANCE_STOPPED, iter.next().type()); - GridCacheAdapter<Integer, String> cache2 = ((IgniteKernal)g2).internalCache(null); + IgniteCache<Integer, String> cache2 = g2.cache(null); + + assertEquals("val1", cache2.localPeek(1, CachePeekMode.ONHEAP)); + assertEquals("val2", cache2.localPeek(2, CachePeekMode.ONHEAP)); - assertEquals("val1", cache2.peek(1)); - assertEquals("val2", cache2.peek(2)); + GridCacheAdapter<Integer, String> cacheAdapter2 = ((IgniteKernal)g2).internalCache(null); - GridCacheEntryEx e2 = cache2.peekEx(1); + GridCacheEntryEx e2 = cacheAdapter2.peekEx(1); assert e2 != null; assert e2 != e1;
