You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/12/02 09:25:22 UTC
[16/19] ignite git commit: ignite-4285 For serializable txs allow
multiple threads to get read lock for the same key
http://git-wip-us.apache.org/repos/asf/ignite/blob/33dda460/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 59f9a9d..f46b290 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
@@ -95,14 +95,14 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
version(1),
123,
version(2),
- 123,
/*local*/false,
/*reentry*/false,
true,
false,
false,
false,
- null
+ null,
+ false
);
Marshaller marshaller = getTestResources().getMarshaller();
@@ -129,14 +129,14 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
GridCacheVersion ver4 = version(4);
GridCacheVersion ver5 = version(5);
- entry.addRemote(node1, 1, ver1, 0, false, true);
+ entry.addRemote(node1, 1, ver1, false, true);
Collection<GridCacheMvccCandidate> cands = entry.remoteMvccSnapshot();
assert cands.size() == 1;
assert cands.iterator().next().version().equals(ver1);
- entry.addRemote(node2, 5, ver5, 0, false, true);
+ entry.addRemote(node2, 5, ver5, false, true);
cands = entry.remoteMvccSnapshot();
@@ -147,7 +147,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
// Check order.
checkOrder(cands, ver1, ver5);
- entry.addRemote(node1, 3, ver3, 0, false, true);
+ entry.addRemote(node1, 3, ver3, false, true);
cands = entry.remoteMvccSnapshot();
@@ -162,7 +162,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
checkDone(entry.candidate(ver3));
- entry.addRemote(node1, 2, ver2, 0, false, true);
+ entry.addRemote(node1, 2, ver2, false, true);
cands = entry.remoteMvccSnapshot();
@@ -197,7 +197,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
checkDone(entry.candidate(ver5));
- entry.addRemote(node1, 4, ver4, 0, false, true);
+ entry.addRemote(node1, 4, ver4, false, true);
cands = entry.remoteMvccSnapshot();
@@ -278,10 +278,10 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
GridCacheVersion ver3 = version(3);
GridCacheVersion ver4 = version(4);
- 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 c1 = entry.addRemote(node1, 1, ver1, false, true);
+ GridCacheMvccCandidate c2 = entry.addRemote(node1, 1, ver2, false, true);
+ GridCacheMvccCandidate c3 = entry.addRemote(node1, 1, ver3, false, true);
+ GridCacheMvccCandidate c4 = entry.addRemote(node1, 1, ver4, false, true);
GridCacheMvccCandidate[] candArr = new GridCacheMvccCandidate[] {c1, c2, c3, c4};
@@ -322,12 +322,12 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
GridCacheVersion ver5 = version(5);
GridCacheVersion ver6 = version(6);
- 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 c1 = entry.addRemote(node1, 1, ver1, false, true);
+ GridCacheMvccCandidate c2 = entry.addRemote(node1, 1, ver2, false, true);
+ GridCacheMvccCandidate c3 = entry.addRemote(node1, 1, ver3, false, true);
+ GridCacheMvccCandidate c4 = entry.addRemote(node1, 1, ver4, false, true);
+ GridCacheMvccCandidate c5 = entry.addRemote(node1, 1, ver5, false, true);
+ GridCacheMvccCandidate c6 = entry.addRemote(node1, 1, ver6, false, true);
GridCacheMvccCandidate[] candArr = new GridCacheMvccCandidate[] {c1, c2, c3, c4, c5, c6};
@@ -369,13 +369,13 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
GridCacheVersion ver5 = version(5);
GridCacheVersion ver6 = version(6);
- 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 c0 = entry.addRemote(node1, 1, ver0, false, true);
+ GridCacheMvccCandidate c1 = entry.addRemote(node1, 1, ver1, false, true);
+ GridCacheMvccCandidate c2 = entry.addRemote(node1, 1, ver2, false, true);
+ GridCacheMvccCandidate c3 = entry.addRemote(node1, 1, ver3, false, true);
+ GridCacheMvccCandidate c4 = entry.addRemote(node1, 1, ver4, false, true);
+ GridCacheMvccCandidate c5 = entry.addRemote(node1, 1, ver5, false, true);
+ GridCacheMvccCandidate c6 = entry.addRemote(node1, 1, ver6, false, true);
GridCacheMvccCandidate[] candArr = new GridCacheMvccCandidate[] {c0, c1, c2, c3, c4, c5, c6};
@@ -486,7 +486,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
GridCacheVersion ver2 = version(2);
GridCacheVersion ver3 = version(3);
- entry.addRemote(nodeId, 1, ver2, 0, false, true);
+ entry.addRemote(nodeId, 1, ver2, false, true);
entry.addLocal(3, ver3, 0, false, true);
@@ -529,15 +529,15 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
GridCacheVersion ver7 = version(7);
GridCacheVersion ver8 = version(8);
- entry.addRemote(node1, 1, ver1, 0, false, true);
- entry.addRemote(node2, 2, ver2, 0, false, true);
- entry.addRemote(node1, 3, ver3, 0, false, true);
- entry.addRemote(node2, 4, ver4, 0, false, true);
- entry.addRemote(node1, 5, ver5, 0, false, true);
- entry.addRemote(node2, 7, ver7, 0, false, true);
- entry.addRemote(node2, 8, ver8, 0, false, true);
+ entry.addRemote(node1, 1, ver1, false, true);
+ entry.addRemote(node2, 2, ver2, false, true);
+ entry.addRemote(node1, 3, ver3, false, true);
+ entry.addRemote(node2, 4, ver4, false, true);
+ entry.addRemote(node1, 5, ver5, false, true);
+ entry.addRemote(node2, 7, ver7, false, true);
+ entry.addRemote(node2, 8, ver8, false, true);
- GridCacheMvccCandidate doomed = entry.addRemote(node2, 6, ver6, 0, false, true);
+ GridCacheMvccCandidate doomed = entry.addRemote(node2, 6, ver6, false, true);
// No reordering happens.
checkOrder(entry.remoteMvccSnapshot(), ver1, ver2, ver3, ver4, ver5, ver7, ver8, ver6);
@@ -581,13 +581,13 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
GridCacheVersion ver6 = version(6);
GridCacheVersion ver7 = version(7);
- entry.addRemote(node1, 1, ver1, 0, false, true);
- entry.addRemote(node2, 2, ver2, 0, false, true);
- entry.addRemote(node1, 3, ver3, 0, false, true);
- entry.addRemote(node2, 4, ver4, 0, false, true);
- entry.addRemote(node1, 5, ver5, 0, false, true);
- entry.addRemote(node2, 6, ver6, 0, false, true);
- entry.addRemote(node2, 7, ver7, 0, false, true);
+ entry.addRemote(node1, 1, ver1, false, true);
+ entry.addRemote(node2, 2, ver2, false, true);
+ entry.addRemote(node1, 3, ver3, false, true);
+ entry.addRemote(node2, 4, ver4, false, true);
+ entry.addRemote(node1, 5, ver5, false, true);
+ entry.addRemote(node2, 6, ver6, false, true);
+ entry.addRemote(node2, 7, ver7, false, true);
List<GridCacheVersion> committed = Arrays.asList(ver4, ver6, ver2);
@@ -623,13 +623,13 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
GridCacheVersion ver6 = version(6);
GridCacheVersion ver7 = version(7);
- entry.addRemote(node1, 1, ver1, 0, false, true);
- entry.addRemote(node2, 2, ver2, 0, false, true);
- entry.addRemote(node1, 3, ver3, 0, false, true);
- entry.addRemote(node2, 4, ver4, 0, false, true);
- entry.addRemote(node1, 5, ver5, 0, false, true);
- entry.addRemote(node2, 6, ver6, 0, false, true);
- entry.addRemote(node2, 7, ver7, 0, false, true);
+ entry.addRemote(node1, 1, ver1, false, true);
+ entry.addRemote(node2, 2, ver2, false, true);
+ entry.addRemote(node1, 3, ver3, false, true);
+ entry.addRemote(node2, 4, ver4, false, true);
+ entry.addRemote(node1, 5, ver5, false, true);
+ entry.addRemote(node2, 6, ver6, false, true);
+ entry.addRemote(node2, 7, ver7, false, true);
List<GridCacheVersion> completed = Arrays.asList(ver4, ver6);
@@ -669,11 +669,11 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
GridCacheVersion ver6 = version(6);
GridCacheVersion ver7 = version(7);
- entry.addRemote(node1, 1, ver1, 0, false, false);
- entry.addRemote(node2, 2, ver2, 0, false, false);
- entry.addRemote(node1, 3, ver3, 0, false, false);
- entry.addRemote(node2, 4, ver4, 0, false, false);
- entry.addRemote(node1, 5, ver5, 0, false, false);
+ entry.addRemote(node1, 1, ver1, false, false);
+ entry.addRemote(node2, 2, ver2, false, false);
+ entry.addRemote(node1, 3, ver3, false, false);
+ entry.addRemote(node2, 4, ver4, false, false);
+ entry.addRemote(node1, 5, ver5, false, false);
List<GridCacheVersion> committed = Arrays.asList(ver6, ver7);
@@ -708,13 +708,13 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
GridCacheVersion ver6 = version(6);
GridCacheVersion ver7 = version(7);
- entry.addRemote(node1, 1, ver1, 0, false, false);
- entry.addRemote(node2, 2, ver2, 0, false, false);
- entry.addRemote(node1, 3, ver3, 0, false, false);
- entry.addRemote(node2, 4, ver4, 0, false, false);
- entry.addRemote(node1, 5, ver5, 0, false, false);
- entry.addRemote(node2, 6, ver6, 0, false, false);
- entry.addRemote(node2, 7, ver7, 0, false, false);
+ entry.addRemote(node1, 1, ver1, false, false);
+ entry.addRemote(node2, 2, ver2, false, false);
+ entry.addRemote(node1, 3, ver3, false, false);
+ entry.addRemote(node2, 4, ver4, false, false);
+ entry.addRemote(node1, 5, ver5, false, false);
+ entry.addRemote(node2, 6, ver6, false, false);
+ entry.addRemote(node2, 7, ver7, false, false);
List<GridCacheVersion> committed = Arrays.asList(ver4, ver6, ver3);
@@ -750,11 +750,11 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
GridCacheVersion ver6 = version(6);
GridCacheVersion ver7 = version(7);
- entry.addRemote(node1, 1, ver1, 0, false, false);
- entry.addRemote(node2, 2, ver2, 0, false, false);
- entry.addRemote(node1, 3, ver3, 0, false, false);
- entry.addRemote(node2, 4, ver4, 0, false, false);
- entry.addRemote(node1, 5, ver5, 0, false, false);
+ entry.addRemote(node1, 1, ver1, false, false);
+ entry.addRemote(node2, 2, ver2, false, false);
+ entry.addRemote(node1, 3, ver3, false, false);
+ entry.addRemote(node2, 4, ver4, false, false);
+ entry.addRemote(node1, 5, ver5, false, false);
List<GridCacheVersion> committed = Arrays.asList(ver6, ver7);
@@ -789,11 +789,11 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
GridCacheVersion ver6 = version(6);
GridCacheVersion ver7 = version(7);
- entry.addRemote(node1, 1, ver1, 0, false, false);
- entry.addRemote(node2, 2, ver2, 0, false, false);
- entry.addRemote(node1, 3, ver3, 0, false, false);
- entry.addRemote(node2, 4, ver4, 0, false, false);
- entry.addRemote(node1, 5, ver5, 0, false, false);
+ entry.addRemote(node1, 1, ver1, false, false);
+ entry.addRemote(node2, 2, ver2, false, false);
+ entry.addRemote(node1, 3, ver3, false, false);
+ entry.addRemote(node2, 4, ver4, false, false);
+ entry.addRemote(node1, 5, ver5, false, false);
List<GridCacheVersion> committed = Arrays.asList(ver6, ver7);
@@ -829,12 +829,12 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
GridCacheVersion ver7 = version(7);
// Don't add version 2.
- entry.addRemote(node1, 1, ver1, 0, false, true);
- entry.addRemote(node1, 3, ver3, 0, false, true);
- entry.addRemote(node2, 4, ver4, 0, false, true);
- entry.addRemote(node1, 5, ver5, 0, false, true);
- entry.addRemote(node2, 6, ver6, 0, false, true);
- entry.addRemote(node2, 7, ver7, 0, false, true);
+ entry.addRemote(node1, 1, ver1, false, true);
+ entry.addRemote(node1, 3, ver3, false, true);
+ entry.addRemote(node2, 4, ver4, false, true);
+ entry.addRemote(node1, 5, ver5, false, true);
+ entry.addRemote(node2, 6, ver6, false, true);
+ entry.addRemote(node2, 7, ver7, false, true);
List<GridCacheVersion> committed = Arrays.asList(ver6, ver4);
@@ -870,9 +870,9 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
GridCacheVersion ver7 = version(7);
// Don't add versions 2, 5, 6, 7.
- entry.addRemote(node1, 1, ver1, 0, false, true);
- entry.addRemote(node1, 3, ver3, 0, false, true);
- entry.addRemote(node2, 4, ver4, 0, false, true);
+ entry.addRemote(node1, 1, ver1, false, true);
+ entry.addRemote(node1, 3, ver3, false, true);
+ entry.addRemote(node2, 4, ver4, false, true);
List<GridCacheVersion> committed = Arrays.asList(ver6, ver5, ver7);
@@ -905,12 +905,12 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
GridCacheVersion ver7 = version(7);
// Don't add version 1.
- entry.addRemote(node1, 2, ver2, 0, false, true);
- entry.addRemote(node1, 3, ver3, 0, false, true);
- entry.addRemote(node2, 4, ver4, 0, false, true);
- entry.addRemote(node1, 5, ver5, 0, false, true);
- entry.addRemote(node2, 6, ver6, 0, false, true);
- entry.addRemote(node2, 7, ver7, 0, false, true);
+ entry.addRemote(node1, 2, ver2, false, true);
+ entry.addRemote(node1, 3, ver3, false, true);
+ entry.addRemote(node2, 4, ver4, false, true);
+ entry.addRemote(node1, 5, ver5, false, true);
+ entry.addRemote(node2, 6, ver6, false, true);
+ entry.addRemote(node2, 7, ver7, false, true);
List<GridCacheVersion> committed = Arrays.asList(ver4, ver6, ver3);
@@ -946,12 +946,12 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
GridCacheVersion ver7 = version(7);
// Don't add version 6, 7
- entry.addRemote(node1, 2, ver2, 0, false, true);
- entry.addRemote(node1, 3, ver3, 0, false, true);
- entry.addRemote(node2, 4, ver4, 0, false, true);
- entry.addRemote(node1, 5, ver5, 0, false, true);
- entry.addRemote(node1, 6, ver6, 0, false, true);
- entry.addRemote(node1, 7, ver7, 0, false, true);
+ entry.addRemote(node1, 2, ver2, false, true);
+ entry.addRemote(node1, 3, ver3, false, true);
+ entry.addRemote(node2, 4, ver4, false, true);
+ entry.addRemote(node1, 5, ver5, false, true);
+ entry.addRemote(node1, 6, ver6, false, true);
+ entry.addRemote(node1, 7, ver7, false, true);
List<GridCacheVersion> committed = Arrays.asList(ver2, ver3);
@@ -987,10 +987,10 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
GridCacheVersion ver7 = version(7);
// Don't add version 5, 6, 7
- entry.addRemote(node1, 1, ver1, 0, false, true);
- entry.addRemote(node1, 2, ver2, 0, false, true);
- entry.addRemote(node1, 3, ver3, 0, false, true);
- entry.addRemote(node2, 4, ver4, 0, false, true);
+ entry.addRemote(node1, 1, ver1, false, true);
+ entry.addRemote(node1, 2, ver2, false, true);
+ entry.addRemote(node1, 3, ver3, false, true);
+ entry.addRemote(node2, 4, ver4, false, true);
List<GridCacheVersion> committed = Arrays.asList(ver6, ver7);
@@ -1021,7 +1021,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
GridCacheVersion ver4 = version(4);
GridCacheVersion ver5 = version(5);
- entry.addRemote(node1, 1, ver1, 0, false, false);
+ entry.addRemote(node1, 1, ver1, false, false);
entry.addLocal(2, ver2, 0, true, true);
Collection<GridCacheMvccCandidate> cands = entry.remoteMvccSnapshot();
@@ -1029,7 +1029,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
assert cands.size() == 1;
assert cands.iterator().next().version().equals(ver1);
- entry.addRemote(node2, 5, ver5, 0, false, false);
+ entry.addRemote(node2, 5, ver5, false, false);
cands = entry.remoteMvccSnapshot();
@@ -1040,7 +1040,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
checkOrder(cands, ver1, ver5);
checkOrder(entry.localCandidates(true), ver2);
- entry.addRemote(node1, 3, ver3, 0, false, true);
+ entry.addRemote(node1, 3, ver3, false, true);
entry.addLocal(4, ver4, 0, /*reenter*/true, false);
cands = entry.remoteMvccSnapshot();
@@ -1174,11 +1174,11 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
linkCandidates(ctx, c13, c33);
- entry2.addRemote(nodeId, 3, ver2, 0, false, true);
+ entry2.addRemote(nodeId, 3, ver2, false, true);
checkLocal(entry2.candidate(ver1), ver1, true, false, false);
- entry3.addRemote(nodeId, 3, ver2, 0, false, false);
+ entry3.addRemote(nodeId, 3, ver2, false, false);
entry3.readyLocal(ver3);
@@ -1245,11 +1245,11 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
linkCandidates(ctx, c13, c33);
- entry2.addRemote(UUID.randomUUID(), 3, ver1, 0, false, true);
+ entry2.addRemote(UUID.randomUUID(), 3, ver1, false, true);
checkLocal(entry2.candidate(ver2), ver2, true, false, false);
- entry3.addRemote(UUID.randomUUID(), 3, ver1, 0, false, true);
+ entry3.addRemote(UUID.randomUUID(), 3, ver1, false, true);
entry3.readyLocal(ver3);
@@ -1421,7 +1421,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
checkLocal(c1k1, ver2, true, true, false);
- GridCacheMvccCandidate c2k1 = entry1.addRemote(id, 2, ver1, 0, false, true);
+ GridCacheMvccCandidate c2k1 = entry1.addRemote(id, 2, ver1, false, true);
// Force recheck of assignments.
entry1.recheckLock();
@@ -1437,7 +1437,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
assert c1k2.previous() == c1k1;
- GridCacheMvccCandidate c2k2 = entry2.addRemote(id, 3, ver1, 0, false, true);
+ GridCacheMvccCandidate c2k2 = entry2.addRemote(id, 3, ver1, false, true);
entry2.readyLocal(c1k2);
@@ -1479,8 +1479,8 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
checkLocal(v3k2, ver3, false, false, false);
// Remote locks.
- GridCacheMvccCandidate v2k1 = entry1.addRemote(id, 3, ver2, 0, false, false);
- GridCacheMvccCandidate v2k2 = entry2.addRemote(id, 3, ver2, 0, false, false);
+ GridCacheMvccCandidate v2k1 = entry1.addRemote(id, 3, ver2, false, false);
+ GridCacheMvccCandidate v2k2 = entry2.addRemote(id, 3, ver2, false, false);
checkRemote(v2k1, ver2, false, false);
checkRemote(v2k2, ver2, false, false);
@@ -1602,7 +1602,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
checkLocal(v1k1, ver1, true, false, false);
checkLocal(v1k2, ver1, true, false, false);
- GridCacheMvccCandidate v2k2 = entry2.addRemote(id, 5, ver2, 0, false, false);
+ GridCacheMvccCandidate v2k2 = entry2.addRemote(id, 5, ver2, false, false);
checkRemote(v2k2, ver2, false, false);
http://git-wip-us.apache.org/repos/asf/ignite/blob/33dda460/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 396629a..48621af 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
@@ -64,24 +64,12 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr
* @param ctx Context.
* @param key Key.
*/
- public GridCacheTestEntryEx(GridCacheContext ctx, Object key) {
+ GridCacheTestEntryEx(GridCacheContext ctx, Object key) {
mvcc = new GridCacheMvcc(ctx);
this.key = ctx.toCacheKeyObject(key);
}
- /**
- * @param ctx Context.
- * @param key Key.
- * @param val Value.
- */
- public GridCacheTestEntryEx(GridCacheContext ctx, Object key, Object val) {
- mvcc = new GridCacheMvcc(ctx);
-
- this.key = ctx.toCacheKeyObject(key);
- this.val = ctx.toCacheObject(val);
- }
-
/** {@inheritDoc} */
@Override public int memorySize() throws IgniteCheckedException {
return 1024;
@@ -146,7 +134,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr
* @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 addLocal(
+ @Nullable GridCacheMvccCandidate addLocal(
long threadId,
GridCacheVersion ver,
long timeout,
@@ -159,6 +147,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr
timeout,
reenter,
tx,
+ false,
false
);
}
@@ -169,14 +158,13 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr
* @param nodeId Node ID.
* @param threadId Thread ID.
* @param ver Lock version.
- * @param timeout Lock acquire timeout.
* @param ec Not used.
* @param tx Transaction flag.
* @return Remote candidate.
*/
- public GridCacheMvccCandidate addRemote(UUID nodeId, long threadId, GridCacheVersion ver, long timeout,
+ GridCacheMvccCandidate addRemote(UUID nodeId, long threadId, GridCacheVersion ver,
boolean ec, boolean tx) {
- return mvcc.addRemote(this, nodeId, null, threadId, ver, timeout, tx, true, false);
+ return mvcc.addRemote(this, nodeId, null, threadId, ver, tx, true, false);
}
/**
@@ -185,20 +173,19 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr
* @param nodeId Node ID.
* @param threadId Thread ID.
* @param ver Lock version.
- * @param timeout Lock acquire timeout.
* @param tx Transaction flag.
* @return Remote candidate.
*/
- public GridCacheMvccCandidate addNearLocal(UUID nodeId, long threadId, GridCacheVersion ver, long timeout,
+ GridCacheMvccCandidate addNearLocal(UUID nodeId, long threadId, GridCacheVersion ver,
boolean tx) {
- return mvcc.addNearLocal(this, nodeId, null, threadId, ver, timeout, tx, true);
+ return mvcc.addNearLocal(this, nodeId, null, threadId, ver, tx, true, false);
}
/**
*
* @param baseVer Base version.
*/
- public void salvageRemote(GridCacheVersion baseVer) {
+ void salvageRemote(GridCacheVersion baseVer) {
mvcc.salvageRemote(baseVer);
}
@@ -210,17 +197,16 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr
* @param baseVer Base version.
* @param committedVers Committed versions relative to base.
* @param rolledbackVers Rolled back versions relative to base.
- * @return Lock owner.
*/
- @Nullable public GridCacheMvccCandidate orderCompleted(GridCacheVersion baseVer,
+ void orderCompleted(GridCacheVersion baseVer,
Collection<GridCacheVersion> committedVers, Collection<GridCacheVersion> rolledbackVers) {
- return mvcc.orderCompleted(baseVer, committedVers, rolledbackVers);
+ mvcc.orderCompleted(baseVer, committedVers, rolledbackVers);
}
/**
* @param ver Version.
*/
- public void doneRemote(GridCacheVersion ver) {
+ void doneRemote(GridCacheVersion ver) {
mvcc.doneRemote(ver, Collections.<GridCacheVersion>emptyList(),
Collections.<GridCacheVersion>emptyList(), Collections.<GridCacheVersion>emptyList());
}
@@ -229,16 +215,15 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr
* @param baseVer Base version.
* @param owned Owned.
*/
- public void orderOwned(GridCacheVersion baseVer, GridCacheVersion owned) {
+ void orderOwned(GridCacheVersion baseVer, GridCacheVersion owned) {
mvcc.markOwned(baseVer, owned);
}
/**
* @param ver Lock version to acquire or set to ready.
- * @return Current owner.
*/
- @Nullable public GridCacheMvccCandidate readyLocal(GridCacheVersion ver) {
- return mvcc.readyLocal(ver);
+ void readyLocal(GridCacheVersion ver) {
+ mvcc.readyLocal(ver);
}
/**
@@ -247,44 +232,33 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr
* @param committedVers Committed versions.
* @param rolledbackVers Rolled back versions.
* @param pending Pending versions.
- * @return Lock owner.
*/
- @Nullable public GridCacheMvccCandidate readyNearLocal(GridCacheVersion ver, GridCacheVersion mapped,
+ void readyNearLocal(GridCacheVersion ver, GridCacheVersion mapped,
Collection<GridCacheVersion> committedVers, Collection<GridCacheVersion> rolledbackVers,
Collection<GridCacheVersion> pending) {
- return mvcc.readyNearLocal(ver, mapped, committedVers, rolledbackVers, pending);
+ mvcc.readyNearLocal(ver, mapped, committedVers, rolledbackVers, pending);
}
/**
* @param cand Candidate to set to ready.
- * @return Current owner.
*/
- @Nullable public GridCacheMvccCandidate readyLocal(GridCacheMvccCandidate cand) {
- return mvcc.readyLocal(cand);
- }
-
- /**
- * Local local release.
- * @return Removed lock candidate or <tt>null</tt> if candidate was not removed.
- */
- @Nullable public GridCacheMvccCandidate releaseLocal() {
- return releaseLocal(Thread.currentThread().getId());
+ void readyLocal(GridCacheMvccCandidate cand) {
+ mvcc.readyLocal(cand);
}
/**
* Local release.
*
* @param threadId ID of the thread.
- * @return Current owner.
*/
- @Nullable public GridCacheMvccCandidate releaseLocal(long threadId) {
- return mvcc.releaseLocal(threadId);
+ void releaseLocal(long threadId) {
+ mvcc.releaseLocal(threadId);
}
/**
*
*/
- public void recheckLock() {
+ void recheckLock() {
mvcc.recheck();
}
@@ -594,8 +568,9 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr
long timeout,
@Nullable GridCacheVersion serOrder,
GridCacheVersion serReadVer,
- boolean keepBinary) {
- assert false; return false;
+ boolean read) {
+ assert false;
+ return false;
}
/** @inheritDoc */
@@ -765,7 +740,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr
}
/** @inheritDoc */
- public Collection<GridCacheMvccCandidate> localCandidates(boolean reentries, GridCacheVersion... exclude) {
+ Collection<GridCacheMvccCandidate> localCandidates(boolean reentries, GridCacheVersion... exclude) {
return mvcc.localCandidates(reentries, exclude);
}
@@ -793,7 +768,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr
/**
* @return Any MVCC owner.
*/
- public GridCacheMvccCandidate anyOwner() {
+ GridCacheMvccCandidate anyOwner() {
return mvcc.anyOwner();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/33dda460/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
index b459dde..5c12f84 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java
@@ -21,6 +21,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.ignite.internal.processors.cache.GridCacheMapEntry;
+import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.testframework.junits.GridTestKernalContext;
@@ -86,10 +87,14 @@ public class GridHashMapLoadTest extends GridCommonAbstractTest {
long timeout,
@Nullable GridCacheVersion serOrder,
GridCacheVersion serReadVer,
- boolean keepBinary) {
+ boolean read) {
return false;
}
+ @Override protected void checkThreadChain(GridCacheMvccCandidate owner) {
+ // No-op.
+ }
+
@Override public void txUnlock(IgniteInternalTx tx) {
// No-op.
}