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 2014/12/22 11:42:11 UTC
[09/50] [abbrv] incubator-ignite git commit: GG-9141 - Renaming
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
index f5f30fd..dadb2d5 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
@@ -221,7 +221,7 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest {
if (put)
cache.put(key, val = Integer.toString(key));
- GridCacheTx tx = cache.txStart(concurrency, isolation, 0, 0);
+ IgniteTx tx = cache.txStart(concurrency, isolation, 0, 0);
try {
if (isTestDebug()) {
@@ -291,7 +291,7 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest {
throw e;
}
finally {
- GridCacheTx t = cache.tx();
+ IgniteTx t = cache.tx();
assert t == null : "Thread should not have transaction upon completion ['t==tx'=" + (t == tx) +
", t=" + t + (t != tx ? "tx=" + tx : "tx=''") + ']';
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
index 341e8ec..d58da7a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
@@ -152,7 +152,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
store.reset();
for (int i = 0; i < GRID_CNT; i++) {
- GridCacheTx tx = grid(i).cache(null).tx();
+ IgniteTx tx = grid(i).cache(null).tx();
if (tx != null) {
error("Ending zombie transaction: " + tx);
@@ -366,7 +366,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
GridCache<Integer, String> near = cache(0);
if (transactional()) {
- try (GridCacheTx tx = near.txStart(OPTIMISTIC, REPEATABLE_READ, 0, 0)) {
+ try (IgniteTx tx = near.txStart(OPTIMISTIC, REPEATABLE_READ, 0, 0)) {
near.putx(2, "2");
String s = near.put(3, "3");
@@ -499,7 +499,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
GridCache<Integer, String> near = cache(0);
if (transactional()) {
- try (GridCacheTx tx = near.txStart(PESSIMISTIC, REPEATABLE_READ, 0, 0)) {
+ try (IgniteTx tx = near.txStart(PESSIMISTIC, REPEATABLE_READ, 0, 0)) {
assertTrue(near.putx(2, "2"));
String s = near.put(3, "3");
@@ -810,7 +810,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
if (transactional()) {
- try (GridCacheTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
// Simple transaction get.
assertEquals(val, cache.get(key));
@@ -855,7 +855,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
assertNull(near(1).peekNearOnly(key));
if (transactional()) {
- try (GridCacheTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
// Read.
assertEquals(val, cache.get(key));
@@ -931,7 +931,7 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public String load(GridCacheTx tx, Integer key) throws IgniteCheckedException {
+ @Override public String load(IgniteTx tx, Integer key) throws IgniteCheckedException {
if (!create)
return map.get(key);
@@ -941,13 +941,13 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void put(GridCacheTx tx, Integer key, @Nullable String val)
+ @Override public void put(IgniteTx tx, Integer key, @Nullable String val)
throws IgniteCheckedException {
map.put(key, val);
}
/** {@inheritDoc} */
- @Override public void remove(GridCacheTx tx, Integer key) throws IgniteCheckedException {
+ @Override public void remove(IgniteTx tx, Integer key) throws IgniteCheckedException {
map.remove(key);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
index 579a141..467c71f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
@@ -141,7 +141,7 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest {
GridCache<Integer, String> near = cache();
GridCacheAdapter<Integer, String> dht = dht();
- try (GridCacheTx tx = cache().txStart(OPTIMISTIC, REPEATABLE_READ) ) {
+ try (IgniteTx tx = cache().txStart(OPTIMISTIC, REPEATABLE_READ) ) {
near.putx(2, "2");
near.put(3, "3");
@@ -269,7 +269,7 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest {
assertEquals("val1", dht().peek(1));
assertNull(near().peekNearOnly(1));
- GridCacheTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ);
assertEquals("val1", cache.get(1));
@@ -288,7 +288,7 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest {
assertEquals("val1", dht().peek(1));
assertNull(near().peekNearOnly(1));
- GridCacheTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ);
assertEquals("val1", cache.get(1));
@@ -351,7 +351,7 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public String load(GridCacheTx tx, Integer key) throws IgniteCheckedException {
+ @Override public String load(IgniteTx tx, Integer key) throws IgniteCheckedException {
if (!create)
return map.get(key);
@@ -361,13 +361,13 @@ public class GridCacheNearOneNodeSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void put(GridCacheTx tx, Integer key, @Nullable String val)
+ @Override public void put(IgniteTx tx, Integer key, @Nullable String val)
throws IgniteCheckedException {
map.put(key, val);
}
/** {@inheritDoc} */
- @Override public void remove(GridCacheTx tx, Integer key) throws IgniteCheckedException {
+ @Override public void remove(IgniteTx tx, Integer key) throws IgniteCheckedException {
map.remove(key);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
index ec7d8de..b92f17c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOnlyTopologySelfTest.java
@@ -178,7 +178,7 @@ public class GridCacheNearOnlyTopologySelfTest extends GridCommonAbstractTest {
// Test optimistic transaction.
GridTestUtils.assertThrows(log, new Callable<Object>() {
@Override public Object call() throws Exception {
- try (GridCacheTx tx = nearOnly.txStart(OPTIMISTIC, REPEATABLE_READ)) {
+ try (IgniteTx tx = nearOnly.txStart(OPTIMISTIC, REPEATABLE_READ)) {
nearOnly.putx("key", "val");
tx.commit();
@@ -191,7 +191,7 @@ public class GridCacheNearOnlyTopologySelfTest extends GridCommonAbstractTest {
// Test pessimistic transaction.
GridTestUtils.assertThrows(log, new Callable<Object>() {
@Override public Object call() throws Exception {
- try (GridCacheTx tx = nearOnly.txStart(PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteTx tx = nearOnly.txStart(PESSIMISTIC, REPEATABLE_READ)) {
nearOnly.put("key", "val");
tx.commit();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxExceptionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxExceptionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxExceptionSelfTest.java
index e15b9e6..a437c21 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxExceptionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxExceptionSelfTest.java
@@ -17,7 +17,7 @@ import static org.gridgain.grid.cache.GridCacheMode.*;
/**
* Tests near cache.
*/
-public class GridCacheNearTxExceptionSelfTest extends GridCacheTxExceptionAbstractSelfTest {
+public class GridCacheNearTxExceptionSelfTest extends IgniteTxExceptionAbstractSelfTest {
/** {@inheritDoc} */
@Override protected GridCacheMode cacheMode() {
return PARTITIONED;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
index 5a5845d..834c145 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java
@@ -127,7 +127,7 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest {
GridCacheProjection cache = priIgnite.cache(null).flagsOn(GridCacheFlag.CLONE);
- GridCacheTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ);
+ IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ);
try {
cache.get(mainKey);
@@ -190,7 +190,7 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest {
private void testReadersUpdate(GridCacheTxConcurrency concurrency, GridCacheTxIsolation isolation) throws Exception {
GridCache<Integer, Integer> cache = grid(0).cache(null);
- try (GridCacheTx tx = cache.txStart(concurrency, isolation)) {
+ try (IgniteTx tx = cache.txStart(concurrency, isolation)) {
for (int i = 0; i < 100; i++)
cache.put(i, 1);
@@ -205,7 +205,7 @@ public class GridCacheNearTxMultiNodeSelfTest extends GridCommonAbstractTest {
assertEquals((Integer)1, c.get(i));
}
- try (GridCacheTx tx = cache.txStart(concurrency, isolation)) {
+ try (IgniteTx tx = cache.txStart(concurrency, isolation)) {
for (int i = 0; i < 100; i++)
cache.put(i, 2);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxPessimisticOriginatingNodeFailureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxPessimisticOriginatingNodeFailureSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxPessimisticOriginatingNodeFailureSelfTest.java
index 195c683..3674841 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxPessimisticOriginatingNodeFailureSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxPessimisticOriginatingNodeFailureSelfTest.java
@@ -23,7 +23,7 @@ import static org.gridgain.grid.cache.GridCacheDistributionMode.*;
*
*/
public class GridCacheNearTxPessimisticOriginatingNodeFailureSelfTest extends
- GridCacheTxPessimisticOriginatingNodeFailureAbstractSelfTest {
+ IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest {
/** {@inheritDoc} */
@Override protected Collection<Class<?>> ignoreMessageClasses() {
return F.asList((Class<?>)GridNearTxFinishRequest.class, GridDhtTxFinishRequest.class);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxPreloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxPreloadSelfTest.java
index 670c64a..c3b193d 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearTxPreloadSelfTest.java
@@ -10,7 +10,6 @@
package org.gridgain.grid.kernal.processors.cache.distributed.near;
import org.gridgain.grid.cache.*;
-import org.gridgain.grid.cache.affinity.consistenthash.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
@@ -19,7 +18,7 @@ import static org.gridgain.grid.cache.GridCacheDistributionMode.*;
/**
* Tests cache transaction during preloading.
*/
-public class GridCacheNearTxPreloadSelfTest extends GridCacheTxPreloadAbstractTest {
+public class GridCacheNearTxPreloadSelfTest extends IgniteTxPreloadAbstractTest {
/** {@inheritDoc} */
@Override protected GridCacheMode cacheMode() {
return PARTITIONED;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
index 669941d..7a553d2 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
@@ -125,7 +125,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
assertEquals(1, store.getLoadCount());
assertEquals(1, store.getPutCount());
- Collection<GridCacheTx> txs = store.transactions();
+ Collection<IgniteTx> txs = store.transactions();
assertEquals(1, txs.size());
}
@@ -158,7 +158,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
assertEquals(1, store.getLoadCount());
assertEquals(1, store.getPutCount());
- Collection<GridCacheTx> txs = store.transactions();
+ Collection<IgniteTx> txs = store.transactions();
assertEquals(1, txs.size());
}
@@ -191,7 +191,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
assertEquals(1, store.getLoadCount());
assertEquals(1, store.getPutCount());
- Collection<GridCacheTx> txs = store.transactions();
+ Collection<IgniteTx> txs = store.transactions();
assertEquals(1, txs.size());
}
@@ -224,7 +224,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
assertEquals(1, store.getLoadCount());
assertEquals(1, store.getPutCount());
- Collection<GridCacheTx> txs = store.transactions();
+ Collection<IgniteTx> txs = store.transactions();
assertEquals(1, txs.size());
}
@@ -257,7 +257,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
assertEquals(1, store.getLoadCount());
assertEquals(1, store.getPutCount());
- Collection<GridCacheTx> txs = store.transactions();
+ Collection<IgniteTx> txs = store.transactions();
assertEquals(1, txs.size());
}
@@ -290,7 +290,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
assertEquals(1, store.getLoadCount());
assertEquals(1, store.getPutCount());
- Collection<GridCacheTx> txs = store.transactions();
+ Collection<IgniteTx> txs = store.transactions();
assertEquals(1, txs.size());
}
@@ -310,7 +310,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
assertEquals(1, store.getPutAllCount());
- Collection<GridCacheTx> txs = store.transactions();
+ Collection<IgniteTx> txs = store.transactions();
assertEquals(1, txs.size());
}
@@ -321,7 +321,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
public void testMultipleOperations() throws Exception {
GridCache<Integer, String> cache = cache(0);
- try (GridCacheTx tx = cache.txStart(OPTIMISTIC, REPEATABLE_READ)) {
+ try (IgniteTx tx = cache.txStart(OPTIMISTIC, REPEATABLE_READ)) {
cache.put(1, "val");
cache.put(2, "val");
cache.put(3, "val");
@@ -337,7 +337,7 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
assertEquals(0, store.getPutCount());
assertEquals(1, store.getPutAllCount());
- Collection<GridCacheTx> txs = store.transactions();
+ Collection<IgniteTx> txs = store.transactions();
assertEquals(1, txs.size());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
index c0bd435..6d3a51d 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEvictionSelfTest.java
@@ -164,7 +164,7 @@ public class GridCachePartitionedEvictionSelfTest extends GridCacheAbstractSelfT
GridCacheProjection<String, Integer> c = cache(aff.mapKeyToNode(key));
- try (GridCacheTx tx = c.txStart(concurrency, isolation)) {
+ try (IgniteTx tx = c.txStart(concurrency, isolation)) {
assert c.get(key) == null;
c.put(key, kv);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java
index 9f5fc04..58064c2 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedFilteredPutSelfTest.java
@@ -127,7 +127,7 @@ public class GridCachePartitionedFilteredPutSelfTest extends GridCommonAbstractT
private void doFilteredPut() throws Exception {
GridCache<Integer, Integer> c = cache();
- try (GridCacheTx tx = c.txStart()) {
+ try (IgniteTx tx = c.txStart()) {
assert !c.putx(1, 1, F.<Integer, Integer>cacheHasPeekValue());
tx.commit();
@@ -144,7 +144,7 @@ public class GridCachePartitionedFilteredPutSelfTest extends GridCommonAbstractT
private void doPutAndRollback() throws Exception {
GridCache<Integer, Integer> c = cache();
- try (GridCacheTx tx = c.txStart()) {
+ try (IgniteTx tx = c.txStart()) {
assert c.putx(1, 1);
tx.rollback();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java
index b2a854e..e991574 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLoadCacheSelfTest.java
@@ -117,19 +117,19 @@ public class GridCachePartitionedLoadCacheSelfTest extends GridCommonAbstractTes
}
/** {@inheritDoc} */
- @Override public String load(GridCacheTx tx, Integer key) throws IgniteCheckedException {
+ @Override public String load(IgniteTx tx, Integer key) throws IgniteCheckedException {
// No-op.
return null;
}
/** {@inheritDoc} */
- @Override public void put(GridCacheTx tx, Integer key, String val) throws IgniteCheckedException {
+ @Override public void put(IgniteTx tx, Integer key, String val) throws IgniteCheckedException {
// No-op.
}
/** {@inheritDoc} */
- @Override public void remove(GridCacheTx tx, Integer key) throws IgniteCheckedException {
+ @Override public void remove(IgniteTx tx, Integer key) throws IgniteCheckedException {
// No-op.
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
index 4d750b4..8274803 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
@@ -304,7 +304,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
GridCacheEntryEx<String, Integer> dhtNear = near(pri).peekEx(CNTR_KEY);
- try (GridCacheTx tx = c.txStart(PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteTx tx = c.txStart(PESSIMISTIC, REPEATABLE_READ)) {
if (DEBUG)
info("Started tx [grid=" + pri.name() + ", primary=true, xid=" + tx.xid() +
", oldCntr=" + oldCntr + ", node=" + priId + ", dhtEntry=" + dhtEntry +
@@ -399,7 +399,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
Integer oldCntr = c.peek(CNTR_KEY);
- try (GridCacheTx tx = c.txStart(PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteTx tx = c.txStart(PESSIMISTIC, REPEATABLE_READ)) {
if (DEBUG)
info("Started tx [grid=" + near.name() + ", primary=false, xid=" +
tx.xid() + ", oldCntr=" + oldCntr + ", node=" + nearId +
@@ -636,7 +636,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
Integer oldCntr = c.peek(CNTR_KEY);
- try (GridCacheTx tx = c.txStart(PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteTx tx = c.txStart(PESSIMISTIC, REPEATABLE_READ)) {
if (DEBUG)
log.info("Started tx [grid=" + near.name() + ", primary=false, xid=" + tx.xid() +
", oldCntr=" + oldCntr + ", node=" + nearId + ", nearEntry=" + nearEntry + ']');
@@ -707,7 +707,7 @@ public class GridCachePartitionedMultiNodeCounterSelfTest extends GridCommonAbst
GridCacheEntryEx<String, Integer> dhtNear = near(pri).peekEx(CNTR_KEY);
- try (GridCacheTx tx = c.txStart(PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteTx tx = c.txStart(PESSIMISTIC, REPEATABLE_READ)) {
if (DEBUG)
log.info("Started tx [grid=" + pri.name() + ", primary=true, xid=" + tx.xid() +
", oldCntr=" + oldCntr + ", node=" + pri.name() + ", dhtEntry=" +
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
index f802948..a088915 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
@@ -172,7 +172,7 @@ public class GridCachePartitionedMultiThreadedPutGetSelfTest extends GridCommonA
for (int i = 0; i < TX_CNT; i++) {
int kv = cntr.incrementAndGet();
- try (GridCacheTx tx = c.txStart(concurrency, isolation)) {
+ try (IgniteTx tx = c.txStart(concurrency, isolation)) {
assertNull(c.get(kv));
assert c.putx(kv, kv);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java
index 201bda7..c47dac0 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedStorePutSelfTest.java
@@ -118,7 +118,7 @@ public class GridCachePartitionedStorePutSelfTest extends GridCommonAbstractTest
*/
private static class TestStore extends GridCacheStoreAdapter<Object, Object> {
/** {@inheritDoc} */
- @Override public Object load(@Nullable GridCacheTx tx, Object key)
+ @Override public Object load(@Nullable IgniteTx tx, Object key)
throws IgniteCheckedException {
assert false;
@@ -126,13 +126,13 @@ public class GridCachePartitionedStorePutSelfTest extends GridCommonAbstractTest
}
/** {@inheritDoc} */
- @Override public void put(GridCacheTx tx, Object key, @Nullable Object val)
+ @Override public void put(IgniteTx tx, Object key, @Nullable Object val)
throws IgniteCheckedException {
// No-op
}
/** {@inheritDoc} */
- @Override public void remove(GridCacheTx tx, Object key) throws IgniteCheckedException {
+ @Override public void remove(IgniteTx tx, Object key) throws IgniteCheckedException {
// No-op
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxConcurrentGetTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxConcurrentGetTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxConcurrentGetTest.java
index fef3421..177a43e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxConcurrentGetTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxConcurrentGetTest.java
@@ -19,7 +19,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
/**
* Checks multithreaded put/get partitioned cache operations on one node.
*/
-public class GridCachePartitionedTxConcurrentGetTest extends GridCacheTxConcurrentGetAbstractTest {
+public class GridCachePartitionedTxConcurrentGetTest extends IgniteTxConcurrentGetAbstractTest {
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxMultiNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxMultiNodeSelfTest.java
index eff9b5a..e827bb8 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxMultiNodeSelfTest.java
@@ -19,7 +19,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
/**
* Test basic cache operations in transactions.
*/
-public class GridCachePartitionedTxMultiNodeSelfTest extends GridCacheTxMultiNodeAbstractTest {
+public class GridCachePartitionedTxMultiNodeSelfTest extends IgniteTxMultiNodeAbstractTest {
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java
index 286ba6f..bd2afae 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java
@@ -23,7 +23,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
/**
* Tests for partitioned cache transactions.
*/
-public class GridCachePartitionedTxMultiThreadedSelfTest extends GridCacheTxMultiThreadedAbstractTest {
+public class GridCachePartitionedTxMultiThreadedSelfTest extends IgniteTxMultiThreadedAbstractTest {
/** Cache debug flag. */
private static final boolean CACHE_DEBUG = false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
index 03a5bfd..215e846 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
@@ -192,7 +192,7 @@ public class GridCachePartitionedTxSalvageSelfTest extends GridCommonAbstractTes
GridCache<Object, Object> c = cache(0);
try {
- GridCacheTx tx = c.txStart(mode, REPEATABLE_READ);
+ IgniteTx tx = c.txStart(mode, REPEATABLE_READ);
for (Integer key : keys)
c.put(key, "val" + key);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java
index ab781c0..f589592 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java
@@ -24,7 +24,7 @@ import static org.gridgain.grid.cache.GridCachePreloadMode.*;
/**
* Tests for partitioned cache transactions.
*/
-public class GridCachePartitionedTxSingleThreadedSelfTest extends GridCacheTxSingleThreadedAbstractTest {
+public class GridCachePartitionedTxSingleThreadedSelfTest extends IgniteTxSingleThreadedAbstractTest {
/** Cache debug flag. */
private static final boolean CACHE_DEBUG = false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxTimeoutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxTimeoutSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxTimeoutSelfTest.java
index 1edcb67..acf3b22 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxTimeoutSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedTxTimeoutSelfTest.java
@@ -22,7 +22,7 @@ import static org.gridgain.grid.cache.GridCacheMode.*;
/**
* Simple cache test.
*/
-public class GridCachePartitionedTxTimeoutSelfTest extends GridCacheTxTimeoutAbstractTest {
+public class GridCachePartitionedTxTimeoutSelfTest extends IgniteTxTimeoutAbstractTest {
/** Transaction timeout. */
private static final long TIMEOUT = 50;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheTxReentryNearSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheTxReentryNearSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheTxReentryNearSelfTest.java
deleted file mode 100644
index 086397e..0000000
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheTxReentryNearSelfTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.gridgain.grid.kernal.processors.cache.distributed.near;
-
-import org.apache.ignite.cluster.*;
-import org.gridgain.grid.cache.*;
-import org.gridgain.grid.kernal.processors.cache.*;
-
-import java.util.*;
-
-import static org.gridgain.grid.cache.GridCacheMode.*;
-
-/**
- *
- */
-public class GridCacheTxReentryNearSelfTest extends GridCacheTxReentryAbstractSelfTest {
- /** {@inheritDoc} */
- @Override protected GridCacheMode cacheMode() {
- return PARTITIONED;
- }
-
- /** {@inheritDoc} */
- @Override protected int gridCount() {
- return 3;
- }
-
- /** {@inheritDoc} */
- @Override protected int testKey() {
- int key = 0;
-
- GridCache<Object, Object> cache = grid(0).cache(null);
-
- while (true) {
- Collection<ClusterNode> nodes = cache.affinity().mapKeyToPrimaryAndBackups(key);
-
- if (nodes.contains(grid(0).localNode()))
- key++;
- else
- break;
- }
-
- return key;
- }
-
- /** {@inheritDoc} */
- @Override protected int expectedNearLockRequests() {
- return 1;
- }
-
- /** {@inheritDoc} */
- @Override protected int expectedDhtLockRequests() {
- return 0;
- }
-
- /** {@inheritDoc} */
- @Override protected int expectedDistributedLockRequests() {
- return 1;
- }
-
- /** {@inheritDoc} */
- @Override protected boolean nearEnabled() {
- return true;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java
index 0a0cfc3..52a7c02 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java
@@ -127,7 +127,7 @@ public class GridPartitionedBackupLoadSelfTest extends GridCommonAbstractTest {
private Map<Integer, Integer> map = new ConcurrentHashMap<>();
/** {@inheritDoc} */
- @Override public Integer load(@Nullable GridCacheTx tx, Integer key)
+ @Override public Integer load(@Nullable IgniteTx tx, Integer key)
throws IgniteCheckedException {
cnt.incrementAndGet();
@@ -135,13 +135,13 @@ public class GridPartitionedBackupLoadSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void put(GridCacheTx tx, Integer key, @Nullable Integer val)
+ @Override public void put(IgniteTx tx, Integer key, @Nullable Integer val)
throws IgniteCheckedException {
map.put(key, val);
}
/** {@inheritDoc} */
- @Override public void remove(GridCacheTx tx, Integer key) throws IgniteCheckedException {
+ @Override public void remove(IgniteTx tx, Integer key) throws IgniteCheckedException {
// No-op
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/IgniteTxReentryNearSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/IgniteTxReentryNearSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/IgniteTxReentryNearSelfTest.java
new file mode 100644
index 0000000..b557e5b
--- /dev/null
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/IgniteTxReentryNearSelfTest.java
@@ -0,0 +1,71 @@
+/* @java.file.header */
+
+/* _________ _____ __________________ _____
+ * __ ____/___________(_)______ /__ ____/______ ____(_)_______
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.gridgain.grid.kernal.processors.cache.distributed.near;
+
+import org.apache.ignite.cluster.*;
+import org.gridgain.grid.cache.*;
+import org.gridgain.grid.kernal.processors.cache.*;
+
+import java.util.*;
+
+import static org.gridgain.grid.cache.GridCacheMode.*;
+
+/**
+ *
+ */
+public class IgniteTxReentryNearSelfTest extends IgniteTxReentryAbstractSelfTest {
+ /** {@inheritDoc} */
+ @Override protected GridCacheMode cacheMode() {
+ return PARTITIONED;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected int gridCount() {
+ return 3;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected int testKey() {
+ int key = 0;
+
+ GridCache<Object, Object> cache = grid(0).cache(null);
+
+ while (true) {
+ Collection<ClusterNode> nodes = cache.affinity().mapKeyToPrimaryAndBackups(key);
+
+ if (nodes.contains(grid(0).localNode()))
+ key++;
+ else
+ break;
+ }
+
+ return key;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected int expectedNearLockRequests() {
+ return 1;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected int expectedDhtLockRequests() {
+ return 0;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected int expectedDistributedLockRequests() {
+ return 1;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected boolean nearEnabled() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java
index 2d597e1..f4febde 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedInvalidateSelfTest.java
@@ -146,7 +146,7 @@ public class GridCacheReplicatedInvalidateSelfTest extends GridCommonAbstractTes
GridCache<Integer, String> cache = cache(idx);
- GridCacheTx tx = cache.txStart(concurrency, isolation, 0, 0);
+ IgniteTx tx = cache.txStart(concurrency, isolation, 0, 0);
try {
cache.put(KEY, VAL);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxConcurrentGetTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxConcurrentGetTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxConcurrentGetTest.java
index b230e2d..2bad410 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxConcurrentGetTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxConcurrentGetTest.java
@@ -19,7 +19,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
/**
* Checks multithreaded put/get replicated cache operations on one node.
*/
-public class GridCacheReplicatedTxConcurrentGetTest extends GridCacheTxConcurrentGetAbstractTest {
+public class GridCacheReplicatedTxConcurrentGetTest extends IgniteTxConcurrentGetAbstractTest {
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxExceptionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxExceptionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxExceptionSelfTest.java
index 4b98390..1e28fc5 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxExceptionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxExceptionSelfTest.java
@@ -18,7 +18,7 @@ import static org.gridgain.grid.cache.GridCacheMode.*;
/**
* Tests replicated cache.
*/
-public class GridCacheReplicatedTxExceptionSelfTest extends GridCacheTxExceptionAbstractSelfTest {
+public class GridCacheReplicatedTxExceptionSelfTest extends IgniteTxExceptionAbstractSelfTest {
/** {@inheritDoc} */
@Override protected GridCacheMode cacheMode() {
return REPLICATED;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiNodeBasicTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiNodeBasicTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiNodeBasicTest.java
index 2e2aa52..71d41dc 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiNodeBasicTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiNodeBasicTest.java
@@ -19,7 +19,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
/**
* Test basic cache operations in transactions.
*/
-public class GridCacheReplicatedTxMultiNodeBasicTest extends GridCacheTxMultiNodeAbstractTest {
+public class GridCacheReplicatedTxMultiNodeBasicTest extends IgniteTxMultiNodeAbstractTest {
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java
index 6e5a28a..0dec070 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java
@@ -23,7 +23,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
/**
* Tests for replicated transactions.
*/
-public class GridCacheReplicatedTxMultiThreadedSelfTest extends GridCacheTxMultiThreadedAbstractTest {
+public class GridCacheReplicatedTxMultiThreadedSelfTest extends IgniteTxMultiThreadedAbstractTest {
/** Cache debug flag. */
private static final boolean CACHE_DEBUG = false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxOriginatingNodeFailureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxOriginatingNodeFailureSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxOriginatingNodeFailureSelfTest.java
index 1982ff2..e9198cc 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxOriginatingNodeFailureSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxOriginatingNodeFailureSelfTest.java
@@ -16,7 +16,7 @@ import org.gridgain.grid.kernal.processors.cache.distributed.*;
* Tests originating node failure in REPLICATED cache.
*/
public class GridCacheReplicatedTxOriginatingNodeFailureSelfTest extends
- GridCacheTxOriginatingNodeFailureAbstractSelfTest {
+ IgniteTxOriginatingNodeFailureAbstractSelfTest {
/** {@inheritDoc} */
@Override protected GridCacheMode cacheMode() {
return GridCacheMode.REPLICATED;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxPessimisticOriginatingNodeFailureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxPessimisticOriginatingNodeFailureSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxPessimisticOriginatingNodeFailureSelfTest.java
index 3f42a05..6cfe6b8 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxPessimisticOriginatingNodeFailureSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxPessimisticOriginatingNodeFailureSelfTest.java
@@ -21,7 +21,7 @@ import static org.gridgain.grid.cache.GridCacheDistributionMode.*;
*
*/
public class GridCacheReplicatedTxPessimisticOriginatingNodeFailureSelfTest extends
- GridCacheTxPessimisticOriginatingNodeFailureAbstractSelfTest {
+ IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest {
/** {@inheritDoc} */
@Override protected Collection<Class<?>> ignoreMessageClasses() {
return Collections.<Class<?>>singletonList(GridDistributedTxFinishRequest.class);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxSingleThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxSingleThreadedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxSingleThreadedSelfTest.java
index cdde421..60cbf81 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxSingleThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxSingleThreadedSelfTest.java
@@ -23,7 +23,7 @@ import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
/**
* Tests for replicated transactions.
*/
-public class GridCacheReplicatedTxSingleThreadedSelfTest extends GridCacheTxSingleThreadedAbstractTest {
+public class GridCacheReplicatedTxSingleThreadedSelfTest extends IgniteTxSingleThreadedAbstractTest {
/** Cache debug flag. */
private static final boolean CACHE_DEBUG = false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxTimeoutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxTimeoutSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxTimeoutSelfTest.java
index 675e989..00b2612 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxTimeoutSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedTxTimeoutSelfTest.java
@@ -21,7 +21,7 @@ import static org.gridgain.grid.cache.GridCacheMode.*;
/**
* Simple cache test.
*/
-public class GridCacheReplicatedTxTimeoutSelfTest extends GridCacheTxTimeoutAbstractTest {
+public class GridCacheReplicatedTxTimeoutSelfTest extends IgniteTxTimeoutAbstractTest {
/** Transaction timeout. */
private static final long TIMEOUT = 50;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridReplicatedTxPreloadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridReplicatedTxPreloadTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridReplicatedTxPreloadTest.java
index 6437143..51b055c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridReplicatedTxPreloadTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridReplicatedTxPreloadTest.java
@@ -17,7 +17,7 @@ import static org.gridgain.grid.cache.GridCacheMode.*;
/**
* Tests cache transaction during preloading.
*/
-public class GridReplicatedTxPreloadTest extends GridCacheTxPreloadAbstractTest {
+public class GridReplicatedTxPreloadTest extends IgniteTxPreloadAbstractTest {
/** {@inheritDoc} */
@Override protected GridCacheMode cacheMode() {
return REPLICATED;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java
index 8ef90c0..7265b7b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java
@@ -48,7 +48,7 @@ public class GridCacheBatchEvictUnswapSelfTest extends GridCacheAbstractSelfTest
cacheCfg.setCacheMode(GridCacheMode.PARTITIONED);
cacheCfg.setStore(new GridCacheStoreAdapter<Long, String>() {
- @Nullable @Override public String load(@Nullable GridCacheTx tx, Long key) {
+ @Nullable @Override public String load(@Nullable IgniteTx tx, Long key) {
return null;
}
@@ -58,11 +58,11 @@ public class GridCacheBatchEvictUnswapSelfTest extends GridCacheAbstractSelfTest
c.apply((long)i, String.valueOf(i));
}
- @Override public void put(@Nullable GridCacheTx tx, Long key,
+ @Override public void put(@Nullable IgniteTx tx, Long key,
@Nullable String val) {
}
- @Override public void remove(@Nullable GridCacheTx tx, Long key) {
+ @Override public void remove(@Nullable IgniteTx tx, Long key) {
}
});
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
index fad09cd..ea6625f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java
@@ -178,7 +178,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb
int j = rnd.nextInt(keyCnt);
- try (GridCacheTx tx = cache.txStart()) {
+ try (IgniteTx tx = cache.txStart()) {
// Put or remove?
if (rnd.nextBoolean())
cache.putx(j, j);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
index c0d2487..df8a76f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java
@@ -124,16 +124,16 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb
checkPolicy0();
testStore = new GridCacheStoreAdapter<String, String>() {
- @Override public String load(@Nullable GridCacheTx tx, String key) {
+ @Override public String load(@Nullable IgniteTx tx, String key) {
return null;
}
- @Override public void put(@Nullable GridCacheTx tx, String key,
+ @Override public void put(@Nullable IgniteTx tx, String key,
@Nullable String val) {
// No-op.
}
- @Override public void remove(@Nullable GridCacheTx tx, String key) {
+ @Override public void remove(@Nullable IgniteTx tx, String key) {
// No-op.
}
};
@@ -199,7 +199,7 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb
* @throws Exception If failed.
*/
private void checkExplicitTx(GridCache<String, String> cache) throws Exception {
- GridCacheTx tx = cache.txStart();
+ IgniteTx tx = cache.txStart();
try {
assertNull(cache.get("key1"));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionAbstractTest.java
index 4a59f9c..423f35e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionAbstractTest.java
@@ -343,7 +343,7 @@ public abstract class GridCacheEvictionAbstractTest<T extends GridCacheEvictionP
int key = rand.nextInt(1000);
String val = Integer.toString(key);
- try (GridCacheTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteTx tx = cache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
String v = cache.get(key);
assert v == null || v.equals(Integer.toString(key)) : "Invalid value for key [key=" + key +
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java
index 932fe02..09f8c22 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java
@@ -61,11 +61,11 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
cc.setEvictionPolicy(plc);
cc.setStore(new GridCacheGenericTestStore<Object, Object>() {
- @Override public Object load(GridCacheTx tx, Object key) {
+ @Override public Object load(IgniteTx tx, Object key) {
return key;
}
- @Override public void loadAll(GridCacheTx tx, Collection<?> keys,
+ @Override public void loadAll(IgniteTx tx, Collection<?> keys,
IgniteBiInClosure<Object, Object> c) {
for (Object key : keys)
c.apply(key, key);
@@ -103,7 +103,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
final Random rnd = new Random();
- try (GridCacheTx tx = cache.txStart()) {
+ try (IgniteTx tx = cache.txStart()) {
int iterCnt = 20;
int keyCnt = 5000;
@@ -213,7 +213,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
GridCache<GridCacheAffinityKey<Object>, Integer> cache = g.cache(null);
- GridCacheTx tx = cache.txStartAffinity(affKey, PESSIMISTIC, REPEATABLE_READ, 0, 5);
+ IgniteTx tx = cache.txStartAffinity(affKey, PESSIMISTIC, REPEATABLE_READ, 0, 5);
try {
for (int i = 0; i < 5; i++)
@@ -259,7 +259,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest {
GridCache<Object, Integer> cache = g.cache(null);
- GridCacheTx tx = cache.txStartPartition(cache.affinity().partition(affKey), PESSIMISTIC, REPEATABLE_READ,
+ IgniteTx tx = cache.txStartPartition(cache.affinity().partition(affKey), PESSIMISTIC, REPEATABLE_READ,
0, 5);
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
index df166b8..f00beaa 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
@@ -219,7 +219,7 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte
private void testTransactionMixed(GridCache<Integer, Object> cache, GridCacheTxConcurrency concurrency,
Integer key1, byte[] val1, @Nullable Integer key2, @Nullable Object val2) throws Exception {
- GridCacheTx tx = cache.txStart(concurrency, REPEATABLE_READ);
+ IgniteTx tx = cache.txStart(concurrency, REPEATABLE_READ);
try {
cache.put(key1, val1);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java
index 109b8a2..28a2810 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalLoadAllSelfTest.java
@@ -73,7 +73,7 @@ public class GridCacheLocalLoadAllSelfTest extends GridCommonAbstractTest {
private static class TestStore extends GridCacheStoreAdapter<Integer, Integer> {
/** {@inheritDoc} */
@SuppressWarnings({"TypeParameterExtendsFinalClass"})
- @Override public void loadAll(GridCacheTx tx, Collection<? extends Integer> keys,
+ @Override public void loadAll(IgniteTx tx, Collection<? extends Integer> keys,
IgniteBiInClosure<Integer, Integer> c) throws IgniteCheckedException {
assert keys != null;
@@ -83,19 +83,19 @@ public class GridCacheLocalLoadAllSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public Integer load(GridCacheTx tx, Integer key) throws IgniteCheckedException {
+ @Override public Integer load(IgniteTx tx, Integer key) throws IgniteCheckedException {
// No-op.
return null;
}
/** {@inheritDoc} */
- @Override public void put(GridCacheTx tx, Integer key, Integer val) throws IgniteCheckedException {
+ @Override public void put(IgniteTx tx, Integer key, Integer val) throws IgniteCheckedException {
// No-op.
}
/** {@inheritDoc} */
- @Override public void remove(GridCacheTx tx, Integer key) throws IgniteCheckedException {
+ @Override public void remove(IgniteTx tx, Integer key) throws IgniteCheckedException {
// No-op.
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxExceptionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxExceptionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxExceptionSelfTest.java
index 64070c4..8a5cfaa 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxExceptionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxExceptionSelfTest.java
@@ -17,7 +17,7 @@ import static org.gridgain.grid.cache.GridCacheMode.LOCAL;
/**
* Tests local cache.
*/
-public class GridCacheLocalTxExceptionSelfTest extends GridCacheTxExceptionAbstractSelfTest {
+public class GridCacheLocalTxExceptionSelfTest extends IgniteTxExceptionAbstractSelfTest {
/** {@inheritDoc} */
@Override protected int gridCount() {
return 1;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxMultiThreadedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxMultiThreadedSelfTest.java
index bc58678..661b03f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxMultiThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxMultiThreadedSelfTest.java
@@ -19,7 +19,7 @@ import static org.gridgain.grid.cache.GridCacheMode.*;
/**
* Tests for local transactions.
*/
-public class GridCacheLocalTxMultiThreadedSelfTest extends GridCacheTxMultiThreadedAbstractTest {
+public class GridCacheLocalTxMultiThreadedSelfTest extends IgniteTxMultiThreadedAbstractTest {
/** Cache debug flag. */
private static final boolean CACHE_DEBUG = false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxSingleThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxSingleThreadedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxSingleThreadedSelfTest.java
index 4cff974..fa8b585 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxSingleThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxSingleThreadedSelfTest.java
@@ -19,7 +19,7 @@ import static org.gridgain.grid.cache.GridCacheMode.*;
/**
* Tests for local transactions.
*/
-public class GridCacheLocalTxSingleThreadedSelfTest extends GridCacheTxSingleThreadedAbstractTest {
+public class GridCacheLocalTxSingleThreadedSelfTest extends IgniteTxSingleThreadedAbstractTest {
/** Cache debug flag. */
private static final boolean CACHE_DEBUG = false;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java
index 0e16131..fa5188c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalTxTimeoutSelfTest.java
@@ -121,7 +121,7 @@ public class GridCacheLocalTxTimeoutSelfTest extends GridCommonAbstractTest {
boolean wasEx = false;
- GridCacheTx tx = null;
+ IgniteTx tx = null;
try {
GridCache<Integer, String> cache = ignite.cache(null);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
index 7e4e5e5..4e93bb8 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
@@ -1507,19 +1507,19 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
}
/** {@inheritDoc} */
- @Nullable @Override public Object load(@Nullable GridCacheTx tx, Object key)
+ @Nullable @Override public Object load(@Nullable IgniteTx tx, Object key)
throws IgniteCheckedException {
return null;
}
/** {@inheritDoc} */
- @Override public void put(@Nullable GridCacheTx tx, Object key,
+ @Override public void put(@Nullable IgniteTx tx, Object key,
@Nullable Object val) throws IgniteCheckedException {
// No-op.
}
/** {@inheritDoc} */
- @Override public void remove(@Nullable GridCacheTx tx, Object key)
+ @Override public void remove(@Nullable IgniteTx tx, Object key)
throws IgniteCheckedException {
// No-op.
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java
index 2146b4a..e6e54f6 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java
@@ -495,7 +495,7 @@ public class GridGgfsSizeSelfTest extends GridGgfsCommonAbstractTest {
@Override public void run() {
try {
- try (GridCacheTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
metaCache.get(id);
latch.await();
@@ -513,7 +513,7 @@ public class GridGgfsSizeSelfTest extends GridGgfsCommonAbstractTest {
// Now add file ID to trash listing so that delete worker could "see" it.
- try (GridCacheTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
+ try (IgniteTx tx = metaCache.txStart(PESSIMISTIC, REPEATABLE_READ)) {
Map<String, GridGgfsListingEntry> listing = Collections.singletonMap(path.name(),
new GridGgfsListingEntry(info));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java
index 9274eec..846fcbc 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAbstractLoadTest.java
@@ -134,7 +134,7 @@ abstract class GridCacheAbstractLoadTest {
while (!done.get()) {
if (tx) {
- try (GridCacheTx tx = cache.txStart()) {
+ try (IgniteTx tx = cache.txStart()) {
writeClos.apply(cache);
tx.commit();
@@ -156,7 +156,7 @@ abstract class GridCacheAbstractLoadTest {
while(!done.get()) {
if (tx) {
- try (GridCacheTx tx = cache.txStart()) {
+ try (IgniteTx tx = cache.txStart()) {
readClos.apply(cache);
tx.commit();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java
index 8d659d4..fbfe371 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheAffinityTransactionsOffHeapTest.java
@@ -65,7 +65,7 @@ public class GridCacheAffinityTransactionsOffHeapTest {
GridCache<Object, Integer> c = cache(key);
- try (GridCacheTx tx = c.txStartAffinity(key, PESSIMISTIC, REPEATABLE_READ, 0, 0)) {
+ try (IgniteTx tx = c.txStartAffinity(key, PESSIMISTIC, REPEATABLE_READ, 0, 0)) {
Integer val = c.get(key);
Integer userVal1 = c.get(new UserKey(key, 0));
Integer userVal2 = c.get(new UserKey(key, 1));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheGroupLockComparisonTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheGroupLockComparisonTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheGroupLockComparisonTest.java
index a3f3f5d..6382f46 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheGroupLockComparisonTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheGroupLockComparisonTest.java
@@ -164,7 +164,7 @@ public class GridCacheGroupLockComparisonTest {
// Threads should not lock the same key.
- try (GridCacheTx tx = cache.txStartAffinity(affKey, PESSIMISTIC, REPEATABLE_READ, 0, BATCH_SIZE)) {
+ try (IgniteTx tx = cache.txStartAffinity(affKey, PESSIMISTIC, REPEATABLE_READ, 0, BATCH_SIZE)) {
for (long i = 0; i < BATCH_SIZE; i++) {
cache.put(new GridCacheAffinityKey<>((key % rangeCnt) + base, affKey), i);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java
index c23858e..bbb1670 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheWriteBehindStoreLoadTest.java
@@ -48,18 +48,18 @@ public class GridCacheWriteBehindStoreLoadTest extends GridCommonAbstractTest {
/** No-op cache store. */
private static final GridCacheStore store = new GridCacheStoreAdapter() {
/** {@inheritDoc} */
- @Override public Object load(@Nullable GridCacheTx tx, Object key) {
+ @Override public Object load(@Nullable IgniteTx tx, Object key) {
return null;
}
/** {@inheritDoc} */
- @Override public void put(@Nullable GridCacheTx tx, Object key,
+ @Override public void put(@Nullable IgniteTx tx, Object key,
@Nullable Object val) {
// No-op.
}
/** {@inheritDoc} */
- @Override public void remove(@Nullable GridCacheTx tx, Object key) {
+ @Override public void remove(@Nullable IgniteTx tx, Object key) {
// No-op.
}
};
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java
index 86b68d6..bbe9cc0 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestCacheStore.java
@@ -108,15 +108,15 @@ public class GridTestCacheStore extends GridCacheStoreAdapter<GridTestKey, Long>
}
}
- @Override public Long load(GridCacheTx tx, GridTestKey key) throws IgniteCheckedException {
+ @Override public Long load(IgniteTx tx, GridTestKey key) throws IgniteCheckedException {
return null; // No-op.
}
- @Override public void put(GridCacheTx tx, GridTestKey key, Long val) throws IgniteCheckedException {
+ @Override public void put(IgniteTx tx, GridTestKey key, Long val) throws IgniteCheckedException {
// No-op.
}
- @Override public void remove(GridCacheTx tx, GridTestKey key) throws IgniteCheckedException {
+ @Override public void remove(IgniteTx tx, GridTestKey key) throws IgniteCheckedException {
// No-op.
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3008d2ad/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
index f01ff0c..8777061 100644
--- a/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
+++ b/modules/core/src/test/java/org/gridgain/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
@@ -103,7 +103,7 @@ public class GridCachePartitionedAtomicLongLoadTest extends GridCommonAbstractTe
long start = System.currentTimeMillis();
while (System.currentTimeMillis() - start < DURATION && !Thread.currentThread().isInterrupted()) {
- GridCacheTx tx = cache.txStart();
+ IgniteTx tx = cache.txStart();
long seqVal = seq.incrementAndGet();