http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java index ab2d4bf..275af80 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractDataStructuresFailoverSelfTest.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.datastructures; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.datastructures.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.lang.*; @@ -122,7 +123,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr try { CacheAtomicLong s = cache().dataStructures().atomicLong(STRUCTURE_NAME, 1, true); - IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { + IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { @Override public void apply() { try { for (int i = 0; i < TOP_CHANGE_CNT; i++) { @@ -172,7 +173,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr try { CacheAtomicLong s = cache().dataStructures().atomicLong(STRUCTURE_NAME, 1, true); - IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { + IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { @Override public void apply() { try { for (int i = 0; i < TOP_CHANGE_CNT; i++) { @@ -251,7 +252,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr try { CacheAtomicReference<Integer> s = cache().dataStructures().atomicReference(STRUCTURE_NAME, 1, true); - IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { + IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { @Override public void apply() { try { for (int i = 0; i < TOP_CHANGE_CNT; i++) { @@ -300,7 +301,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr try { CacheAtomicReference<Integer> s = cache().dataStructures().atomicReference(STRUCTURE_NAME, 1, true); - IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { + IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { @Override public void apply() { try { for (int i = 0; i < TOP_CHANGE_CNT; i++) { @@ -386,7 +387,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr try { CacheAtomicStamped<Integer, Integer> s = cache().dataStructures().atomicStamped(STRUCTURE_NAME, 1, 1, true); - IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { + IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { @Override public void apply() { try { for (int i = 0; i < TOP_CHANGE_CNT; i++) { @@ -449,7 +450,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr try { CacheAtomicStamped<Integer, Integer> s = cache().dataStructures().atomicStamped(STRUCTURE_NAME, 1, 1, true); - IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { + IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { @Override public void apply() { try { for (int i = 0; i < TOP_CHANGE_CNT; i++) { @@ -544,7 +545,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr CacheCountDownLatch s = cache().dataStructures().countDownLatch(STRUCTURE_NAME, Integer.MAX_VALUE, false, true); - IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { + IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { @Override public void apply() { try { for (int i = 0; i < TOP_CHANGE_CNT; i++) { @@ -599,7 +600,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr CacheCountDownLatch s = cache().dataStructures() .countDownLatch(STRUCTURE_NAME, Integer.MAX_VALUE, false, true); - IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { + IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { @Override public void apply() { try { for (int i = 0; i < TOP_CHANGE_CNT; i++) { @@ -684,7 +685,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr s.put(1); - IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { + IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { @Override public void apply() { try { for (int i = 0; i < TOP_CHANGE_CNT; i++) { @@ -734,7 +735,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr s.put(1); - IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { + IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { @Override public void apply() { try { for (int i = 0; i < TOP_CHANGE_CNT; i++) { @@ -809,7 +810,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr try { CacheAtomicSequence s = cache().dataStructures().atomicSequence(STRUCTURE_NAME, 1, true); - IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { + IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { @Override public void apply() { try { String name = UUID.randomUUID().toString(); @@ -860,7 +861,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr final AtomicInteger idx = new AtomicInteger(gridCount()); - IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { + IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { @Override public void apply() { int id = idx.getAndIncrement(); @@ -911,7 +912,7 @@ public abstract class GridCacheAbstractDataStructuresFailoverSelfTest extends Gr try { CacheAtomicSequence s = cache().dataStructures().atomicSequence(STRUCTURE_NAME, 1, true); - IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { + IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new CA() { @Override public void apply() { try { for (int i = 0; i < TOP_CHANGE_CNT; i++) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java index 95db99e..a29d461 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheAbstractQueueFailoverDataConsistencySelfTest.java @@ -24,7 +24,6 @@ import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.lang.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.*; @@ -173,7 +172,7 @@ public abstract class GridCacheAbstractQueueFailoverDataConsistencySelfTest exte final AtomicBoolean stop = new AtomicBoolean(); - IgniteFuture<?> fut = startNodeKiller(stop, new AtomicInteger(), killIdxs); + IgniteInternalFuture<?> fut = startNodeKiller(stop, new AtomicInteger(), killIdxs); final int ITEMS = (atomicityMode() == ATOMIC) ? 10_000 : 3000; @@ -279,7 +278,7 @@ public abstract class GridCacheAbstractQueueFailoverDataConsistencySelfTest exte final AtomicInteger stopCnt = new AtomicInteger(); - IgniteFuture<?> fut = startNodeKiller(stop, stopCnt, killIdxs); + IgniteInternalFuture<?> fut = startNodeKiller(stop, stopCnt, killIdxs); int err = 0; @@ -332,7 +331,7 @@ public abstract class GridCacheAbstractQueueFailoverDataConsistencySelfTest exte * @param killIdxs Indexes of nodes to kill. * @return Future completing when thread finishes. */ - private IgniteFuture<?> startNodeKiller(final AtomicBoolean stop, final AtomicInteger killCnt, + private IgniteInternalFuture<?> startNodeKiller(final AtomicBoolean stop, final AtomicInteger killCnt, final List<Integer> killIdxs) { return GridTestUtils.runAsync(new Callable<Void>() { @Override public Void call() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java index 3860d1a..763135d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheCountDownLatchSelfTest.java @@ -152,7 +152,7 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl assert latch.count() == 2; - IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync( + IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { CacheCountDownLatch latch = grid(0).cache("local").dataStructures() @@ -219,7 +219,7 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl @Nullable @Override public Object call() throws Exception { // Test latch in multiple threads on each node. - IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync( + IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { CacheCountDownLatch latch = ignite.cache(cacheName).dataStructures() @@ -246,7 +246,7 @@ public class GridCacheCountDownLatchSelfTest extends GridCommonAbstractTest impl } }); - IgniteFuture<Object> fut = comp.future(); + IgniteInternalFuture<Object> fut = comp.future(); Thread.sleep(3000); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java index b123402..131e7b4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueCleanupSelfTest.java @@ -23,7 +23,6 @@ import org.apache.ignite.cache.datastructures.*; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.lang.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.testframework.*; @@ -208,7 +207,7 @@ public class GridCacheQueueCleanupSelfTest extends GridCacheAbstractSelfTest { * @param queueName Queue name. * @return Future completing when thread finishes. */ - private IgniteFuture<?> startAddPollThread(final Ignite ignite, final AtomicBoolean stop, final String queueName) { + private IgniteInternalFuture<?> startAddPollThread(final Ignite ignite, final AtomicBoolean stop, final String queueName) { return GridTestUtils.runAsync(new Callable<Void>() { @Override public Void call() throws Exception { CacheQueue<Integer> queue = ignite.cache(null).dataStructures().queue(queueName, 0, false, true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java index 2268044..935dcec 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueJoinedNodeSelfAbstractTest.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.datastructures; import org.apache.ignite.*; import org.apache.ignite.cache.datastructures.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -89,9 +90,9 @@ public abstract class GridCacheQueueJoinedNodeSelfAbstractTest extends GridCommo comp.run(putJob); - IgniteFuture<?> fut = comp.future(); + IgniteInternalFuture<?> fut = comp.future(); - Collection<IgniteFuture<?>> futs = new ArrayList<>(GRID_CNT - 1); + Collection<IgniteInternalFuture<?>> futs = new ArrayList<>(GRID_CNT - 1); Collection<TakeJob> jobs = new ArrayList<>(GRID_CNT - 1); @@ -134,7 +135,7 @@ public abstract class GridCacheQueueJoinedNodeSelfAbstractTest extends GridCommo info(">>> Joined node polled " + polled); - for (IgniteFuture<?> f : futs) + for (IgniteInternalFuture<?> f : futs) f.cancel(); putJob.stop(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java index a480880..a3b78df 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java @@ -22,6 +22,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.cache.datastructures.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -177,7 +178,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon final Ignite g = startGrid(GRID_CNT + 1); - IgniteFuture<Object> fut1 = GridTestUtils.runAsync(new Callable<Object>() { + IgniteInternalFuture<Object> fut1 = GridTestUtils.runAsync(new Callable<Object>() { @Override public Object call() throws Exception { info(">>> Executing put callable [node=" + g.cluster().localNode().id() + ", thread=" + Thread.currentThread().getName() + ", aff=" + @@ -208,7 +209,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon final Ignite g1 = startGrid(GRID_CNT + 2); - IgniteFuture<Object> fut2 = GridTestUtils.runAsync(new Callable<Object>() { + IgniteInternalFuture<Object> fut2 = GridTestUtils.runAsync(new Callable<Object>() { @SuppressWarnings("BusyWait") @Override public Object call() throws Exception { try { @@ -362,7 +363,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon info("Queue name: " + queueName + ", collocated: " + collocated); try { - Collection<IgniteFuture> futs = new ArrayList<>(); + Collection<IgniteInternalFuture> futs = new ArrayList<>(); final int THREADS_PER_NODE = 3; final int ITEMS_PER_THREAD = 1000; @@ -384,7 +385,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon }, THREADS_PER_NODE, "testPutMultiNode")); } - for (IgniteFuture fut : futs) + for (IgniteInternalFuture fut : futs) fut.get(); GridCache cache = grid(0).cache(null); @@ -427,8 +428,8 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon info("Queue name: " + queueName + ", collocated: " + collocated); try { - Collection<IgniteFuture> putFuts = new ArrayList<>(); - Collection<IgniteFuture> pollFuts = new ArrayList<>(); + Collection<IgniteInternalFuture> putFuts = new ArrayList<>(); + Collection<IgniteInternalFuture> pollFuts = new ArrayList<>(); final int PUT_THREADS_PER_NODE = 3; final int POLL_THREADS_PER_NODE = 2; @@ -479,12 +480,12 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon } } - for (IgniteFuture fut : putFuts) + for (IgniteInternalFuture fut : putFuts) fut.get(); stopPoll.set(true); - for (IgniteFuture fut : pollFuts) + for (IgniteInternalFuture fut : pollFuts) fut.get(); GridCache cache = grid(0).cache(null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java index f92a963..47d4daa 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java @@ -24,7 +24,6 @@ import org.apache.ignite.cache.datastructures.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.lang.*; import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.*; @@ -668,7 +667,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf assertNotNull(set0); - Collection<IgniteFuture> futs = new ArrayList<>(); + Collection<IgniteInternalFuture> futs = new ArrayList<>(); final int THREADS_PER_NODE = 5; final int KEY_RANGE = 10_000; @@ -723,7 +722,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf }, THREADS_PER_NODE, "testSetMultithreaded")); } - for (IgniteFuture fut : futs) + for (IgniteInternalFuture fut : futs) fut.get(); } @@ -775,7 +774,7 @@ public abstract class GridCacheSetAbstractSelfTest extends GridCacheAbstractSelf final AtomicInteger val = new AtomicInteger(10_000); - IgniteFuture<?> fut; + IgniteInternalFuture<?> fut; try { fut = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java index 67d8300..efcc227 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetFailoverAbstractSelfTest.java @@ -113,7 +113,7 @@ public class GridCacheSetFailoverAbstractSelfTest extends GridCacheAbstractSelfT AtomicBoolean stop = new AtomicBoolean(); - IgniteFuture<?> killFut = startNodeKiller(stop); + IgniteInternalFuture<?> killFut = startNodeKiller(stop); long stopTime = System.currentTimeMillis() + TEST_DURATION; @@ -219,7 +219,7 @@ public class GridCacheSetFailoverAbstractSelfTest extends GridCacheAbstractSelfT * @param stop Stop flag. * @return Future completing when thread finishes. */ - private IgniteFuture<?> startNodeKiller(final AtomicBoolean stop) { + private IgniteInternalFuture<?> startNodeKiller(final AtomicBoolean stop) { return GridTestUtils.runAsync(new Callable<Void>() { @Override public Void call() throws Exception { ThreadLocalRandom rnd = ThreadLocalRandom.current(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java index 63aaf60..111980f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.datastructures.*; import org.apache.ignite.configuration.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.transactions.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -87,7 +87,7 @@ public class GridCachePartitionedQueueCreateMultiNodeSelfTest extends GridCommon public void testQueueCreation() throws Exception { final AtomicInteger idx = new AtomicInteger(); - IgniteFuture<?> fut = multithreadedAsync( + IgniteInternalFuture<?> fut = multithreadedAsync( new Callable<Object>() { @Override public Object call() throws Exception { Ignite ignite = startGrid(idx.getAndIncrement()); @@ -139,7 +139,7 @@ public class GridCachePartitionedQueueCreateMultiNodeSelfTest extends GridCommon final CountDownLatch latch = new CountDownLatch(threadCnt); - IgniteFuture<?> fut = multithreadedAsync( + IgniteInternalFuture<?> fut = multithreadedAsync( new Callable<Object>() { @Override public Object call() throws Exception { Ignite ignite = startGrid(idx.getAndIncrement()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java index 2401115..0a499b4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueEntryMoveSelfTest.java @@ -23,7 +23,7 @@ import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cache.datastructures.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.affinity.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -100,7 +100,7 @@ public class GridCachePartitionedQueueEntryMoveSelfTest extends GridCommonAbstra final CountDownLatch latch1 = new CountDownLatch(1); //final CountDownLatch latch2 = new CountDownLatch(1); - IgniteFuture<?> fut1 = GridTestUtils.runAsync(new Callable<Void>() { + IgniteInternalFuture<?> fut1 = GridTestUtils.runAsync(new Callable<Void>() { @Override public Void call() throws IgniteCheckedException { Ignite ignite = grid(0); @@ -140,7 +140,7 @@ public class GridCachePartitionedQueueEntryMoveSelfTest extends GridCommonAbstra //latch2.countDown(); - IgniteFuture<?> fut2 = GridTestUtils.runAsync(new Callable<Void>() { + IgniteInternalFuture<?> fut2 = GridTestUtils.runAsync(new Callable<Void>() { @Override public Void call() throws IgniteCheckedException { Ignite ignite = grid(GRID_CNT); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java index 9878cb5..172e914 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.distributed; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.resources.*; import org.apache.ignite.transactions.*; @@ -121,7 +121,7 @@ public abstract class GridCacheAbstractJobExecutionTest extends GridCommonAbstra Ignite ignite = grid(0); - Collection<IgniteFuture<?>> futs = new LinkedList<>(); + Collection<IgniteInternalFuture<?>> futs = new LinkedList<>(); IgniteCompute comp = ignite.compute().withAsync(); @@ -158,7 +158,7 @@ public abstract class GridCacheAbstractJobExecutionTest extends GridCommonAbstra futs.add(comp.future()); } - for (IgniteFuture<?> fut : futs) + for (IgniteInternalFuture<?> fut : futs) fut.get(); // Wait for completion. for (int i = 0; i < GRID_CNT; i++) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java index 6f15f64..4bf8d42 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java @@ -23,7 +23,6 @@ import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; -import org.apache.ignite.lang.*; import org.apache.ignite.spi.*; import org.apache.ignite.internal.managers.communication.*; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*; @@ -121,7 +120,7 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest { commSpi.skipNearRequest = true; - IgniteFuture<Object> fut = cache.putAsync(key, 1); + IgniteInternalFuture<Object> fut = cache.putAsync(key, 1); Map<UUID, GridCommunicationClient> clients = U.field(commSpi, "clients"); @@ -155,7 +154,7 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest { commSpi.skipNearResponse = true; - IgniteFuture<Object> fut = cache.putAsync(key, 1); + IgniteInternalFuture<Object> fut = cache.putAsync(key, 1); Map<UUID, GridCommunicationClient> clients = U.field(commSpi, "clients"); @@ -189,7 +188,7 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest { commSpi.skipDhtRequest = true; - IgniteFuture<Object> fut = cache.putAsync(key, 1); + IgniteInternalFuture<Object> fut = cache.putAsync(key, 1); Map<UUID, GridCommunicationClient> clients = U.field(commSpi, "clients"); @@ -224,7 +223,7 @@ public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest { commSpi.skipDhtResponse = true; - IgniteFuture<Object> fut = cache.putAsync(key, 1); + IgniteInternalFuture<Object> fut = cache.putAsync(key, 1); Map<UUID, GridCommunicationClient> clients = U.field(commSpi, "clients"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java index d904d99..462b84f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java @@ -21,6 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -183,7 +184,7 @@ public abstract class GridCacheBasicOpAbstractTest extends GridCommonAbstractTes ignite2.events().localListen(lsnr, EVT_CACHE_OBJECT_PUT, EVT_CACHE_OBJECT_REMOVED); ignite3.events().localListen(lsnr, EVT_CACHE_OBJECT_PUT, EVT_CACHE_OBJECT_REMOVED); - IgniteFuture<String> f1 = cache1.getAsync("async1"); + IgniteInternalFuture<String> f1 = cache1.getAsync("async1"); assert f1.get() == null; @@ -200,8 +201,8 @@ public abstract class GridCacheBasicOpAbstractTest extends GridCommonAbstractTes assert latch.await(5, SECONDS); - IgniteFuture<String> f2 = cache2.getAsync("async1"); - IgniteFuture<String> f3 = cache3.getAsync("async1"); + IgniteInternalFuture<String> f2 = cache2.getAsync("async1"); + IgniteInternalFuture<String> f3 = cache3.getAsync("async1"); String v2 = f2.get(); String v3 = f3.get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java index c6686cf..f83e151 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.distributed; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -393,7 +393,7 @@ public abstract class GridCacheLockAbstractTest extends GridCommonAbstractTest { final CountDownLatch l1 = new CountDownLatch(1); final CountDownLatch l2 = new CountDownLatch(1); - IgniteFuture<?> fut1 = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> fut1 = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { @Nullable @Override public Object call() throws Exception { info("Before lock for keys."); @@ -438,7 +438,7 @@ public abstract class GridCacheLockAbstractTest extends GridCommonAbstractTest { } }, 1, "TEST-THREAD-1"); - IgniteFuture<?> fut2 = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> fut2 = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { @Nullable @Override public Object call() throws Exception { info("Waiting for latch1..."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java index 6d3351b..1610e4a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java @@ -21,6 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -232,7 +233,7 @@ public abstract class GridCacheMultiNodeAbstractTest extends GridCommonAbstractT addListener(ignite2, unlockLsnr, EVT_CACHE_OBJECT_UNLOCKED); addListener(ignite3, unlockLsnr, EVT_CACHE_OBJECT_UNLOCKED); - IgniteFuture<Boolean> f1 = cache1.lockAsync(1, 0L); + IgniteInternalFuture<Boolean> f1 = cache1.lockAsync(1, 0L); assert f1.get(10000); @@ -274,9 +275,9 @@ public abstract class GridCacheMultiNodeAbstractTest extends GridCommonAbstractT addListener(ignite2, unlockLsnr, EVT_CACHE_OBJECT_UNLOCKED); addListener(ignite3, unlockLsnr, EVT_CACHE_OBJECT_UNLOCKED); - IgniteFuture<Boolean> f1 = cache1.lockAsync(1, 0L); - IgniteFuture<Boolean> f2 = cache2.lockAsync(1, 0L); - IgniteFuture<Boolean> f3 = cache3.lockAsync(1, 0L); + IgniteInternalFuture<Boolean> f1 = cache1.lockAsync(1, 0L); + IgniteInternalFuture<Boolean> f2 = cache2.lockAsync(1, 0L); + IgniteInternalFuture<Boolean> f3 = cache3.lockAsync(1, 0L); boolean l1 = false; boolean l2 = false; @@ -361,9 +362,9 @@ public abstract class GridCacheMultiNodeAbstractTest extends GridCommonAbstractT addListener(ignite2, lsnr); addListener(ignite3, lsnr); - IgniteFuture<String> f1 = cache1.putAsync(2, "val1"); - IgniteFuture<String> f2 = cache2.putAsync(2, "val2"); - IgniteFuture<String> f3 = cache3.putAsync(2, "val3"); + IgniteInternalFuture<String> f1 = cache1.putAsync(2, "val1"); + IgniteInternalFuture<String> f2 = cache2.putAsync(2, "val2"); + IgniteInternalFuture<String> f3 = cache3.putAsync(2, "val3"); String v1 = f1.get(20000); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java index e57434d..73a9bbe 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java @@ -20,8 +20,8 @@ package org.apache.ignite.internal.processors.cache.distributed; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; import org.apache.ignite.internal.processors.cache.distributed.dht.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; @@ -357,7 +357,7 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra putThreads[i] = thread; } - IgniteFuture<?> killNodeFut = null; + IgniteInternalFuture<?> killNodeFut = null; if (nodeKillProbability() > 0) { killNodeFut = GridTestUtils.runAsync(new Callable<Void>() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java index 49611c3..9466f5b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.transactions.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -174,7 +174,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac info("Check grid index: " + checkIdx); - IgniteFuture<?> f = waitForLocalEvent(grid(checkIdx).events(), new P1<IgniteEvent>() { + IgniteInternalFuture<?> f = waitForLocalEvent(grid(checkIdx).events(), new P1<IgniteEvent>() { @Override public boolean apply(IgniteEvent e) { info("Received grid event: " + e); @@ -259,7 +259,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac assert e.isLocked() : "Entry is not locked for grid [idx=" + checkIdx + ", entry=" + e + ']'; - IgniteFuture<?> f = waitForLocalEvent(grid(checkIdx).events(), new P1<IgniteEvent>() { + IgniteInternalFuture<?> f = waitForLocalEvent(grid(checkIdx).events(), new P1<IgniteEvent>() { @Override public boolean apply(IgniteEvent e) { info("Received grid event: " + e); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java index c6b3adc..2240552 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java @@ -190,7 +190,7 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest tx.commit(); - IgniteFuture<IgniteTx> fut = tx.future(); + IgniteInternalFuture<IgniteTx> fut = tx.future(); info("Got future for commitAsync()."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java index 7f62202..4fffa17 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java @@ -19,8 +19,8 @@ package org.apache.ignite.internal.processors.cache.distributed; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; import org.apache.ignite.testframework.*; import org.jetbrains.annotations.*; @@ -76,7 +76,7 @@ public abstract class IgniteTxPreloadAbstractTest extends GridCacheAbstractSelfT final AtomicInteger gridIdx = new AtomicInteger(1); - IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync( + IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { int idx = gridIdx.getAndIncrement(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java index 3435991..433bda5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java @@ -26,7 +26,6 @@ import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -282,7 +281,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { final int keysCnt = 10; - IgniteFuture<?> fut = multithreadedAsync(new Runnable() { + IgniteInternalFuture<?> fut = multithreadedAsync(new Runnable() { @Override public void run() { // Make thread-local copy to shuffle keys. List<Integer> threadKeys = new ArrayList<>(keys); @@ -378,7 +377,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { final Lock lock = g0.jcache(null).lock(key); - IgniteFuture<?> unlockFut = multithreadedAsync(new Runnable() { + IgniteInternalFuture<?> unlockFut = multithreadedAsync(new Runnable() { @Override public void run() { try { lock.lock(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java index fee7183..b3fa9ee 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java @@ -255,13 +255,13 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT assert nearOther.peekExx(key) == null; assert dhtOther.peekExx(key) == null; - IgniteFuture<IgniteEvent> futOther = + IgniteInternalFuture<IgniteEvent> futOther = waitForLocalEvent(grid(other).events(), nodeEvent(other.id()), EVT_CACHE_ENTRY_EVICTED); - IgniteFuture<IgniteEvent> futBackup = + IgniteInternalFuture<IgniteEvent> futBackup = waitForLocalEvent(grid(backup).events(), nodeEvent(backup.id()), EVT_CACHE_ENTRY_EVICTED); - IgniteFuture<IgniteEvent> futPrimary = + IgniteInternalFuture<IgniteEvent> futPrimary = waitForLocalEvent(grid(primary).events(), nodeEvent(primary.id()), EVT_CACHE_ENTRY_EVICTED); // Get value on other node, it should be loaded to near cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java index fab65a9..b518b96 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java @@ -243,10 +243,10 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest { assertTrue(entryPrimary.readers().isEmpty()); assertTrue(entryBackup.readers().isEmpty()); - IgniteFuture<IgniteEvent> futBackup = + IgniteInternalFuture<IgniteEvent> futBackup = waitForLocalEvent(grid(backup).events(), nodeEvent(backup.id()), EVT_CACHE_ENTRY_EVICTED); - IgniteFuture<IgniteEvent> futPrimary = + IgniteInternalFuture<IgniteEvent> futPrimary = waitForLocalEvent(grid(primary).events(), nodeEvent(primary.id()), EVT_CACHE_ENTRY_EVICTED); // Evict on primary node. @@ -308,7 +308,7 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest { final AtomicInteger cntBackup = new AtomicInteger(); - IgniteFuture<IgniteEvent> futBackup = waitForLocalEvent(backupIgnite.events(), new P1<IgniteEvent>() { + IgniteInternalFuture<IgniteEvent> futBackup = waitForLocalEvent(backupIgnite.events(), new P1<IgniteEvent>() { @Override public boolean apply(IgniteEvent e) { return e.node().id().equals(backupIgnite.cluster().localNode().id()) && cntBackup.incrementAndGet() == keyCnt; @@ -317,7 +317,7 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest { final AtomicInteger cntPrimary = new AtomicInteger(); - IgniteFuture<IgniteEvent> futPrimary = waitForLocalEvent(primaryIgnite.events(), new P1<IgniteEvent>() { + IgniteInternalFuture<IgniteEvent> futPrimary = waitForLocalEvent(primaryIgnite.events(), new P1<IgniteEvent>() { @Override public boolean apply(IgniteEvent e) { return e.node().id().equals(primaryIgnite.cluster().localNode().id()) && cntPrimary.incrementAndGet() == keyCnt; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java index 9a0224f..c48e353 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -186,7 +186,7 @@ public class GridCacheDhtPreloadPutGetSelfTest extends GridCommonAbstractTest { final AtomicBoolean done = new AtomicBoolean(); - IgniteFuture fut1 = GridTestUtils.runMultiThreadedAsync( + IgniteInternalFuture fut1 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { Ignite g2 = startGrid(2); @@ -222,7 +222,7 @@ public class GridCacheDhtPreloadPutGetSelfTest extends GridCommonAbstractTest { "reader" ); - IgniteFuture fut2 = GridTestUtils.runMultiThreadedAsync( + IgniteInternalFuture fut2 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { writeLatch.await(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java index d13f647..1d77b81 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java @@ -24,6 +24,7 @@ import org.apache.ignite.cache.affinity.consistenthash.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -257,7 +258,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { info(">>> Finished checking nodes [keyCnt=" + keyCnt + ", nodeCnt=" + nodeCnt + ", grids=" + U.grids2names(ignites) + ']'); - Collection<IgniteFuture<?>> futs = new LinkedList<>(); + Collection<IgniteInternalFuture<?>> futs = new LinkedList<>(); Ignite last = F.last(ignites); @@ -536,7 +537,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { it.remove(); - Collection<IgniteFuture<?>> futs = new LinkedList<>(); + Collection<IgniteInternalFuture<?>> futs = new LinkedList<>(); for (Ignite gg : ignites) futs.add(waitForLocalEvent(gg.events(), new P1<IgniteEvent>() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java index bce6cf8..e81c3ec 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java @@ -24,7 +24,6 @@ import org.apache.ignite.cache.affinity.consistenthash.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.lang.*; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -216,7 +215,7 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest = ((GridKernal)g1).context().cache().context().exchange(); // Wait for exchanges to complete. - for (IgniteFuture<?> fut : exchMgr.exchangeFutures()) + for (IgniteInternalFuture<?> fut : exchMgr.exchangeFutures()) fut.get(); CacheAffinity<Integer> aff = affinity(c1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java index b71c7da..7865567 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java @@ -136,7 +136,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra GridKernal[] nodes = new GridKernal[] {(GridKernal)grid(0), (GridKernal)grid(1)}; - Collection<IgniteFuture> futs = new ArrayList<>(); + Collection<IgniteInternalFuture> futs = new ArrayList<>(); final CountDownLatch startLatch = new CountDownLatch(1); @@ -180,7 +180,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra } } - IgniteFuture<?> startFut = multithreadedAsync(new Runnable() { + IgniteInternalFuture<?> startFut = multithreadedAsync(new Runnable() { @Override public void run() { try { startGrid(2); @@ -201,7 +201,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra startLatch.countDown(); - for (IgniteFuture fut : futs) + for (IgniteInternalFuture fut : futs) fut.get(1000); startFut.get(); @@ -229,7 +229,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra final CountDownLatch commitLatch = new CountDownLatch(1); - Collection<IgniteFuture> futs = new ArrayList<>(); + Collection<IgniteInternalFuture> futs = new ArrayList<>(); for (final GridKernal node : nodes) { printDistribution(node); @@ -292,7 +292,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra // Now start new node. We do it in a separate thread since startGrid // should block until partition exchange completes. - IgniteFuture startFut = multithreadedAsync(new Runnable() { + IgniteInternalFuture startFut = multithreadedAsync(new Runnable() { @Override public void run() { try { Ignite g3 = startGrid(3); @@ -312,7 +312,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra assertFalse("Node was able to join the grid while there exist pending transactions.", startFut.isDone()); // Now check that new transactions will wait for new topology version to become available. - Collection<IgniteFuture> txFuts = new ArrayList<>(nodes.length); + Collection<IgniteInternalFuture> txFuts = new ArrayList<>(nodes.length); for (final Ignite g : nodes) { txFuts.add(multithreadedAsync(new Runnable() { @@ -340,19 +340,19 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra Thread.sleep(500); - for (IgniteFuture txFut : txFuts) + for (IgniteInternalFuture txFut : txFuts) assertFalse("New transaction was completed before new node joined topology", txFut.isDone()); info(">>> Committing pending transactions."); commitLatch.countDown(); - for (IgniteFuture fut : futs) + for (IgniteInternalFuture fut : futs) fut.get(1000); startFut.get(1000); - for (IgniteFuture txFut : txFuts) + for (IgniteInternalFuture txFut : txFuts) txFut.get(1000); } finally { @@ -381,7 +381,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra info(">>> Started nodes [g0=" + g0.localNode().id() + ", g1=" + g1.localNode().id() + ", g2=" + g2.localNode().id() + ", g3=" + g3.localNode().id() + ']'); - Collection<IgniteFuture> futs = new ArrayList<>(); + Collection<IgniteInternalFuture> futs = new ArrayList<>(); printDistribution(g3); @@ -448,7 +448,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra leaveLatch.await(); // Now check that new transactions will wait for new topology version to become available. - Collection<IgniteFuture> txFuts = new ArrayList<>(nodes.length); + Collection<IgniteInternalFuture> txFuts = new ArrayList<>(nodes.length); for (final Ignite g : nodes) { txFuts.add(multithreadedAsync(new Runnable() { @@ -474,17 +474,17 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra Thread.sleep(500); - for (IgniteFuture txFut : txFuts) + for (IgniteInternalFuture txFut : txFuts) assertFalse("New transaction was completed before old transactions were committed", txFut.isDone()); info(">>> Committing pending transactions."); commitLatch.countDown(); - for (IgniteFuture fut : futs) + for (IgniteInternalFuture fut : futs) fut.get(1000); - for (IgniteFuture txFut : txFuts) + for (IgniteInternalFuture txFut : txFuts) txFut.get(1000); for (int i = 0; i < 3; i++) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java index b60a86e..12b2aba 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java @@ -24,7 +24,6 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; -import org.apache.ignite.lang.*; import org.apache.ignite.spi.*; import org.apache.ignite.internal.managers.communication.*; import org.apache.ignite.spi.communication.tcp.*; @@ -177,7 +176,7 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA System.err.println("FINISHED PUTS"); // Start put threads. - IgniteFuture<?> fut = multithreadedAsync(new Callable<Object>() { + IgniteInternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { Random rnd = new Random(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEntryLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEntryLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEntryLockSelfTest.java index cf93827..2d0c63e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEntryLockSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedEntryLockSelfTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.lang.*; @@ -61,7 +62,7 @@ public class GridCachePartitionedEntryLockSelfTest extends GridCacheAbstractSelf comp.call(new Callable<Boolean>() { @Override public Boolean call() throws Exception { - IgniteFuture<Boolean> f = e.lockAsync(1000); + IgniteInternalFuture<Boolean> f = e.lockAsync(1000); try { f.get(100); @@ -83,7 +84,7 @@ public class GridCachePartitionedEntryLockSelfTest extends GridCacheAbstractSelf } }); - IgniteFuture<Boolean> f = comp.future(); + IgniteInternalFuture<Boolean> f = comp.future(); // Let another thread start. Thread.sleep(300); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java index cbf1a7e..da3bab4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -114,7 +114,7 @@ public class GridCachePartitionedExplicitLockNodeFailureSelfTest extends GridCom assert e.isLocked() : "Entry is not locked for grid [idx=" + checkIdx + ", entry=" + e + ']'; } - Collection<IgniteFuture<?>> futs = new LinkedList<>(); + Collection<IgniteInternalFuture<?>> futs = new LinkedList<>(); for (int i = 1; i < GRID_CNT; i++) { futs.add( @@ -129,7 +129,7 @@ public class GridCachePartitionedExplicitLockNodeFailureSelfTest extends GridCom stopGrid(idx); - for (IgniteFuture<?> fut : futs) + for (IgniteInternalFuture<?> fut : futs) fut.get(); for (int i = 0; i < 3; i++) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java index 86ba60b..e18421f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java @@ -22,6 +22,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; +import org.apache.ignite.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; @@ -452,7 +453,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti @Override public Boolean call() throws Exception { syncLatch.countDown(); - IgniteFuture<Boolean> f = e.lockAsync(15000); + IgniteInternalFuture<Boolean> f = e.lockAsync(15000); try { f.get(100); @@ -477,7 +478,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti } }); - IgniteFuture<Boolean> f = comp.future(); + IgniteInternalFuture<Boolean> f = comp.future(); syncLatch.await(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java index 1ff2317..d2820ae 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -144,7 +144,7 @@ public class GridCachePartitionedQueryMultiThreadedSelfTest extends GridCommonAb final AtomicLong luceneCnt = new AtomicLong(); // Start lucene query threads. - IgniteFuture<?> futLucene = GridTestUtils.runMultiThreadedAsync(new CAX() { + IgniteInternalFuture<?> futLucene = GridTestUtils.runMultiThreadedAsync(new CAX() { @Override public void applyx() throws IgniteCheckedException { while (!done.get()) { CacheQuery<Map.Entry<UUID, Person>> masters = cache0.queries().createFullTextQuery( @@ -165,7 +165,7 @@ public class GridCachePartitionedQueryMultiThreadedSelfTest extends GridCommonAb final AtomicLong sqlCnt = new AtomicLong(); // Start sql query threads. - IgniteFuture<?> futSql = GridTestUtils.runMultiThreadedAsync(new CAX() { + IgniteInternalFuture<?> futSql = GridTestUtils.runMultiThreadedAsync(new CAX() { @Override public void applyx() throws IgniteCheckedException { while (!done.get()) { CacheQuery<Map.Entry<UUID, Person>> bachelors = http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java index db674fc..50eefad 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java @@ -23,7 +23,6 @@ import org.apache.ignite.cache.affinity.consistenthash.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -196,7 +195,7 @@ public class GridCachePartitionedTxSalvageSelfTest extends GridCommonAbstractTes final Collection<Integer> keys = nearKeys(ignite); - IgniteFuture<?> fut = multithreadedAsync(new Runnable() { + IgniteInternalFuture<?> fut = multithreadedAsync(new Runnable() { @Override public void run() { GridCache<Object, Object> c = cache(0); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java index 5a23839..ac89ea0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed.replicated; import org.apache.ignite.cache.*; import org.apache.ignite.events.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.lang.*; import org.apache.ignite.internal.util.typedef.*; @@ -78,7 +79,7 @@ public class GridCacheReplicatedEvictionSelfTest extends GridCacheAbstractSelfTe assertNotNull(cache(g).peek(String.valueOf(i))); } - Collection<IgniteFuture<IgniteEvent>> futs = new ArrayList<>(); + Collection<IgniteInternalFuture<IgniteEvent>> futs = new ArrayList<>(); for (int g = 0 ; g < gridCount(); g++) futs.add(waitForLocalEvent(grid(g).events(), nodeEvent(grid(g).localNode().id()), EVT_CACHE_ENTRY_EVICTED)); @@ -90,7 +91,7 @@ public class GridCacheReplicatedEvictionSelfTest extends GridCacheAbstractSelfTe } } - for (IgniteFuture<IgniteEvent> fut : futs) + for (IgniteInternalFuture<IgniteEvent> fut : futs) fut.get(3000); boolean evicted = GridTestUtils.waitForCondition(new PA() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java index f2d07ec..f6ffaa5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheBatchEvictUnswapSelfTest.java @@ -22,6 +22,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.cache.GridCache; import org.apache.ignite.cache.eviction.fifo.*; import org.apache.ignite.cache.store.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.lang.*; import org.jetbrains.annotations.*; @@ -124,7 +125,7 @@ public class GridCacheBatchEvictUnswapSelfTest extends GridCacheAbstractSelfTest info("Finished load cache."); - IgniteFuture<?> evictFut = multithreadedAsync(new Runnable() { + IgniteInternalFuture<?> evictFut = multithreadedAsync(new Runnable() { @Override public void run() { Collection<Long> keys = new ArrayList<>(batchSize); @@ -151,7 +152,7 @@ public class GridCacheBatchEvictUnswapSelfTest extends GridCacheAbstractSelfTest final AtomicInteger unswappedKeys = new AtomicInteger(); - IgniteFuture<?> unswapFut = multithreadedAsync(new Runnable() { + IgniteInternalFuture<?> unswapFut = multithreadedAsync(new Runnable() { @Override public void run() { try { Collection<Long> keys = new ArrayList<>(batchSize); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java index a5a4fba..d4be3a6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionConsistencySelfTest.java @@ -23,7 +23,7 @@ import org.apache.ignite.cache.eviction.*; import org.apache.ignite.cache.eviction.fifo.*; import org.apache.ignite.cache.eviction.lru.*; import org.apache.ignite.configuration.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.transactions.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -176,7 +176,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb long start = System.currentTimeMillis(); - IgniteFuture<?> fut = multithreadedAsync( + IgniteInternalFuture<?> fut = multithreadedAsync( new Callable<Object>() { @Override public Object call() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d5bef132/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java index 5726c11..ffc80a8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java @@ -23,7 +23,7 @@ import org.apache.ignite.cache.eviction.*; import org.apache.ignite.cache.eviction.fifo.*; import org.apache.ignite.cache.eviction.lru.*; import org.apache.ignite.configuration.*; -import org.apache.ignite.lang.*; +import org.apache.ignite.internal.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -152,7 +152,7 @@ public class GridCacheConcurrentEvictionsSelfTest extends GridCommonAbstractTest long start = System.currentTimeMillis(); - IgniteFuture<?> fut = multithreadedAsync( + IgniteInternalFuture<?> fut = multithreadedAsync( new Callable<Object>() { @Override public Object call() throws Exception { for (int i = 0; i < iterCnt; i++) {
