http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java index d2de20e..be7e3c9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccSelfTest.java @@ -82,9 +82,9 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { public void testMarshalUnmarshalCandidate() throws Exception { GridCacheAdapter<String, String> cache = grid.internalCache(); - GridCacheTestEntryEx<String, String> parent = new GridCacheTestEntryEx<>(cache.context(), "1"); + GridCacheTestEntryEx parent = new GridCacheTestEntryEx(cache.context(), "1"); - GridCacheMvccCandidate<String> cand = new GridCacheMvccCandidate<>( + GridCacheMvccCandidate cand = new GridCacheMvccCandidate( parent, UUID.randomUUID(), UUID.randomUUID(), @@ -102,7 +102,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { Marshaller marshaller = getTestResources().getMarshaller(); - GridCacheMvccCandidate<String> unmarshalled = marshaller.unmarshal(marshaller.marshal(cand), null); + GridCacheMvccCandidate unmarshalled = marshaller.unmarshal(marshaller.marshal(cand), null); info(unmarshalled.toString()); } @@ -113,7 +113,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { public void testRemotes() { GridCacheAdapter<String, String> cache = grid.internalCache(); - GridCacheTestEntryEx<String, String> entry = new GridCacheTestEntryEx<>(cache.context(), "1"); + GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1"); UUID node1 = UUID.randomUUID(); UUID node2 = UUID.randomUUID(); @@ -126,7 +126,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { entry.addRemote(node1, 1, ver1, 0, false, true); - Collection<GridCacheMvccCandidate<String>> cands = entry.remoteMvccSnapshot(); + Collection<GridCacheMvccCandidate> cands = entry.remoteMvccSnapshot(); assert cands.size() == 1; assert cands.iterator().next().version().equals(ver1); @@ -264,7 +264,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { public void testNearRemoteWithOwned() { GridCacheAdapter<String, String> cache = grid.internalCache(); - GridCacheTestEntryEx<String, String> entry = new GridCacheTestEntryEx<>(cache.context(), "1"); + GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1"); UUID node1 = UUID.randomUUID(); @@ -273,14 +273,14 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheVersion ver3 = version(3); GridCacheVersion ver4 = version(4); - GridCacheMvccCandidate<String> c1 = entry.addRemote(node1, 1, ver1, 0, false, true); - GridCacheMvccCandidate<String> c2 = entry.addRemote(node1, 1, ver2, 0, false, true); - GridCacheMvccCandidate<String> c3 = entry.addRemote(node1, 1, ver3, 0, false, true); - GridCacheMvccCandidate<String> c4 = entry.addRemote(node1, 1, ver4, 0, false, true); + GridCacheMvccCandidate c1 = entry.addRemote(node1, 1, ver1, 0, false, true); + GridCacheMvccCandidate c2 = entry.addRemote(node1, 1, ver2, 0, false, true); + GridCacheMvccCandidate c3 = entry.addRemote(node1, 1, ver3, 0, false, true); + GridCacheMvccCandidate c4 = entry.addRemote(node1, 1, ver4, 0, false, true); GridCacheMvccCandidate[] candArr = new GridCacheMvccCandidate[] {c1, c2, c3, c4}; - Collection<GridCacheMvccCandidate<String>> rmtCands = entry.remoteMvccSnapshot(); + Collection<GridCacheMvccCandidate> rmtCands = entry.remoteMvccSnapshot(); assert rmtCands.size() == 4; assert rmtCands.iterator().next().version().equals(ver1); @@ -291,7 +291,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { int i = 0; - for (GridCacheMvccCandidate<String> cand : rmtCands) { + for (GridCacheMvccCandidate cand : rmtCands) { assertTrue(cand == candArr[i]); assertTrue(ver2.equals(cand.ownerVersion()) || cand != c1); @@ -306,7 +306,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { public void testNearRemoteWithOwned1() { GridCacheAdapter<String, String> cache = grid.internalCache(); - GridCacheTestEntryEx<String, String> entry = new GridCacheTestEntryEx<>(cache.context(), "1"); + GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1"); UUID node1 = UUID.randomUUID(); @@ -317,16 +317,16 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheVersion ver5 = version(5); GridCacheVersion ver6 = version(6); - GridCacheMvccCandidate<String> c1 = entry.addRemote(node1, 1, ver1, 0, false, true); - GridCacheMvccCandidate<String> c2 = entry.addRemote(node1, 1, ver2, 0, false, true); - GridCacheMvccCandidate<String> c3 = entry.addRemote(node1, 1, ver3, 0, false, true); - GridCacheMvccCandidate<String> c4 = entry.addRemote(node1, 1, ver4, 0, false, true); - GridCacheMvccCandidate<String> c5 = entry.addRemote(node1, 1, ver5, 0, false, true); - GridCacheMvccCandidate<String> c6 = entry.addRemote(node1, 1, ver6, 0, false, true); + GridCacheMvccCandidate c1 = entry.addRemote(node1, 1, ver1, 0, false, true); + GridCacheMvccCandidate c2 = entry.addRemote(node1, 1, ver2, 0, false, true); + GridCacheMvccCandidate c3 = entry.addRemote(node1, 1, ver3, 0, false, true); + GridCacheMvccCandidate c4 = entry.addRemote(node1, 1, ver4, 0, false, true); + GridCacheMvccCandidate c5 = entry.addRemote(node1, 1, ver5, 0, false, true); + GridCacheMvccCandidate c6 = entry.addRemote(node1, 1, ver6, 0, false, true); GridCacheMvccCandidate[] candArr = new GridCacheMvccCandidate[] {c1, c2, c3, c4, c5, c6}; - Collection<GridCacheMvccCandidate<String>> cands = entry.remoteMvccSnapshot(); + Collection<GridCacheMvccCandidate> cands = entry.remoteMvccSnapshot(); assert cands.size() == 6; assert cands.iterator().next().version().equals(ver1); @@ -337,7 +337,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { int i = 0; - for (GridCacheMvccCandidate<String> cand : cands) { + for (GridCacheMvccCandidate cand : cands) { assert cand == candArr[i]; assertTrue(ver3.equals(cand.ownerVersion()) || cand != c1); @@ -352,7 +352,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { public void testNearRemoteWithOwned2() { GridCacheAdapter<String, String> cache = grid.internalCache(); - GridCacheTestEntryEx<String, String> entry = new GridCacheTestEntryEx<>(cache.context(), "1"); + GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1"); UUID node1 = UUID.randomUUID(); @@ -364,17 +364,17 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheVersion ver5 = version(5); GridCacheVersion ver6 = version(6); - GridCacheMvccCandidate<String> c0 = entry.addRemote(node1, 1, ver0, 0, false, true); - GridCacheMvccCandidate<String> c1 = entry.addRemote(node1, 1, ver1, 0, false, true); - GridCacheMvccCandidate<String> c2 = entry.addRemote(node1, 1, ver2, 0, false, true); - GridCacheMvccCandidate<String> c3 = entry.addRemote(node1, 1, ver3, 0, false, true); - GridCacheMvccCandidate<String> c4 = entry.addRemote(node1, 1, ver4, 0, false, true); - GridCacheMvccCandidate<String> c5 = entry.addRemote(node1, 1, ver5, 0, false, true); - GridCacheMvccCandidate<String> c6 = entry.addRemote(node1, 1, ver6, 0, false, true); + GridCacheMvccCandidate c0 = entry.addRemote(node1, 1, ver0, 0, false, true); + GridCacheMvccCandidate c1 = entry.addRemote(node1, 1, ver1, 0, false, true); + GridCacheMvccCandidate c2 = entry.addRemote(node1, 1, ver2, 0, false, true); + GridCacheMvccCandidate c3 = entry.addRemote(node1, 1, ver3, 0, false, true); + GridCacheMvccCandidate c4 = entry.addRemote(node1, 1, ver4, 0, false, true); + GridCacheMvccCandidate c5 = entry.addRemote(node1, 1, ver5, 0, false, true); + GridCacheMvccCandidate c6 = entry.addRemote(node1, 1, ver6, 0, false, true); GridCacheMvccCandidate[] candArr = new GridCacheMvccCandidate[] {c0, c1, c2, c3, c4, c5, c6}; - Collection<GridCacheMvccCandidate<String>> cands = entry.remoteMvccSnapshot(); + Collection<GridCacheMvccCandidate> cands = entry.remoteMvccSnapshot(); assert cands.size() == 7; assert cands.iterator().next().version().equals(ver0); @@ -385,7 +385,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { int i = 0; - for (GridCacheMvccCandidate<String> cand : cands) { + for (GridCacheMvccCandidate cand : cands) { assert cand == candArr[i]; assertTrue(ver2.equals(cand.ownerVersion()) || cand != c1); @@ -400,7 +400,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { public void testLocal() { GridCacheAdapter<String, String> cache = grid.internalCache(); - GridCacheTestEntryEx<String, String> entry = new GridCacheTestEntryEx<>(cache.context(), "1"); + GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1"); GridCacheVersion ver3 = version(3); GridCacheVersion ver4 = version(4); @@ -408,7 +408,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { entry.addLocal(3, ver3, 0, true, true); - Collection<GridCacheMvccCandidate<String>> cands = entry.localCandidates(); + Collection<GridCacheMvccCandidate> cands = entry.localCandidates(); assert cands.size() == 1; @@ -474,7 +474,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { public void testLocalWithRemote() { GridCacheAdapter<String, String> cache = grid.internalCache(); - GridCacheTestEntryEx<String, String> entry = new GridCacheTestEntryEx<>(cache.context(), "1"); + GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1"); UUID nodeId = UUID.randomUUID(); @@ -510,7 +510,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { public void testCompletedWithBaseInTheMiddle() { GridCacheAdapter<String, String> cache = grid.internalCache(); - GridCacheTestEntryEx<String, String> entry = new GridCacheTestEntryEx<>(cache.context(), "1"); + GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1"); UUID node1 = UUID.randomUUID(); UUID node2 = UUID.randomUUID(); @@ -532,7 +532,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { entry.addRemote(node2, 7, ver7, 0, false, true); entry.addRemote(node2, 8, ver8, 0, false, true); - GridCacheMvccCandidate<String> doomed = entry.addRemote(node2, 6, ver6, 0, false, true); + GridCacheMvccCandidate doomed = entry.addRemote(node2, 6, ver6, 0, false, true); // No reordering happens. checkOrder(entry.remoteMvccSnapshot(), ver1, ver2, ver3, ver4, ver5, ver7, ver8, ver6); @@ -563,7 +563,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { public void testCompletedWithCompletedBaseInTheMiddle() { GridCacheAdapter<String, String> cache = grid.internalCache(); - GridCacheTestEntryEx<String, String> entry = new GridCacheTestEntryEx<>(cache.context(), "1"); + GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1"); UUID node1 = UUID.randomUUID(); UUID node2 = UUID.randomUUID(); @@ -605,7 +605,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { public void testCompletedTwiceWithBaseInTheMiddle() { GridCacheAdapter<String, String> cache = grid.internalCache(); - GridCacheTestEntryEx<String, String> entry = new GridCacheTestEntryEx<>(cache.context(), "1"); + GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1"); UUID node1 = UUID.randomUUID(); UUID node2 = UUID.randomUUID(); @@ -651,7 +651,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { public void testCompletedWithBaseInTheMiddleNoChange() { GridCacheAdapter<String, String> cache = grid.internalCache(); - GridCacheTestEntryEx<String, String> entry = new GridCacheTestEntryEx<>(cache.context(), "1"); + GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1"); UUID node1 = UUID.randomUUID(); UUID node2 = UUID.randomUUID(); @@ -690,7 +690,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { public void testCompletedWithBaseInTheBeginning() { GridCacheAdapter<String, String> cache = grid.internalCache(); - GridCacheTestEntryEx<String, String> entry = new GridCacheTestEntryEx<>(cache.context(), "1"); + GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1"); UUID node1 = UUID.randomUUID(); UUID node2 = UUID.randomUUID(); @@ -732,7 +732,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { public void testCompletedWithBaseInTheBeginningNoChange() { GridCacheAdapter<String, String> cache = grid.internalCache(); - GridCacheTestEntryEx<String, String> entry = new GridCacheTestEntryEx<>(cache.context(), "1"); + GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1"); UUID node1 = UUID.randomUUID(); UUID node2 = UUID.randomUUID(); @@ -771,7 +771,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { public void testCompletedWithBaseInTheEndNoChange() { GridCacheAdapter<String, String> cache = grid.internalCache(); - GridCacheTestEntryEx<String, String> entry = new GridCacheTestEntryEx<>(cache.context(), "1"); + GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1"); UUID node1 = UUID.randomUUID(); UUID node2 = UUID.randomUUID(); @@ -810,7 +810,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { public void testCompletedWithBaseNotPresentInTheMiddle() { GridCacheAdapter<String, String> cache = grid.internalCache(); - GridCacheTestEntryEx<String, String> entry = new GridCacheTestEntryEx<>(cache.context(), "1"); + GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1"); UUID node1 = UUID.randomUUID(); UUID node2 = UUID.randomUUID(); @@ -851,7 +851,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { public void testCompletedWithBaseNotPresentInTheMiddleNoChange() { GridCacheAdapter<String, String> cache = grid.internalCache(); - GridCacheTestEntryEx<String, String> entry = new GridCacheTestEntryEx<>(cache.context(), "1"); + GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1"); UUID node1 = UUID.randomUUID(); UUID node2 = UUID.randomUUID(); @@ -886,7 +886,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { public void testCompletedWithBaseNotPresentInTheBeginning() { GridCacheAdapter<String, String> cache = grid.internalCache(); - GridCacheTestEntryEx<String, String> entry = new GridCacheTestEntryEx<>(cache.context(), "1"); + GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1"); UUID node1 = UUID.randomUUID(); UUID node2 = UUID.randomUUID(); @@ -927,7 +927,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { public void testCompletedWithBaseNotPresentInTheBeginningNoChange() { GridCacheAdapter<String, String> cache = grid.internalCache(); - GridCacheTestEntryEx<String, String> entry = new GridCacheTestEntryEx<>(cache.context(), "1"); + GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1"); UUID node1 = UUID.randomUUID(); UUID node2 = UUID.randomUUID(); @@ -968,7 +968,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { public void testCompletedWithBaseNotPresentInTheEndNoChange() { GridCacheAdapter<String, String> cache = grid.internalCache(); - GridCacheTestEntryEx<String, String> entry = new GridCacheTestEntryEx<>(cache.context(), "1"); + GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1"); UUID node1 = UUID.randomUUID(); UUID node2 = UUID.randomUUID(); @@ -1005,7 +1005,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { public void testLocalAndRemote() { GridCacheAdapter<String, String> cache = grid.internalCache(); - GridCacheTestEntryEx<String, String> entry = new GridCacheTestEntryEx<>(cache.context(), "1"); + GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1"); UUID node1 = UUID.randomUUID(); UUID node2 = UUID.randomUUID(); @@ -1019,7 +1019,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { entry.addRemote(node1, 1, ver1, 0, false, false); entry.addLocal(2, ver2, 0, true, true); - Collection<GridCacheMvccCandidate<String>> cands = entry.remoteMvccSnapshot(); + Collection<GridCacheMvccCandidate> cands = entry.remoteMvccSnapshot(); assert cands.size() == 1; assert cands.iterator().next().version().equals(ver1); @@ -1105,7 +1105,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { assert entry.anyOwner() == null; - GridCacheMvccCandidate<String> c5 = entry.candidate(ver5); + GridCacheMvccCandidate c5 = entry.candidate(ver5); assert c5 != null; @@ -1135,25 +1135,25 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheContext<String, String> ctx = cache.context(); - GridCacheTestEntryEx<String, String> entry1 = new GridCacheTestEntryEx<>(ctx, "1"); - GridCacheTestEntryEx<String, String> entry2 = new GridCacheTestEntryEx<>(ctx, "2"); - GridCacheTestEntryEx<String, String> entry3 = new GridCacheTestEntryEx<>(ctx, "3"); + GridCacheTestEntryEx entry1 = new GridCacheTestEntryEx(ctx, "1"); + GridCacheTestEntryEx entry2 = new GridCacheTestEntryEx(ctx, "2"); + GridCacheTestEntryEx entry3 = new GridCacheTestEntryEx(ctx, "3"); GridCacheVersion ver1 = version(1); GridCacheVersion ver2 = version(2); GridCacheVersion ver3 = version(3); - GridCacheMvccCandidate<String> c13 = entry1.addLocal(1, ver3, 0, true, false); + GridCacheMvccCandidate c13 = entry1.addLocal(1, ver3, 0, true, false); entry1.readyLocal(ver3); checkLocalOwner(entry1.candidate(ver3), ver3, false); - GridCacheMvccCandidate<String> c11 = entry1.addLocal(2, ver1, 0, true, true); - GridCacheMvccCandidate<String> c21 = entry2.addLocal(2, ver1, 0, true, true); - GridCacheMvccCandidate<String> c31 = entry3.addLocal(2, ver1, 0, true, true); + GridCacheMvccCandidate c11 = entry1.addLocal(2, ver1, 0, true, true); + GridCacheMvccCandidate c21 = entry2.addLocal(2, ver1, 0, true, true); + GridCacheMvccCandidate c31 = entry3.addLocal(2, ver1, 0, true, true); - GridCacheMvccCandidate<String> c33 = entry3.addLocal(1, ver3, 0, true, false); + GridCacheMvccCandidate c33 = entry3.addLocal(1, ver3, 0, true, false); linkCandidates(ctx, c11, c21, c31); @@ -1206,25 +1206,25 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheContext<String, String> ctx = cache.context(); - GridCacheTestEntryEx<String, String> entry1 = new GridCacheTestEntryEx<>(ctx, "1"); - GridCacheTestEntryEx<String, String> entry2 = new GridCacheTestEntryEx<>(ctx, "2"); - GridCacheTestEntryEx<String, String> entry3 = new GridCacheTestEntryEx<>(ctx, "3"); + GridCacheTestEntryEx entry1 = new GridCacheTestEntryEx(ctx, "1"); + GridCacheTestEntryEx entry2 = new GridCacheTestEntryEx(ctx, "2"); + GridCacheTestEntryEx entry3 = new GridCacheTestEntryEx(ctx, "3"); GridCacheVersion ver1 = version(1); GridCacheVersion ver2 = version(2); GridCacheVersion ver3 = version(3); - GridCacheMvccCandidate<String> c13 = entry1.addLocal(1, ver3, 0, true, true); + GridCacheMvccCandidate c13 = entry1.addLocal(1, ver3, 0, true, true); entry1.readyLocal(ver3); checkLocalOwner(entry1.candidate(ver3), ver3, false); - GridCacheMvccCandidate<String> c11 = entry1.addLocal(2, ver2, 0, true, false); - GridCacheMvccCandidate<String> c21 = entry2.addLocal(2, ver2, 0, true, false); - GridCacheMvccCandidate<String> c31 = entry3.addLocal(2, ver2, 0, true, false); + GridCacheMvccCandidate c11 = entry1.addLocal(2, ver2, 0, true, false); + GridCacheMvccCandidate c21 = entry2.addLocal(2, ver2, 0, true, false); + GridCacheMvccCandidate c31 = entry3.addLocal(2, ver2, 0, true, false); - GridCacheMvccCandidate<String> c33 = entry3.addLocal(1, ver3, 0, true, true); + GridCacheMvccCandidate c33 = entry3.addLocal(1, ver3, 0, true, true); linkCandidates(ctx, c11, c21, c31); @@ -1293,20 +1293,20 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheContext<String, String> ctx = cache.context(); - GridCacheTestEntryEx<String, String> entry1 = new GridCacheTestEntryEx<>(ctx, "1"); - GridCacheTestEntryEx<String, String> entry2 = new GridCacheTestEntryEx<>(ctx, "2"); + GridCacheTestEntryEx entry1 = new GridCacheTestEntryEx(ctx, "1"); + GridCacheTestEntryEx entry2 = new GridCacheTestEntryEx(ctx, "2"); GridCacheVersion ver1 = version(1); GridCacheVersion ver3 = version(3); - GridCacheMvccCandidate<String> c13 = entry1.addLocal(1, ver3, 0, true, false); + GridCacheMvccCandidate c13 = entry1.addLocal(1, ver3, 0, true, false); entry1.readyLocal(ver3); checkLocalOwner(entry1.candidate(ver3), ver3, false); - GridCacheMvccCandidate<String> c11 = entry1.addLocal(2, ver1, 0, true, true); + GridCacheMvccCandidate c11 = entry1.addLocal(2, ver1, 0, true, true); - GridCacheMvccCandidate<String> c21 = entry2.addLocal(2, ver1, 0, true, false); + GridCacheMvccCandidate c21 = entry2.addLocal(2, ver1, 0, true, false); linkCandidates(ctx, c11, c21); @@ -1316,7 +1316,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { checkLocal(entry1.candidate(ver1), ver1, true, false, false); checkLocal(entry2.candidate(ver1), ver1, true, false, false); - GridCacheMvccCandidate<String> c23 = entry2.addLocal(1, ver3, 0, true, true); + GridCacheMvccCandidate c23 = entry2.addLocal(1, ver3, 0, true, true); linkCandidates(ctx, c13, c23); @@ -1334,22 +1334,22 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheContext<String, String> ctx = cache.context(); - GridCacheTestEntryEx<String, String> entry = new GridCacheTestEntryEx<>(cache.context(), "1"); + GridCacheTestEntryEx entry = new GridCacheTestEntryEx(cache.context(), "1"); GridCacheVersion ver1 = version(1); GridCacheVersion ver2 = version(2); GridCacheVersion ver3 = version(3); GridCacheVersion ver4 = version(4); - GridCacheMvccCandidate<String> c1 = entry.addLocal(1, ver1, 0, true, false); + GridCacheMvccCandidate c1 = entry.addLocal(1, ver1, 0, true, false); ctx.mvcc().addNext(ctx, c1); - GridCacheMvccCandidate<String> c2 = entry.addLocal(2, ver2, 0, true, false); + GridCacheMvccCandidate c2 = entry.addLocal(2, ver2, 0, true, false); ctx.mvcc().addNext(ctx, c2); - GridCacheMvccCandidate<String> c3 = entry.addLocal(3, ver3, 0, true, true); + GridCacheMvccCandidate c3 = entry.addLocal(3, ver3, 0, true, true); ctx.mvcc().addNext(ctx, c3); @@ -1383,7 +1383,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { checkLocal(entry.candidate(ver3), ver3, true, true, false); - GridCacheMvccCandidate<String> c4 = entry.addLocal(4, ver4, 0, true, true); + GridCacheMvccCandidate c4 = entry.addLocal(4, ver4, 0, true, true); ctx.mvcc().addNext(ctx, c4); @@ -1402,13 +1402,13 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheContext<String, String> ctx = cache.context(); - GridCacheTestEntryEx<String, String> entry1 = new GridCacheTestEntryEx<>(cache.context(), "1"); - GridCacheTestEntryEx<String, String> entry2 = new GridCacheTestEntryEx<>(cache.context(), "2"); + GridCacheTestEntryEx entry1 = new GridCacheTestEntryEx(cache.context(), "1"); + GridCacheTestEntryEx entry2 = new GridCacheTestEntryEx(cache.context(), "2"); GridCacheVersion ver1 = version(1); GridCacheVersion ver2 = version(2); - GridCacheMvccCandidate<String> c1k1 = entry1.addLocal(2, ver2, 0, true, false); + GridCacheMvccCandidate c1k1 = entry1.addLocal(2, ver2, 0, true, false); // Link up. ctx.mvcc().addNext(ctx, c1k1); @@ -1417,7 +1417,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { checkLocal(c1k1, ver2, true, true, false); - GridCacheMvccCandidate<String> c2k1 = entry1.addRemote(id, 2, ver1, 0, false, true); + GridCacheMvccCandidate c2k1 = entry1.addRemote(id, 2, ver1, 0, false, true); // Force recheck of assignments. entry1.recheckLock(); @@ -1425,7 +1425,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { checkLocal(c1k1, ver2, true, true, false); checkRemote(c2k1, ver1, false, false); - GridCacheMvccCandidate<String> c1k2 = entry2.addLocal(2, ver2, 0, true, false); + GridCacheMvccCandidate c1k2 = entry2.addLocal(2, ver2, 0, true, false); assert c1k2 != null; @@ -1433,7 +1433,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { assert c1k2.previous() == c1k1; - GridCacheMvccCandidate<String> c2k2 = entry2.addRemote(id, 3, ver1, 0, false, true); + GridCacheMvccCandidate c2k2 = entry2.addRemote(id, 3, ver1, 0, false, true); entry2.readyLocal(c1k2); @@ -1455,16 +1455,16 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheContext<String, String> ctx = cache.context(); - GridCacheTestEntryEx<String, String> entry1 = new GridCacheTestEntryEx<>(ctx, "1"); - GridCacheTestEntryEx<String, String> entry2 = new GridCacheTestEntryEx<>(ctx, "2"); + GridCacheTestEntryEx entry1 = new GridCacheTestEntryEx(ctx, "1"); + GridCacheTestEntryEx entry2 = new GridCacheTestEntryEx(ctx, "2"); GridCacheVersion ver1 = version(1); GridCacheVersion ver2 = version(2); GridCacheVersion ver3 = version(3); // Local with higher version. - GridCacheMvccCandidate<String> v3k1 = entry1.addLocal(3, ver3, 0, true, true); - GridCacheMvccCandidate<String> v3k2 = entry2.addLocal(3, ver3, 0, true, true); + GridCacheMvccCandidate v3k1 = entry1.addLocal(3, ver3, 0, true, true); + GridCacheMvccCandidate v3k2 = entry2.addLocal(3, ver3, 0, true, true); // Link up. linkCandidates(ctx, v3k1, v3k2); @@ -1475,15 +1475,15 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { checkLocal(v3k2, ver3, false, false, false); // Remote locks. - GridCacheMvccCandidate<String> v2k1 = entry1.addRemote(id, 3, ver2, 0, false, false); - GridCacheMvccCandidate<String> v2k2 = entry2.addRemote(id, 3, ver2, 0, false, false); + GridCacheMvccCandidate v2k1 = entry1.addRemote(id, 3, ver2, 0, false, false); + GridCacheMvccCandidate v2k2 = entry2.addRemote(id, 3, ver2, 0, false, false); checkRemote(v2k1, ver2, false, false); checkRemote(v2k2, ver2, false, false); // Local with lower version. - GridCacheMvccCandidate<String> v1k1 = entry1.addLocal(4, ver1, 0, true, true); - GridCacheMvccCandidate<String> v1k2 = entry2.addLocal(4, ver1, 0, true, true); + GridCacheMvccCandidate v1k1 = entry1.addLocal(4, ver1, 0, true, true); + GridCacheMvccCandidate v1k2 = entry2.addLocal(4, ver1, 0, true, true); // Link up. linkCandidates(ctx, v1k1, v1k2); @@ -1515,15 +1515,15 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheContext<String, String> ctx = cache.context(); - GridCacheTestEntryEx<String, String> entry1 = new GridCacheTestEntryEx<>(ctx, "1"); - GridCacheTestEntryEx<String, String> entry2 = new GridCacheTestEntryEx<>(ctx, "2"); + GridCacheTestEntryEx entry1 = new GridCacheTestEntryEx(ctx, "1"); + GridCacheTestEntryEx entry2 = new GridCacheTestEntryEx(ctx, "2"); GridCacheVersion ver1 = version(1); GridCacheVersion ver3 = version(3); // Local with higher version. - GridCacheMvccCandidate<String> v3k1 = entry1.addLocal(3, ver3, 0, true, false); - GridCacheMvccCandidate<String> v3k2 = entry2.addLocal(3, ver3, 0, true, false); + GridCacheMvccCandidate v3k1 = entry1.addLocal(3, ver3, 0, true, false); + GridCacheMvccCandidate v3k2 = entry2.addLocal(3, ver3, 0, true, false); linkCandidates(ctx, v3k1, v3k2); @@ -1532,8 +1532,8 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { checkLocal(v3k1, ver3, true, true, false); checkLocal(v3k2, ver3, false, false, false); - GridCacheMvccCandidate<String> v1k1 = entry1.addLocal(4, ver1, 0, true, true); - GridCacheMvccCandidate<String> v1k2 = entry2.addLocal(4, ver1, 0, true, true); + GridCacheMvccCandidate v1k1 = entry1.addLocal(4, ver1, 0, true, true); + GridCacheMvccCandidate v1k2 = entry2.addLocal(4, ver1, 0, true, true); // Link up. linkCandidates(ctx, v1k1, v1k2); @@ -1565,16 +1565,16 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { GridCacheContext<String, String> ctx = cache.context(); - GridCacheTestEntryEx<String, String> entry1 = new GridCacheTestEntryEx<>(ctx, "1"); - GridCacheTestEntryEx<String, String> entry2 = new GridCacheTestEntryEx<>(ctx, "2"); + GridCacheTestEntryEx entry1 = new GridCacheTestEntryEx(ctx, "1"); + GridCacheTestEntryEx entry2 = new GridCacheTestEntryEx(ctx, "2"); GridCacheVersion ver1 = version(1); GridCacheVersion ver2 = version(2); GridCacheVersion ver3 = version(3); // Local with higher version. - GridCacheMvccCandidate<String> v3k1 = entry1.addLocal(3, ver3, 0, true, false); - GridCacheMvccCandidate<String> v3k2 = entry2.addLocal(3, ver3, 0, true, false); + GridCacheMvccCandidate v3k1 = entry1.addLocal(3, ver3, 0, true, false); + GridCacheMvccCandidate v3k2 = entry2.addLocal(3, ver3, 0, true, false); linkCandidates(ctx, v3k1, v3k2); @@ -1583,8 +1583,8 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { checkLocal(v3k1, ver3, true, true, false); checkLocal(v3k2, ver3, false, false, false); - GridCacheMvccCandidate<String> v1k1 = entry1.addLocal(4, ver1, 0, true, true); - GridCacheMvccCandidate<String> v1k2 = entry2.addLocal(4, ver1, 0, true, true); + GridCacheMvccCandidate v1k1 = entry1.addLocal(4, ver1, 0, true, true); + GridCacheMvccCandidate v1k2 = entry2.addLocal(4, ver1, 0, true, true); // Link up. linkCandidates(ctx, v1k1, v1k2); @@ -1598,7 +1598,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { checkLocal(v1k1, ver1, true, false, false); checkLocal(v1k2, ver1, true, false, false); - GridCacheMvccCandidate<String> v2k2 = entry2.addRemote(id, 5, ver2, 0, false, false); + GridCacheMvccCandidate v2k2 = entry2.addRemote(id, 5, ver2, 0, false, false); checkRemote(v2k2, ver2, false, false); @@ -1625,10 +1625,10 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ private void linkCandidates(final GridCacheContext<String, String> ctx, - final GridCacheMvccCandidate<String>... cands) throws Exception { + final GridCacheMvccCandidate... cands) throws Exception { multithreaded(new Runnable() { @Override public void run() { - for (GridCacheMvccCandidate<String> cand : cands) { + for (GridCacheMvccCandidate cand : cands) { boolean b = grid.<String, String>internalCache().context().mvcc().addNext(ctx, cand); assert b; @@ -1645,12 +1645,12 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { * @param cands Candidates to check order for. * @param vers Ordered versions. */ - private void checkOrder(Collection<GridCacheMvccCandidate<String>> cands, GridCacheVersion... vers) { + private void checkOrder(Collection<GridCacheMvccCandidate> cands, GridCacheVersion... vers) { assert cands.size() == vers.length; int i = 0; - for (GridCacheMvccCandidate<String> cand : cands) { + for (GridCacheMvccCandidate cand : cands) { assert cand.version().equals(vers[i]) : "Invalid order of candidates [cands=" + toString(cands) + ", order=" + toString(vers) + ']'; @@ -1695,7 +1695,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { * * @param cand Candidate to check. */ - private void checkDone(GridCacheMvccCandidate<String> cand) { + private void checkDone(GridCacheMvccCandidate cand) { assert cand != null; info("Done candidate: " + cand); @@ -1714,7 +1714,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { * @param owner Owner flag. * @param used Done flag. */ - private void checkRemote(GridCacheMvccCandidate<String> cand, GridCacheVersion ver, boolean owner, boolean used) { + private void checkRemote(GridCacheMvccCandidate cand, GridCacheVersion ver, boolean owner, boolean used) { assert cand != null; info("Done candidate: " + cand); @@ -1736,7 +1736,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { * @param cand Candidate to check. * @param ver Version. */ - private void checkRemoteOwner(GridCacheMvccCandidate<String> cand, GridCacheVersion ver) { + private void checkRemoteOwner(GridCacheMvccCandidate cand, GridCacheVersion ver) { assert cand != null; info("Done candidate: " + cand); @@ -1761,7 +1761,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { * @param owner Lock owner. * @param reentry Reentry flag. */ - private void checkLocal(GridCacheMvccCandidate<String> cand, GridCacheVersion ver, boolean ready, + private void checkLocal(GridCacheMvccCandidate cand, GridCacheVersion ver, boolean ready, boolean owner, boolean reentry) { assert cand != null; @@ -1789,7 +1789,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { * @param reentry Reentry flag. * @param used Used flag. */ - private void checkLocal(GridCacheMvccCandidate<String> cand, GridCacheVersion ver, boolean ready, + private void checkLocal(GridCacheMvccCandidate cand, GridCacheVersion ver, boolean ready, boolean owner, boolean reentry, boolean used) { assert cand != null; @@ -1813,7 +1813,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { * @param ver Cache version. * @param reentry Reentry flag. */ - private void checkLocalOwner(GridCacheMvccCandidate<String> cand, GridCacheVersion ver, boolean reentry) { + private void checkLocalOwner(GridCacheMvccCandidate cand, GridCacheVersion ver, boolean reentry) { assert cand != null; info("Done candidate: " + cand); @@ -1840,10 +1840,10 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest { /** * @param cands Candidates to print. */ - private void info(Iterable<GridCacheMvccCandidate<String>> cands) { + private void info(Iterable<GridCacheMvccCandidate> cands) { info("Collection of candidates: "); - for (GridCacheMvccCandidate<String> c : cands) { + for (GridCacheMvccCandidate c : cands) { info(">>> " + c); } }
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java index 67b77d6..c23840b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheObjectToStringSelfTest.java @@ -158,7 +158,7 @@ public class GridCacheObjectToStringSelfTest extends GridCommonAbstractTest { cache.put(i, i); for (int i = 0; i < 10; i++) { - GridCacheEntryEx<Object, Object> entry = ((IgniteKernal)g).context().cache().internalCache().peekEx(i); + GridCacheEntryEx entry = ((IgniteKernal)g).context().cache().internalCache().peekEx(i); if (entry != null) assertFalse("Entry is locked after implicit transaction commit: " + entry, entry.lockedByAny()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java index 4846183..166e8a0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java @@ -561,15 +561,15 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { for (int i = lowerBound; i < upperBound; i++) { cache.promote(i); - GridCacheEntryEx<Integer, CacheValue> entry = dht(cache).entryEx(i); + GridCacheEntryEx entry = dht(cache).entryEx(i); assert entry != null; assert entry.key() != null; - CacheValue val = entry.rawGet(); + CacheValue val = CU.value(entry.rawGet(), entry.context()); assertNotNull("Value null for key: " + i, val); - assertEquals(entry.key(), (Integer)val.value()); + assertEquals(entry.key().value(entry.context()), (Integer)val.value()); assertEquals(entry.version(), versions.get(i)); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java index 34a8fa5..bd9a683 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java @@ -82,7 +82,7 @@ public class GridCacheStoreValueBytesSelfTest extends GridCommonAbstractTest { c.put(1, "Cached value"); - GridCacheEntryEx<Object, Object> entry = ((IgniteKernal)g1).internalCache().peekEx(1); + GridCacheEntryEx entry = ((IgniteKernal)g1).internalCache().peekEx(1); assert entry != null; assert entry.valueBytes().isNull(); @@ -103,7 +103,7 @@ public class GridCacheStoreValueBytesSelfTest extends GridCommonAbstractTest { c.put(1, "Cached value"); - GridCacheEntryEx<Object, Object> entry = ((IgniteKernal)g1).internalCache().peekEx(1); + GridCacheEntryEx entry = ((IgniteKernal)g1).internalCache().peekEx(1); assert entry != null; assert entry.valueBytes() != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java index b5e226f..6cdd97e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java @@ -35,12 +35,13 @@ import java.util.*; /** * Test entry. */ -public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter implements GridCacheEntryEx<K, V> { +@SuppressWarnings("unchecked") +public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements GridCacheEntryEx { /** Key. */ - private K key; + private KeyCacheObject key; /** Val. */ - private V val; + private CacheObject val; /** TTL. */ private long ttl; @@ -52,16 +53,16 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme private GridCacheVersion obsoleteVer = ver; /** MVCC. */ - private GridCacheMvcc<K> mvcc; + private GridCacheMvcc mvcc; /** * @param ctx Context. * @param key Key. */ - public GridCacheTestEntryEx(GridCacheContext<K, V> ctx, K key) { - mvcc = new GridCacheMvcc<>(ctx); + public GridCacheTestEntryEx(GridCacheContext ctx, Object key) { + mvcc = new GridCacheMvcc(ctx); - this.key = key; + this.key = ctx.toCacheKeyObject(key); } /** @@ -69,11 +70,11 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme * @param key Key. * @param val Value. */ - public GridCacheTestEntryEx(GridCacheContext<K, V> ctx, K key, V val) { - mvcc = new GridCacheMvcc<>(ctx); + public GridCacheTestEntryEx(GridCacheContext ctx, Object key, Object val) { + mvcc = new GridCacheMvcc(ctx); - this.key = key; - this.val = val; + this.key = ctx.toCacheKeyObject(key); + this.val = ctx.toCacheObject(val); } /** {@inheritDoc} */ @@ -112,12 +113,12 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme } /** {@inheritDoc} */ - @Nullable @Override public GridCacheContext<K, V> context() { + @Nullable @Override public GridCacheContext context() { return null; } /** {@inheritDoc} */ - @Nullable @Override public EvictableEntry<K, V> wrapEviction() { + @Nullable @Override public EvictableEntry wrapEviction() { return null; } @@ -140,7 +141,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme * @return New lock candidate if lock was added, or current owner if lock was reentered, * or <tt>null</tt> if lock was owned by another thread and timeout is negative. */ - @Nullable public GridCacheMvccCandidate<K> addLocal( + @Nullable public GridCacheMvccCandidate addLocal( long threadId, GridCacheVersion ver, long timeout, @@ -168,7 +169,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme * @param tx Transaction flag. * @return Remote candidate. */ - public GridCacheMvccCandidate<K> addRemote(UUID nodeId, long threadId, GridCacheVersion ver, long timeout, + public GridCacheMvccCandidate addRemote(UUID nodeId, long threadId, GridCacheVersion ver, long timeout, boolean ec, boolean tx) { return mvcc.addRemote(this, nodeId, null, threadId, ver, timeout, tx, true, false); } @@ -183,7 +184,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme * @param tx Transaction flag. * @return Remote candidate. */ - public GridCacheMvccCandidate<K> addNearLocal(UUID nodeId, long threadId, GridCacheVersion ver, long timeout, + public GridCacheMvccCandidate addNearLocal(UUID nodeId, long threadId, GridCacheVersion ver, long timeout, boolean tx) { return mvcc.addNearLocal(this, nodeId, null, threadId, ver, timeout, tx, true); } @@ -206,7 +207,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme * @param rolledbackVers Rolled back versions relative to base. * @return Lock owner. */ - @Nullable public GridCacheMvccCandidate<K> orderCompleted(GridCacheVersion baseVer, + @Nullable public GridCacheMvccCandidate orderCompleted(GridCacheVersion baseVer, Collection<GridCacheVersion> committedVers, Collection<GridCacheVersion> rolledbackVers) { return mvcc.orderCompleted(baseVer, committedVers, rolledbackVers); } @@ -231,7 +232,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme * @param ver Lock version to acquire or set to ready. * @return Current owner. */ - @Nullable public GridCacheMvccCandidate<K> readyLocal(GridCacheVersion ver) { + @Nullable public GridCacheMvccCandidate readyLocal(GridCacheVersion ver) { return mvcc.readyLocal(ver); } @@ -243,7 +244,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme * @param pending Pending versions. * @return Lock owner. */ - @Nullable public GridCacheMvccCandidate<K> readyNearLocal(GridCacheVersion ver, GridCacheVersion mapped, + @Nullable public GridCacheMvccCandidate readyNearLocal(GridCacheVersion ver, GridCacheVersion mapped, Collection<GridCacheVersion> committedVers, Collection<GridCacheVersion> rolledbackVers, Collection<GridCacheVersion> pending) { return mvcc.readyNearLocal(ver, mapped, committedVers, rolledbackVers, pending); @@ -253,7 +254,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme * @param cand Candidate to set to ready. * @return Current owner. */ - @Nullable public GridCacheMvccCandidate<K> readyLocal(GridCacheMvccCandidate<K> cand) { + @Nullable public GridCacheMvccCandidate readyLocal(GridCacheMvccCandidate cand) { return mvcc.readyLocal(cand); } @@ -261,7 +262,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme * Local local release. * @return Removed lock candidate or <tt>null</tt> if candidate was not removed. */ - @Nullable public GridCacheMvccCandidate<K> releaseLocal() { + @Nullable public GridCacheMvccCandidate releaseLocal() { return releaseLocal(Thread.currentThread().getId()); } @@ -271,7 +272,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme * @param threadId ID of the thread. * @return Current owner. */ - @Nullable public GridCacheMvccCandidate<K> releaseLocal(long threadId) { + @Nullable public GridCacheMvccCandidate releaseLocal(long threadId) { return mvcc.releaseLocal(threadId); } @@ -283,15 +284,13 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme } /** {@inheritDoc} */ - @Override public GridCacheEntryInfo<K, V> info() { - GridCacheEntryInfo<K, V> info = new GridCacheEntryInfo<>(); + @Override public GridCacheEntryInfo info() { + GridCacheEntryInfo info = new GridCacheEntryInfo(); info.key(key()); info.value(val); info.ttl(ttl()); info.expireTime(expireTime()); - info.keyBytes(keyBytes()); - info.valueBytes(valueBytes().getIfMarshaled()); info.version(version()); return info; @@ -303,22 +302,22 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme } /** @inheritDoc */ - @Override public K key() { + @Override public KeyCacheObject key() { return key; } /** {@inheritDoc} */ - @Override public IgniteTxKey<K> txKey() { - return new IgniteTxKey<>(key, 0); + @Override public IgniteTxKey txKey() { + return new IgniteTxKey(key, 0); } /** @inheritDoc */ - @Override public V rawGet() { + @Override public CacheObject rawGet() { return val; } /** {@inheritDoc} */ - @Override public V rawGetOrUnmarshal(boolean tmp) throws IgniteCheckedException { + @Override public CacheObject rawGetOrUnmarshal(boolean tmp) throws IgniteCheckedException { return val; } @@ -328,8 +327,8 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme } /** @inheritDoc */ - @Override public V rawPut(V val, long ttl) { - V old = this.val; + @Override public CacheObject rawPut(CacheObject val, long ttl) { + CacheObject old = this.val; this.ttl = ttl; this.val = val; @@ -338,22 +337,28 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme } /** @inheritDoc */ - @Override public Cache.Entry<K, V> wrap() { - assert false; return null; + @Override public Cache.Entry wrap() { + assert false; + + return null; } /** @inheritDoc */ - @Override public Cache.Entry<K, V> wrapLazyValue() { - assert false; return null; + @Override public Cache.Entry wrapLazyValue() { + assert false; + + return null; } /** {@inheritDoc} */ - @Override public CacheVersionedEntryImpl<K, V> wrapVersioned() { - assert false; return null; + @Override public CacheVersionedEntryImpl wrapVersioned() { + assert false; + + return null; } /** {@inheritDoc} */ - @Override public Cache.Entry<K, V> wrapFilterLocked() throws IgniteCheckedException { + @Override public Cache.Entry wrapFilterLocked() { assert false; return null; } @@ -375,31 +380,41 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme /** @inheritDoc */ @Override public boolean invalidate(@Nullable GridCacheVersion curVer, GridCacheVersion newVer) throws IgniteCheckedException { - assert false; return false; + assert false; + + return false; } /** @inheritDoc */ - @Override public boolean invalidate(@Nullable IgnitePredicate<Cache.Entry<K, V>>[] filter) + @Override public <K, V> boolean invalidate(@Nullable IgnitePredicate<Cache.Entry<K, V>>[] filter) throws GridCacheEntryRemovedException, IgniteCheckedException { - assert false; return false; + assert false; + + return false; } /** @inheritDoc */ - @Override public boolean compact(@Nullable IgnitePredicate<Cache.Entry<K, V>>[] filter) + @Override public <K, V> boolean compact(@Nullable IgnitePredicate<Cache.Entry<K, V>>[] filter) throws GridCacheEntryRemovedException, IgniteCheckedException { - assert false; return false; + assert false; + + return false; } /** @inheritDoc */ - @Override public boolean evictInternal(boolean swap, GridCacheVersion obsoleteVer, + @Override public <K, V> boolean evictInternal(boolean swap, GridCacheVersion obsoleteVer, @Nullable IgnitePredicate<Cache.Entry<K, V>>[] filter) { - assert false; return false; + assert false; + + return false; } /** {@inheritDoc} */ - @Override public GridCacheBatchSwapEntry<K, V> evictInBatchInternal(GridCacheVersion obsoleteVer) + @Override public GridCacheBatchSwapEntry evictInBatchInternal(GridCacheVersion obsoleteVer) throws IgniteCheckedException { - assert false; return null; + assert false; + + return null; } /** @inheritDoc */ @@ -413,7 +428,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme } /** @inheritDoc */ - @Override public V innerGet(@Nullable IgniteInternalTx<K, V> tx, + @Override public CacheObject innerGet(@Nullable IgniteInternalTx tx, boolean readSwap, boolean readThrough, boolean failFast, @@ -429,21 +444,31 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme } /** @inheritDoc */ - @Override public V innerReload() { + @Override public CacheObject innerReload() { return val; } /** @inheritDoc */ - @Override public GridCacheUpdateTxResult<V> innerSet(@Nullable IgniteInternalTx<K, V> tx, UUID evtNodeId, UUID affNodeId, - @Nullable V val, @Nullable byte[] valBytes, boolean writeThrough, boolean retval, long ttl, - boolean evt, boolean metrics, long topVer, IgnitePredicate<Cache.Entry<K, V>>[] filter, GridDrType drType, + @Override public GridCacheUpdateTxResult innerSet(@Nullable IgniteInternalTx tx, + UUID evtNodeId, + UUID affNodeId, + @Nullable CacheObject val, + @Nullable byte[] valBytes, + boolean writeThrough, + boolean retval, + long ttl, + boolean evt, + boolean metrics, + long topVer, + IgnitePredicate<Cache.Entry<Object, Object>>[] filter, GridDrType drType, long drExpireTime, @Nullable GridCacheVersion drVer, UUID subjId, String taskName) throws IgniteCheckedException, GridCacheEntryRemovedException { - return new GridCacheUpdateTxResult<>(true, rawPut(val, ttl)); + return new GridCacheUpdateTxResult(true, rawPut(val, ttl)); } /** {@inheritDoc} */ - @Override public GridTuple3<Boolean, V, EntryProcessorResult<Object>> innerUpdateLocal(GridCacheVersion ver, + @Override public GridTuple3<Boolean, CacheObject, EntryProcessorResult<Object>> innerUpdateLocal( + GridCacheVersion ver, GridCacheOperation op, @Nullable Object writeObj, @Nullable Object[] invokeArgs, @@ -452,7 +477,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme @Nullable ExpiryPolicy expiryPlc, boolean evt, boolean metrics, - @Nullable IgnitePredicate<Cache.Entry<K, V>>[] filter, + @Nullable IgnitePredicate<Cache.Entry<Object, Object>>[] filter, boolean intercept, UUID subjId, String taskName) @@ -461,7 +486,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme } /** {@inheritDoc} */ - @Override public GridCacheUpdateAtomicResult<K, V> innerUpdate( + @Override public GridCacheUpdateAtomicResult innerUpdate( GridCacheVersion ver, UUID evtNodeId, UUID affNodeId, @@ -476,7 +501,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme boolean metrics, boolean primary, boolean checkVer, - @Nullable IgnitePredicate<Cache.Entry<K, V>>[] filter, + @Nullable IgnitePredicate<Cache.Entry<Object, Object>>[] filter, GridDrType drType, long conflictTtl, long conflictExpireTime, @@ -486,34 +511,37 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme UUID subjId, String taskName) throws IgniteCheckedException, GridCacheEntryRemovedException { - return new GridCacheUpdateAtomicResult<>(true, - rawPut((V)val, 0), - (V)val, - null, - 0L, - 0L, - null, - null, - true); + assert false; + + return null; } /** @inheritDoc */ - @Override public GridCacheUpdateTxResult<V> innerRemove(@Nullable IgniteInternalTx<K, V> tx, UUID evtNodeId, - UUID affNodeId, boolean writeThrough, boolean retval, boolean evt, boolean metrics, long topVer, - IgnitePredicate<Cache.Entry<K, V>>[] filter, GridDrType drType, @Nullable GridCacheVersion drVer, UUID subjId, + @Override public GridCacheUpdateTxResult innerRemove(@Nullable IgniteInternalTx tx, + UUID evtNodeId, + UUID affNodeId, + boolean writeThrough, + boolean retval, + boolean evt, + boolean metrics, + long topVer, + IgnitePredicate<Cache.Entry<Object, Object>>[] filter, + GridDrType drType, + @Nullable GridCacheVersion drVer, + UUID subjId, String taskName) throws IgniteCheckedException, GridCacheEntryRemovedException { obsoleteVer = ver; - V old = val; + CacheObject old = val; val = null; - return new GridCacheUpdateTxResult<>(true, old); + return new GridCacheUpdateTxResult(true, old); } /** @inheritDoc */ - @Override public boolean clear(GridCacheVersion ver, boolean readers, + @Override public <K, V> boolean clear(GridCacheVersion ver, boolean readers, @Nullable IgnitePredicate<Cache.Entry<K, V>>[] filter) throws IgniteCheckedException { if (ver == null || ver.equals(this.ver)) { val = null; @@ -525,18 +553,18 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme } /** @inheritDoc */ - @Override public boolean tmLock(IgniteInternalTx<K, V> tx, long timeout) { + @Override public boolean tmLock(IgniteInternalTx tx, long timeout) { assert false; return false; } /** @inheritDoc */ - @Override public void txUnlock(IgniteInternalTx<K, V> tx) { + @Override public void txUnlock(IgniteInternalTx tx) { assert false; } /** @inheritDoc */ @Override public boolean removeLock(GridCacheVersion ver) { - GridCacheMvccCandidate<K> doomed = mvcc.candidate(ver); + GridCacheMvccCandidate doomed = mvcc.candidate(ver); mvcc.remove(ver); @@ -596,32 +624,27 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme } /** @inheritDoc */ - @Override public V peek(GridCachePeekMode mode, IgnitePredicate<Cache.Entry<K, V>>[] filter) { + @Override public <K, V> CacheObject peek(GridCachePeekMode mode, IgnitePredicate<Cache.Entry<K, V>>[] filter) { return val; } /** @inheritDoc */ - @Override public GridTuple<V> peek0(boolean failFast, GridCachePeekMode mode, - IgnitePredicate<Cache.Entry<K, V>>[] filter, IgniteInternalTx<K, V> tx) + @Override public <K, V> GridTuple<CacheObject> peek0(boolean failFast, GridCachePeekMode mode, + IgnitePredicate<Cache.Entry<K, V>>[] filter, IgniteInternalTx tx) throws GridCacheEntryRemovedException, GridCacheFilterFailedException, IgniteCheckedException { return F.t(val); } /** @inheritDoc */ - @Override public V peek(Collection<GridCachePeekMode> modes, IgnitePredicate<Cache.Entry<K, V>>[] filter) + @Override public <K, V> CacheObject peek(Collection<GridCachePeekMode> modes, + IgnitePredicate<Cache.Entry<K, V>>[] filter) throws GridCacheEntryRemovedException { return val; } - /** @inheritDoc */ - @Override public V peekFailFast(GridCachePeekMode mode, - IgnitePredicate<Cache.Entry<K, V>>[] filter) { - assert false; return null; - } - /** {@inheritDoc} */ - @Override public V poke(V val) throws GridCacheEntryRemovedException, IgniteCheckedException { - V old = this.val; + @Override public CacheObject poke(CacheObject val) throws GridCacheEntryRemovedException, IgniteCheckedException { + CacheObject old = this.val; this.val = val; @@ -629,24 +652,35 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme } /** @inheritDoc */ - @Override public boolean initialValue(V val, @Nullable byte[] valBytes, GridCacheVersion ver, long ttl, - long expireTime, boolean preload, long topVer, GridDrType drType) throws IgniteCheckedException, - GridCacheEntryRemovedException { - assert false; return false; + @Override public boolean initialValue(CacheObject val, + @Nullable byte[] valBytes, + GridCacheVersion ver, + long ttl, + long expireTime, + boolean preload, + long topVer, + GridDrType drType) + throws IgniteCheckedException, GridCacheEntryRemovedException + { + assert false; + + return false; } /** @inheritDoc */ - @Override public boolean initialValue(K key, GridCacheSwapEntry<V> unswapped) { - assert false; return false; + @Override public boolean initialValue(KeyCacheObject key, GridCacheSwapEntry unswapped) { + assert false; + + return false; } /** @inheritDoc */ - @Override public GridCacheVersionedEntryEx<K, V> versionedEntry() throws IgniteCheckedException { + @Override public GridCacheVersionedEntryEx versionedEntry() throws IgniteCheckedException { return null; } /** @inheritDoc */ - @Override public boolean versionedValue(V val, GridCacheVersion curVer, GridCacheVersion newVer) { + @Override public boolean versionedValue(CacheObject val, GridCacheVersion curVer, GridCacheVersion newVer) { assert false; return false; } @@ -712,32 +746,32 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme } /** @inheritDoc */ - @Override public Collection<GridCacheMvccCandidate<K>> localCandidates(GridCacheVersion... exclude) { + @Override public Collection<GridCacheMvccCandidate> localCandidates(GridCacheVersion... exclude) { return mvcc.localCandidates(exclude); } /** @inheritDoc */ - public Collection<GridCacheMvccCandidate<K>> localCandidates(boolean reentries, GridCacheVersion... exclude) { + public Collection<GridCacheMvccCandidate> localCandidates(boolean reentries, GridCacheVersion... exclude) { return mvcc.localCandidates(reentries, exclude); } /** @inheritDoc */ - @Override public Collection<GridCacheMvccCandidate<K>> remoteMvccSnapshot(GridCacheVersion... exclude) { + @Override public Collection<GridCacheMvccCandidate> remoteMvccSnapshot(GridCacheVersion... exclude) { return mvcc.remoteCandidates(exclude); } /** {@inheritDoc} */ - @Override public GridCacheMvccCandidate<K> localCandidate(long threadId) throws GridCacheEntryRemovedException { + @Override public GridCacheMvccCandidate localCandidate(long threadId) throws GridCacheEntryRemovedException { return mvcc.localCandidate(threadId); } /** @inheritDoc */ - @Override public GridCacheMvccCandidate<K> candidate(GridCacheVersion ver) { + @Override public GridCacheMvccCandidate candidate(GridCacheVersion ver) { return mvcc.candidate(ver); } /** {@inheritDoc} */ - @Override public GridCacheMvccCandidate<K> candidate(UUID nodeId, long threadId) + @Override public GridCacheMvccCandidate candidate(UUID nodeId, long threadId) throws GridCacheEntryRemovedException { return mvcc.remoteCandidate(nodeId, threadId); } @@ -745,12 +779,12 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme /** * @return Any MVCC owner. */ - public GridCacheMvccCandidate<K> anyOwner() { + public GridCacheMvccCandidate anyOwner() { return mvcc.anyOwner(); } /** @inheritDoc */ - @Override public GridCacheMvccCandidate<K> localOwner() { + @Override public GridCacheMvccCandidate localOwner() { return mvcc.localOwner(); } @@ -805,12 +839,12 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme } /** {@inheritDoc} */ - @Override public V unswap() throws IgniteCheckedException { + @Override public CacheObject unswap() throws IgniteCheckedException { return null; } /** {@inheritDoc} */ - @Override public V unswap(boolean ignoreFlags, boolean needVal) throws IgniteCheckedException { + @Override public CacheObject unswap(boolean ignoreFlags, boolean needVal) throws IgniteCheckedException { return null; } @@ -835,7 +869,7 @@ public class GridCacheTestEntryEx<K, V> extends GridMetadataAwareAdapter impleme } /** {@inheritDoc} */ - @Nullable @Override public V peek(boolean heap, + @Nullable @Override public CacheObject peek(boolean heap, boolean offheap, boolean swap, long topVer, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionMultinodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionMultinodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionMultinodeTest.java index 78ba777..951a5b3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionMultinodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionMultinodeTest.java @@ -228,7 +228,7 @@ public class GridCacheVersionMultinodeTest extends GridCacheAbstractSelfTest { GridCacheAdapter<Object, Object> cache = grid.context().cache().internalCache(); - GridCacheEntryEx<Object, Object> e; + GridCacheEntryEx e; if (cache.affinity().isPrimaryOrBackup(grid.localNode(), key)) { if (cache instanceof GridNearCacheAdapter) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheContainsKeyAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheContainsKeyAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheContainsKeyAbstractSelfTest.java index cf2e779..f0f9761 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheContainsKeyAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheContainsKeyAbstractSelfTest.java @@ -127,9 +127,9 @@ public abstract class IgniteCacheContainsKeyAbstractSelfTest extends GridCacheAb private boolean txContainsKey(Transaction tx, String key) { TransactionProxyImpl<String, Integer> proxy = (TransactionProxyImpl<String, Integer>)tx; - IgniteInternalTx<String, Integer> txEx = proxy.tx(); + IgniteInternalTx txEx = proxy.tx(); - IgniteTxEntry entry = txEx.entry(context(0).txKey(key)); + IgniteTxEntry entry = txEx.entry(context(0).txKey(context(0).toCacheKeyObject(key))); return entry != null; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java index 8c8b77b..40922f4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java @@ -191,8 +191,8 @@ public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest { for (int i = 0; i < keyCnt; i++) { if (cacheAdapter.isNear()) { - GridDhtCacheEntry<Object, Object> entry = ((GridNearCacheAdapter<Object, Object>)cacheAdapter) - .dht().peekExx(i); + GridDhtCacheEntry entry = (GridDhtCacheEntry) + ((GridNearCacheAdapter<Object, Object>)cacheAdapter).dht().peekEx(i); if (entry != null) { assertFalse(entry.lockedByAny()); @@ -201,7 +201,7 @@ public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest { } } - GridCacheEntryEx<Object, Object> entry = cacheAdapter.peekEx(i); + GridCacheEntryEx entry = cacheAdapter.peekEx(i); if (entry != null) { assertFalse(entry.lockedByAny()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java index 557390f..aa4f8c5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java @@ -102,8 +102,8 @@ public class IgnitePutAllUpdateNonPreloadedPartitionSelfTest extends GridCommonA for (int i = 0; i < keyCnt; i++) { if (cacheAdapter.isNear()) { - GridDhtCacheEntry<Object, Object> entry = ((GridNearCacheAdapter<Object, Object>)cacheAdapter) - .dht().peekExx(i); + GridDhtCacheEntry entry = (GridDhtCacheEntry) + ((GridNearCacheAdapter<Object, Object>)cacheAdapter).dht().peekEx(i); if (entry != null) { assertFalse(entry.lockedByAny()); @@ -112,7 +112,7 @@ public class IgnitePutAllUpdateNonPreloadedPartitionSelfTest extends GridCommonA } } - GridCacheEntryEx<Object, Object> entry = cacheAdapter.peekEx(i); + GridCacheEntryEx entry = cacheAdapter.peekEx(i); if (entry != null) { assertFalse(entry.lockedByAny()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java index 14e99ac..8240d89 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java @@ -97,7 +97,7 @@ public abstract class IgniteTxConcurrentGetAbstractTest extends GridCommonAbstra ignite.jcache(null).put(key, "val"); - GridCacheEntryEx<String,Integer> dhtEntry = dht(ignite).peekEx(key); + GridCacheEntryEx dhtEntry = dht(ignite).peekEx(key); if (DEBUG) info("DHT entry [hash=" + System.identityHashCode(dhtEntry) + ", entry=" + dhtEntry + ']'); @@ -123,7 +123,7 @@ public abstract class IgniteTxConcurrentGetAbstractTest extends GridCommonAbstra */ private String txGet(Ignite ignite, String key) throws Exception { try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { - GridCacheEntryEx<String, Integer> dhtEntry = dht(ignite).peekEx(key); + GridCacheEntryEx dhtEntry = dht(ignite).peekEx(key); if (DEBUG) info("DHT entry [hash=" + System.identityHashCode(dhtEntry) + ", xid=" + tx.xid() + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java index e3adab1..e2adc8b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java @@ -125,7 +125,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe * @param key Key. * @return DHT entry. */ - @Nullable private static GridCacheEntryEx<Object, Integer> dhtEntry(UUID nodeId, Object key) { + @Nullable private static GridCacheEntryEx dhtEntry(UUID nodeId, Object key) { Ignite g = G.ignite(nodeId); GridDhtCacheAdapter<Object, Integer> dht = @@ -139,7 +139,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe * @param key Key. * @return Near entry. */ - @Nullable private static GridCacheEntryEx<Object, Integer> nearEntry(UUID nodeId, Object key) { + @Nullable private static GridCacheEntryEx nearEntry(UUID nodeId, Object key) { Ignite g = G.ignite(nodeId); GridNearCacheAdapter<Object, Integer> near = ((IgniteKernal)g).<Object, Integer>internalCache().context().near(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java index e61d15b..d7c80f1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java @@ -180,7 +180,7 @@ public class GridCacheQueueCleanupSelfTest extends IgniteCollectionAbstractTest GridCacheAdapter<Object, Object> cache = ((IgniteKernal)grid(i)).context().cache().internalCache(queueCacheName); - Iterator<GridCacheEntryEx<Object, Object>> entries = cache.map().allEntries0().iterator(); + Iterator<GridCacheEntryEx> entries = cache.map().allEntries0().iterator(); while (entries.hasNext()) { cnt++; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java index 11b39e5..9d8da4f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java @@ -790,11 +790,11 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr GridCacheContext cctx = GridTestUtils.getFieldValue(set0, "cctx"); for (int i = 0; i < gridCount(); i++) { - Iterator<GridCacheEntryEx<Object, Object>> entries = + Iterator<GridCacheEntryEx> entries = ((IgniteKernal)grid(i)).context().cache().internalCache(cctx.name()).map().allEntries0().iterator(); while (entries.hasNext()) { - GridCacheEntryEx<Object, Object> entry = entries.next(); + GridCacheEntryEx entry = entries.next(); if (entry.hasValue()) { cnt++; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java index b7a95a8..c26e240 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java @@ -168,11 +168,11 @@ public abstract class GridCacheSetFailoverAbstractSelfTest extends IgniteCollect Set<IgniteUuid> setIds = new HashSet<>(); for (int i = 0; i < gridCount(); i++) { - Iterator<GridCacheEntryEx<Object, Object>> entries = + Iterator<GridCacheEntryEx> entries = ((IgniteKernal)grid(i)).context().cache().internalCache().map().allEntries0().iterator(); while (entries.hasNext()) { - GridCacheEntryEx<Object, Object> entry = entries.next(); + GridCacheEntryEx entry = entries.next(); if (entry.hasValue()) { cnt++; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedSetNoBackupsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedSetNoBackupsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedSetNoBackupsSelfTest.java index ecdb208..3228788 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedSetNoBackupsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/IgnitePartitionedSetNoBackupsSelfTest.java @@ -54,7 +54,7 @@ public class IgnitePartitionedSetNoBackupsSelfTest extends GridCachePartitionedS for (int i = 0; i < gridCount(); i++) { IgniteKernal grid = (IgniteKernal)grid(i); - Iterator<GridCacheEntryEx<Object, Object>> entries = + Iterator<GridCacheEntryEx> entries = grid.context().cache().internalCache(cctx.name()).map().allEntries0().iterator(); if (entries.hasNext()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java index d52b67e..359dd34 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java @@ -165,7 +165,7 @@ public abstract class GridCacheAbstractJobExecutionTest extends GridCommonAbstra for (int g = 0; g < GRID_CNT; g++) { info("Will check grid: " + g); - GridCacheEntryEx<Object, Object> testEntry = + GridCacheEntryEx testEntry = ((IgniteKernal)grid(i)).internalCache(null).peekEx("TestKey"); info("Entry: " + testEntry); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java index 1627a21..af1289a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java @@ -697,7 +697,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { assertTrue(near.isNear()); - GridCacheEntryEx<Integer, Integer> nearEntry = near.peekEx(key); + GridCacheEntryEx nearEntry = near.peekEx(key); if (expectNear) { assertNotNull("No near entry for: " + key + ", grid: " + ignite.name(), nearEntry); @@ -709,7 +709,7 @@ public class GridCacheAtomicNearCacheSelfTest extends GridCommonAbstractTest { GridDhtCacheAdapter<Integer, Integer> dht = ((GridNearCacheAdapter<Integer, Integer>)near).dht(); - GridDhtCacheEntry<Integer, Integer> dhtEntry = (GridDhtCacheEntry<Integer, Integer>)dht.peekEx(key); + GridDhtCacheEntry dhtEntry = (GridDhtCacheEntry)dht.peekEx(key); boolean expectDht = near.affinity().isPrimaryOrBackup(ignite.cluster().localNode(), key); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java index 21f2c52..62c45b4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java @@ -317,11 +317,11 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { GridCacheAdapter<Object, Object> cache = ((IgniteKernal)grid(i)).internalCache(); for (Integer key : keys) { - GridCacheEntryEx<Object, Object> entry = cache.peekEx(key); + GridCacheEntryEx entry = cache.peekEx(key); if (entry != null) { - Collection<GridCacheMvccCandidate<Object>> locCands = entry.localCandidates(); - Collection<GridCacheMvccCandidate<Object>> rmtCands = entry.remoteMvccSnapshot(); + Collection<GridCacheMvccCandidate> locCands = entry.localCandidates(); + Collection<GridCacheMvccCandidate> rmtCands = entry.remoteMvccSnapshot(); assert locCands == null || locCands.isEmpty() : "Local candidates is not empty [idx=" + i + ", entry=" + entry + ']'; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/760182ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java index a1eb4e3..113155e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java @@ -164,8 +164,8 @@ public class GridCacheDhtEntrySelfTest extends GridCommonAbstractTest { near0.put(key, val); - GridDhtCacheEntry<Integer, String> e0 = (GridDhtCacheEntry<Integer, String>)dht0.peekEx(key); - GridDhtCacheEntry<Integer, String> e1 = (GridDhtCacheEntry<Integer, String>)dht1.peekEx(key); + GridDhtCacheEntry e0 = (GridDhtCacheEntry)dht0.peekEx(key); + GridDhtCacheEntry e1 = (GridDhtCacheEntry)dht1.peekEx(key); assert e0 == null || e0.readers().isEmpty(); assert e1 == null || e1.readers().isEmpty(); @@ -209,8 +209,8 @@ public class GridCacheDhtEntrySelfTest extends GridCommonAbstractTest { near0.put(key, val); - GridDhtCacheEntry<Integer, String> e0 = (GridDhtCacheEntry<Integer, String>)dht0.peekEx(key); - GridDhtCacheEntry<Integer, String> e1 = (GridDhtCacheEntry<Integer, String>)dht1.peekEx(key); + GridDhtCacheEntry e0 = (GridDhtCacheEntry)dht0.peekEx(key); + GridDhtCacheEntry e1 = (GridDhtCacheEntry)dht1.peekEx(key); assert e0 == null || e0.readers().isEmpty(); assert e1 == null || e1.readers().isEmpty(); @@ -255,8 +255,8 @@ public class GridCacheDhtEntrySelfTest extends GridCommonAbstractTest { near0.put(key, val); - GridDhtCacheEntry<Integer, String> e0 = (GridDhtCacheEntry<Integer, String>)dht0.peekEx(key); - GridDhtCacheEntry<Integer, String> e1 = (GridDhtCacheEntry<Integer, String>)dht1.peekEx(key); + GridDhtCacheEntry e0 = (GridDhtCacheEntry)dht0.peekEx(key); + GridDhtCacheEntry e1 = (GridDhtCacheEntry)dht1.peekEx(key); assert e0 == null || e0.readers().isEmpty(); assert e1 == null || e1.readers().isEmpty();
