http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheEventAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheEventAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheEventAbstractTest.java index 484f9a2..559a365 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheEventAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheEventAbstractTest.java @@ -871,7 +871,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe try { cf.get(WAIT_TIMEOUT); } - catch (IgniteFutureTimeoutException e) { + catch (InternalFutureTimeoutException e) { throw new RuntimeException("Timed out waiting for events: " + cf, e); } }
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java index 4d4ba11..360dbe3 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java @@ -379,7 +379,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>() { + InternalFuture<?> fut1 = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { @Nullable @Override public Object call() throws Exception { info("Before lock for keys."); @@ -422,7 +422,7 @@ public abstract class GridCacheLockAbstractTest extends GridCommonAbstractTest { } }, 1, "TEST-THREAD-1"); - IgniteFuture<?> fut2 = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { + InternalFuture<?> 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/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java index f4691a1..a5488b6 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java @@ -224,7 +224,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); + InternalFuture<Boolean> f1 = cache1.lockAsync(1, 0L); assert f1.get(10000); @@ -266,9 +266,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); + InternalFuture<Boolean> f1 = cache1.lockAsync(1, 0L); + InternalFuture<Boolean> f2 = cache2.lockAsync(1, 0L); + InternalFuture<Boolean> f3 = cache3.lockAsync(1, 0L); boolean l1 = false; boolean l2 = false; @@ -353,9 +353,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"); + InternalFuture<String> f1 = cache1.putAsync(2, "val1"); + InternalFuture<String> f2 = cache2.putAsync(2, "val2"); + InternalFuture<String> f3 = cache3.putAsync(2, "val3"); String v1 = f1.get(20000); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java index 2e8867b..f4220b0 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java @@ -13,7 +13,6 @@ import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; @@ -433,7 +432,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr Collections.addAll(keys1, 1, 2, 3); Collections.addAll(keys2, 2, 3, 4); - IgniteFuture<Boolean> f1 = cache1.lockAllAsync(keys1, 0); + InternalFuture<Boolean> f1 = cache1.lockAllAsync(keys1, 0); try { assert f1.get(); @@ -442,7 +441,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr checkRemoteLocked(cache2, keys1); - IgniteFuture<Boolean> f2 = cache2.lockAllAsync(keys2, -1); + InternalFuture<Boolean> f2 = cache2.lockAllAsync(keys2, -1); assert !f2.get(); @@ -463,7 +462,7 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr addListener(ignite1, new UnlockListener(latch, keys2)); - IgniteFuture<Boolean> f2 = cache2.lockAllAsync(keys2, 0); + InternalFuture<Boolean> f2 = cache2.lockAllAsync(keys2, 0); try { assert f2.get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java index cab17f0..8200963 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java @@ -12,7 +12,6 @@ package org.gridgain.grid.kernal.processors.cache.distributed; import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; @@ -351,7 +350,7 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra putThreads[i] = thread; } - IgniteFuture<?> killNodeFut = null; + InternalFuture<?> killNodeFut = null; if (nodeKillProbability() > 0) { killNodeFut = GridTestUtils.runAsync(new Callable<Void>() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java index ec3ed43..9c93e0a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java @@ -13,7 +13,6 @@ import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -166,7 +165,7 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac info("Check grid index: " + checkIdx); - IgniteFuture<?> f = waitForLocalEvent(grid(checkIdx).events(), new P1<IgniteEvent>() { + InternalFuture<?> f = waitForLocalEvent(grid(checkIdx).events(), new P1<IgniteEvent>() { @Override public boolean apply(IgniteEvent e) { info("Received grid event: " + e); @@ -251,7 +250,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>() { + InternalFuture<?> 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/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxOriginatingNodeFailureAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxOriginatingNodeFailureAbstractSelfTest.java index a3dd944..1a8f73c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxOriginatingNodeFailureAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxOriginatingNodeFailureAbstractSelfTest.java @@ -156,7 +156,7 @@ public abstract class GridCacheTxOriginatingNodeFailureAbstractSelfTest extends try { txEx.prepareAsync().get(3, TimeUnit.SECONDS); } - catch (IgniteFutureTimeoutException ignored) { + catch (InternalFutureTimeoutException ignored) { info("Failed to wait for prepare future completion: " + partial); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxPessimisticOriginatingNodeFailureAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxPessimisticOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxPessimisticOriginatingNodeFailureAbstractSelfTest.java index ec20f23..3612b6b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxPessimisticOriginatingNodeFailureAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxPessimisticOriginatingNodeFailureAbstractSelfTest.java @@ -176,13 +176,13 @@ public abstract class GridCacheTxPessimisticOriginatingNodeFailureAbstractSelfTe info("Before commitAsync"); - IgniteFuture<GridCacheTx> fut = tx.commitAsync(); + InternalFuture<GridCacheTx> fut = tx.commitAsync(); info("Got future for commitAsync()."); fut.get(3, TimeUnit.SECONDS); } - catch (IgniteFutureTimeoutException ignored) { + catch (InternalFutureTimeoutException ignored) { info("Failed to wait for commit future completion [fullFailure=" + fullFailure + ']'); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxPreloadAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxPreloadAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxPreloadAbstractTest.java index 2bb781d..4cc2442 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxPreloadAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxPreloadAbstractTest.java @@ -64,7 +64,7 @@ public abstract class GridCacheTxPreloadAbstractTest extends GridCacheAbstractSe final AtomicInteger gridIdx = new AtomicInteger(1); - IgniteFuture<?> fut = GridTestUtils.runMultiThreadedAsync( + InternalFuture<?> 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/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java index 246bfb4..44f7565 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java @@ -12,7 +12,6 @@ package org.gridgain.grid.kernal.processors.cache.distributed.dht; import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.consistenthash.*; import org.gridgain.grid.cache.store.*; @@ -267,7 +266,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { final int keysCnt = 10; - IgniteFuture<?> fut = multithreadedAsync(new Runnable() { + InternalFuture<?> fut = multithreadedAsync(new Runnable() { @Override public void run() { // Make thread-local copy to shuffle keys. List<Integer> threadKeys = new ArrayList<>(keys); @@ -361,7 +360,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { final CountDownLatch lockLatch = new CountDownLatch(1); final CountDownLatch unlockLatch = new CountDownLatch(1); - IgniteFuture<?> unlockFut = multithreadedAsync(new Runnable() { + InternalFuture<?> unlockFut = multithreadedAsync(new Runnable() { @Override public void run() { try { assert g0.cache(null).lock(key, 0); @@ -387,7 +386,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { assert g0.cache(null).isLocked(key); assert !g0.cache(null).isLockedByThread(key) : "Key can not be locked by current thread."; - IgniteFuture<Boolean> lockFut = g0.cache(null).lockAsync(key, 0); + InternalFuture<Boolean> lockFut = g0.cache(null).lockAsync(key, 0); assert g0.cache(null).isLocked(key); assert !lockFut.isDone() : "Key can not be locked by current thread."; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java index 64b28a5..1c6b6a3 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java @@ -14,7 +14,6 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.consistenthash.*; import org.gridgain.grid.cache.eviction.fifo.*; @@ -248,13 +247,13 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT assert nearOther.peekExx(key) == null; assert dhtOther.peekExx(key) == null; - IgniteFuture<IgniteEvent> futOther = + InternalFuture<IgniteEvent> futOther = waitForLocalEvent(grid(other).events(), nodeEvent(other.id()), EVT_CACHE_ENTRY_EVICTED); - IgniteFuture<IgniteEvent> futBackup = + InternalFuture<IgniteEvent> futBackup = waitForLocalEvent(grid(backup).events(), nodeEvent(backup.id()), EVT_CACHE_ENTRY_EVICTED); - IgniteFuture<IgniteEvent> futPrimary = + InternalFuture<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/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java index e3d9aa1..ced14f5 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java @@ -14,7 +14,6 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.consistenthash.*; import org.gridgain.grid.cache.eviction.fifo.*; @@ -236,10 +235,10 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest { assertTrue(entryPrimary.readers().isEmpty()); assertTrue(entryBackup.readers().isEmpty()); - IgniteFuture<IgniteEvent> futBackup = + InternalFuture<IgniteEvent> futBackup = waitForLocalEvent(grid(backup).events(), nodeEvent(backup.id()), EVT_CACHE_ENTRY_EVICTED); - IgniteFuture<IgniteEvent> futPrimary = + InternalFuture<IgniteEvent> futPrimary = waitForLocalEvent(grid(primary).events(), nodeEvent(primary.id()), EVT_CACHE_ENTRY_EVICTED); // Evict on primary node. @@ -301,7 +300,7 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest { final AtomicInteger cntBackup = new AtomicInteger(); - IgniteFuture<IgniteEvent> futBackup = waitForLocalEvent(backupIgnite.events(), new P1<IgniteEvent>() { + InternalFuture<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; @@ -310,7 +309,7 @@ public class GridCacheDhtEvictionSelfTest extends GridCommonAbstractTest { final AtomicInteger cntPrimary = new AtomicInteger(); - IgniteFuture<IgniteEvent> futPrimary = waitForLocalEvent(primaryIgnite.events(), new P1<IgniteEvent>() { + InternalFuture<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/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java index ba1d3c3..db60414 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java @@ -406,7 +406,7 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { * @param caches Maps to compare. */ private void checkMaps(final boolean strict, final GridDhtCacheAdapter<String, Integer>... caches) - throws GridInterruptedException { + throws InternalInterruptedException { if (caches.length < 2) return; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java index 656150a..305dc50 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadPutGetSelfTest.java @@ -178,7 +178,7 @@ public class GridCacheDhtPreloadPutGetSelfTest extends GridCommonAbstractTest { final AtomicBoolean done = new AtomicBoolean(); - IgniteFuture fut1 = GridTestUtils.runMultiThreadedAsync( + InternalFuture fut1 = GridTestUtils.runMultiThreadedAsync( new Callable<Object>() { @Nullable @Override public Object call() throws Exception { Ignite g2 = startGrid(2); @@ -214,7 +214,7 @@ public class GridCacheDhtPreloadPutGetSelfTest extends GridCommonAbstractTest { "reader" ); - IgniteFuture fut2 = GridTestUtils.runMultiThreadedAsync( + InternalFuture 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/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java index 68994c4..7c34ec0 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java @@ -14,7 +14,6 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.cache.affinity.consistenthash.*; @@ -250,7 +249,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { info(">>> Finished checking nodes [keyCnt=" + keyCnt + ", nodeCnt=" + nodeCnt + ", grids=" + U.grids2names(ignites) + ']'); - Collection<IgniteFuture<?>> futs = new LinkedList<>(); + Collection<InternalFuture<?>> futs = new LinkedList<>(); Ignite last = F.last(ignites); @@ -529,7 +528,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest { it.remove(); - Collection<IgniteFuture<?>> futs = new LinkedList<>(); + Collection<InternalFuture<?>> 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/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java index cba688a..ab097e6 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java @@ -12,7 +12,6 @@ package org.gridgain.grid.kernal.processors.cache.distributed.dht; import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.cache.affinity.consistenthash.*; @@ -209,7 +208,7 @@ public class GridCacheDhtPreloadStartStopSelfTest extends GridCommonAbstractTest = ((GridKernal)g1).context().cache().context().exchange(); // Wait for exchanges to complete. - for (IgniteFuture<?> fut : exchMgr.exchangeFutures()) + for (InternalFuture<?> fut : exchMgr.exchangeFutures()) fut.get(); GridCacheAffinity<Integer> aff = affinity(c1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java index f5de2a3..c78b8cc 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java @@ -14,7 +14,6 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.cache.affinity.consistenthash.*; @@ -128,7 +127,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra GridKernal[] nodes = new GridKernal[] {(GridKernal)grid(0), (GridKernal)grid(1)}; - Collection<IgniteFuture> futs = new ArrayList<>(); + Collection<InternalFuture> futs = new ArrayList<>(); final CountDownLatch startLatch = new CountDownLatch(1); @@ -176,7 +175,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra } } - IgniteFuture<?> startFut = multithreadedAsync(new Runnable() { + InternalFuture<?> startFut = multithreadedAsync(new Runnable() { @Override public void run() { try { startGrid(2); @@ -197,7 +196,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra startLatch.countDown(); - for (IgniteFuture fut : futs) + for (InternalFuture fut : futs) fut.get(1000); startFut.get(); @@ -225,7 +224,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra final CountDownLatch commitLatch = new CountDownLatch(1); - Collection<IgniteFuture> futs = new ArrayList<>(); + Collection<InternalFuture> futs = new ArrayList<>(); for (final GridKernal node : nodes) { printDistribution(node); @@ -288,7 +287,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() { + InternalFuture startFut = multithreadedAsync(new Runnable() { @Override public void run() { try { Ignite g3 = startGrid(3); @@ -308,7 +307,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<InternalFuture> txFuts = new ArrayList<>(nodes.length); for (final Ignite g : nodes) { txFuts.add(multithreadedAsync(new Runnable() { @@ -336,19 +335,19 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra Thread.sleep(500); - for (IgniteFuture txFut : txFuts) + for (InternalFuture 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 (InternalFuture fut : futs) fut.get(1000); startFut.get(1000); - for (IgniteFuture txFut : txFuts) + for (InternalFuture txFut : txFuts) txFut.get(1000); } finally { @@ -377,7 +376,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<InternalFuture> futs = new ArrayList<>(); printDistribution(g3); @@ -444,7 +443,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<InternalFuture> txFuts = new ArrayList<>(nodes.length); for (final Ignite g : nodes) { txFuts.add(multithreadedAsync(new Runnable() { @@ -470,17 +469,17 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra Thread.sleep(500); - for (IgniteFuture txFut : txFuts) + for (InternalFuture 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 (InternalFuture fut : futs) fut.get(1000); - for (IgniteFuture txFut : txFuts) + for (InternalFuture txFut : txFuts) txFut.get(1000); for (int i = 0; i < 3; i++) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java index 846f3dd..4d051da 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java @@ -168,7 +168,7 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA System.err.println("FINISHED PUTS"); // Start put threads. - IgniteFuture<?> fut = multithreadedAsync(new Callable<Object>() { + InternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { Random rnd = new Random(); @@ -295,7 +295,7 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA if (delayMessage((GridIoMessage)msg)) U.sleep(ThreadLocalRandom8.current().nextInt(250) + 1); } - catch (GridInterruptedException e) { + catch (InternalInterruptedException e) { throw new IgniteSpiException(e); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEntryLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEntryLockSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEntryLockSelfTest.java index 5163bd6..3028b91 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEntryLockSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedEntryLockSelfTest.java @@ -53,14 +53,14 @@ public class GridCachePartitionedEntryLockSelfTest extends GridCacheAbstractSelf comp.call(new Callable<Boolean>() { @Override public Boolean call() throws Exception { - IgniteFuture<Boolean> f = e.lockAsync(1000); + InternalFuture<Boolean> f = e.lockAsync(1000); try { f.get(100); fail(); } - catch (IgniteFutureTimeoutException ex) { + catch (InternalFutureTimeoutException ex) { info("Caught expected exception: " + ex); } @@ -75,7 +75,7 @@ public class GridCachePartitionedEntryLockSelfTest extends GridCacheAbstractSelf } }); - IgniteFuture<Boolean> f = comp.future(); + InternalFuture<Boolean> f = comp.future(); // Let another thread start. Thread.sleep(300); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java index 64f13d1..a9a2942 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedExplicitLockNodeFailureSelfTest.java @@ -107,7 +107,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<InternalFuture<?>> futs = new LinkedList<>(); for (int i = 1; i < GRID_CNT; i++) { futs.add( @@ -122,7 +122,7 @@ public class GridCachePartitionedExplicitLockNodeFailureSelfTest extends GridCom stopGrid(idx); - for (IgniteFuture<?> fut : futs) + for (InternalFuture<?> fut : futs) fut.get(); for (int i = 0; i < 3; i++) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java index a50239d..f36c181 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java @@ -13,7 +13,6 @@ import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.log4j.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; @@ -74,7 +73,7 @@ public class GridCachePartitionedLockSelfTest extends GridCacheLockAbstractTest } }, IgniteCheckedException.class, "Locks are not supported"); - final IgniteFuture<Boolean> lockFut1 = g0.cache(null).lockAsync(1, Long.MAX_VALUE); + final InternalFuture<Boolean> lockFut1 = g0.cache(null).lockAsync(1, Long.MAX_VALUE); GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -82,7 +81,7 @@ public class GridCachePartitionedLockSelfTest extends GridCacheLockAbstractTest } }, IgniteCheckedException.class, "Locks are not supported"); - final IgniteFuture<Boolean> lockFut2 = g0.cache(null).lockAllAsync(Arrays.asList(1), Long.MAX_VALUE); + final InternalFuture<Boolean> lockFut2 = g0.cache(null).lockAllAsync(Arrays.asList(1), Long.MAX_VALUE); GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java index 237309f..3e44a9c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java @@ -444,7 +444,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti @Override public Boolean call() throws Exception { syncLatch.countDown(); - IgniteFuture<Boolean> f = e.lockAsync(15000); + InternalFuture<Boolean> f = e.lockAsync(15000); try { f.get(100); @@ -453,7 +453,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti ", backup=" + e.backup() + ']'); fail(); - } catch (IgniteFutureTimeoutException ex) { + } catch (InternalFutureTimeoutException ex) { info("Caught expected exception: " + ex); } @@ -469,7 +469,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti } }); - IgniteFuture<Boolean> f = comp.future(); + InternalFuture<Boolean> f = comp.future(); syncLatch.await(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java index 79e5467..1fed455 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java @@ -136,7 +136,7 @@ public class GridCachePartitionedQueryMultiThreadedSelfTest extends GridCommonAb final AtomicLong luceneCnt = new AtomicLong(); // Start lucene query threads. - IgniteFuture<?> futLucene = GridTestUtils.runMultiThreadedAsync(new CAX() { + InternalFuture<?> futLucene = GridTestUtils.runMultiThreadedAsync(new CAX() { @Override public void applyx() throws IgniteCheckedException { while (!done.get()) { GridCacheQuery<Map.Entry<UUID, Person>> masters = cache0.queries().createFullTextQuery( @@ -157,7 +157,7 @@ public class GridCachePartitionedQueryMultiThreadedSelfTest extends GridCommonAb final AtomicLong sqlCnt = new AtomicLong(); // Start sql query threads. - IgniteFuture<?> futSql = GridTestUtils.runMultiThreadedAsync(new CAX() { + InternalFuture<?> futSql = GridTestUtils.runMultiThreadedAsync(new CAX() { @Override public void applyx() throws IgniteCheckedException { while (!done.get()) { GridCacheQuery<Map.Entry<UUID, Person>> bachelors = http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/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 3ba8a10..957a2c7 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 @@ -12,7 +12,6 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.consistenthash.*; import org.gridgain.grid.kernal.*; @@ -188,7 +187,7 @@ public class GridCachePartitionedTxSalvageSelfTest extends GridCommonAbstractTes final Collection<Integer> keys = nearKeys(ignite); - IgniteFuture<?> fut = multithreadedAsync(new Runnable() { + InternalFuture<?> 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/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java index 3067583..3752f63 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/GridCacheReplicatedEvictionSelfTest.java @@ -70,7 +70,7 @@ public class GridCacheReplicatedEvictionSelfTest extends GridCacheAbstractSelfTe assertNotNull(cache(g).peek(String.valueOf(i))); } - Collection<IgniteFuture<IgniteEvent>> futs = new ArrayList<>(); + Collection<InternalFuture<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)); @@ -78,7 +78,7 @@ public class GridCacheReplicatedEvictionSelfTest extends GridCacheAbstractSelfTe for (int i = 0; i < KEYS; i++) assertTrue(cache(0).evict(String.valueOf(i))); - for (IgniteFuture<IgniteEvent> fut : futs) + for (InternalFuture<IgniteEvent> fut : futs) fut.get(3000); boolean evicted = GridTestUtils.waitForCondition(new PA() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/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 98d1b64..9cef61a 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 @@ -2,7 +2,6 @@ package org.gridgain.grid.kernal.processors.cache.eviction; import org.apache.ignite.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.eviction.fifo.*; import org.gridgain.grid.cache.store.*; @@ -98,7 +97,7 @@ public class GridCacheBatchEvictUnswapSelfTest extends GridCacheAbstractSelfTest info("Finished load cache."); - IgniteFuture<?> evictFut = multithreadedAsync(new Runnable() { + InternalFuture<?> evictFut = multithreadedAsync(new Runnable() { @Override public void run() { Collection<Long> keys = new ArrayList<>(batchSize); @@ -125,7 +124,7 @@ public class GridCacheBatchEvictUnswapSelfTest extends GridCacheAbstractSelfTest final AtomicInteger unswappedKeys = new AtomicInteger(); - IgniteFuture<?> unswapFut = multithreadedAsync(new Runnable() { + InternalFuture<?> 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/90948e67/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 1d5ad97..1754ae5 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 @@ -167,7 +167,7 @@ public class GridCacheConcurrentEvictionConsistencySelfTest extends GridCommonAb long start = System.currentTimeMillis(); - IgniteFuture<?> fut = multithreadedAsync( + InternalFuture<?> fut = multithreadedAsync( new Callable<Object>() { @Override public Object call() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java index 26ccf3b..4c529f4 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheConcurrentEvictionsSelfTest.java @@ -144,7 +144,7 @@ public class GridCacheConcurrentEvictionsSelfTest extends GridCommonAbstractTest long start = System.currentTimeMillis(); - IgniteFuture<?> fut = multithreadedAsync( + InternalFuture<?> fut = multithreadedAsync( new Callable<Object>() { @Override public Object call() throws Exception { for (int i = 0; i < iterCnt; i++) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/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 825d526..f542ef2 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 @@ -264,10 +264,10 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb * Checks that cache is empty. * * @param cache Cache to check. - * @throws GridInterruptedException If interrupted while sleeping. + * @throws InternalInterruptedException If interrupted while sleeping. */ @SuppressWarnings({"ErrorNotRethrown", "TypeMayBeWeakened"}) - private void checkEmpty(GridCache<String, String> cache) throws GridInterruptedException { + private void checkEmpty(GridCache<String, String> cache) throws InternalInterruptedException { for (int i = 0; i < 3; i++) { try { assertTrue(cache.entrySet().toString(), cache.entrySet().isEmpty()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheMockEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheMockEntry.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheMockEntry.java index 6519617..acab859 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheMockEntry.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheMockEntry.java @@ -156,7 +156,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Nullable @Override public IgniteFuture<V> setAsync(V val, + @Nullable @Override public InternalFuture<V> setAsync(V val, @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { // No-op. return null; @@ -169,7 +169,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Nullable @Override public IgniteFuture<V> setIfAbsentAsync(V val) { + @Nullable @Override public InternalFuture<V> setIfAbsentAsync(V val) { // No-op. return null; } @@ -182,7 +182,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Nullable @Override public IgniteFuture<Boolean> setxAsync(V val, + @Nullable @Override public InternalFuture<Boolean> setxAsync(V val, @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { // No-op. return null; @@ -195,7 +195,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Nullable @Override public IgniteFuture<Boolean> setxIfAbsentAsync(V val) { + @Nullable @Override public InternalFuture<Boolean> setxIfAbsentAsync(V val) { // No-op. return null; } @@ -206,7 +206,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Override public IgniteFuture<?> transformAsync(IgniteClosure<V, V> transformer) { + @Override public InternalFuture<?> transformAsync(IgniteClosure<V, V> transformer) { // No-op. return null; } @@ -218,7 +218,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Nullable @Override public IgniteFuture<V> replaceAsync(V val) { + @Nullable @Override public InternalFuture<V> replaceAsync(V val) { // No-op. return null; } @@ -230,7 +230,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Nullable @Override public IgniteFuture<Boolean> replacexAsync(V val) { + @Nullable @Override public InternalFuture<Boolean> replacexAsync(V val) { // No-op. return null; } @@ -242,7 +242,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Nullable @Override public IgniteFuture<Boolean> replaceAsync(V oldVal, V newVal) { + @Nullable @Override public InternalFuture<Boolean> replaceAsync(V oldVal, V newVal) { // No-op. return null; } @@ -255,7 +255,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Nullable @Override public IgniteFuture<V> removeAsync( + @Nullable @Override public InternalFuture<V> removeAsync( @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { // No-op. return null; @@ -268,7 +268,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Nullable @Override public IgniteFuture<Boolean> removexAsync( + @Nullable @Override public InternalFuture<Boolean> removexAsync( @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { // No-op. return null; @@ -281,7 +281,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Nullable @Override public IgniteFuture<Boolean> removeAsync(V val) { + @Nullable @Override public InternalFuture<Boolean> removeAsync(V val) { // No-op. return null; } @@ -298,7 +298,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Override public IgniteFuture<Boolean> lockAsync(long timeout, + @Override public InternalFuture<Boolean> lockAsync(long timeout, @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { return new GridFinishedFuture<>(null, false); } @@ -329,7 +329,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Override public IgniteFuture<V> reloadAsync() { + @Override public InternalFuture<V> reloadAsync() { return new GridFinishedFuture<>(); } @@ -339,7 +339,7 @@ public class GridCacheMockEntry<K, V> extends GridMetadataAwareAdapter implement } /** {@inheritDoc} */ - @Override public IgniteFuture<V> getAsync() { + @Override public InternalFuture<V> getAsync() { return new GridFinishedFuture<>(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java index e554949..c15c120 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java @@ -73,7 +73,7 @@ public class GridCacheSynchronousEvictionsFailoverSelfTest extends GridCacheAbst final AtomicBoolean stop = new AtomicBoolean(); - IgniteFuture<?> fut = null; + InternalFuture<?> fut = null; try { Map<String, Integer> data = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java index 7740025..ef94ee4 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java @@ -360,18 +360,18 @@ public class GridCacheLocalMultithreadedSelfTest extends GridCommonAbstractTest try { l1.await(); - IgniteFuture<Boolean> f1 = cache.lockAsync(1, 0L); + InternalFuture<Boolean> f1 = cache.lockAsync(1, 0L); try { f1.get(100, TimeUnit.MILLISECONDS); assert false; } - catch (IgniteFutureTimeoutException e) { + catch (InternalFutureTimeoutException e) { info("Correctly received timeout exception: " + e); } - IgniteFuture<Boolean> f2 = cache.lockAsync(2, 0L); + InternalFuture<Boolean> f2 = cache.lockAsync(2, 0L); try { // Can't acquire f2 because f1 is held. @@ -380,7 +380,7 @@ public class GridCacheLocalMultithreadedSelfTest extends GridCommonAbstractTest // TODO uncomment after GG-3756 fix //assert false; } - catch (IgniteFutureTimeoutException e) { + catch (InternalFutureTimeoutException e) { info("Correctly received timeout exception: " + e); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessorSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessorSelfTest.java index cc4278a..54cbe2b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessorSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessorSelfTest.java @@ -16,7 +16,6 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -182,7 +181,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { * @return Future object. * @throws IgniteCheckedException If failed. */ - private IgniteFuture<?> runAsync(int idx, Runnable job, @Nullable IgnitePredicate<ClusterNode> p) + private InternalFuture<?> runAsync(int idx, Runnable job, @Nullable IgnitePredicate<ClusterNode> p) throws IgniteCheckedException { assert idx >= 0 && idx < NODES_CNT; assert job != null; @@ -205,7 +204,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { * @return Future object. * @throws IgniteCheckedException If failed. */ - private IgniteFuture<?> broadcast(int idx, Runnable job, @Nullable IgnitePredicate<ClusterNode> p) + private InternalFuture<?> broadcast(int idx, Runnable job, @Nullable IgnitePredicate<ClusterNode> p) throws IgniteCheckedException { assert idx >= 0 && idx < NODES_CNT; assert job != null; @@ -231,7 +230,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { * @return Future object. * @throws IgniteCheckedException If failed. */ - private IgniteFuture<?> runAsync(int idx, Collection<TestRunnable> jobs, @Nullable IgnitePredicate<ClusterNode> p) + private InternalFuture<?> runAsync(int idx, Collection<TestRunnable> jobs, @Nullable IgnitePredicate<ClusterNode> p) throws IgniteCheckedException { assert idx >= 0 && idx < NODES_CNT; assert !F.isEmpty(jobs); @@ -254,7 +253,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { * @return Future object. * @throws IgniteCheckedException If failed. */ - private IgniteFuture<Integer> callAsync(int idx, Callable<Integer> job, @Nullable IgnitePredicate<ClusterNode> p) + private InternalFuture<Integer> callAsync(int idx, Callable<Integer> job, @Nullable IgnitePredicate<ClusterNode> p) throws IgniteCheckedException { assert idx >= 0 && idx < NODES_CNT; assert job != null; @@ -277,7 +276,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { * @return Future object. * @throws IgniteCheckedException If failed. */ - private IgniteFuture<Collection<Integer>> broadcast(int idx, Callable<Integer> job, + private InternalFuture<Collection<Integer>> broadcast(int idx, Callable<Integer> job, @Nullable IgnitePredicate<ClusterNode> p) throws IgniteCheckedException { assert idx >= 0 && idx < NODES_CNT; assert job != null; @@ -300,7 +299,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { * @return Future object. * @throws IgniteCheckedException If failed. */ - private IgniteFuture<Collection<Integer>> callAsync(int idx, Collection<TestCallable> jobs, + private InternalFuture<Collection<Integer>> callAsync(int idx, Collection<TestCallable> jobs, @Nullable IgnitePredicate<ClusterNode> p) throws IgniteCheckedException { assert idx >= 0 && idx < NODES_CNT; assert !F.isEmpty(jobs); @@ -334,7 +333,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { public void testRunAsyncSingle() throws Exception { Runnable job = new TestRunnable(); - IgniteFuture<?> fut = broadcast(0, job, null); + InternalFuture<?> fut = broadcast(0, job, null); assert fut.get() == null; @@ -360,7 +359,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { public void testRunAsyncMultiple() throws Exception { Collection<TestRunnable> jobs = F.asList(new TestRunnable(), new TestRunnable()); - IgniteFuture<?> fut = runAsync(0, jobs, null); + InternalFuture<?> fut = runAsync(0, jobs, null); assert fut.get() == null : "Execution result must be null."; @@ -374,7 +373,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { public void testCallAsyncSingle() throws Exception { Callable<Integer> job = new TestCallable(); - IgniteFuture<Collection<Integer>> fut1 = broadcast(0, job, null); + InternalFuture<Collection<Integer>> fut1 = broadcast(0, job, null); assert fut1.get() != null; @@ -387,7 +386,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { assertEquals(1, execCntr.get()); - IgniteFuture<Integer> fut2 = callAsync(0, job, null); + InternalFuture<Integer> fut2 = callAsync(0, job, null); assert fut2.get() == 1 : "Execution result must be equal to 1, actual: " + fut2.get(); @@ -404,7 +403,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { comp.withNoFailover().call(new TestCallableError()); - IgniteFuture<Integer> fut = comp.future(); + InternalFuture<Integer> fut = comp.future(); try { fut.get(); @@ -460,7 +459,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { public void testCallAsyncMultiple() throws Exception { Collection<TestCallable> jobs = F.asList(new TestCallable(), new TestCallable()); - IgniteFuture<Collection<Integer>> fut = callAsync(0, jobs, null); + InternalFuture<Collection<Integer>> fut = callAsync(0, jobs, null); Collection<Integer> results = fut.get(); @@ -483,7 +482,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest { comp.call(jobs, F.sumIntReducer()); - IgniteFuture<Integer> fut = comp.future(); + InternalFuture<Integer> fut = comp.future(); // Sum of arithmetic progression. int exp = (1 + jobs.size()) * jobs.size() / 2; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java index c42022a..bc6a9e1 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java @@ -16,7 +16,6 @@ import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.typedef.*; @@ -951,7 +950,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { final Random rnd = new Random(); - IgniteFuture<?> starterFut = multithreadedAsync(new Callable<Object>() { + InternalFuture<?> starterFut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { for (int i = 0; i < CONSUME_CNT; i++) { int idx = rnd.nextInt(GRID_CNT); @@ -984,7 +983,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { } }, 8, "consume-starter"); - IgniteFuture<?> stopperFut = multithreadedAsync(new Callable<Object>() { + InternalFuture<?> stopperFut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { while (!stop.get()) { IgniteBiTuple<Integer, UUID> t = queue.poll(1, SECONDS); @@ -1013,7 +1012,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { } }, 4, "consume-stopper"); - IgniteFuture<?> nodeRestarterFut = multithreadedAsync(new Callable<Object>() { + InternalFuture<?> nodeRestarterFut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { while (!stop.get()) { startGrid("anotherGrid"); @@ -1024,7 +1023,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { } }, 1, "node-restarter"); - IgniteFuture<?> jobRunnerFut = multithreadedAsync(new Callable<Object>() { + InternalFuture<?> jobRunnerFut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { while (!stop.get()) { int idx = rnd.nextInt(GRID_CNT); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java index c1ceb68..d581d7d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java @@ -14,7 +14,6 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.optimized.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.eviction.fifo.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -186,9 +185,9 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { final CountDownLatch l1 = new CountDownLatch(threads); - IgniteFuture<?> f1 = multithreadedAsync(new Callable<Object>() { + InternalFuture<?> f1 = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { - Collection<IgniteFuture<?>> futs = new ArrayList<>(cnt); + Collection<InternalFuture<?>> futs = new ArrayList<>(cnt); for (int i = 0; i < cnt; i++) { int idx = idxGen.getAndIncrement(); @@ -198,7 +197,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { l1.countDown(); - for (IgniteFuture<?> fut : futs) + for (InternalFuture<?> fut : futs) fut.get(); return null; @@ -230,9 +229,9 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { final CountDownLatch l2 = new CountDownLatch(threads); - IgniteFuture<?> f2 = multithreadedAsync(new Callable<Object>() { + InternalFuture<?> f2 = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { - Collection<IgniteFuture<?>> futs = new ArrayList<>(cnt); + Collection<InternalFuture<?>> futs = new ArrayList<>(cnt); for (int i = 0; i < cnt; i++) { final int key = idxGen.decrementAndGet(); @@ -242,7 +241,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { l2.countDown(); - for (IgniteFuture<?> fut : futs) + for (InternalFuture<?> fut : futs) fut.get(); return null; @@ -376,9 +375,9 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { try { final int totalPutCnt = 50000; - IgniteFuture<?> fut1 = multithreadedAsync(new Callable<Object>() { + InternalFuture<?> fut1 = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { - Collection<IgniteFuture<?>> futs = new ArrayList<>(); + Collection<InternalFuture<?>> futs = new ArrayList<>(); while (!done.get()) { int idx = idxGen.getAndIncrement(); @@ -394,14 +393,14 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { ldr.flush(); - for (IgniteFuture<?> fut : futs) + for (InternalFuture<?> fut : futs) fut.get(); return null; } }, 5, "producer"); - IgniteFuture<?> fut2 = multithreadedAsync(new Callable<Object>() { + InternalFuture<?> fut2 = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { while (!done.get()) { ldr.flush(); @@ -416,7 +415,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { // Define index of node being restarted. final int restartNodeIdx = nodesCntCache + nodesCntNoCache + 1; - IgniteFuture<?> fut3 = multithreadedAsync(new Callable<Object>() { + InternalFuture<?> fut3 = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { try { for (int i = 0; i < 5; i++) { @@ -522,7 +521,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest { assert false; } - catch (IgniteFutureCancelledException e) { + catch (InternalFutureCancelledException e) { info("Caught expected exception: " + e); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java index 2544402..a82f1e1 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java @@ -474,7 +474,7 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest extends GridGgfsComm * @param curBlocks Current blocks. * @param curBytes Current bytes. */ - private void checkEvictionPolicy(final int curBlocks, final long curBytes) throws GridInterruptedException { + private void checkEvictionPolicy(final int curBlocks, final long curBytes) throws InternalInterruptedException { assert GridTestUtils.waitForCondition(new GridAbsPredicate() { @Override public boolean apply() { return evictPlc.getCurrentBlocks() == curBlocks && evictPlc.getCurrentSize() == curBytes; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java index 517d36a..5d4b369 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java @@ -1108,7 +1108,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes int threadCnt = 5; - IgniteFuture<?> fut = multithreadedAsync(new Runnable() { + InternalFuture<?> fut = multithreadedAsync(new Runnable() { @Override public void run() { while (!stop.get()) { IgniteFsOutputStream os = null; @@ -1128,7 +1128,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes try { U.sleep(10); } - catch (GridInterruptedException ignored) { + catch (InternalInterruptedException ignored) { // nO-op. } } @@ -1427,7 +1427,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes int threadCnt = 5; - IgniteFuture<?> fut = multithreadedAsync(new Runnable() { + InternalFuture<?> fut = multithreadedAsync(new Runnable() { @Override public void run() { while (!stop.get()) { IgniteFsOutputStream os = null; @@ -1447,7 +1447,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes try { U.sleep(10); } - catch (GridInterruptedException ignored) { + catch (InternalInterruptedException ignored) { // nO-op. } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java index 565b423..c6b644b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java @@ -157,7 +157,7 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest { rnd.nextBytes(data); - IgniteFuture<Boolean> fut = mgr.writeStart(info); + InternalFuture<Boolean> fut = mgr.writeStart(info); expectsStoreFail(info, data, "Not enough space reserved to store data"); @@ -244,7 +244,7 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest { info = new GridGgfsFileInfo(info, info.length() + data.length + remainder.length); - IgniteFuture<Boolean> fut = mgr.writeStart(info); + InternalFuture<Boolean> fut = mgr.writeStart(info); GridGgfsFileAffinityRange range = new GridGgfsFileAffinityRange(); @@ -329,7 +329,7 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest { info = new GridGgfsFileInfo(info, info.length() + data.length * writesCnt); - IgniteFuture<Boolean> fut = mgr.writeStart(info); + InternalFuture<Boolean> fut = mgr.writeStart(info); for (int j = 0; j < 64; j++) { Arrays.fill(data, (byte)(j / 4)); @@ -366,7 +366,7 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest { pos += stored.length; } - IgniteFuture<Object> delFut = mgr.delete(info); + InternalFuture<Object> delFut = mgr.delete(info); delFut.get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90948e67/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java index 68ac49f..dfd3897 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java @@ -17,7 +17,6 @@ import org.apache.ignite.fs.mapreduce.*; import org.apache.ignite.fs.mapreduce.records.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -178,7 +177,7 @@ public class GridGgfsTaskSelfTest extends GridGgfsCommonAbstractTest { assertNull(ggfsAsync.execute( new Task(), new IgniteFsStringDelimiterRecordResolver(" "), Collections.singleton(FILE), arg)); - IgniteFuture<IgniteBiTuple<Long, Integer>> fut = ggfsAsync.future(); + InternalFuture<IgniteBiTuple<Long, Integer>> fut = ggfsAsync.future(); assertNotNull(fut); @@ -190,7 +189,7 @@ public class GridGgfsTaskSelfTest extends GridGgfsCommonAbstractTest { ggfsAsync.format(); - IgniteFuture<?> fut = ggfsAsync.future(); + InternalFuture<?> fut = ggfsAsync.future(); assertNotNull(fut);
